You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by an...@apache.org on 2022/03/30 14:30:48 UTC
[sling-org-apache-sling-feature-cpconverter] 01/01: SLING-11235 : DefaultVisitor, NoOpVisitor do not override new methods
This is an automated email from the ASF dual-hosted git repository.
angela pushed a commit to branch SLING-11235
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git
commit 8683d8fa5a49356a8524913c6089999c1102a0f5
Author: angela <an...@adobe.com>
AuthorDate: Wed Mar 30 16:30:35 2022 +0200
SLING-11235 : DefaultVisitor, NoOpVisitor do not override new methods
---
.../cpconverter/repoinit/DefaultVisitor.java | 36 ++++++++++++++++++++++
.../feature/cpconverter/repoinit/NoOpVisitor.java | 30 ++++++++++++++++++
...positoryInitializer-no-conversion-result.config | 36 +++++++++++++++++++++-
...RepositoryInitializer-no-conversion-test.config | 36 +++++++++++++++++++++-
4 files changed, 136 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/repoinit/DefaultVisitor.java b/src/main/java/org/apache/sling/feature/cpconverter/repoinit/DefaultVisitor.java
index e630229..e47f666 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/repoinit/DefaultVisitor.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/repoinit/DefaultVisitor.java
@@ -20,6 +20,9 @@ import org.apache.sling.repoinit.parser.operations.AddGroupMembers;
import org.apache.sling.repoinit.parser.operations.CreateGroup;
import org.apache.sling.repoinit.parser.operations.CreatePath;
import org.apache.sling.repoinit.parser.operations.CreateUser;
+import org.apache.sling.repoinit.parser.operations.DeleteAclPaths;
+import org.apache.sling.repoinit.parser.operations.DeleteAclPrincipalBased;
+import org.apache.sling.repoinit.parser.operations.DeleteAclPrincipals;
import org.apache.sling.repoinit.parser.operations.DeleteGroup;
import org.apache.sling.repoinit.parser.operations.DeleteServiceUser;
import org.apache.sling.repoinit.parser.operations.DeleteUser;
@@ -27,6 +30,9 @@ import org.apache.sling.repoinit.parser.operations.DisableServiceUser;
import org.apache.sling.repoinit.parser.operations.RegisterNamespace;
import org.apache.sling.repoinit.parser.operations.RegisterNodetypes;
import org.apache.sling.repoinit.parser.operations.RegisterPrivilege;
+import org.apache.sling.repoinit.parser.operations.RemoveAcePaths;
+import org.apache.sling.repoinit.parser.operations.RemoveAcePrincipalBased;
+import org.apache.sling.repoinit.parser.operations.RemoveAcePrincipals;
import org.apache.sling.repoinit.parser.operations.RemoveGroupMembers;
import org.apache.sling.repoinit.parser.operations.SetAclPrincipalBased;
import org.apache.sling.repoinit.parser.operations.SetProperties;
@@ -98,6 +104,36 @@ class DefaultVisitor extends NoOpVisitor {
}
@Override
+ public void visitRemoveAcePrincipal(RemoveAcePrincipals s) {
+ formatter.format("%s", s.asRepoInitString());
+ }
+
+ @Override
+ public void visitRemoveAcePaths(RemoveAcePaths s) {
+ formatter.format("%s", s.asRepoInitString());
+ }
+
+ @Override
+ public void visitRemoveAcePrincipalBased(RemoveAcePrincipalBased s) {
+ formatter.format("%s", s.asRepoInitString());
+ }
+
+ @Override
+ public void visitDeleteAclPrincipals(DeleteAclPrincipals s) {
+ formatter.format("%s", s.asRepoInitString());
+ }
+
+ @Override
+ public void visitDeleteAclPaths(DeleteAclPaths s) {
+ formatter.format("%s", s.asRepoInitString());
+ }
+
+ @Override
+ public void visitDeleteAclPrincipalBased(DeleteAclPrincipalBased s) {
+ formatter.format("%s", s.asRepoInitString());
+ }
+
+ @Override
public void visitAddGroupMembers(AddGroupMembers addGroupMembers) {
formatter.format("%s", addGroupMembers.asRepoInitString());
}
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/repoinit/NoOpVisitor.java b/src/main/java/org/apache/sling/feature/cpconverter/repoinit/NoOpVisitor.java
index 6a5771e..8c74ca6 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/repoinit/NoOpVisitor.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/repoinit/NoOpVisitor.java
@@ -21,6 +21,9 @@ import org.apache.sling.repoinit.parser.operations.CreateGroup;
import org.apache.sling.repoinit.parser.operations.CreatePath;
import org.apache.sling.repoinit.parser.operations.CreateServiceUser;
import org.apache.sling.repoinit.parser.operations.CreateUser;
+import org.apache.sling.repoinit.parser.operations.DeleteAclPaths;
+import org.apache.sling.repoinit.parser.operations.DeleteAclPrincipalBased;
+import org.apache.sling.repoinit.parser.operations.DeleteAclPrincipals;
import org.apache.sling.repoinit.parser.operations.DeleteGroup;
import org.apache.sling.repoinit.parser.operations.DeleteServiceUser;
import org.apache.sling.repoinit.parser.operations.DeleteUser;
@@ -29,6 +32,9 @@ import org.apache.sling.repoinit.parser.operations.OperationVisitor;
import org.apache.sling.repoinit.parser.operations.RegisterNamespace;
import org.apache.sling.repoinit.parser.operations.RegisterNodetypes;
import org.apache.sling.repoinit.parser.operations.RegisterPrivilege;
+import org.apache.sling.repoinit.parser.operations.RemoveAcePaths;
+import org.apache.sling.repoinit.parser.operations.RemoveAcePrincipalBased;
+import org.apache.sling.repoinit.parser.operations.RemoveAcePrincipals;
import org.apache.sling.repoinit.parser.operations.RemoveGroupMembers;
import org.apache.sling.repoinit.parser.operations.SetAclPaths;
import org.apache.sling.repoinit.parser.operations.SetAclPrincipalBased;
@@ -74,6 +80,18 @@ public abstract class NoOpVisitor implements OperationVisitor {
}
@Override
+ public void visitRemoveAcePrincipal(RemoveAcePrincipals s) {
+ }
+
+ @Override
+ public void visitRemoveAcePaths(RemoveAcePaths s) {
+ }
+
+ @Override
+ public void visitRemoveAcePrincipalBased(RemoveAcePrincipalBased s) {
+ }
+
+ @Override
public void visitCreatePath(CreatePath createPath) {
}
@@ -104,4 +122,16 @@ public abstract class NoOpVisitor implements OperationVisitor {
@Override
public void visitSetProperties(SetProperties setProperties) {
}
+
+ @Override
+ public void visitDeleteAclPrincipals(DeleteAclPrincipals s) {
+ }
+
+ @Override
+ public void visitDeleteAclPaths(DeleteAclPaths s) {
+ }
+
+ @Override
+ public void visitDeleteAclPrincipalBased(DeleteAclPrincipalBased s) {
+ }
}
\ No newline at end of file
diff --git a/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config.publish/org.apache.sling.jcr.repoinit.RepositoryInitializer-no-conversion-result.config b/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config.publish/org.apache.sling.jcr.repoinit.RepositoryInitializer-no-conversion-result.config
index 3fa81ce..e2bce5c 100644
--- a/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config.publish/org.apache.sling.jcr.repoinit.RepositoryInitializer-no-conversion-result.config
+++ b/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config.publish/org.apache.sling.jcr.repoinit.RepositoryInitializer-no-conversion-result.config
@@ -78,6 +78,40 @@ register namespace ( prefix ) http://prefix/v0.0.0",\
"
register abstract privilege privAbstract
register privilege priv1
-register privilege priv2 with privAbstract,priv1"\
+register privilege priv2 with privAbstract,priv1",\
+"
+delete ACL for ana
+delete ACL for alice, aida
+delete ACL on :repository, home(anni), functionNamesAreFree(aendu)
+delete ACL on /, /var, /etc
+delete ACL on /content
+delete principal ACL for ada, amy
+delete principal ACL for adi",\
+"
+remove ACE on /libs,/apps, /, /content/example.com/some-other_path
+ allow jcr:read for user1,user2
+ allow privilege_without_namespace for user4
+ deny jcr:write,something:else,another:one for user2
+ deny jcr:lockManagement for user1
+ deny jcr:modifyProperties for user2 restriction(rep:itemNames,prop1,prop2)
+end",\
+"
+remove ACE for user1,u2
+ allow jcr:read on /content
+ allow jcr:addChildNodes, jcr:modifyProperties on /content restriction(rep:glob)
+ deny jcr:read on /etc, /var restriction(rep:ntNames,sling:Folder,nt:unstructured) restriction(rep:itemNames,prop1,prop2)
+end",\
+"
+remove principal ACE for principal1,principal2
+ allow jcr:read on /content
+ deny jcr:modifyProperties on /apps, /content restriction(rep:itemNames,prop1,prop2)
+ allow jcr:addChildNodes on /apps restriction(rep:ntNames,sling:Folder,nt:unstructured)
+ allow jcr:modifyProperties on /apps restriction(rep:ntNames,sling:Folder,nt:unstructured) restriction(rep:itemNames,prop1,prop2)
+ allow jcr:addChildNodes on /apps,/content restriction(rep:glob,/cat,/cat/,cat)
+ allow jcr:addChildNodes on /apps,/content restriction(rep:glob,cat/,*,*cat)
+ allow jcr:addChildNodes on /apps,/content restriction(rep:glob,/cat/*,*/cat,*cat/*)
+ allow jcr:something on / restriction(rep:glob)
+ allow jcr:all on :repository,home(alice)
+end"\
]
diff --git a/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config.publish/org.apache.sling.jcr.repoinit.RepositoryInitializer-no-conversion-test.config b/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config.publish/org.apache.sling.jcr.repoinit.RepositoryInitializer-no-conversion-test.config
index 436d758..379f48c 100644
--- a/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config.publish/org.apache.sling.jcr.repoinit.RepositoryInitializer-no-conversion-test.config
+++ b/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/apps/asd/config.publish/org.apache.sling.jcr.repoinit.RepositoryInitializer-no-conversion-test.config
@@ -78,6 +78,40 @@ register namespace ( prefix ) http://prefix/v0.0.0",\
"
register abstract privilege privAbstract
register privilege priv1
-register privilege priv2 with privAbstract,priv1"\
+register privilege priv2 with privAbstract,priv1",\
+"
+delete ACL for ana
+delete ACL for alice, aida
+delete ACL on :repository, home(anni), functionNamesAreFree(aendu)
+delete ACL on /, /var, /etc
+delete ACL on /content
+delete principal ACL for ada, amy
+delete principal ACL for adi",\
+"
+remove ACE on /libs,/apps, /, /content/example.com/some-other_path
+ allow jcr:read for user1,user2
+ allow privilege_without_namespace for user4
+ deny jcr:write,something:else,another:one for user2
+ deny jcr:lockManagement for user1
+ deny jcr:modifyProperties for user2 restriction(rep:itemNames,prop1,prop2)
+end",\
+"
+remove ACE for user1,u2
+ allow jcr:read on /content
+ allow jcr:addChildNodes, jcr:modifyProperties on /content restriction(rep:glob)
+ deny jcr:read on /etc, /var restriction(rep:ntNames,sling:Folder,nt:unstructured) restriction(rep:itemNames,prop1,prop2)
+end",\
+"
+remove principal ACE for principal1,principal2
+ allow jcr:read on /content
+ deny jcr:modifyProperties on /apps, /content restriction(rep:itemNames,prop1,prop2)
+ allow jcr:addChildNodes on /apps restriction(rep:ntNames,sling:Folder,nt:unstructured)
+ allow jcr:modifyProperties on /apps restriction(rep:ntNames,sling:Folder,nt:unstructured) restriction(rep:itemNames,prop1,prop2)
+ allow jcr:addChildNodes on /apps,/content restriction(rep:glob,/cat,/cat/,cat)
+ allow jcr:addChildNodes on /apps,/content restriction(rep:glob,cat/,*,*cat)
+ allow jcr:addChildNodes on /apps,/content restriction(rep:glob,/cat/*,*/cat,*cat/*)
+ allow jcr:something on / restriction(rep:glob)
+ allow jcr:all on :repository,home(alice)
+end"\
]