Merge pull request #130 from reda-alaoui

* gh-130:
  ProxyDataSource#close uses instanceof AutoCloseable instead of isWrapperFor(AutoCloseable.class)

Closes #129

Author: ttddyy

src/main/java/net/ttddyy/dsproxy/support/ProxyDataSource.java

@@ -24,6 +24,7 @@
  * A proxy of {@link javax.sql.DataSource} with {@link net.ttddyy.dsproxy.listener.QueryExecutionListener}.
  *
  * @author Tadaya Tsuyukubo
+ * @author Réda Housni Alaoui
  */
 public class ProxyDataSource extends ProxyLogicSupport implements DataSource, Closeable {
 
@@ -153,14 +154,22 @@ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
 
     @Override
     public void close() throws IOException {
+        try {
+            doClose();
+        } catch (Exception e) {
+            throw new IOException(e);
+        }
+    }
+
+    private void doClose() throws Exception {
         if (dataSource instanceof Closeable) {
             ((Closeable) dataSource).close();
         } else if (isAutoCloseablePresent && dataSource instanceof AutoCloseable) {
-            try {
-                ((AutoCloseable) dataSource).close(); // (jdk7+)
-            } catch (Exception ex) {
-                throw new IOException(ex);
-            }
+            ((AutoCloseable) dataSource).close(); // (jdk7+)
+        } else if (dataSource.isWrapperFor(Closeable.class)) {
+            dataSource.unwrap(Closeable.class).close();
+        } else if (isAutoCloseablePresent && dataSource.isWrapperFor(AutoCloseable.class)) {
+            dataSource.unwrap(AutoCloseable.class).close();  // (jdk7+)
         }
     }
 

src/test/java/net/ttddyy/dsproxy/ProxyDataSourceTest.java

@@ -1,5 +1,7 @@
 package net.ttddyy.dsproxy;
 
+import java.io.Closeable;
+import java.util.concurrent.atomic.AtomicBoolean;
 import net.ttddyy.dsproxy.listener.CallCheckMethodExecutionListener;
 import net.ttddyy.dsproxy.listener.MethodExecutionContext;
 import net.ttddyy.dsproxy.proxy.ProxyConfig;
@@ -26,13 +28,15 @@
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.withSettings;
 
 
 /**
  * TODO: clean up & rewrite
  *
  * @author Tadaya Tsuyukubo
+ * @author Réda Housni Alaoui
  */
 public class ProxyDataSourceTest {
 
@@ -258,6 +262,58 @@ public void autoCloseable() throws Exception {
         verify((AutoCloseable) ds).close();
     }
 
+	@Test
+	public void closeProxyOfAutoCloseableViaClose() throws Exception {
+		DataSource ds = mock(DataSource.class);
+		when(ds.isWrapperFor(AutoCloseable.class)).thenReturn(true);
+
+		AtomicBoolean closed = new AtomicBoolean();
+		AutoCloseable autoCloseable = () -> closed.set(true);
+		when(ds.unwrap(AutoCloseable.class)).thenReturn(autoCloseable);
+
+		new ProxyDataSource(ds).close();
+		assertThat(closed).isTrue();
+	}
+
+	@Test
+	public void closeProxyOfCloseableViaClose() throws Exception {
+		DataSource ds = mock(DataSource.class);
+		when(ds.isWrapperFor(Closeable.class)).thenReturn(true);
+
+		AtomicBoolean closed = new AtomicBoolean();
+		Closeable closeable = () -> closed.set(true);
+		when(ds.unwrap(Closeable.class)).thenReturn(closeable);
+
+		new ProxyDataSource(ds).close();
+		assertThat(closed).isTrue();
+	}
+
+	@Test
+	public void closeProxyOfAutoCloseableViaUnwrap() throws Exception {
+		DataSource ds = mock(DataSource.class);
+		when(ds.isWrapperFor(AutoCloseable.class)).thenReturn(true);
+
+		AtomicBoolean closed = new AtomicBoolean();
+		AutoCloseable autoCloseable = () -> closed.set(true);
+		when(ds.unwrap(AutoCloseable.class)).thenReturn(autoCloseable);
+
+		new ProxyDataSource(ds).unwrap(AutoCloseable.class).close();
+		assertThat(closed).isTrue();
+	}
+
+	@Test
+	public void closeProxyOfCloseableViaUnwrap() throws Exception {
+		DataSource ds = mock(DataSource.class);
+		when(ds.isWrapperFor(Closeable.class)).thenReturn(true);
+
+		AtomicBoolean closed = new AtomicBoolean();
+		Closeable closeable = () -> closed.set(true);
+		when(ds.unwrap(Closeable.class)).thenReturn(closeable);
+
+		new ProxyDataSource(ds).unwrap(Closeable.class).close();
+		assertThat(closed).isTrue();
+	}
+
     @Test
     public void getDataSource() {
         DataSource original = mock(DataSource.class);