javers#528 Handling of @ShallowReference on collections and maps

FmeuMan · Mar 11, 2019 · 6ae9576 · 6ae9576
1 parent b71ebc3
commit 6ae9576
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 13 deletions.
diff --git a/javers-core/src/main/java/org/javers/core/graph/EdgeBuilder.java b/javers-core/src/main/java/org/javers/core/graph/EdgeBuilder.java
@@ -8,9 +8,6 @@
 import org.javers.core.metamodel.object.PropertyOwnerContext;
 import org.javers.core.metamodel.type.*;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * @author bartosz walacik
  */
@@ -48,17 +45,24 @@ MultiEdge createMultiEdge(JaversProperty containerProperty, EnumerableType enume
 
         Object container = node.getPropertyValue(containerProperty);
 
-        EnumerableFunction edgeBuilder;
+        EnumerableFunction edgeBuilder = (input, context) -> {
+            final LiveCdo cdo = cdoFactory.create(input, context);
+            if (!containerProperty.isShallowReference()) {
+                return buildNodeStubOrReuse(cdo);
+            } else {
+                return cdo.getGlobalId();
+            }
+        };
+
         if (enumerableType instanceof KeyValueType){
             KeyValueType mapType = (KeyValueType)enumerableType;
             edgeBuilder = new MultiEdgeMapBuilder(
                     typeMapper.getJaversType(mapType.getKeyType()) instanceof ManagedType,
-                    typeMapper.getJaversType(mapType.getValueType()) instanceof ManagedType
+                    typeMapper.getJaversType(mapType.getValueType()) instanceof ManagedType,
+                    edgeBuilder
             );
 
-        } else if (enumerableType instanceof ContainerType) {
-            edgeBuilder = (input, context) -> buildNodeStubOrReuse(cdoFactory.create(input, context));
-        } else {
+        } else if (!(enumerableType instanceof ContainerType)) {
             throw new JaversException(JaversExceptionCode.NOT_IMPLEMENTED);
         }
 
@@ -69,24 +73,24 @@ MultiEdge createMultiEdge(JaversProperty containerProperty, EnumerableType enume
     private class MultiEdgeMapBuilder implements EnumerableFunction {
         private final boolean managedKeys;
         private final boolean managedValues;
+        private final EnumerableFunction edgeBuilder;
 
-        public MultiEdgeMapBuilder(boolean managedKeys, boolean managedValues) {
+        public MultiEdgeMapBuilder(boolean managedKeys, boolean managedValues, EnumerableFunction edgeBuilder) {
             this.managedKeys = managedKeys;
             this.managedValues = managedValues;
+            this.edgeBuilder = edgeBuilder;
         }
 
         @Override
         public Object apply(Object keyOrValue, EnumerationAwareOwnerContext context) {
             MapEnumerationOwnerContext mapContext = (MapEnumerationOwnerContext)context;
 
             if (managedKeys && mapContext.isKey()) {
-                LiveNode objectNode = buildNodeStubOrReuse(cdoFactory.create(keyOrValue, context));
-                return objectNode;
+                return edgeBuilder.apply(keyOrValue, context);
             }
 
             if (managedValues && !mapContext.isKey()) {
-                LiveNode objectNode = buildNodeStubOrReuse(cdoFactory.create(keyOrValue, context));
-                return objectNode;
+                return edgeBuilder.apply(keyOrValue, context);
             }
 
             return keyOrValue;

diff --git a/javers-core/src/test/groovy/org/javers/core/JaversCommitE2ETest.groovy b/javers-core/src/test/groovy/org/javers/core/JaversCommitE2ETest.groovy
@@ -53,6 +53,38 @@ class JaversCommitE2ETest extends Specification {
         commit.snapshots.size() == 1
     }
 
+    def "should not commit snapshot of ShallowReference collection property"() {
+        given:
+        def javers = javers().build()
+        def entity =  new PhoneWithShallowCategory(id:1, shallowCategories:[new CategoryC(1, "old shallow")])
+
+        when:
+        def commit = javers.commit("", entity)
+
+        then:
+        commit.snapshots.each {
+            println it.toString()
+            println ".. props:"+ it.state.propertyNames
+        }
+        commit.snapshots.size() == 1
+    }
+
+    def "should not commit snapshot of ShallowReference map property"() {
+        given:
+        def javers = javers().build()
+        def entity =  new PhoneWithShallowCategory(id:1, shallowCategoryMap:["foo":new CategoryC(1, "old shallow")])
+
+        when:
+        def commit = javers.commit("", entity)
+
+        then:
+        commit.snapshots.each {
+            println it.toString()
+            println ".. props:"+ it.state.propertyNames
+        }
+        commit.snapshots.size() == 1
+    }
+
     def "should mark changed properties"() {
         given:
         def javers = javers().build()

diff --git a/javers-core/src/test/groovy/org/javers/core/model/PhoneWithShallowCategory.groovy b/javers-core/src/test/groovy/org/javers/core/model/PhoneWithShallowCategory.groovy
@@ -12,6 +12,10 @@ class PhoneWithShallowCategory {
     String number = "123"
     @ShallowReference
     CategoryC shallowCategory
+    @ShallowReference
+    Set<CategoryC> shallowCategories
+    @ShallowReference
+    Map<String, CategoryC> shallowCategoryMap
     CategoryC deepCategory
 
     @Id