Minor refactor (thanks Simo) and some tests

Author: emacarron

src/main/java/org/apache/ibatis/binding/MapperProxy.java

@@ -17,17 +17,16 @@ private <T> MapperProxy(SqlSession sqlSession) {
   }
 
   public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-    if (method.getDeclaringClass() != Object.class) {
-      final Class<?> declaringInterface = findDeclaringInterface(proxy, method);
-      final MapperMethod mapperMethod = new MapperMethod(declaringInterface, method, sqlSession);
-      final Object result = mapperMethod.execute(args);
-      if (result == null && method.getReturnType().isPrimitive() && !method.getReturnType().equals(Void.TYPE)) {
-        throw new BindingException("Mapper method '" + method.getName() + "' (" + method.getDeclaringClass() + ") attempted to return null from a method with a primitive return type (" + method.getReturnType() + ").");
-      }
-      return result;
-    } else {
+    if (method.getDeclaringClass() == Object.class) {
       return method.invoke(this, args);
     }
+    final Class<?> declaringInterface = findDeclaringInterface(proxy, method);
+    final MapperMethod mapperMethod = new MapperMethod(declaringInterface, method, sqlSession);
+    final Object result = mapperMethod.execute(args);
+    if (result == null && method.getReturnType().isPrimitive() && !method.getReturnType().equals(Void.TYPE)) {
+      throw new BindingException("Mapper method '" + method.getName() + "' (" + method.getDeclaringClass() + ") attempted to return null from a method with a primitive return type (" + method.getReturnType() + ").");
+    }
+    return result;
   }
 
   private Class<?> findDeclaringInterface(Object proxy, Method method) {

src/test/java/org/apache/ibatis/binding/BindingTest.java

@@ -400,5 +400,38 @@ public void shouldSelectDraftTypedPostsWithResultMap() {
     }
   }
 
+  @Test
+  public void shouldReturnANotNullToString() throws Exception {
+    SqlSession session = sqlSessionFactory.openSession();
+    try {
+      BoundBlogMapper mapper = session.getMapper(BoundBlogMapper.class);
+      assertNotNull(mapper.toString());
+    } finally {
+      session.close();
+    }
+  }
+
+  @Test
+  public void shouldReturnANotNullHashCode() throws Exception {
+    SqlSession session = sqlSessionFactory.openSession();
+    try {
+      BoundBlogMapper mapper = session.getMapper(BoundBlogMapper.class);
+      assertNotNull(mapper.hashCode());
+    } finally {
+      session.close();
+    }
+  }
+
+  @Test
+  public void shouldCompareToMappers() throws Exception {
+    SqlSession session = sqlSessionFactory.openSession();
+    try {
+      BoundBlogMapper mapper = session.getMapper(BoundBlogMapper.class);
+      BoundBlogMapper mapper2 = session.getMapper(BoundBlogMapper.class);
+      assertFalse(mapper.equals(mapper2));
+    } finally {
+      session.close();
+    }
+  }
 
 }