From 51cb520bfd967e1f4d532107d357a849c276bc19 Mon Sep 17 00:00:00 2001
From: Schneider Roland <roland.schneider@extern.a1.at>
Date: Mon, 23 Sep 2024 06:34:19 +0200
Subject: [PATCH] improve update helpers

---
 pom.xml                                              |  2 +-
 ...CLDefinition.java => SimpleJcrACLDefinition.java} |  2 +-
 .../util/bootstrap/simpleUpdate/UpdateHelper.java    | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename src/main/java/at/ucs/magnolia/util/bootstrap/simpleUpdate/{SimpleACLDefinition.java => SimpleJcrACLDefinition.java} (88%)

diff --git a/pom.xml b/pom.xml
index 3d79981..8bcfc9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>at.ucs.magnolia.util</groupId>
     <artifactId>ucs-magnolia-utils</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.0</version>
     <packaging>jar</packaging>
 
     <name>ucs-magnolia-utils</name>
diff --git a/src/main/java/at/ucs/magnolia/util/bootstrap/simpleUpdate/SimpleACLDefinition.java b/src/main/java/at/ucs/magnolia/util/bootstrap/simpleUpdate/SimpleJcrACLDefinition.java
similarity index 88%
rename from src/main/java/at/ucs/magnolia/util/bootstrap/simpleUpdate/SimpleACLDefinition.java
rename to src/main/java/at/ucs/magnolia/util/bootstrap/simpleUpdate/SimpleJcrACLDefinition.java
index e9b1e24..52fc24c 100644
--- a/src/main/java/at/ucs/magnolia/util/bootstrap/simpleUpdate/SimpleACLDefinition.java
+++ b/src/main/java/at/ucs/magnolia/util/bootstrap/simpleUpdate/SimpleJcrACLDefinition.java
@@ -7,7 +7,7 @@ import lombok.Data;
 @Data
 @Builder
 @AllArgsConstructor
-public class SimpleACLDefinition {
+public class SimpleJcrACLDefinition {
     private String workspace;
     private String path;
     private long permission;
diff --git a/src/main/java/at/ucs/magnolia/util/bootstrap/simpleUpdate/UpdateHelper.java b/src/main/java/at/ucs/magnolia/util/bootstrap/simpleUpdate/UpdateHelper.java
index a3b95ee..b9fdb26 100644
--- a/src/main/java/at/ucs/magnolia/util/bootstrap/simpleUpdate/UpdateHelper.java
+++ b/src/main/java/at/ucs/magnolia/util/bootstrap/simpleUpdate/UpdateHelper.java
@@ -20,7 +20,7 @@ public class UpdateHelper {
      * @param aclDefinitions list of ACL definitions to add
      * @param uuid           uuid the new node should have
      */
-    public static void createAndPublishUserrole(List<Task> tasks, String roleName, Collection<SimpleACLDefinition> aclDefinitions, List<String> assignToGroups, String uuid) {
+    public static void createAndPublishUserrole(List<Task> tasks, String roleName, Collection<SimpleJcrACLDefinition> aclDefinitions, List<String> assignToGroups, String uuid) {
         addCreateRoleTask(tasks, roleName, aclDefinitions, null, assignToGroups, uuid);
         setActivationStatus(tasks, Workspace.USER_ROLES, "/" + roleName);
 
@@ -34,7 +34,7 @@ public class UpdateHelper {
      * @param aclDefinitions list of ACL definitions to add
      * @param uuid           uuid the new node should have
      */
-    public static void createAndPublishUserrole(List<Task> tasks, String roleName, Collection<SimpleACLDefinition> aclDefinitions, Collection<SimpleWebACLDefinition> webACLDefinitions, List<String> assignToGroups, String uuid) {
+    public static void createAndPublishUserrole(List<Task> tasks, String roleName, Collection<SimpleJcrACLDefinition> aclDefinitions, Collection<SimpleWebACLDefinition> webACLDefinitions, List<String> assignToGroups, String uuid) {
         addCreateRoleTask(tasks, roleName, aclDefinitions, webACLDefinitions, assignToGroups, uuid);
         setActivationStatus(tasks, Workspace.USER_ROLES, "/" + roleName);
 
@@ -47,7 +47,7 @@ public class UpdateHelper {
      * @param roleName       the name of the newly created role
      * @param aclDefinitions list of ACL definitions to add
      */
-    public static void createUserrole(List<Task> tasks, String roleName, Collection<SimpleACLDefinition> aclDefinitions, List<String> assignToGroups) {
+    public static void createUserrole(List<Task> tasks, String roleName, Collection<SimpleJcrACLDefinition> aclDefinitions, List<String> assignToGroups) {
         addCreateRoleTask(tasks, roleName, aclDefinitions, null, assignToGroups, null);
     }
 
@@ -60,7 +60,7 @@ public class UpdateHelper {
      * @param webACLDefinitions list of web ACL definitions to add
      * @param uuid           uuid the new node should have, if null a uuid is automatically assigned.
      */
-    private static void addCreateRoleTask(List<Task> tasks, String roleName, Collection<SimpleACLDefinition> aclDefinitions, Collection<SimpleWebACLDefinition> webACLDefinitions, List<String> assignToGroups, String uuid) {
+    public static void addCreateRoleTask(List<Task> tasks, String roleName, Collection<SimpleJcrACLDefinition> aclDefinitions, Collection<SimpleWebACLDefinition> webACLDefinitions, List<String> assignToGroups, String uuid) {
         if (uuid != null) {
             tasks.add(new CreateNodeWithFixedUUIDTask("Create default userrole " + roleName, "Creates default userroles", Workspace.USER_ROLES, "/", roleName, NodeTypes.Role.NAME, uuid));
         } else {
@@ -68,7 +68,7 @@ public class UpdateHelper {
         }
 
         if (aclDefinitions != null) {
-            for (SimpleACLDefinition definition : aclDefinitions) {
+            for (SimpleJcrACLDefinition definition : aclDefinitions) {
                 addJcrAcl(tasks, roleName, definition.getWorkspace(), definition.getPath(), definition.getPermission(), definition.isIncludeSubNodes());
             }
         }
@@ -84,7 +84,7 @@ public class UpdateHelper {
         }
     }
 
-    public static void addJcrAcl(List<Task> tasks, String roleName, List<SimpleACLDefinition> jcrAcls) {
+    public static void addJcrAcl(List<Task> tasks, String roleName, List<SimpleJcrACLDefinition> jcrAcls) {
         jcrAcls.forEach(
                simpleACLDefinition ->
                    tasks.add(new AddPermissionTask("Add permission to default userrole " + roleName, roleName, simpleACLDefinition.getWorkspace(), simpleACLDefinition.getPath(), simpleACLDefinition.getPermission() , simpleACLDefinition.isIncludeSubNodes()))