commit 344ebc33dc5468774a1f829f4be49572fd04d1ae
author Karl Pauls <karlpauls@gmail.com> Wed Jan 20 14:47:59 2021 +0100
committer Karl Pauls <karlpauls@gmail.com> Wed Jan 20 14:47:59 2021 +0100
tree 43de7a39afc0b6fbe26769775b7a0041e59d3c4c
parent 6afb821b7449e73bbb6031044a581c7eac74d091

Handle restriction() correctly

src/main/java/org/apache/sling/feature/cpconverter/accesscontrol/DefaultAclManager.java

diff --git a/src/main/java/org/apache/sling/feature/cpconverter/accesscontrol/DefaultAclManager.java b/src/main/java/org/apache/sling/feature/cpconverter/accesscontrol/DefaultAclManager.java
index aff08fc..f0c282f 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/accesscontrol/DefaultAclManager.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/accesscontrol/DefaultAclManager.java
@@ -225,9 +225,8 @@
                 entry.getPrivileges(),
                 path);
 
-        if (!entry.getRestrictions().isEmpty()) {
-            formatter.format(" restriction(%s)",
-                    String.join(",", entry.getRestrictions()));
+        for (String restriction : entry.getRestrictions()) {
+            formatter.format(" restriction(%s)", restriction);
         }
 
         formatter.format("%n");

src/test/java/org/apache/sling/feature/cpconverter/handlers/RepPolicyEntryHandlerTest.java

diff --git a/src/test/java/org/apache/sling/feature/cpconverter/handlers/RepPolicyEntryHandlerTest.java b/src/test/java/org/apache/sling/feature/cpconverter/handlers/RepPolicyEntryHandlerTest.java
index 9523b51..cfca3de 100644
--- a/src/test/java/org/apache/sling/feature/cpconverter/handlers/RepPolicyEntryHandlerTest.java
+++ b/src/test/java/org/apache/sling/feature/cpconverter/handlers/RepPolicyEntryHandlerTest.java
@@ -267,7 +267,7 @@
         String expected =
                 "create service user service1 with path /home/users/system/services" + System.lineSeparator() +
                 "set ACL for service1\n" +
-                "allow jcr:read on /asd/jr2restrictions restriction(rep:glob,*/subtree/*,sling:customRestriction,sling:value1,sling:value2)\n" +
+                "allow jcr:read on /asd/jr2restrictions restriction(rep:glob,*/subtree/*) restriction(sling:customRestriction,sling:value1,sling:value2)\n" +
                 "end\n";
 
         String actual = repoinitExtension.getText();

src/test/java/org/apache/sling/feature/cpconverter/handlers/RepPrincipalPolicyEntryHandlerTest.java

diff --git a/src/test/java/org/apache/sling/feature/cpconverter/handlers/RepPrincipalPolicyEntryHandlerTest.java b/src/test/java/org/apache/sling/feature/cpconverter/handlers/RepPrincipalPolicyEntryHandlerTest.java
index e9d2c14..04af9d7 100644
--- a/src/test/java/org/apache/sling/feature/cpconverter/handlers/RepPrincipalPolicyEntryHandlerTest.java
+++ b/src/test/java/org/apache/sling/feature/cpconverter/handlers/RepPrincipalPolicyEntryHandlerTest.java
@@ -87,7 +87,7 @@
         String expected =
                 "create service user service2 with path /home/users/system/services" + System.lineSeparator() +
                         "set principal ACL for service2\n" +
-                        "allow jcr:read on /asd/public restriction(rep:ntNames,nt:folder,sling:Folder,sling:customRestriction,customRestrictionValue)\n" +
+                        "allow jcr:read on /asd/public restriction(rep:ntNames,nt:folder,sling:Folder) restriction(sling:customRestriction,customRestrictionValue)\n" +
                         "end\n";
 
         String actual = repoinitExtension.getText();