Fix comments

Author: IvanBorislavovDimitrov

multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/model/SupportedParameters.java

@@ -204,7 +204,8 @@ public class SupportedParameters {
                                                                  DEFAULT_SERVICE_NAME, DEFAULT_XS_APP_NAME, SERVICE, SERVICE_KEYS,
                                                                  SERVICE_KEY_NAME, SERVICE_NAME, SERVICE_PLAN, SERVICE_TAGS, SERVICE_BROKER,
                                                                  SKIP_SERVICE_UPDATES, TYPE, PROVIDER_ID, PROVIDER_NID, TARGET,
-                                                                 SERVICE_CONFIG_PATH, FILTER, MANAGED, VERSION, PATH, MEMORY);
+                                                                 SERVICE_CONFIG_PATH, FILTER, MANAGED, VERSION, PATH, MEMORY,
+                                                                 FAIL_ON_SERVICE_UPDATE);
     public static final Set<String> GLOBAL_PARAMETERS = Set.of(KEEP_EXISTING_ROUTES, APPS_UPLOAD_TIMEOUT, APPS_TASK_EXECUTION_TIMEOUT,
                                                                APPS_START_TIMEOUT, APPS_STAGE_TIMEOUT, APPLY_NAMESPACE,
                                                                ENABLE_PARALLEL_DEPLOYMENTS, DEPLOY_MODE);

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

@@ -22,7 +22,8 @@ public PollServiceCreateOrUpdateOperationsExecution(ServiceOperationGetter servi
     }
 
     public PollServiceCreateOrUpdateOperationsExecution(ServiceOperationGetter serviceOperationGetter,
-                                                        ServiceProgressReporter serviceProgressReporter, Supplier<Boolean> shouldFailOnUpdateSupplier) {
+                                                        ServiceProgressReporter serviceProgressReporter,
+                                                        Supplier<Boolean> shouldFailOnUpdateSupplier) {
         super(serviceOperationGetter, serviceProgressReporter);
         this.shouldFailOnUpdateSupplier = shouldFailOnUpdateSupplier;
     }
@@ -40,8 +41,7 @@ protected List<CloudServiceInstanceExtended> getServicesData(ProcessContext cont
     protected ServiceOperation mapOperationState(StepLogger stepLogger, ServiceOperation lastServiceOperation,
                                                  CloudServiceInstanceExtended service) {
         lastServiceOperation = super.mapOperationState(stepLogger, lastServiceOperation, service);
-        if ((lastServiceOperation.getType() == ServiceOperation.Type.UPDATE && !shouldFailOnUpdateSupplier.get())
-            && lastServiceOperation.getState() == ServiceOperation.State.FAILED) {
+        if (shouldIgnoreLastOperationFailure(lastServiceOperation)) {
             stepLogger.warn(Messages.FAILED_SERVICE_UPDATE, service.getName(), lastServiceOperation.getDescription());
             return new ServiceOperation(lastServiceOperation.getType(),
                                         lastServiceOperation.getDescription(),
@@ -50,6 +50,12 @@ protected ServiceOperation mapOperationState(StepLogger stepLogger, ServiceOpera
         return lastServiceOperation;
     }
 
+    private boolean shouldIgnoreLastOperationFailure(ServiceOperation lastServiceOperation) {
+        return lastServiceOperation.getType() == ServiceOperation.Type.UPDATE
+            && lastServiceOperation.getState() == ServiceOperation.State.FAILED
+            && !shouldFailOnUpdateSupplier.get();
+    }
+
     @Override
     protected void handleMissingOperationState(StepLogger stepLogger, CloudServiceInstanceExtended service) {
         if (!service.isOptional()) {