Fix inconsistency between isWrapperFor and unwrap

Closes brettwooldridgeGH-2237
quaff · Sep 25, 2024 · 2de62fe · 2de62fe
1 parent 80d30d3
commit 2de62fe
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 3 deletions.
diff --git a/src/main/java/com/zaxxer/hikari/pool/ProxyConnection.java b/src/main/java/com/zaxxer/hikari/pool/ProxyConnection.java
@@ -30,7 +30,7 @@
 import static com.zaxxer.hikari.SQLExceptionOverride.Override.DO_NOT_EVICT;
 
 /**
- * This is the proxy class for java.sql.Connection.
+ * This is the proxy class for {@link java.sql.Connection}.
  *
  * @author Brett Wooldridge
  */

diff --git a/src/main/java/com/zaxxer/hikari/pool/ProxyDatabaseMetaData.java b/src/main/java/com/zaxxer/hikari/pool/ProxyDatabaseMetaData.java
@@ -5,6 +5,12 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+/**
+ * This is the proxy class for {@link java.sql.DatabaseMetaData}.
+ *
+ * @author Brett Wooldridge
+ * @author Yanming Zhou
+ */
 public abstract class ProxyDatabaseMetaData implements DatabaseMetaData
 {
  protected final ProxyConnection connection;
@@ -302,6 +308,13 @@ public ResultSet getPseudoColumns(String catalog, String schemaPattern, String t
  return ProxyFactory.getProxyResultSet(connection, (ProxyStatement) statement, resultSet);
  }
 
+ /** {@inheritDoc} */
+ @Override
+ public final boolean isWrapperFor(Class<?> iface) throws SQLException
+ {
+ return iface.isInstance(delegate) || (delegate != null && delegate.isWrapperFor(iface));
+ }
+
  /** {@inheritDoc} */
  @Override
  @SuppressWarnings("unchecked")

diff --git a/src/main/java/com/zaxxer/hikari/pool/ProxyResultSet.java b/src/main/java/com/zaxxer/hikari/pool/ProxyResultSet.java
@@ -21,9 +21,10 @@
 import java.sql.Statement;
 
 /**
- * This is the proxy class for java.sql.ResultSet.
+ * This is the proxy class for {@link java.sql.ResultSet}.
  *
  * @author Brett Wooldridge
+ * @author Yanming Zhou
  */
 public abstract class ProxyResultSet implements ResultSet
 {
@@ -85,6 +86,13 @@ public void deleteRow() throws SQLException
  delegate.deleteRow();
  }
 
+ /** {@inheritDoc} */
+ @Override
+ public final boolean isWrapperFor(Class<?> iface) throws SQLException
+ {
+ return iface.isInstance(delegate) || (delegate != null && delegate.isWrapperFor(iface));
+ }
+
  /** {@inheritDoc} */
  @Override
  @SuppressWarnings("unchecked")

diff --git a/src/main/java/com/zaxxer/hikari/pool/ProxyStatement.java b/src/main/java/com/zaxxer/hikari/pool/ProxyStatement.java
@@ -22,9 +22,10 @@
 import java.sql.Statement;
 
 /**
- * This is the proxy class for java.sql.Statement.
+ * This is the proxy class for {@link java.sql.Statement}.
  *
  * @author Brett Wooldridge
+ * @author Yanming Zhou
  */
 public abstract class ProxyStatement implements Statement
 {
@@ -233,6 +234,13 @@ public ResultSet getGeneratedKeys() throws SQLException
  return proxyResultSet;
  }
 
+ /** {@inheritDoc} */
+ @Override
+ public final boolean isWrapperFor(Class<?> iface) throws SQLException
+ {
+ return iface.isInstance(delegate) || (delegate != null && delegate.isWrapperFor(iface));
+ }
+
  /** {@inheritDoc} */
  @Override
  @SuppressWarnings("unchecked")