Spring-backed DataSources consistently implement JDBC 4.0's Wrapper interface

Issue: SPR-9770

spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDataSource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,6 @@ import javax.sql.DataSource;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.util.Assert;
-
 /**
  * Abstract base class for Spring's {@link javax.sql.DataSource}
  * implementations, taking care of the padding.
@@ -79,16 +77,15 @@ public abstract class AbstractDataSource implements DataSource {
 
 	@SuppressWarnings("unchecked")
 	public <T> T unwrap(Class<T> iface) throws SQLException {
-		Assert.notNull(iface, "Interface argument must not be null");
+		if (iface.isInstance(this)) {
-		if (!DataSource.class.equals(iface)) {
-			throw new SQLException("DataSource of type [" + getClass().getName() +
-					"] can only be unwrapped as [javax.sql.DataSource], not as [" + iface.getName());
-		}
 			return (T) this;
 		}
+		throw new SQLException("DataSource of type [" + getClass().getName() +
+				"] cannot be unwrapped as [" + iface.getName() + "]");
+	}
 
 	public boolean isWrapperFor(Class<?> iface) throws SQLException {
-		return DataSource.class.equals(iface);
+		return iface.isInstance(this);
 	}
 
 

spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DelegatingDataSource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -111,11 +111,14 @@ public class DelegatingDataSource implements DataSource, InitializingBean {
 
 	@SuppressWarnings("unchecked")
 	public <T> T unwrap(Class<T> iface) throws SQLException {
+		if (iface.isInstance(this)) {
+			return (T) this;
+		}
 		return getTargetDataSource().unwrap(iface);
 	}
 
 	public boolean isWrapperFor(Class<?> iface) throws SQLException {
-		return getTargetDataSource().isWrapperFor(iface);
+		return (iface.isInstance(this) || getTargetDataSource().isWrapperFor(iface));
 	}