removed the handleApplicationName method signature from StepFlowHandler

Author: ikasarov

multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/Messages.java

@@ -161,7 +161,6 @@ public class Messages {
     public static final String ERROR_MONITORING_OPERATIONS_OVER_SERVICES = "Error monitoring operations over services";
     public static final String ERROR_DELETING_REMAINING_FILE_PARTS = "Error deleting remaining file parts";
     public static final String ERROR_DETECTING_APPLICATIONS_TO_RENAME = "Error detecting applications to rename";
-    public static final String ERROR_RENAMING_NEW_APPLICATIONS = "Error renaming new applications";
     public static final String ERROR_MONITORING_CREATION_OR_UPDATE_OF_SERVICES = "Error monitoring creation or update of services";
     public static final String ERROR_MONITORING_DELETION_OF_SERVICES = "Error monitoring deletion of services";
     public static final String SERVICE_IS_ALREADY_DELETED = "Service \"{0}\" is already deleted";

multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/CreateOrUpdateAppStep.java

@@ -81,7 +81,6 @@ protected StepPhase executeStep(ProcessContext context) throws FileStorageExcept
         flowHandler.injectServiceKeysCredentialsInAppEnv();
         flowHandler.handleApplicationAttributes();
         flowHandler.handleApplicationServices();
-        flowHandler.handleApplicationName();
         flowHandler.printStepEndMessage();
 
         return StepPhase.DONE;
@@ -157,8 +156,6 @@ private Map<String, String> buildServiceKeysCredentials(CloudControllerClient cl
 
         public abstract void handleApplicationAttributes();
 
-        public abstract void handleApplicationName();
-
         public abstract void handleApplicationServices();
 
         public abstract void printStepEndMessage();
@@ -199,10 +196,6 @@ public void handleApplicationServices() {
             context.setVariable(Variables.SERVICES_TO_UNBIND_BIND, app.getServices());
         }
 
-        @Override
-        public void handleApplicationName() {
-        }
-
         @Override
         public void printStepStartMessage() {
             getStepLogger().info(Messages.CREATING_APP_FROM_MODULE, app.getName(), app.getModuleName());
@@ -247,7 +240,9 @@ public void handleApplicationAttributes() {
 
             reportApplicationUpdateStatus(app, arePropertiesChanged);
             context.setVariable(Variables.VCAP_APP_PROPERTIES_CHANGED, arePropertiesChanged);
+
             updateApplicationEnvironment();
+            updateApplicationName();
         }
 
         private void updateApplicationEnvironment() {
@@ -295,8 +290,7 @@ private UpdateStrategy getEnvUpdateStrategy() {
                       .shouldKeepExistingEnv() ? UpdateStrategy.MERGE : UpdateStrategy.REPLACE;
         }
 
-        @Override
-        public void handleApplicationName() {
+        public void updateApplicationName() {
             boolean processIsBlueGreenWithIdleSuffix = StepsUtil.getAppSuffixDeterminer(context)
                                                                 .shouldAppendIdleSuffix();
             if (!processIsBlueGreenWithIdleSuffix) {

multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/steps/StepsUtil.java

@@ -216,7 +216,7 @@ static ApplicationCloudModelBuilder getApplicationCloudModelBuilder(ProcessConte
                                                               shouldApplyIncrementalInstancesUpdate(context));
     }
 
-    static AppSuffixDeterminer getAppSuffixDeterminer(ProcessContext context) {
+    public static AppSuffixDeterminer getAppSuffixDeterminer(ProcessContext context) {
         boolean keepOriginalNamesAfterDeploy = context.getVariable(Variables.KEEP_ORIGINAL_APP_NAMES_AFTER_DEPLOY);
         boolean isAfterResumePhase = context.getVariable(Variables.PHASE) == Phase.AFTER_RESUME;
         return new AppSuffixDeterminer(keepOriginalNamesAfterDeploy, isAfterResumePhase);