Pull setLastModifiedDate() out of JCRNodesWriter and into ProtoNodeDecorator

Jeff Bornemann · Jeff Bornemann · commit 6535fc2a08b0 · 2017-01-03T16:46:50.000+07:00
diff --git a/src/main/groovy/com/twcable/grabbit/client/batch/steps/jcrnodes/JcrNodesWriter.groovy b/src/main/groovy/com/twcable/grabbit/client/batch/steps/jcrnodes/JcrNodesWriter.groovy
@@ -88,8 +88,7 @@ class JcrNodesWriter implements ItemWriter<ProtoNode>, ItemWriteListener {
     }
 
     private static void writeToJcr(ProtoNode nodeProto, Session session) {
-        JCRNodeDecorator jcrNode = ProtoNodeDecorator.createFrom(nodeProto).writeToJcr(session)
-        jcrNode.setLastModified()
+        ProtoNodeDecorator.createFrom(nodeProto).writeToJcr(session)
     }
 
     private Session theSession() {
diff --git a/src/main/groovy/com/twcable/grabbit/jcr/ACLProtoNodeDecorator.groovy b/src/main/groovy/com/twcable/grabbit/jcr/ACLProtoNodeDecorator.groovy
@@ -54,7 +54,7 @@ class ACLProtoNodeDecorator extends ProtoNodeDecorator {
 
 
     @Override
-    JCRNodeDecorator writeToJcr(@Nonnull Session session) {
+    protected JCRNodeDecorator writeNode(@Nonnull Session session) {
         /**
          * We don't write the rep:policy node directly. Rather, we find the rep:policy node's ACE(s) and add them to the
          * owner's existing policy; or we add them to a new policy.
diff --git a/src/main/groovy/com/twcable/grabbit/jcr/AuthorizableProtoNodeDecorator.groovy b/src/main/groovy/com/twcable/grabbit/jcr/AuthorizableProtoNodeDecorator.groovy
@@ -52,7 +52,7 @@ class AuthorizableProtoNodeDecorator extends ProtoNodeDecorator {
 
 
     @Override
-    JCRNodeDecorator writeToJcr(@Nonnull Session session) {
+    protected JCRNodeDecorator writeNode(@Nonnull Session session) {
         if(!checkSecurityPermissions()) {
             throw new InsufficientGrabbitPrivilegeException("JVM Permissions needed by Grabbit to sync Users/Groups were not found. See log for specific permissions needed, and add these to your security manager; or do not sync users and groups." +
                                                             "Unfortunately, the way Jackrabbit goes about certain things requires us to do a bit of hacking in order to sync Authorizables securely, and efficiently.")
diff --git a/src/main/groovy/com/twcable/grabbit/jcr/DefaultProtoNodeDecorator.groovy b/src/main/groovy/com/twcable/grabbit/jcr/DefaultProtoNodeDecorator.groovy
@@ -42,7 +42,7 @@ class DefaultProtoNodeDecorator extends ProtoNodeDecorator {
 
 
     @Override
-    JCRNodeDecorator writeToJcr(@Nonnull Session session) {
+    protected JCRNodeDecorator writeNode(@Nonnull Session session) {
         final jcrNode = getOrCreateNode(session)
         //Write mixin types first to avoid InvalidConstraintExceptions
         final mixinProperty = getMixinProperty()
diff --git a/src/main/groovy/com/twcable/grabbit/jcr/ProtoNodeDecorator.groovy b/src/main/groovy/com/twcable/grabbit/jcr/ProtoNodeDecorator.groovy
@@ -32,7 +32,7 @@ abstract class ProtoNodeDecorator {
 
     protected String nameOverride
 
-    abstract JCRNodeDecorator writeToJcr(@Nonnull Session session)
+    protected abstract JCRNodeDecorator writeNode(@Nonnull Session session)
 
     static ProtoNodeDecorator createFrom(@Nonnull ProtoNode node, String nameOverride = null) {
         if(!node) throw new IllegalArgumentException("node must not be null!")
@@ -47,6 +47,14 @@ abstract class ProtoNodeDecorator {
         return new DefaultProtoNodeDecorator(node, protoProperties, nameOverride)
     }
 
+
+    JCRNodeDecorator writeToJcr(@Nonnull Session session) {
+        final JCRNodeDecorator writtenNode = writeNode(session)
+        writtenNode.setLastModified()
+        return writtenNode
+    }
+
+
     boolean hasProperty(String propertyName) {
         propertiesList.any{ it.name == propertyName }
     }
diff --git a/src/test/groovy/com/twcable/grabbit/jcr/ACLProtoNodeDecoratorSpec.groovy b/src/test/groovy/com/twcable/grabbit/jcr/ACLProtoNodeDecoratorSpec.groovy
@@ -29,6 +29,7 @@ import javax.jcr.PathNotFoundException
 import javax.jcr.Property
 import javax.jcr.PropertyIterator
 import javax.jcr.Session
+import javax.jcr.nodetype.NodeType
 import javax.jcr.security.AccessControlEntry
 import javax.jcr.security.AccessControlManager
 import javax.jcr.security.AccessControlPolicy
@@ -148,6 +149,9 @@ class ACLProtoNodeDecoratorSpec extends Specification {
                 it.getString() >> NT_REP_ACL
             }
             it.getName() >> "${ownerNodePath}/rep:policy"
+            it.getPrimaryNodeType() >> Mock(NodeType) {
+                it.canSetProperty(_, _) >> false
+            }
         }
         final Session session = Mock(Session) {
             1 * it.save()
@@ -221,6 +225,9 @@ class ACLProtoNodeDecoratorSpec extends Specification {
                 it.getString() >> NT_REP_ACL
             }
             it.getName() >> "${ownerNodePath}/rep:policy"
+            it.getPrimaryNodeType() >> Mock(NodeType) {
+                it.canSetProperty(_, _) >> false
+            }
         }
         final Session session = Mock(Session) {
             2 * it.save()
@@ -337,6 +344,9 @@ class ACLProtoNodeDecoratorSpec extends Specification {
                 it.getString() >> 'nt:unstructured'
             }
             it.getName() >> ownerNodePath
+            it.getPrimaryNodeType() >> Mock(NodeType) {
+                it.canSetProperty(_, _) >> false
+            }
         }
         final Session session = Mock(Session) {
             it.getNode(ownerNodePath) >> ownerNode
diff --git a/src/test/groovy/com/twcable/grabbit/jcr/AuthorizableProtoNodeDecoratorSpec.groovy b/src/test/groovy/com/twcable/grabbit/jcr/AuthorizableProtoNodeDecoratorSpec.groovy
@@ -26,6 +26,7 @@ import javax.jcr.Node
 import javax.jcr.Property
 import javax.jcr.PropertyIterator
 import javax.jcr.Session
+import javax.jcr.nodetype.NodeType
 import org.apache.jackrabbit.api.security.user.Authorizable
 import org.apache.jackrabbit.api.security.user.Group
 import org.apache.jackrabbit.api.security.user.User
@@ -139,6 +140,9 @@ class AuthorizableProtoNodeDecoratorSpec extends Specification {
                 getProperties() >> Mock(PropertyIterator) {
                     it.toList() >> []
                 }
+                it.getPrimaryNodeType() >> Mock(NodeType) {
+                    it.canSetProperty(_, _) >> false
+                }
             }
         }
         final protoNodeDecorator = theProtoNodeDecorator(false, false, false) {
@@ -174,6 +178,9 @@ class AuthorizableProtoNodeDecoratorSpec extends Specification {
                 getProperties() >> Mock(PropertyIterator) {
                     it.toList() >> []
                 }
+                it.getPrimaryNodeType() >> Mock(NodeType) {
+                    it.canSetProperty(_, _) >> false
+                }
             }
         }
         final protoNodeDecorator = theProtoNodeDecorator(false, false, false) {
@@ -210,6 +217,9 @@ class AuthorizableProtoNodeDecoratorSpec extends Specification {
             getProperties() >> Mock(PropertyIterator) {
                 it.toList() >> []
             }
+            it.getPrimaryNodeType() >> Mock(NodeType) {
+                it.canSetProperty(_, _) >> false
+            }
         }
         final session = Mock(Session) {
             it.getNode('newUserPath') >> node
@@ -248,6 +258,9 @@ class AuthorizableProtoNodeDecoratorSpec extends Specification {
             getProperties() >> Mock(PropertyIterator) {
                 it.toList() >> []
             }
+            it.getPrimaryNodeType() >> Mock(NodeType) {
+                it.canSetProperty(_, _) >> false
+            }
         }
         final session = Mock(Session) {
             it.getNode('newGroupPath') >> node
@@ -281,6 +294,9 @@ class AuthorizableProtoNodeDecoratorSpec extends Specification {
             getProperties() >> Mock(PropertyIterator) {
                 it.toList() >> []
             }
+            it.getPrimaryNodeType() >> Mock(NodeType) {
+                it.canSetProperty(_, _) >> false
+            }
         }
         final session = Mock(Session) {
             it.getNode('/home/users/u/newuser') >> node
@@ -314,6 +330,9 @@ class AuthorizableProtoNodeDecoratorSpec extends Specification {
             getProperties() >> Mock(PropertyIterator) {
                 it.toList() >> []
             }
+            it.getPrimaryNodeType() >> Mock(NodeType) {
+                it.canSetProperty(_, _) >> false
+            }
         }
         final session = Mock(Session) {
             it.getNode('/home/users/u/newuser') >> node
diff --git a/src/test/groovy/com/twcable/grabbit/jcr/DefaultProtoNodeDecoratorSpec.groovy b/src/test/groovy/com/twcable/grabbit/jcr/DefaultProtoNodeDecoratorSpec.groovy
@@ -20,6 +20,7 @@ import com.twcable.grabbit.proto.NodeProtos
 import com.twcable.grabbit.proto.NodeProtos.Node as ProtoNode
 import com.twcable.grabbit.proto.NodeProtos.Node.Builder as ProtoNodeBuilder
 import com.twcable.grabbit.proto.NodeProtos.Property as ProtoProperty
+import javax.jcr.nodetype.NodeType
 import spock.lang.Specification
 
 import javax.jcr.Node
@@ -126,6 +127,9 @@ class DefaultProtoNodeDecoratorSpec extends Specification {
             getProperties() >> Mock(PropertyIterator) {
                 toList() >> []
             }
+            it.getPrimaryNodeType() >> Mock(NodeType) {
+                it.canSetProperty(_, _) >> false
+            }
         }
         final protoPropertyDecorators = [
                 new ProtoPropertyDecorator(mixinProperty),

Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,7 @@ class JcrNodesWriter implements ItemWriter<ProtoNode>, ItemWriteListener {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`private static void writeToJcr(ProtoNode nodeProto, Session session) {`
`91`		`- JCRNodeDecorator jcrNode = ProtoNodeDecorator.createFrom(nodeProto).writeToJcr(session)`
`92`		`- jcrNode.setLastModified()`
	`91`	`+ ProtoNodeDecorator.createFrom(nodeProto).writeToJcr(session)`
`93`	`92`	`}`
`94`	`93`
`95`	`94`	`private Session theSession() {`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ import javax.jcr.Node`
`26`	`26`	`import javax.jcr.Property`
`27`	`27`	`import javax.jcr.PropertyIterator`
`28`	`28`	`import javax.jcr.Session`
	`29`	`+import javax.jcr.nodetype.NodeType`
`29`	`30`	`import org.apache.jackrabbit.api.security.user.Authorizable`
`30`	`31`	`import org.apache.jackrabbit.api.security.user.Group`
`31`	`32`	`import org.apache.jackrabbit.api.security.user.User`
`@@ -139,6 +140,9 @@ class AuthorizableProtoNodeDecoratorSpec extends Specification {`
`139`	`140`	`getProperties() >> Mock(PropertyIterator) {`
`140`	`141`	`it.toList() >> []`
`141`	`142`	`}`
	`143`	`+ it.getPrimaryNodeType() >> Mock(NodeType) {`
	`144`	`+ it.canSetProperty(_, _) >> false`
	`145`	`+ }`
`142`	`146`	`}`
`143`	`147`	`}`
`144`	`148`	`final protoNodeDecorator = theProtoNodeDecorator(false, false, false) {`
`@@ -174,6 +178,9 @@ class AuthorizableProtoNodeDecoratorSpec extends Specification {`
`174`	`178`	`getProperties() >> Mock(PropertyIterator) {`
`175`	`179`	`it.toList() >> []`
`176`	`180`	`}`
	`181`	`+ it.getPrimaryNodeType() >> Mock(NodeType) {`
	`182`	`+ it.canSetProperty(_, _) >> false`
	`183`	`+ }`
`177`	`184`	`}`
`178`	`185`	`}`
`179`	`186`	`final protoNodeDecorator = theProtoNodeDecorator(false, false, false) {`
`@@ -210,6 +217,9 @@ class AuthorizableProtoNodeDecoratorSpec extends Specification {`
`210`	`217`	`getProperties() >> Mock(PropertyIterator) {`
`211`	`218`	`it.toList() >> []`
`212`	`219`	`}`
	`220`	`+ it.getPrimaryNodeType() >> Mock(NodeType) {`
	`221`	`+ it.canSetProperty(_, _) >> false`
	`222`	`+ }`
`213`	`223`	`}`
`214`	`224`	`final session = Mock(Session) {`
`215`	`225`	`it.getNode('newUserPath') >> node`
`@@ -248,6 +258,9 @@ class AuthorizableProtoNodeDecoratorSpec extends Specification {`
`248`	`258`	`getProperties() >> Mock(PropertyIterator) {`
`249`	`259`	`it.toList() >> []`
`250`	`260`	`}`
	`261`	`+ it.getPrimaryNodeType() >> Mock(NodeType) {`
	`262`	`+ it.canSetProperty(_, _) >> false`
	`263`	`+ }`
`251`	`264`	`}`
`252`	`265`	`final session = Mock(Session) {`
`253`	`266`	`it.getNode('newGroupPath') >> node`
`@@ -281,6 +294,9 @@ class AuthorizableProtoNodeDecoratorSpec extends Specification {`
`281`	`294`	`getProperties() >> Mock(PropertyIterator) {`
`282`	`295`	`it.toList() >> []`
`283`	`296`	`}`
	`297`	`+ it.getPrimaryNodeType() >> Mock(NodeType) {`
	`298`	`+ it.canSetProperty(_, _) >> false`
	`299`	`+ }`
`284`	`300`	`}`
`285`	`301`	`final session = Mock(Session) {`
`286`	`302`	`it.getNode('/home/users/u/newuser') >> node`
`@@ -314,6 +330,9 @@ class AuthorizableProtoNodeDecoratorSpec extends Specification {`
`314`	`330`	`getProperties() >> Mock(PropertyIterator) {`
`315`	`331`	`it.toList() >> []`
`316`	`332`	`}`
	`333`	`+ it.getPrimaryNodeType() >> Mock(NodeType) {`
	`334`	`+ it.canSetProperty(_, _) >> false`
	`335`	`+ }`
`317`	`336`	`}`
`318`	`337`	`final session = Mock(Session) {`
`319`	`338`	`it.getNode('/home/users/u/newuser') >> node`