Merge branch 'georgantasp-issue-74'

# Conflicts:
#	src/main/java/org/mybatis/guice/mappers/MapperProvider.java
#	src/main/java/org/mybatis/guice/type/TypeHandlerProvider.java
#	src/test/java/org/mybatis/guice/GuiceTestRunner.java

Author: christianpoitras

src/main/java/org/mybatis/guice/mappers/MapperProvider.java

@@ -17,6 +17,8 @@
 
 import org.apache.ibatis.session.SqlSessionManager;
 
+import com.google.common.base.Objects;
+
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -43,4 +45,17 @@ public T get() {
         return this.sqlSessionManager.getMapper(mapperType);
     }
 
+    @Override
+    public int hashCode() {
+      return Objects.hashCode(this.mapperType);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if(obj == null){
+        return false;
+      }
+      MapperProvider other = (MapperProvider) obj;
+      return Objects.equal(this.mapperType, other.mapperType);
+    }
 }

src/main/java/org/mybatis/guice/type/TypeHandlerProvider.java

@@ -20,6 +20,7 @@
 import org.apache.ibatis.type.TypeException;
 import org.apache.ibatis.type.TypeHandler;
 
+import com.google.common.base.Objects;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.TypeLiteral;
@@ -70,4 +71,19 @@ public TH get() {
         }
         return instance;
     }
+
+    @Override
+    public int hashCode() {
+      return Objects.hashCode(this.typeHandlerTypeLiteral, this.handledType);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+      if(obj == null){
+        return false;
+      }
+      TypeHandlerProvider other = (TypeHandlerProvider) obj;
+      return Objects.equal(this.typeHandlerTypeLiteral, other.typeHandlerTypeLiteral) &&
+        Objects.equal(this.handledType, other.handledType);
+    }
 }

src/test/java/org/mybatis/guice/GuiceTestRunner.java

@@ -54,6 +54,18 @@ protected void initialize() {
                 defaultStatementTimeout(null);
             }
 
+        });
+        modules.add(new MyBatisModule() {
+
+            @Override
+            protected void initialize() {
+                addMapperClass(ContactMapper.class);
+                handleType(CustomType.class).with(CustomLongTypeHandler.class);
+                handleType(Address.class).with(AddressTypeHandler.class);
+                addTypeHandlerClass(ContactIdTypeHandler.class);
+                addTypeHandlerClass(ContactNameTypeHandler.class);
+            }
+
         });
 
         return modules;