Reformat catalog-be

[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / components / merge / TopologyComparator.java

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/TopologyComparator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/TopologyComparator.java
index 24e669a..bb84a57 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/TopologyComparator.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/TopologyComparator.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,10 +17,11 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.be.components.merge;
 
 import fj.data.Either;
+import java.util.List;
+import java.util.Map;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.utils.MapUtil;
 import org.openecomp.sdc.be.exception.SdcActionException;
@@ -32,29 +33,22 @@ import org.openecomp.sdc.be.model.jsonjanusgraph.operations.ToscaOperationFacade
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 
-import java.util.List;
-import java.util.Map;
-
 @org.springframework.stereotype.Component
 public class TopologyComparator {
 
     public static final Logger log = Logger.getLogger(TopologyComparator.class);
-
     @javax.annotation.Resource
     private RelationsComparator relationsComparator;
-
     @javax.annotation.Resource
     private ToscaOperationFacade toscaOperationFacade;
-
     @javax.annotation.Resource
     private ComponentsUtils componentsUtils;
 
     /**
-     *
      * @param oldResource the old version of the resource of which to check for topology change
      * @param newResource the new version of the resource of which to check for topology change
-     * @return true if there was a topology change between the old resource and new resource or false otherwise
-     * in case the action to find topology change failed, an appropriate {@link ActionStatus} will be returned
+     * @return true if there was a topology change between the old resource and new resource or false otherwise in case the action to find topology
+     * change failed, an appropriate {@link ActionStatus} will be returned
      */
     public Either<Boolean, ActionStatus> isTopologyChanged(Resource oldResource, Resource newResource) {
         List<ComponentInstance> oldInstances = oldResource.getComponentInstances();
@@ -70,14 +64,17 @@ public class TopologyComparator {
         return isTopologyInstancesChanged(oldResource, newResource, oldInstancesByName, newInstancesByName);
     }
 
-    private Either<Boolean, ActionStatus> isTopologyInstancesChanged(Resource oldResource, Resource newResource, Map<String, ComponentInstance> oldInstancesByName, Map<String, ComponentInstance> newInstancesByName) {
+    private Either<Boolean, ActionStatus> isTopologyInstancesChanged(Resource oldResource, Resource newResource,
+                                                                     Map<String, ComponentInstance> oldInstancesByName,
+                                                                     Map<String, ComponentInstance> newInstancesByName) {
         try {
-            boolean isTopologyChanged = isInstanceNamesChanged(oldInstancesByName, newInstancesByName) ||
-                                        isInstanceTypesChanged(oldInstancesByName, newInstancesByName) ||
-                                        relationsComparator.isRelationsChanged(oldResource, newResource);
+            boolean isTopologyChanged =
+                isInstanceNamesChanged(oldInstancesByName, newInstancesByName) || isInstanceTypesChanged(oldInstancesByName, newInstancesByName)
+                    || relationsComparator.isRelationsChanged(oldResource, newResource);
             return Either.left(isTopologyChanged);
         } catch (SdcActionException e) {
-            log.error("failed to merge entities of previous resource %s to current resource %s. reason: %s", oldResource.getUniqueId(), newResource.getUniqueId(), e.getActionStatus(), e);
+            log.error("failed to merge entities of previous resource %s to current resource %s. reason: %s", oldResource.getUniqueId(),
+                newResource.getUniqueId(), e.getActionStatus(), e);
             return Either.right(e.getActionStatus());
         }
     }
@@ -97,8 +94,7 @@ public class TopologyComparator {
     }
 
     private boolean isSameToscaTypeOrOriginComponent(ComponentInstance oldInstance, ComponentInstance newInstance) {
-        return isSameToscaType(oldInstance, newInstance) ||
-               isSameOriginComponent(oldInstance, newInstance);
+        return isSameToscaType(oldInstance, newInstance) || isSameOriginComponent(oldInstance, newInstance);
     }
 
     private boolean isSameToscaType(ComponentInstance oldInstance, ComponentInstance newInstance) {
@@ -109,8 +105,10 @@ public class TopologyComparator {
         if (oldInstance.getComponentUid().equals(newInstance.getComponentUid())) {
             return true;
         }
-        Component oldOriginCmpt = toscaOperationFacade.getToscaElement(oldInstance.getComponentUid()).left().on(storageStatus -> throwSdcActionException(storageStatus, oldInstance));
-        Component newOriginCmpt = toscaOperationFacade.getToscaElement(newInstance.getComponentUid()).left().on(storageStatus -> throwSdcActionException(storageStatus, newInstance));
+        Component oldOriginCmpt = toscaOperationFacade.getToscaElement(oldInstance.getComponentUid()).left()
+            .on(storageStatus -> throwSdcActionException(storageStatus, oldInstance));
+        Component newOriginCmpt = toscaOperationFacade.getToscaElement(newInstance.getComponentUid()).left()
+            .on(storageStatus -> throwSdcActionException(storageStatus, newInstance));
         return oldOriginCmpt.getInvariantUUID().equals(newOriginCmpt.getInvariantUUID());
     }
 
@@ -118,6 +116,4 @@ public class TopologyComparator {
         log.error("failed to fetch origin node type %s for instance %s", cmptInstance.getUniqueId(), cmptInstance.getComponentUid());
         throw new SdcActionException(componentsUtils.convertFromStorageResponse(storageOperationStatus));
     }
-
-
 }