set UseBoolBin instead of casting, fix test case to default to Long

Author: cinterloper

src/main/java/com/aerospike/mapper/tools/ValueType.java

@@ -97,11 +97,7 @@ public void set(final Object obj, final Object value) throws ReflectiveOperation
                 DeferredObjectSetter objectSetter = new DeferredObjectSetter(setter, (DeferredObject) value);
                 DeferredObjectLoader.add(objectSetter);
             } else {
-                if (this.field.getType().isAssignableFrom(Boolean.class) && value instanceof Long) {
-                    this.field.set(obj, (Long) value != 0);
-                } else {
-                    this.field.set(obj, value);
-                }
+                this.field.set(obj, value);
             }
         }
 

src/main/java/com/aerospike/mapper/tools/mappers/BooleanMapper.java

@@ -22,21 +22,20 @@ public BooleanMapper(final ClassConfig config) {
 
     @Override
     public Object toAerospikeFormat(Object value) {
-        final boolean useObjectEncoding;
         if (ClassCache.getInstance().hasClassConfig(Boolean.class)) {
-            useObjectEncoding = ClassCache.getInstance()
+            UseBoolBin = ClassCache.getInstance()
                     .getClassConfig(Boolean.class)
                     .getBoolEncoding()
                     .equals(Encoding.Boolean);
         } else {
-            useObjectEncoding = false;
+            UseBoolBin = false;
         }
 
 
         if (value == null) {
             return null;
         }
-        if (UseBoolBin && useObjectEncoding) {
+        if (UseBoolBin) {
             return value;
         }
         return ((Boolean) value) ? 1 : 0;

src/test/java/com/aerospike/mapper/DefaultFieldValuesTest.java

@@ -87,7 +87,7 @@ public void testBooleanValue() {
         UseBoolBin = true;
         mapper.save(obj);
         record = client.get(null, key);
-        assertTrue(record.bins.get("bool2") instanceof Boolean);
+        assertTrue(record.bins.get("bool2") instanceof Long);
         assertFalse(record.getBoolean("bool2"));
         dfc = mapper.read(DefaultFieldsClass.class, "dfc");
         assertFalse(dfc.bool2);