Merge pull request #201 from mohrezaei/utf8

17.1.1: Fix json deserialized without relationships.
goldmansachs · Sep 1, 2019 · 0e466e7 · 0e466e7
2 parents 8ba45b3 + a53a438
commit 0e466e7
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
 # Change Log
+## 17.1.2 - 2019-09-01
+### Bug Fixes:
+- Fix json deserialization without relationships
+
 ## 17.1.0 - 2019-07-16
 ### Enhancements:
 - Add support for test file charset

diff --git a/build/reladomo-config.xml b/build/reladomo-config.xml
@@ -14,6 +14,6 @@
   under the License.
   -->
 <project name="mithra-config" default="determine-jdk">
-    <property name="reladomo.version" value="17.1.0"/>
+    <property name="reladomo.version" value="17.1.1"/>
     <property name="snapshot" value=""/>
 </project>
diff --git a/reladomo/src/main/java/com/gs/fw/common/mithra/util/serializer/ReladomoDeserializer.java b/reladomo/src/main/java/com/gs/fw/common/mithra/util/serializer/ReladomoDeserializer.java
@@ -56,6 +56,7 @@
 import com.gs.fw.finder.Navigation;
 import com.gs.reladomo.metadata.ReladomoClassMetaData;
 import org.eclipse.collections.api.block.function.Function;
+import org.eclipse.collections.impl.factory.Maps;
 import org.eclipse.collections.impl.list.mutable.FastList;
 import org.eclipse.collections.impl.map.mutable.UnifiedMap;
 import org.eclipse.collections.impl.set.mutable.UnifiedSet;
@@ -82,6 +83,7 @@
  */
 public class ReladomoDeserializer<T extends MithraObject>
 {
+    private static final Map<String, Object> EMPTY_MAP = Maps.fixedSize.of();
     protected static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
     private static final Object[] NULL_ARGS = (Object[]) null;
     private static final Object[] SINGLE_NULL = new Object[1];
@@ -546,7 +548,7 @@ protected void wireRelationshipsForList(DeserializationClassMetaData metaData, L
                         wireRelationshipsForInMemory(metaData, partialDeserialized);
                         break;
                     case ReladomoSerializationContext.DETACHED_STATE:
-                        if (partialDeserialized.partialRelationships != null)
+                        if (partialDeserialized.partialRelationships != EMPTY_MAP)
                         {
                             detached.add(partialDeserialized);
                         }
@@ -1081,13 +1083,13 @@ protected static class PartialDeserialized
         protected Timestamp processingDate;
         protected BitSet populatedAttributes;
         protected int state;
-        protected Map<String, Object> partialRelationships; //Object is either PartialDeserialized or List<PartialDeserialized>
+        protected Map<String, Object> partialRelationships = EMPTY_MAP; //Object is either PartialDeserialized or List<PartialDeserialized>
         protected byte deserializedState;
         protected MithraObject deserialized; // constructed at the end of the stream
 
         protected void storeRelated(RelatedFinder relatedFinder, Object related)
         {
-            if (this.partialRelationships == null)
+            if (this.partialRelationships == EMPTY_MAP)
             {
                 this.partialRelationships = UnifiedMap.newMap();
             }

diff --git a/...t/java/com/gs/reladomo/serial/jackson/ExampleJacksonReladomoBitemporalSerializerTest.java b/...t/java/com/gs/reladomo/serial/jackson/ExampleJacksonReladomoBitemporalSerializerTest.java
@@ -19,15 +19,18 @@
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import com.gs.fw.common.mithra.test.domain.BitemporalOrder;
-import com.gs.fw.common.mithra.test.domain.BitemporalOrderFinder;
-import com.gs.fw.common.mithra.test.domain.Order;
-import com.gs.fw.common.mithra.test.domain.OrderFinder;
+import com.gs.fw.common.mithra.test.MithraTestAbstract;
+import com.gs.fw.common.mithra.test.domain.*;
 import com.gs.fw.common.mithra.test.util.serializer.TestBitemporalRoundTripStringBased;
 import com.gs.fw.common.mithra.test.util.serializer.TestRoundTripStringBased;
+import com.gs.fw.common.mithra.util.serializer.SerializationConfig;
 import com.gs.fw.common.mithra.util.serializer.Serialized;
+import org.junit.Assert;
 import org.junit.Test;
 
+import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
+
 public class ExampleJacksonReladomoBitemporalSerializerTest extends TestBitemporalRoundTripStringBased
 {
     @Override
@@ -92,4 +95,31 @@ public void testOrderWithRemovedItem() throws Exception
         assertEquals(0, order.getItems().size());
     }
 
+    @Test
+    public void testInMemoryNoRelationships() throws Exception
+    {
+        String serialized = "{\n" +
+                "  \"_rdoClassName\" : \"com.gs.fw.common.mithra.test.domain.BitemporalOrderItem\",\n" +
+//                "  \"_rdoState\" : 20,\n" +
+                "  \"id\" : 70459,\n" +
+                "  \"orderId\" : 1,\n" +
+                "  \"productId\" : 1,\n" +
+                "  \"quantity\" : 20.0,\n" +
+                "  \"originalPrice\" : 10.5,\n" +
+                "  \"discountPrice\" : 10.5,\n" +
+                "  \"state\" : \"In-Progress\",\n" +
+                "  \"businessDate\" : 1567363437186\n" +
+                "}\n";
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.registerModule(new JacksonReladomoModule());
+        mapper.enable(SerializationFeature.INDENT_OUTPUT);
+        JavaType customClassCollection = mapper.getTypeFactory().constructCollectionLikeType(Serialized.class, BitemporalOrderItem.class);
+
+        Serialized<BitemporalOrderItem> back = mapper.readValue(serialized, customClassCollection);
+        BitemporalOrderItem wrapped = back.getWrapped();
+        Assert.assertEquals(70459, wrapped.getId());
+        Assert.assertEquals("In-Progress", wrapped.getState());
+        Assert.assertEquals(BitemporalOrderItemFinder.processingDate().getInfinityDate(), wrapped.getProcessingDate());
+    }
+
 }