1 files changed, 16 insertions, 19 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/input/GlobalInputsMergeCommand.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/input/GlobalInputsMergeCommand.java
index 91c6ff05b3..4f63dd4ab0 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/input/GlobalInputsMergeCommand.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/input/GlobalInputsMergeCommand.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,9 +17,15 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.be.components.merge.input;
 
+import static java.util.stream.Collectors.toMap;
+import static org.openecomp.sdc.be.components.merge.resource.ResourceDataMergeBusinessLogic.LAST_COMMAND;
+import static org.openecomp.sdc.be.utils.PropertyDefinitionUtils.convertListOfProperties;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
 import org.openecomp.sdc.be.components.impl.utils.ExceptionUtils;
 import org.openecomp.sdc.be.components.merge.ComponentsGlobalMergeCommand;
 import org.openecomp.sdc.be.components.merge.GlobalInputsFilteringBusinessLogic;
@@ -31,14 +37,6 @@ import org.openecomp.sdc.be.model.InputDefinition;
 import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade;
 import org.springframework.core.annotation.Order;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
-
-import static java.util.stream.Collectors.toMap;
-import static org.openecomp.sdc.be.components.merge.resource.ResourceDataMergeBusinessLogic.LAST_COMMAND;
-import static org.openecomp.sdc.be.utils.PropertyDefinitionUtils.convertListOfProperties;
-
 @org.springframework.stereotype.Component
 @Order(LAST_COMMAND)
 public class GlobalInputsMergeCommand extends InputsMergeCommand implements ComponentsGlobalMergeCommand {
@@ -46,7 +44,9 @@ public class GlobalInputsMergeCommand extends InputsMergeCommand implements Comp
     private GlobalInputsFilteringBusinessLogic globalInputsFilteringBusinessLogic;
     private ExceptionUtils exceptionUtils;
 
-    public GlobalInputsMergeCommand(InputsValuesMergingBusinessLogic inputsValuesMergingBusinessLogic, DeclaredInputsResolver declaredInputsResolver, ToscaOperationFacade toscaOperationFacade, ComponentsUtils componentsUtils, GlobalInputsFilteringBusinessLogic globalInputsFilteringBusinessLogic, ExceptionUtils exceptionUtils) {
+    public GlobalInputsMergeCommand(InputsValuesMergingBusinessLogic inputsValuesMergingBusinessLogic, DeclaredInputsResolver declaredInputsResolver,
+                                    ToscaOperationFacade toscaOperationFacade, ComponentsUtils componentsUtils,
+                                    GlobalInputsFilteringBusinessLogic globalInputsFilteringBusinessLogic, ExceptionUtils exceptionUtils) {
         super(inputsValuesMergingBusinessLogic, declaredInputsResolver, toscaOperationFacade, componentsUtils);
         this.globalInputsFilteringBusinessLogic = globalInputsFilteringBusinessLogic;
         this.exceptionUtils = exceptionUtils;
@@ -69,12 +69,9 @@ public class GlobalInputsMergeCommand extends InputsMergeCommand implements Comp
 
     @Override
     Map<String, List<PropertyDataDefinition>> getProperties(Component component) {
-        return Stream.of(component.safeGetUiComponentInstancesProperties(),
-                         component.safeGetUiComponentInstancesInputs(),
-                         component.safeGetGroupsProperties(),
-                         component.safeGetPolicyProperties())
-                .flatMap(map -> map.entrySet().stream())
-                .collect(toMap(Map.Entry::getKey, entry -> convertListOfProperties(entry.getValue())));
+        return Stream
+            .of(component.safeGetUiComponentInstancesProperties(), component.safeGetUiComponentInstancesInputs(), component.safeGetGroupsProperties(),
+                component.safeGetPolicyProperties()).flatMap(map -> map.entrySet().stream())
+            .collect(toMap(Map.Entry::getKey, entry -> convertListOfProperties(entry.getValue())));
     }
-
 }