Handle null values in EnumMapper (#122)

Author: reugn

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

@@ -14,12 +14,12 @@ public class EnumMapper extends TypeMapper {
     public EnumMapper(Class<? extends Enum<?>> clazz, String enumField) {
         this.clazz = clazz;
         this.enumField = enumField;
-        if (!enumField.equals("")) {
+        if (!enumField.isEmpty()) {
             try {
                 this.enumRequestedField = clazz.getDeclaredField(enumField);
                 this.enumRequestedField.setAccessible(true);
             } catch (NoSuchFieldException e) {
-                throw new AerospikeException("Cannot Map requested enum, issue with the requested enumField.");
+                throw toAerospikeException(e);
             }
         } else {
             this.enumRequestedField = null;
@@ -28,11 +28,19 @@ public EnumMapper(Class<? extends Enum<?>> clazz, String enumField) {
 
     @Override
     public Object toAerospikeFormat(Object value) {
-        if (!enumField.equals("")) {
+        if (value == null) {
+            return null;
+        }
+
+        if (!enumField.isEmpty()) {
+            if (enumRequestedField == null) {
+                return null;
+            }
             try {
-                return enumRequestedField.get(value).toString();
+                Object enumValue = enumRequestedField.get(value);
+                return enumValue == null ? null : enumValue.toString();
             } catch (IllegalAccessException e) {
-                throw new AerospikeException("Cannot Map requested enum, issue with the requested enumField.");
+                throw toAerospikeException(e);
             }
         }
         return value.toString();
@@ -47,15 +55,15 @@ public Object fromAerospikeFormat(Object value) {
         String stringValue = (String) value;
         Enum<?>[] constants = clazz.getEnumConstants();
 
-        if (!enumField.equals("")) {
+        if (!enumField.isEmpty()) {
             try {
                 for (Enum<?> thisEnum : constants) {
                     if (enumRequestedField.get(thisEnum).equals(stringValue)) {
                         return thisEnum;
                     }
                 }
             } catch (IllegalAccessException e) {
-                throw new AerospikeException("Cannot Map requested enum, issue with the requested enumField.");
+                throw toAerospikeException(e);
             }
         } else {
             for (Enum<?> thisEnum : constants) {
@@ -64,6 +72,10 @@ public Object fromAerospikeFormat(Object value) {
                 }
             }
         }
-        throw new AerospikeException(String.format("Enum value of \"%s\" not found in type %s", stringValue, clazz.toString()));
+        throw new AerospikeException(String.format("Enum value of \"%s\" not found in type %s", stringValue, clazz));
+    }
+
+    private AerospikeException toAerospikeException(Exception e) {
+        return new AerospikeException("Cannot Map requested enum, issue with the requested enumField.", e);
     }
 }

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

@@ -1,16 +1,50 @@
 package com.aerospike.mapper;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Test;
-
 import com.aerospike.mapper.annotations.AerospikeEnum;
 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.assertEquals;
 
 public class AeroMapperEnumTest extends AeroMapperBaseTest {
 
+    @Test
+    public void runTest() {
+        A a1 = new A(1, "a", 10, Status.MARRIED, Country.ARGENTINA, Country.ARGENTINA);
+        A a2 = new A(2, "b", 20, Status.SINGLE, Country.DENMARK, Country.DENMARK);
+        A a3 = new A(3, "c", 30, Status.COMPLICATED, Country.UNITED_STATES, Country.UNITED_STATES);
+        A a4 = new A(4, "d", 40, null, null, null);
+
+        AeroMapper mapper = new AeroMapper.Builder(client).build();
+        mapper.save(a1);
+        mapper.save(a2);
+        mapper.save(a3);
+        mapper.save(a4);
+
+        A a11 = mapper.read(A.class, 1);
+        A a12 = mapper.read(A.class, 2);
+        A a13 = mapper.read(A.class, 3);
+        A a14 = mapper.read(A.class, 4);
+
+        assertEquals(a1.id, a11.id);
+        assertEquals(a1.status, a11.status);
+        assertEquals(a1.country, a11.country);
+
+        assertEquals(a2.name, a12.name);
+        assertEquals(a2.country, a12.country);
+        assertEquals(a2.countryAnno, a12.countryAnno);
+
+        assertEquals(a3.age, a13.age);
+        assertEquals(a3.country, a13.country);
+        assertEquals(a3.countryAnno, a13.countryAnno);
+
+        assertEquals(a4.age, a14.age);
+        assertEquals(a4.country, a14.country);
+        assertEquals(a4.countryAnno, a14.countryAnno);
+    }
+
     enum Status {
         MARRIED,
         SINGLE,
@@ -41,10 +75,9 @@ public static class A {
         public String name;
         public int age;
         public Status status;
-        public Country country;
         @AerospikeEnum(enumField = "countryCode")
         public Country countryAnno;
-
+        private Country country;
 
         public A() {
         }
@@ -59,29 +92,4 @@ public A(int id, String name, int age, Status status, Country country, Country c
             this.countryAnno = countryAnno;
         }
     }
-
-    @Test
-    public void runTest() {
-        A a1 = new A(1, "a", 10, Status.MARRIED, Country.ARGENTINA, Country.ARGENTINA);
-        A a2 = new A(2, "b", 20, Status.SINGLE, Country.DENMARK, Country.DENMARK);
-        A a3 = new A(3, "c", 30, Status.COMPLICATED, Country.UNITED_STATES, Country.UNITED_STATES);
-
-        AeroMapper mapper = new AeroMapper.Builder(client).build();
-        mapper.save(a1);
-        mapper.save(a2);
-        mapper.save(a3);
-
-        A a11 = mapper.read(A.class, 1);
-        A a12 = mapper.read(A.class, 2);
-        A a13 = mapper.read(A.class, 3);
-
-        assertEquals(a1.id, a11.id);
-        assertEquals(a1.status, a11.status);
-        assertEquals(a1.country, a11.country);
-        assertEquals(a2.name, a12.name);
-        assertEquals(a2.country, a12.country);
-        assertEquals(a2.countryAnno, a12.countryAnno);
-        assertEquals(a3.age, a13.age);
-        assertEquals(a3.countryAnno, a13.countryAnno);
-    }
 }