fix: RedisEntity value fixes (#67)

* feat: protoparsedmessage.getfieldbyname should return ProtoField

* tests: adding unit tests

* tests: unit tests

* test: fix tests

* feat: add json friendly strings for default

* fix: mapfield with message

* fix: simplify string conversion

* feat: add list json

* tests: default fields

* test: add jsonassert

* fix: remove extra code

* chore: version bump

* fix: template should also parse complex data

Author: lavkesh

build.gradle

@@ -22,7 +22,7 @@ plugins {
 }
 
 group 'io.odpf'
-version '0.3.4'
+version '0.3.5'
 
 repositories {
     mavenCentral()

src/main/java/io/odpf/depot/bigtable/parser/BigTableRecordParser.java

@@ -10,10 +10,11 @@
 import io.odpf.depot.exception.DeserializerException;
 import io.odpf.depot.exception.EmptyMessageException;
 import io.odpf.depot.message.OdpfMessage;
-import io.odpf.depot.message.ParsedOdpfMessage;
-import io.odpf.depot.message.OdpfMessageSchema;
 import io.odpf.depot.message.OdpfMessageParser;
+import io.odpf.depot.message.OdpfMessageSchema;
+import io.odpf.depot.message.ParsedOdpfMessage;
 import io.odpf.depot.message.SinkConnectorSchemaMessageMode;
+import io.odpf.depot.message.field.GenericFieldFactory;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.IOException;
@@ -61,7 +62,7 @@ private BigTableRecord createRecord(OdpfMessage message, long index) {
                             .getColumns(columnFamily)
                             .forEach(column -> {
                                 String fieldName = bigTableSchema.getField(columnFamily, column);
-                                String value = String.valueOf(parsedOdpfMessage.getFieldByName(fieldName, schema));
+                                String value = GenericFieldFactory.getField(parsedOdpfMessage.getFieldByName(fieldName, schema)).getString();
                                 rowMutationEntry.setCell(columnFamily, column, value);
                             }));
             BigTableRecord bigTableRecord = new BigTableRecord(rowMutationEntry, index, null, message.getMetadata());

src/main/java/io/odpf/depot/common/Template.java

@@ -4,6 +4,8 @@
 import io.odpf.depot.exception.InvalidTemplateException;
 import io.odpf.depot.message.OdpfMessageSchema;
 import io.odpf.depot.message.ParsedOdpfMessage;
+import io.odpf.depot.message.field.GenericFieldFactory;
+import io.odpf.depot.message.proto.converter.fields.ProtoField;
 import io.odpf.depot.utils.StringUtils;
 
 import java.util.ArrayList;
@@ -36,8 +38,16 @@ private void validate() throws InvalidTemplateException {
     public String parse(ParsedOdpfMessage parsedOdpfMessage, OdpfMessageSchema schema) {
         Object[] patternVariableData = patternVariableFieldNames
                 .stream()
-                .map(fieldName -> parsedOdpfMessage.getFieldByName(fieldName, schema))
+                .map(fieldName -> fetchInternalValue(parsedOdpfMessage.getFieldByName(fieldName, schema)))
                 .toArray();
         return String.format(templatePattern, patternVariableData);
     }
+
+    private Object fetchInternalValue(Object ob) {
+        if (ob instanceof ProtoField) {
+            return GenericFieldFactory.getField(ob).getString();
+        } else {
+            return ob;
+        }
+    }
 }

src/main/java/io/odpf/depot/exception/EmptyMessageException.java

@@ -8,3 +8,4 @@ public EmptyMessageException() {
         super("log message is empty");
     }
 }
+

src/main/java/io/odpf/depot/message/field/FieldUtils.java

@@ -0,0 +1,44 @@
+package io.odpf.depot.message.field;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+import java.util.Collection;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+public class FieldUtils {
+    private static final Gson GSON = new GsonBuilder().create();
+
+    public static String convertToStringForMessageTypes(Object value, Function<Object, String> toStringFunc) {
+        if (value instanceof Collection<?>) {
+            return "[" + ((Collection<?>) value)
+                    .stream()
+                    .map(toStringFunc)
+                    .collect(Collectors.joining(",")) + "]";
+        }
+        return toStringFunc.apply(value);
+    }
+
+    /**
+     * This method is used to convert default types which string formats are not in json.
+     * for example: a list of doubles, strings, enum etc.
+     */
+    public static String convertToString(Object value) {
+        if (value instanceof Collection<?>) {
+            return GSON.toJson(value);
+        } else {
+            return value.toString();
+        }
+    }
+
+    public static String convertToStringForSpecialTypes(Object value, Function<Object, String> toStringFunc) {
+        if (value instanceof Collection<?>) {
+            return GSON.toJson(((Collection<?>) value)
+                    .stream()
+                    .map(toStringFunc)
+                    .collect(Collectors.toList()));
+        }
+        return toStringFunc.apply(value);
+    }
+}

src/main/java/io/odpf/depot/message/field/GenericField.java

@@ -0,0 +1,5 @@
+package io.odpf.depot.message.field;
+
+public interface GenericField {
+    String getString();
+}

src/main/java/io/odpf/depot/message/field/GenericFieldFactory.java

@@ -0,0 +1,17 @@
+package io.odpf.depot.message.field;
+
+import io.odpf.depot.message.field.json.JsonFieldFactory;
+import io.odpf.depot.message.field.proto.ProtoFieldFactory;
+import io.odpf.depot.message.proto.converter.fields.ProtoField;
+
+public class GenericFieldFactory {
+
+    public static GenericField getField(Object field) {
+        if (field instanceof ProtoField) {
+            return ProtoFieldFactory.getField((ProtoField) field);
+        } else {
+            return JsonFieldFactory.getField(field);
+        }
+
+    }
+}

src/main/java/io/odpf/depot/message/field/json/DefaultField.java

@@ -0,0 +1,16 @@
+package io.odpf.depot.message.field.json;
+
+import io.odpf.depot.message.field.GenericField;
+
+public class DefaultField implements GenericField {
+    private final Object value;
+
+    public DefaultField(Object field) {
+        this.value = field;
+    }
+
+    @Override
+    public String getString() {
+        return value.toString();
+    }
+}

src/main/java/io/odpf/depot/message/field/json/JsonFieldFactory.java

@@ -0,0 +1,9 @@
+package io.odpf.depot.message.field.json;
+
+import io.odpf.depot.message.field.GenericField;
+
+public class JsonFieldFactory {
+    public static GenericField getField(Object field) {
+        return new DefaultField(field);
+    }
+}

src/main/java/io/odpf/depot/message/field/proto/DefaultField.java

@@ -0,0 +1,17 @@
+package io.odpf.depot.message.field.proto;
+
+import io.odpf.depot.message.field.FieldUtils;
+import io.odpf.depot.message.field.GenericField;
+
+public class DefaultField implements GenericField {
+    private final Object value;
+
+    public DefaultField(Object value) {
+        this.value = value;
+    }
+
+    @Override
+    public String getString() {
+        return FieldUtils.convertToString(value);
+    }
+}