Handle default field values properly (#106)

* handle default field values properly

* rename test

Author: reugn

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

@@ -7,15 +7,15 @@ public class BooleanMapper extends TypeMapper {
     @Override
     public Object toAerospikeFormat(Object value) {
         if (value == null) {
-            return 0;
+            return null;
         }
         return ((Boolean) value) ? 1 : 0;
     }
 
     @Override
     public Object fromAerospikeFormat(Object value) {
         if (value == null) {
-            return false;
+            return null;
         }
         return !Long.valueOf(0).equals(value);
     }

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

@@ -6,14 +6,17 @@ public class ByteMapper extends TypeMapper {
 
     @Override
     public Object toAerospikeFormat(Object value) {
-        return Long.valueOf(((Number) value).longValue());
+        if (value == null) {
+            return null;
+        }
+        return ((Number) value).longValue();
     }
 
     @Override
     public Object fromAerospikeFormat(Object value) {
         if (value == null) {
-            return Byte.valueOf((byte) 0);
+            return null;
         }
-        return Byte.valueOf(((Number) value).byteValue());
+        return ((Number) value).byteValue();
     }
 }

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

@@ -7,19 +7,19 @@ public class CharacterMapper extends TypeMapper {
     @Override
     public Object toAerospikeFormat(Object value) {
         if (value == null) {
-            return Long.valueOf(0);
+            return null;
         } else {
-            char c = ((Character) value).charValue();
-            return Long.valueOf(c);
+            char c = (Character) value;
+            return (long) c;
         }
     }
 
     @Override
     public Object fromAerospikeFormat(Object value) {
         if (value == null) {
-            return Character.valueOf((char) 0);
+            return null;
         }
         long longVal = ((Number) value).longValue();
-        return Character.valueOf((char) longVal);
+        return (char) longVal;
     }
 }

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

@@ -11,9 +11,6 @@ public Object toAerospikeFormat(Object value) {
 
     @Override
     public Object fromAerospikeFormat(Object value) {
-        if (value == null) {
-            return Double.valueOf(0);
-        }
         return value;
     }
 }

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

@@ -12,8 +12,8 @@ public Object toAerospikeFormat(Object value) {
     @Override
     public Object fromAerospikeFormat(Object value) {
         if (value == null) {
-            return Float.valueOf(0f);
+            return null;
         }
-        return Float.valueOf(((Number) value).floatValue());
+        return ((Number) value).floatValue();
     }
 }

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

@@ -12,8 +12,8 @@ public Object toAerospikeFormat(Object value) {
     @Override
     public Object fromAerospikeFormat(Object value) {
         if (value == null) {
-            return Integer.valueOf(0);
+            return null;
         }
-        return Integer.valueOf(((Number) value).intValue());
+        return ((Number) value).intValue();
     }
 }

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

@@ -11,9 +11,6 @@ public Object toAerospikeFormat(Object value) {
 
     @Override
     public Object fromAerospikeFormat(Object value) {
-        if (value == null) {
-            return Long.valueOf(0);
-        }
         return value;
     }
 }

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

@@ -6,14 +6,17 @@ public class ShortMapper extends TypeMapper {
 
     @Override
     public Object toAerospikeFormat(Object value) {
-        return Long.valueOf(((Number) value).longValue());
+        if (value == null) {
+            return null;
+        }
+        return ((Number) value).longValue();
     }
 
     @Override
     public Object fromAerospikeFormat(Object value) {
         if (value == null) {
-            return Short.valueOf((short) 0);
+            return null;
         }
-        return Short.valueOf(((Number) value).shortValue());
+        return ((Number) value).shortValue();
     }
 }

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

@@ -0,0 +1,66 @@
+package com.aerospike.mapper;
+
+import com.aerospike.client.policy.WritePolicy;
+import com.aerospike.mapper.annotations.AerospikeKey;
+import com.aerospike.mapper.annotations.AerospikeRecord;
+import com.aerospike.mapper.tools.AeroMapper;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class DefaultFieldValuesTest extends AeroMapperBaseTest {
+
+    @AerospikeRecord(namespace = "test", set = "testSet")
+    public static class DefaultFieldsClass {
+        @AerospikeKey
+        String key;
+        Integer i;
+        int i2;
+        Long l;
+        long l2;
+        Short s;
+        short s2;
+        Float f;
+        float f2;
+        Double d;
+        double d2;
+        Character c;
+        char c2;
+        Byte b;
+        byte b2;
+        Boolean bool;
+        boolean bool2;
+    }
+
+    @Test
+    public void testDefaultValues() {
+        WritePolicy writePolicy = new WritePolicy(client.getWritePolicyDefault());
+        writePolicy.totalTimeout = 2000;
+        writePolicy.socketTimeout = 100;
+        AeroMapper mapper = new AeroMapper.Builder(client)
+                .withWritePolicy(writePolicy).forClasses(PartialRecordsTest.DataClass.class)
+                .build();
+
+        DefaultFieldsClass obj = new DefaultFieldsClass();
+        obj.key = "dfc";
+        mapper.save(obj);
+
+        DefaultFieldsClass dfc = mapper.read(DefaultFieldsClass.class, "dfc");
+        assertNull(dfc.i);
+        assertEquals(0, dfc.i2);
+        assertNull(dfc.l);
+        assertEquals(0, dfc.l2);
+        assertNull(dfc.s);
+        assertEquals(0, dfc.s2);
+        assertNull(dfc.f);
+        assertEquals(0, dfc.f2);
+        assertNull(dfc.d);
+        assertEquals(0, dfc.d2);
+        assertNull(dfc.c);
+        assertEquals(0, dfc.c2);
+        assertNull(dfc.b);
+        assertEquals(0, dfc.b2);
+        assertNull(dfc.bool);
+        assertFalse(dfc.bool2);
+    }
+}