Updated to use new EppoValue.getType()

Author: hbordersTwitch

src/main/java/cloud/eppo/api/EppoValue.java

@@ -6,7 +6,7 @@
 import java.util.Objects;
 
 public class EppoValue {
-  public final EppoValueType type;
+  protected final EppoValueType type;
   protected Boolean boolValue;
   protected Double doubleValue;
   protected String stringValue;
@@ -92,6 +92,10 @@ public boolean isStringArray() {
     return type == EppoValueType.ARRAY_OF_STRING;
   }
 
+  public EppoValueType getType() {
+    return type;
+  }
+
   @Override
   public String toString() {
     switch (this.type) {

src/main/java/cloud/eppo/ufc/dto/adapters/EppoValueSerializer.java

@@ -1,6 +1,8 @@
 package cloud.eppo.ufc.dto.adapters;
 
 import cloud.eppo.api.EppoValue;
+import cloud.eppo.ufc.dto.EppoValueType;
+
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
@@ -18,23 +20,31 @@ public EppoValueSerializer() {
   @Override
   public void serialize(EppoValue src, JsonGenerator jgen, SerializerProvider provider)
       throws IOException {
-    switch (src.type) {
-      case NULL:
-        jgen.writeNull();
-        break;
-      case BOOLEAN:
-        jgen.writeBoolean(src.booleanValue());
-        break;
-      case NUMBER:
-        jgen.writeNumber(src.doubleValue());
-        break;
-      case STRING:
-        jgen.writeString(src.stringValue());
-        break;
-      case ARRAY_OF_STRING:
-        String[] arr = src.stringArrayValue().toArray(new String[0]);
-        jgen.writeArray(arr, 0, arr.length);
-        break;
+    final EppoValueType type = src.getType();
+    if (type == null) {
+      // this should never happen, but if it does,
+      // we need to write something so that we're valid JSON
+      // so a null value is safest.
+      jgen.writeNull();
+    } else {
+      switch (src.getType()) {
+        case NULL:
+          jgen.writeNull();
+          break;
+        case BOOLEAN:
+          jgen.writeBoolean(src.booleanValue());
+          break;
+        case NUMBER:
+          jgen.writeNumber(src.doubleValue());
+          break;
+        case STRING:
+          jgen.writeString(src.stringValue());
+          break;
+        case ARRAY_OF_STRING:
+          String[] arr = src.stringArrayValue().toArray(new String[0]);
+          jgen.writeArray(arr, 0, arr.length);
+          break;
+      }
     }
   }
 }