From 91d5eea673eb529b22d3f4b9cc6d06e1c343eb0d Mon Sep 17 00:00:00 2001 From: Elmira Zhernova Date: Mon, 1 Apr 2019 11:54:49 +0300 Subject: [PATCH 1/2] issue - 213 : quote replacement to fix issue 213 'Grabbit fails sync when node name contain' --- .../com/twcable/grabbit/jcr/DefaultProtoNodeDecorator.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/groovy/com/twcable/grabbit/jcr/DefaultProtoNodeDecorator.groovy b/src/main/groovy/com/twcable/grabbit/jcr/DefaultProtoNodeDecorator.groovy index 2d6dc8f..f724524 100644 --- a/src/main/groovy/com/twcable/grabbit/jcr/DefaultProtoNodeDecorator.groovy +++ b/src/main/groovy/com/twcable/grabbit/jcr/DefaultProtoNodeDecorator.groovy @@ -19,6 +19,8 @@ import com.twcable.grabbit.proto.NodeProtos.Node as ProtoNode import com.twcable.grabbit.proto.NodeProtos.Value as ProtoValue import groovy.transform.CompileStatic import groovy.util.logging.Slf4j + +import java.util.regex.Matcher import java.util.regex.Pattern import javax.annotation.Nonnull import javax.jcr.Node as JCRNode @@ -55,7 +57,7 @@ class DefaultProtoNodeDecorator extends ProtoNodeDecorator { if(innerProtoNode.mandatoryChildNodeList && innerProtoNode.mandatoryChildNodeList.size() > 0) { for(ProtoNode childNode: innerProtoNode.mandatoryChildNodeList) { //Mandatory children must inherit any name overrides from their parent (if they exist) - createFrom(childNode, childNode.getName().replaceFirst(Pattern.quote(innerProtoNode.name), getName())).writeToJcr(session) + createFrom(childNode, childNode.getName().replaceFirst(Pattern.quote(innerProtoNode.name), Matcher.quoteReplacement(getName()))).writeToJcr(session) } } return new JCRNodeDecorator(jcrNode) From c721519db105edc19f002ef65548f1695c2399a2 Mon Sep 17 00:00:00 2001 From: Elmira Zhernova Date: Mon, 1 Apr 2019 11:57:58 +0300 Subject: [PATCH 2/2] issue - 213 : removed extra new line , divided too long line --- .../com/twcable/grabbit/jcr/DefaultProtoNodeDecorator.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/groovy/com/twcable/grabbit/jcr/DefaultProtoNodeDecorator.groovy b/src/main/groovy/com/twcable/grabbit/jcr/DefaultProtoNodeDecorator.groovy index f724524..5a93545 100644 --- a/src/main/groovy/com/twcable/grabbit/jcr/DefaultProtoNodeDecorator.groovy +++ b/src/main/groovy/com/twcable/grabbit/jcr/DefaultProtoNodeDecorator.groovy @@ -19,7 +19,6 @@ import com.twcable.grabbit.proto.NodeProtos.Node as ProtoNode import com.twcable.grabbit.proto.NodeProtos.Value as ProtoValue import groovy.transform.CompileStatic import groovy.util.logging.Slf4j - import java.util.regex.Matcher import java.util.regex.Pattern import javax.annotation.Nonnull @@ -57,7 +56,8 @@ class DefaultProtoNodeDecorator extends ProtoNodeDecorator { if(innerProtoNode.mandatoryChildNodeList && innerProtoNode.mandatoryChildNodeList.size() > 0) { for(ProtoNode childNode: innerProtoNode.mandatoryChildNodeList) { //Mandatory children must inherit any name overrides from their parent (if they exist) - createFrom(childNode, childNode.getName().replaceFirst(Pattern.quote(innerProtoNode.name), Matcher.quoteReplacement(getName()))).writeToJcr(session) + createFrom(childNode, childNode.getName().replaceFirst(Pattern.quote(innerProtoNode.name), + Matcher.quoteReplacement(getName()))).writeToJcr(session) } } return new JCRNodeDecorator(jcrNode)