Merge pull request #23 from twz123/standard-object-methods-for-proxy

Object standard methods support for proxy instances

Author: hjacobs

pom.xml

@@ -228,6 +228,12 @@
             <artifactId>joda-time</artifactId>
             <version>2.6</version>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>2.0.31-beta</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <profiles>
         <profile>

src/main/java/de/zalando/sprocwrapper/proxy/SProcProxy.java

@@ -7,17 +7,21 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.base.Objects;
+import com.google.common.reflect.AbstractInvocationHandler;
+
 import de.zalando.sprocwrapper.dsprovider.DataSourceProvider;
 
 /**
  * @author  jmussler
  */
-class SProcProxy implements java.lang.reflect.InvocationHandler {
+class SProcProxy extends AbstractInvocationHandler {
 
     private final HashMap<Method, StoredProcedure> sprocs = new HashMap<Method, StoredProcedure>();
     private final DataSourceProvider dataSourceProvider;
 
     private static final Logger LOG = LoggerFactory.getLogger(OtherStoredProcedureParameter.class);
+    private final String description;
 
     public boolean addStoredProcedure(final Method method, final StoredProcedure p) {
         if (sprocs.containsKey(method)) {
@@ -28,23 +32,33 @@ public boolean addStoredProcedure(final Method method, final StoredProcedure p)
         return true;
     }
 
-    public SProcProxy(final DataSourceProvider provider) {
+    public SProcProxy(final DataSourceProvider provider, final String description) {
         if (provider == null) {
             throw new IllegalArgumentException("DataSourceProvider cannot be null");
         }
 
         dataSourceProvider = provider;
+        this.description = description;
     }
 
     @Override
-    public Object invoke(final Object proxy, final Method m, final Object[] args) {
-        StoredProcedure p = sprocs.get(m);
+    protected Object handleInvocation(final Object proxy, final Method method, final Object[] args) {
+        final StoredProcedure p = sprocs.get(method);
 
         if (p == null) {
-            LOG.warn("no StoredProcedure found for method {}", m);
+            LOG.warn("no StoredProcedure found for method {}", method);
             return null;
         }
 
-        return p.execute(dataSourceProvider, new InvocationContext(proxy, m, args));
+        return p.execute(dataSourceProvider, new InvocationContext(proxy, method, args));
+    }
+
+    @Override
+    public String toString() {
+        return
+            Objects.toStringHelper(this)                          //
+                   .addValue(description)                         //
+                   .add("dataSourceProvider", dataSourceProvider) //
+                   .toString();
     }
 }

src/main/java/de/zalando/sprocwrapper/proxy/SProcProxyBuilder.java

@@ -23,7 +23,7 @@ private SProcProxyBuilder() {
 
     @SuppressWarnings("unchecked")
     public static <T> T build(final DataSourceProvider d, final Class<T> c) {
-        final SProcProxy proxy = new SProcProxy(d);
+        final SProcProxy proxy = new SProcProxy(d, c.getName());
 
 
         try {

src/test/java/de/zalando/sprocwrapper/proxy/SProcProxyBuilderTest.java

@@ -0,0 +1,51 @@
+package de.zalando.sprocwrapper.proxy;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+
+import org.mockito.runners.MockitoJUnitRunner;
+
+import de.zalando.sprocwrapper.dsprovider.DataSourceProvider;
+
+@RunWith(MockitoJUnitRunner.class)
+public class SProcProxyBuilderTest {
+
+    private interface EmptySProcService {
+        // empty
+    }
+
+    @Mock
+    private DataSourceProvider dataSourceProvider;
+
+    private EmptySProcService underTest;
+
+    @Before
+    public void setUp() {
+        underTest = SProcProxyBuilder.build(dataSourceProvider, EmptySProcService.class);
+    }
+
+    @Test
+    public void hashCodeOnDynamicProxyWorks() {
+        assertThat("hashCode() on dynamic proxy returned 0", underTest.hashCode(), is(not(0)));
+    }
+
+    @Test
+    public void equalsOnDynamicProxyWorks() {
+        assertThat("proxy.equals(proxy) is false", underTest.equals(underTest));
+    }
+
+    @Test
+    public void toStringOnDynamicProxyWorks() {
+        assertThat("toString() on dynamic proxy returned null", underTest.toString(), is(not(nullValue())));
+    }
+}