GitHub-Spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-05-02 12:03:41 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Issue: SPR-9770
This commit is contained in:
Juergen Hoeller
2012-09-10 10:41:36 +02:00
committed by unknown
parent f32e4077fa
commit a90f25668b
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDataSource.java
+7 -10
View File
@@ -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.
@@ -78,17 +76,16 @@ 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 (!DataSource.class.equals(iface)) {
throw new SQLException("DataSource of type [" + getClass().getName() +
"] can only be unwrapped as [javax.sql.DataSource], not as [" + iface.getName());
public <T> T unwrap(Class<T> iface) throws SQLException {
if (iface.isInstance(this)) {
return (T) this;
}
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
+6 -3
View File
@@ -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.
@@ -110,12 +110,15 @@ public class DelegatingDataSource implements DataSource, InitializingBean {
//---------------------------------------------------------------------
@SuppressWarnings("unchecked")
public <T> T unwrap(Class<T> iface) throws SQLException {
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));
}