Allowing for sort order to be overridden

marklogic · Jul 5, 2015 · 91b858f · 91b858f
1 parent b230bb9
commit 91b858f
Show file tree

Hide file tree

Showing 19 changed files with 51 additions and 62 deletions.
diff --git a/src/main/java/com/marklogic/appdeployer/command/AbstractCommand.java b/src/main/java/com/marklogic/appdeployer/command/AbstractCommand.java
@@ -8,14 +8,15 @@
 import com.marklogic.clientutil.LoggingObject;
 
 /**
- * Abstract base class that provides some convenience methods for implementing a command. Requires that the Spring
- * Ordered interface be implemented so that the implementor takes into account when this particular command should be
- * executed relative to other commands.
+ * Abstract base class that provides some convenience methods for implementing a command. Subclasses will typically override
+ * the default sort order within the subclass constructor.
  */
 public abstract class AbstractCommand extends LoggingObject implements Command {
 
     protected TokenReplacer tokenReplacer = new DefaultTokenReplacer();
 
+    protected int executeSortOrder = Integer.MAX_VALUE;
+
     protected String copyFileToString(File f) {
         try {
             return new String(FileCopyUtils.copyToByteArray(f));
@@ -37,4 +38,13 @@ public TokenReplacer getTokenReplacer() {
         return tokenReplacer;
     }
 
+    @Override
+    public Integer getExecuteSortOrder() {
+        return this.executeSortOrder;
+    }
+
+    public void setExecuteSortOrder(int executeSortOrder) {
+        this.executeSortOrder = executeSortOrder;
+    }
+
 }
diff --git a/src/main/java/com/marklogic/appdeployer/command/cpf/CreateCpfConfigsCommand.java b/src/main/java/com/marklogic/appdeployer/command/cpf/CreateCpfConfigsCommand.java
@@ -7,9 +7,8 @@
 
 public class CreateCpfConfigsCommand extends AbstractCpfResourceCommand {
 
-    @Override
-    public Integer getExecuteSortOrder() {
-        return SortOrderConstants.CREATE_CPF_CONFIGS_ORDER;
+    public CreateCpfConfigsCommand() {
+        setExecuteSortOrder(SortOrderConstants.CREATE_CPF_CONFIGS_ORDER);
     }
 
     @Override

diff --git a/src/main/java/com/marklogic/appdeployer/command/cpf/CreateDomainsCommand.java b/src/main/java/com/marklogic/appdeployer/command/cpf/CreateDomainsCommand.java
@@ -7,9 +7,8 @@
 
 public class CreateDomainsCommand extends AbstractCpfResourceCommand {
 
-    @Override
-    public Integer getExecuteSortOrder() {
-        return SortOrderConstants.CREATE_DOMAINS_ORDER;
+    public CreateDomainsCommand() {
+        setExecuteSortOrder(SortOrderConstants.CREATE_DOMAINS_ORDER);
     }
 
     @Override

diff --git a/src/main/java/com/marklogic/appdeployer/command/cpf/CreatePipelinesCommand.java b/src/main/java/com/marklogic/appdeployer/command/cpf/CreatePipelinesCommand.java
@@ -7,9 +7,8 @@
 
 public class CreatePipelinesCommand extends AbstractCpfResourceCommand {
 
-    @Override
-    public Integer getExecuteSortOrder() {
-        return SortOrderConstants.CREATE_PIPELINES_ORDER;
+    public CreatePipelinesCommand() {
+        setExecuteSortOrder(SortOrderConstants.CREATE_PIPELINES_ORDER);
     }
 
     @Override

diff --git a/src/main/java/com/marklogic/appdeployer/command/cpf/LoadDefaultPipelinesCommand.java b/src/main/java/com/marklogic/appdeployer/command/cpf/LoadDefaultPipelinesCommand.java
@@ -7,15 +7,14 @@
 
 public class LoadDefaultPipelinesCommand extends AbstractCommand {
 
+    public LoadDefaultPipelinesCommand() {
+        setExecuteSortOrder(SortOrderConstants.LOAD_DEFAULT_PIPELINES);
+    }
+
     @Override
     public void execute(CommandContext context) {
         new PipelineManager(context.getManageClient()).loadDefaultPipelines(context.getAppConfig()
                 .getTriggersDatabaseName());
     }
 
-    @Override
-    public Integer getExecuteSortOrder() {
-        return SortOrderConstants.LOAD_DEFAULT_PIPELINES;
-    }
-
 }
diff --git a/src/main/java/com/marklogic/appdeployer/command/databases/CreateTriggersDatabaseCommand.java b/src/main/java/com/marklogic/appdeployer/command/databases/CreateTriggersDatabaseCommand.java
@@ -13,9 +13,8 @@
 
 public class CreateTriggersDatabaseCommand extends AbstractCommand implements UndoableCommand {
 
-    @Override
-    public Integer getExecuteSortOrder() {
-        return SortOrderConstants.CREATE_TRIGGERS_DATABASE_ORDER;
+    public CreateTriggersDatabaseCommand() {
+        setExecuteSortOrder(SortOrderConstants.CREATE_TRIGGERS_DATABASE_ORDER);
     }
 
     /**

diff --git a/src/main/java/com/marklogic/appdeployer/command/databases/UpdateContentDatabasesCommand.java b/src/main/java/com/marklogic/appdeployer/command/databases/UpdateContentDatabasesCommand.java
@@ -13,9 +13,8 @@
 
 public class UpdateContentDatabasesCommand extends AbstractCommand {
 
-    @Override
-    public Integer getExecuteSortOrder() {
-        return SortOrderConstants.UPDATE_CONTENT_DATABASES_ORDER;
+    public UpdateContentDatabasesCommand() {
+        setExecuteSortOrder(SortOrderConstants.UPDATE_CONTENT_DATABASES_ORDER);
     }
 
     @Override

diff --git a/src/main/java/com/marklogic/appdeployer/command/modules/LoadAssetsViaXccCommand.java b/src/main/java/com/marklogic/appdeployer/command/modules/LoadAssetsViaXccCommand.java
@@ -21,11 +21,7 @@ public class LoadAssetsViaXccCommand extends AbstractCommand {
 
     public LoadAssetsViaXccCommand(String... assetPaths) {
         this.assetPaths = assetPaths;
-    }
-
-    @Override
-    public Integer getExecuteSortOrder() {
-        return SortOrderConstants.LOAD_MODULES_ORDER - 10;
+        setExecuteSortOrder(SortOrderConstants.LOAD_MODULES_ORDER - 10);
     }
 
     @Override

diff --git a/src/main/java/com/marklogic/appdeployer/command/modules/LoadModulesCommand.java b/src/main/java/com/marklogic/appdeployer/command/modules/LoadModulesCommand.java
@@ -23,9 +23,8 @@ public class LoadModulesCommand extends AbstractCommand {
     private String defaultAssetRolesAndCapabilities = "rest-admin,read,rest-admin,update,rest-extension-user,execute";
     private String customAssetRolesAndCapabilities;
 
-    @Override
-    public Integer getExecuteSortOrder() {
-        return SortOrderConstants.LOAD_MODULES_ORDER;
+    public LoadModulesCommand() {
+        setExecuteSortOrder(SortOrderConstants.LOAD_MODULES_ORDER);
     }
 
     @Override

diff --git a/src/main/java/com/marklogic/appdeployer/command/restapis/CreateRestApiServersCommand.java b/src/main/java/com/marklogic/appdeployer/command/restapis/CreateRestApiServersCommand.java
@@ -19,9 +19,8 @@ public class CreateRestApiServersCommand extends AbstractCommand implements Undo
     private boolean includeModules = true;
     private boolean includeContent = true;
 
-    @Override
-    public Integer getExecuteSortOrder() {
-        return SortOrderConstants.CREATE_REST_API_SERVERS_ORDER;
+    public CreateRestApiServersCommand() {
+        setExecuteSortOrder(SortOrderConstants.CREATE_REST_API_SERVERS_ORDER);
     }
 
     @Override

diff --git a/src/main/java/com/marklogic/appdeployer/command/security/CreateAmpsCommand.java b/src/main/java/com/marklogic/appdeployer/command/security/CreateAmpsCommand.java
@@ -10,9 +10,8 @@
 
 public class CreateAmpsCommand extends AbstractResourceCommand {
 
-    @Override
-    public Integer getExecuteSortOrder() {
-        return SortOrderConstants.CREATE_AMPS;
+    public CreateAmpsCommand() {
+        setExecuteSortOrder(SortOrderConstants.CREATE_AMPS);
     }
 
     @Override

diff --git a/...in/java/com/marklogic/appdeployer/command/security/CreateCertificateTemplatesCommand.java b/...in/java/com/marklogic/appdeployer/command/security/CreateCertificateTemplatesCommand.java
@@ -10,9 +10,8 @@
 
 public class CreateCertificateTemplatesCommand extends AbstractResourceCommand {
 
-    @Override
-    public Integer getExecuteSortOrder() {
-        return SortOrderConstants.CREATE_CERTIFICATE_TEMPLATES;
+    public CreateCertificateTemplatesCommand() {
+        setExecuteSortOrder(SortOrderConstants.CREATE_CERTIFICATE_TEMPLATES);
     }
 
     @Override

diff --git a/src/main/java/com/marklogic/appdeployer/command/security/CreateExternalSecurityCommand.java b/src/main/java/com/marklogic/appdeployer/command/security/CreateExternalSecurityCommand.java
@@ -10,9 +10,8 @@
 
 public class CreateExternalSecurityCommand extends AbstractResourceCommand {
 
-    @Override
-    public Integer getExecuteSortOrder() {
-        return SortOrderConstants.CREATE_EXTERNAL_SECURITY;
+    public CreateExternalSecurityCommand() {
+        setExecuteSortOrder(SortOrderConstants.CREATE_EXTERNAL_SECURITY);
     }
 
     @Override

diff --git a/src/main/java/com/marklogic/appdeployer/command/security/CreatePrivilegesCommand.java b/src/main/java/com/marklogic/appdeployer/command/security/CreatePrivilegesCommand.java
@@ -10,9 +10,8 @@
 
 public class CreatePrivilegesCommand extends AbstractResourceCommand {
 
-    @Override
-    public Integer getExecuteSortOrder() {
-        return SortOrderConstants.CREATE_PRIVILEGES;
+    public CreatePrivilegesCommand() {
+        setExecuteSortOrder(SortOrderConstants.CREATE_PRIVILEGES);
     }
 
     @Override

diff --git a/...in/java/com/marklogic/appdeployer/command/security/CreateProtectedCollectionsCommand.java b/...in/java/com/marklogic/appdeployer/command/security/CreateProtectedCollectionsCommand.java
@@ -10,9 +10,8 @@
 
 public class CreateProtectedCollectionsCommand extends AbstractResourceCommand {
 
-    @Override
-    public Integer getExecuteSortOrder() {
-        return SortOrderConstants.CREATE_PROTECTED_COLLECTIONS;
+    public CreateProtectedCollectionsCommand() {
+        setExecuteSortOrder(SortOrderConstants.CREATE_PROTECTED_COLLECTIONS);
     }
 
     @Override

diff --git a/src/main/java/com/marklogic/appdeployer/command/security/CreateRolesCommand.java b/src/main/java/com/marklogic/appdeployer/command/security/CreateRolesCommand.java
@@ -2,17 +2,16 @@
 
 import java.io.File;
 
-import com.marklogic.appdeployer.command.CommandContext;
 import com.marklogic.appdeployer.command.AbstractResourceCommand;
+import com.marklogic.appdeployer.command.CommandContext;
 import com.marklogic.appdeployer.command.SortOrderConstants;
 import com.marklogic.rest.mgmt.ResourceManager;
 import com.marklogic.rest.mgmt.security.RoleManager;
 
 public class CreateRolesCommand extends AbstractResourceCommand {
 
-    @Override
-    public Integer getExecuteSortOrder() {
-        return SortOrderConstants.CREATE_ROLES;
+    public CreateRolesCommand() {
+        setExecuteSortOrder(SortOrderConstants.CREATE_ROLES);
     }
 
     protected File getResourcesDir(CommandContext context) {

diff --git a/src/main/java/com/marklogic/appdeployer/command/security/CreateUsersCommand.java b/src/main/java/com/marklogic/appdeployer/command/security/CreateUsersCommand.java
@@ -10,9 +10,8 @@
 
 public class CreateUsersCommand extends AbstractResourceCommand {
 
-    @Override
-    public Integer getExecuteSortOrder() {
-        return SortOrderConstants.CREATE_USERS;
+    public CreateUsersCommand() {
+        setExecuteSortOrder(SortOrderConstants.CREATE_USERS);
     }
 
     protected File getResourcesDir(CommandContext context) {

diff --git a/src/main/java/com/marklogic/appdeployer/command/servers/UpdateRestApiServersCommand.java b/src/main/java/com/marklogic/appdeployer/command/servers/UpdateRestApiServersCommand.java
@@ -10,9 +10,8 @@
 
 public class UpdateRestApiServersCommand extends AbstractCommand {
 
-    @Override
-    public Integer getExecuteSortOrder() {
-        return SortOrderConstants.UPDATE_REST_API_SERVERS_ORDER;
+    public UpdateRestApiServersCommand() {
+        setExecuteSortOrder(SortOrderConstants.UPDATE_REST_API_SERVERS_ORDER);
     }
 
     /**

diff --git a/src/main/java/com/marklogic/appdeployer/command/tasks/CreateScheduledTasksCommand.java b/src/main/java/com/marklogic/appdeployer/command/tasks/CreateScheduledTasksCommand.java
@@ -12,9 +12,8 @@ public class CreateScheduledTasksCommand extends AbstractResourceCommand {
 
     private String groupName;
 
-    @Override
-    public Integer getExecuteSortOrder() {
-        return SortOrderConstants.CREATE_SCHEDULED_TASKS;
+    public CreateScheduledTasksCommand() {
+        setExecuteSortOrder(SortOrderConstants.CREATE_SCHEDULED_TASKS);
     }
 
     @Override