Use definitionBuilders lib

merkle-open · May 2, 2024 · 8c905f5 · 8c905f5
1 parent e707500
commit 8c905f5
Show file tree

Hide file tree

Showing 27 changed files with 133 additions and 361 deletions.
diff --git a/pom.xml b/pom.xml
@@ -30,6 +30,7 @@
 
 	<properties>
 		<magnolia.version>6.2.44</magnolia.version>
+		<namics.oss.definitionbuilder.version>1.0.18</namics.oss.definitionbuilder.version>
 		<!--Test dependency versions-->
 		<junit.version>5.10.2</junit.version>
 		<mockito.version>5.11.0</mockito.version>
@@ -81,6 +82,16 @@
 			<artifactId>magnolia-ui-framework-compatibility</artifactId>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.namics.oss.magnolia</groupId>
+			<artifactId>magnolia-definition-builders</artifactId>
+			<version>${namics.oss.definitionbuilder.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.namics.oss.magnolia</groupId>
+			<artifactId>custom-definition-builders</artifactId>
+			<version>${namics.oss.definitionbuilder.version}</version>
+		</dependency>
 
 		<!-- Vaadin Compatibility -->
 		<dependency>

diff --git a/src/main/java/com/namics/oss/magnolia/appbuilder/LegacyAppDescriptorProvider.java b/src/main/java/com/namics/oss/magnolia/appbuilder/LegacyAppDescriptorProvider.java
@@ -43,8 +43,8 @@
 import org.apache.jackrabbit.JcrConstants;
 
 import com.google.common.collect.ImmutableList;
+import com.merkle.oss.magnolia.definition.custom.contentapp.column.modificationdate.ModificationDateColumnDefinition;
 import com.namics.oss.magnolia.appbuilder.annotations.AppFactory;
-import com.namics.oss.magnolia.appbuilder.builder.ModificationDateColumnDefinition;
 import com.vaadin.data.ValueProvider;
 import com.vaadin.v7.ui.Table;
 

diff --git a/src/main/java/com/namics/oss/magnolia/appbuilder/action/AvailabilityDefinitionBuilder.java b/src/main/java/com/namics/oss/magnolia/appbuilder/action/AvailabilityDefinitionBuilder.java
diff --git a/...ava/com/namics/oss/magnolia/appbuilder/action/activation/ActivateAppActionDefinition.java b/...ava/com/namics/oss/magnolia/appbuilder/action/activation/ActivateAppActionDefinition.java
@@ -1,13 +1,14 @@
 package com.namics.oss.magnolia.appbuilder.action.activation;
 
-import com.namics.oss.magnolia.appbuilder.MgnlIcon;
-import com.namics.oss.magnolia.appbuilder.action.AppActionDefinition;
-import com.namics.oss.magnolia.appbuilder.action.AvailabilityDefinitionBuilder;
-import com.namics.oss.magnolia.appbuilder.action.rule.JcrIsNotDeletedRuleDefinition;
 import info.magnolia.ui.api.action.ConfiguredActionDefinition;
 import info.magnolia.ui.availability.rule.JcrPublishableRuleDefinition;
 import info.magnolia.ui.contentapp.action.JcrCommandActionDefinition;
 
+import com.merkle.oss.magnolia.definition.builder.availability.AvailabilityDefinitionBuilder;
+import com.namics.oss.magnolia.appbuilder.MgnlIcon;
+import com.namics.oss.magnolia.appbuilder.action.AppActionDefinition;
+import com.namics.oss.magnolia.appbuilder.action.rule.JcrIsNotDeletedRuleDefinition;
+
 public class ActivateAppActionDefinition implements AppActionDefinition {
 
 	@Override

diff --git a/...namics/oss/magnolia/appbuilder/action/activation/ActivateDeletionAppActionDefinition.java b/...namics/oss/magnolia/appbuilder/action/activation/ActivateDeletionAppActionDefinition.java
@@ -1,13 +1,14 @@
 package com.namics.oss.magnolia.appbuilder.action.activation;
 
-import com.namics.oss.magnolia.appbuilder.MgnlIcon;
-import com.namics.oss.magnolia.appbuilder.action.AppActionDefinition;
-import com.namics.oss.magnolia.appbuilder.action.AvailabilityDefinitionBuilder;
 import info.magnolia.ui.api.action.ConfiguredActionDefinition;
 import info.magnolia.ui.availability.rule.JcrIsDeletedRuleDefinition;
 import info.magnolia.ui.availability.rule.JcrPublishableRuleDefinition;
 import info.magnolia.ui.contentapp.action.JcrCommandActionDefinition;
 
+import com.merkle.oss.magnolia.definition.builder.availability.AvailabilityDefinitionBuilder;
+import com.namics.oss.magnolia.appbuilder.MgnlIcon;
+import com.namics.oss.magnolia.appbuilder.action.AppActionDefinition;
+
 public class ActivateDeletionAppActionDefinition implements AppActionDefinition {
 
 	@Override

diff --git a/...amics/oss/magnolia/appbuilder/action/activation/ActivateRecursiveAppActionDefinition.java b/...amics/oss/magnolia/appbuilder/action/activation/ActivateRecursiveAppActionDefinition.java
@@ -6,9 +6,9 @@
 
 import java.util.Map;
 
+import com.merkle.oss.magnolia.definition.builder.availability.AvailabilityDefinitionBuilder;
 import com.namics.oss.magnolia.appbuilder.MgnlIcon;
 import com.namics.oss.magnolia.appbuilder.action.AppActionDefinition;
-import com.namics.oss.magnolia.appbuilder.action.AvailabilityDefinitionBuilder;
 import com.namics.oss.magnolia.appbuilder.action.rule.JcrIsNotDeletedRuleDefinition;
 
 public class ActivateRecursiveAppActionDefinition implements AppActionDefinition {

diff --git a/...a/com/namics/oss/magnolia/appbuilder/action/activation/DeactivateAppActionDefinition.java b/...a/com/namics/oss/magnolia/appbuilder/action/activation/DeactivateAppActionDefinition.java
@@ -1,13 +1,14 @@
 package com.namics.oss.magnolia.appbuilder.action.activation;
 
-import com.namics.oss.magnolia.appbuilder.MgnlIcon;
-import com.namics.oss.magnolia.appbuilder.action.AppActionDefinition;
-import com.namics.oss.magnolia.appbuilder.action.AvailabilityDefinitionBuilder;
-import com.namics.oss.magnolia.appbuilder.action.rule.JcrIsNotDeletedRuleDefinition;
 import info.magnolia.ui.api.action.ConfiguredActionDefinition;
 import info.magnolia.ui.availability.rule.JcrPublishedRuleDefinition;
 import info.magnolia.ui.contentapp.action.JcrCommandActionDefinition;
 
+import com.merkle.oss.magnolia.definition.builder.availability.AvailabilityDefinitionBuilder;
+import com.namics.oss.magnolia.appbuilder.MgnlIcon;
+import com.namics.oss.magnolia.appbuilder.action.AppActionDefinition;
+import com.namics.oss.magnolia.appbuilder.action.rule.JcrIsNotDeletedRuleDefinition;
+
 public class DeactivateAppActionDefinition implements AppActionDefinition {
 
 	@Override

diff --git a/...s/magnolia/appbuilder/action/activation/workflow/WorkflowActivateAppActionDefinition.java b/...s/magnolia/appbuilder/action/activation/workflow/WorkflowActivateAppActionDefinition.java
@@ -1,13 +1,14 @@
 package com.namics.oss.magnolia.appbuilder.action.activation.workflow;
 
-import com.namics.oss.magnolia.appbuilder.MgnlIcon;
-import com.namics.oss.magnolia.appbuilder.action.AppActionDefinition;
-import com.namics.oss.magnolia.appbuilder.action.AvailabilityDefinitionBuilder;
-import com.namics.oss.magnolia.appbuilder.action.rule.JcrIsNotDeletedRuleDefinition;
 import info.magnolia.ui.api.action.ConfiguredActionDefinition;
 import info.magnolia.ui.availability.rule.JcrPublishableRuleDefinition;
 import info.magnolia.ui.dialog.actions.OpenDialogActionDefinition;
 
+import com.merkle.oss.magnolia.definition.builder.availability.AvailabilityDefinitionBuilder;
+import com.namics.oss.magnolia.appbuilder.MgnlIcon;
+import com.namics.oss.magnolia.appbuilder.action.AppActionDefinition;
+import com.namics.oss.magnolia.appbuilder.action.rule.JcrIsNotDeletedRuleDefinition;
+
 public class WorkflowActivateAppActionDefinition implements AppActionDefinition {
 
     @Override

diff --git a/...ia/appbuilder/action/activation/workflow/WorkflowActivateDeletionAppActionDefinition.java b/...ia/appbuilder/action/activation/workflow/WorkflowActivateDeletionAppActionDefinition.java
@@ -1,13 +1,14 @@
 package com.namics.oss.magnolia.appbuilder.action.activation.workflow;
 
-import com.namics.oss.magnolia.appbuilder.MgnlIcon;
-import com.namics.oss.magnolia.appbuilder.action.AppActionDefinition;
-import com.namics.oss.magnolia.appbuilder.action.AvailabilityDefinitionBuilder;
 import info.magnolia.ui.api.action.ConfiguredActionDefinition;
 import info.magnolia.ui.availability.rule.JcrIsDeletedRuleDefinition;
 import info.magnolia.ui.availability.rule.JcrPublishableRuleDefinition;
 import info.magnolia.ui.dialog.actions.OpenDialogActionDefinition;
 
+import com.merkle.oss.magnolia.definition.builder.availability.AvailabilityDefinitionBuilder;
+import com.namics.oss.magnolia.appbuilder.MgnlIcon;
+import com.namics.oss.magnolia.appbuilder.action.AppActionDefinition;
+
 public class WorkflowActivateDeletionAppActionDefinition implements AppActionDefinition {
 
     @Override

diff --git a/...a/appbuilder/action/activation/workflow/WorkflowActivateRecursiveAppActionDefinition.java b/...a/appbuilder/action/activation/workflow/WorkflowActivateRecursiveAppActionDefinition.java
@@ -4,9 +4,9 @@
 import info.magnolia.ui.availability.rule.JcrPublishableRuleDefinition;
 import info.magnolia.ui.dialog.actions.OpenDialogActionDefinition;
 
+import com.merkle.oss.magnolia.definition.builder.availability.AvailabilityDefinitionBuilder;
 import com.namics.oss.magnolia.appbuilder.MgnlIcon;
 import com.namics.oss.magnolia.appbuilder.action.AppActionDefinition;
-import com.namics.oss.magnolia.appbuilder.action.AvailabilityDefinitionBuilder;
 import com.namics.oss.magnolia.appbuilder.action.rule.JcrIsNotDeletedRuleDefinition;
 
 public class WorkflowActivateRecursiveAppActionDefinition implements AppActionDefinition {

diff --git a/...magnolia/appbuilder/action/activation/workflow/WorkflowDeactivateAppActionDefinition.java b/...magnolia/appbuilder/action/activation/workflow/WorkflowDeactivateAppActionDefinition.java
@@ -1,13 +1,14 @@
 package com.namics.oss.magnolia.appbuilder.action.activation.workflow;
 
-import com.namics.oss.magnolia.appbuilder.MgnlIcon;
-import com.namics.oss.magnolia.appbuilder.action.AppActionDefinition;
-import com.namics.oss.magnolia.appbuilder.action.AvailabilityDefinitionBuilder;
-import com.namics.oss.magnolia.appbuilder.action.rule.JcrIsNotDeletedRuleDefinition;
 import info.magnolia.ui.api.action.ConfiguredActionDefinition;
 import info.magnolia.ui.availability.rule.JcrPublishedRuleDefinition;
 import info.magnolia.ui.dialog.actions.OpenDialogActionDefinition;
 
+import com.merkle.oss.magnolia.definition.builder.availability.AvailabilityDefinitionBuilder;
+import com.namics.oss.magnolia.appbuilder.MgnlIcon;
+import com.namics.oss.magnolia.appbuilder.action.AppActionDefinition;
+import com.namics.oss.magnolia.appbuilder.action.rule.JcrIsNotDeletedRuleDefinition;
+
 public class WorkflowDeactivateAppActionDefinition implements AppActionDefinition {
 
     @Override

diff --git a/src/main/java/com/namics/oss/magnolia/appbuilder/action/add/AddAppActionDefinition.java b/src/main/java/com/namics/oss/magnolia/appbuilder/action/add/AddAppActionDefinition.java
@@ -6,9 +6,9 @@
 
 import javax.annotation.Nullable;
 
+import com.merkle.oss.magnolia.definition.builder.availability.AvailabilityDefinitionBuilder;
 import com.namics.oss.magnolia.appbuilder.MgnlIcon;
 import com.namics.oss.magnolia.appbuilder.action.AppActionDefinition;
-import com.namics.oss.magnolia.appbuilder.action.AvailabilityDefinitionBuilder;
 import com.namics.oss.magnolia.appbuilder.action.OpenDialogAction;
 import com.namics.oss.magnolia.appbuilder.action.rule.JcrIsNotDeletedRuleDefinition;
 import com.namics.oss.magnolia.appbuilder.action.rule.PermissionRequiredRuleDefinition;

diff --git a/...java/com/namics/oss/magnolia/appbuilder/action/edit/ConfirmDeleteAppActionDefinition.java b/...java/com/namics/oss/magnolia/appbuilder/action/edit/ConfirmDeleteAppActionDefinition.java
@@ -1,13 +1,14 @@
 package com.namics.oss.magnolia.appbuilder.action.edit;
 
+import info.magnolia.cms.security.Permission;
+import info.magnolia.ui.api.action.ConfiguredActionDefinition;
+import info.magnolia.ui.contentapp.action.DeleteNodesConfirmationActionDefinition;
+
+import com.merkle.oss.magnolia.definition.builder.availability.AvailabilityDefinitionBuilder;
 import com.namics.oss.magnolia.appbuilder.MgnlIcon;
 import com.namics.oss.magnolia.appbuilder.action.AppActionDefinition;
-import com.namics.oss.magnolia.appbuilder.action.AvailabilityDefinitionBuilder;
 import com.namics.oss.magnolia.appbuilder.action.rule.JcrIsNotDeletedRuleDefinition;
 import com.namics.oss.magnolia.appbuilder.action.rule.PermissionRequiredRuleDefinition;
-import info.magnolia.cms.security.Permission;
-import info.magnolia.ui.api.action.ConfiguredActionDefinition;
-import info.magnolia.ui.contentapp.action.DeleteNodesConfirmationActionDefinition;
 
 public class ConfirmDeleteAppActionDefinition implements AppActionDefinition {
 	private final String icon;

diff --git a/src/main/java/com/namics/oss/magnolia/appbuilder/action/edit/CopyAppActionDefinition.java b/src/main/java/com/namics/oss/magnolia/appbuilder/action/edit/CopyAppActionDefinition.java
@@ -1,13 +1,14 @@
 package com.namics.oss.magnolia.appbuilder.action.edit;
 
+import info.magnolia.cms.security.Permission;
+import info.magnolia.ui.api.action.ConfiguredActionDefinition;
+
+import com.merkle.oss.magnolia.definition.builder.availability.AvailabilityDefinitionBuilder;
 import com.namics.oss.magnolia.appbuilder.MgnlIcon;
 import com.namics.oss.magnolia.appbuilder.action.AppActionDefinition;
-import com.namics.oss.magnolia.appbuilder.action.AvailabilityDefinitionBuilder;
 import com.namics.oss.magnolia.appbuilder.action.edit.clipboard.CopyContentActionDefinition;
 import com.namics.oss.magnolia.appbuilder.action.rule.JcrIsNotDeletedRuleDefinition;
 import com.namics.oss.magnolia.appbuilder.action.rule.PermissionRequiredRuleDefinition;
-import info.magnolia.cms.security.Permission;
-import info.magnolia.ui.api.action.ConfiguredActionDefinition;
 
 public class CopyAppActionDefinition implements AppActionDefinition {
 	private final String icon;

diff --git a/src/main/java/com/namics/oss/magnolia/appbuilder/action/edit/DeleteAppActionDefinition.java b/src/main/java/com/namics/oss/magnolia/appbuilder/action/edit/DeleteAppActionDefinition.java
@@ -1,13 +1,14 @@
 package com.namics.oss.magnolia.appbuilder.action.edit;
 
-import com.namics.oss.magnolia.appbuilder.action.AppActionDefinition;
-import com.namics.oss.magnolia.appbuilder.action.AvailabilityDefinitionBuilder;
-import com.namics.oss.magnolia.appbuilder.action.rule.JcrIsNotDeletedRuleDefinition;
-import com.namics.oss.magnolia.appbuilder.action.rule.PermissionRequiredRuleDefinition;
 import info.magnolia.cms.security.Permission;
 import info.magnolia.ui.api.action.ConfiguredActionDefinition;
 import info.magnolia.ui.contentapp.action.JcrCommandActionDefinition;
 
+import com.merkle.oss.magnolia.definition.builder.availability.AvailabilityDefinitionBuilder;
+import com.namics.oss.magnolia.appbuilder.action.AppActionDefinition;
+import com.namics.oss.magnolia.appbuilder.action.rule.JcrIsNotDeletedRuleDefinition;
+import com.namics.oss.magnolia.appbuilder.action.rule.PermissionRequiredRuleDefinition;
+
 public class DeleteAppActionDefinition implements AppActionDefinition {
 
 	@Override

diff --git a/...ain/java/com/namics/oss/magnolia/appbuilder/action/edit/DuplicateAppActionDefinition.java b/...ain/java/com/namics/oss/magnolia/appbuilder/action/edit/DuplicateAppActionDefinition.java
@@ -1,13 +1,14 @@
 package com.namics.oss.magnolia.appbuilder.action.edit;
 
+import info.magnolia.cms.security.Permission;
+import info.magnolia.ui.api.action.ConfiguredActionDefinition;
+import info.magnolia.ui.contentapp.action.DuplicateNodeActionDefinition;
+
+import com.merkle.oss.magnolia.definition.builder.availability.AvailabilityDefinitionBuilder;
 import com.namics.oss.magnolia.appbuilder.MgnlIcon;
 import com.namics.oss.magnolia.appbuilder.action.AppActionDefinition;
-import com.namics.oss.magnolia.appbuilder.action.AvailabilityDefinitionBuilder;
 import com.namics.oss.magnolia.appbuilder.action.rule.JcrIsNotDeletedRuleDefinition;
 import com.namics.oss.magnolia.appbuilder.action.rule.PermissionRequiredRuleDefinition;
-import info.magnolia.cms.security.Permission;
-import info.magnolia.ui.api.action.ConfiguredActionDefinition;
-import info.magnolia.ui.contentapp.action.DuplicateNodeActionDefinition;
 
 public class DuplicateAppActionDefinition implements AppActionDefinition {
 	private final String icon;

diff --git a/src/main/java/com/namics/oss/magnolia/appbuilder/action/edit/EditAppActionDefinition.java b/src/main/java/com/namics/oss/magnolia/appbuilder/action/edit/EditAppActionDefinition.java
@@ -5,9 +5,9 @@
 
 import javax.annotation.Nullable;
 
+import com.merkle.oss.magnolia.definition.builder.availability.AvailabilityDefinitionBuilder;
 import com.namics.oss.magnolia.appbuilder.MgnlIcon;
 import com.namics.oss.magnolia.appbuilder.action.AppActionDefinition;
-import com.namics.oss.magnolia.appbuilder.action.AvailabilityDefinitionBuilder;
 import com.namics.oss.magnolia.appbuilder.action.OpenDialogAction;
 import com.namics.oss.magnolia.appbuilder.action.rule.JcrIsNotDeletedRuleDefinition;
 import com.namics.oss.magnolia.appbuilder.action.rule.PermissionRequiredRuleDefinition;

diff --git a/...java/com/namics/oss/magnolia/appbuilder/action/edit/MarkAsDeletedAppActionDefinition.java b/...java/com/namics/oss/magnolia/appbuilder/action/edit/MarkAsDeletedAppActionDefinition.java
@@ -1,13 +1,14 @@
 package com.namics.oss.magnolia.appbuilder.action.edit;
 
-import com.namics.oss.magnolia.appbuilder.action.AppActionDefinition;
-import com.namics.oss.magnolia.appbuilder.action.AvailabilityDefinitionBuilder;
-import com.namics.oss.magnolia.appbuilder.action.rule.JcrIsNotDeletedRuleDefinition;
-import com.namics.oss.magnolia.appbuilder.action.rule.PermissionRequiredRuleDefinition;
 import info.magnolia.cms.security.Permission;
 import info.magnolia.ui.api.action.ConfiguredActionDefinition;
 import info.magnolia.ui.contentapp.action.MarkAsDeletedCommandActionDefinition;
 
+import com.merkle.oss.magnolia.definition.builder.availability.AvailabilityDefinitionBuilder;
+import com.namics.oss.magnolia.appbuilder.action.AppActionDefinition;
+import com.namics.oss.magnolia.appbuilder.action.rule.JcrIsNotDeletedRuleDefinition;
+import com.namics.oss.magnolia.appbuilder.action.rule.PermissionRequiredRuleDefinition;
+
 public class MarkAsDeletedAppActionDefinition implements AppActionDefinition {
 
 	@Override