1 files changed, 14 insertions, 29 deletions

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CommonTypeOperations.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CommonTypeOperations.java
index f8a43ca3c7..a9dc6bd672 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CommonTypeOperations.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/CommonTypeOperations.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,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.be.model.operations.impl;
 
 import static java.util.Collections.emptyList;
@@ -31,8 +30,8 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import org.openecomp.sdc.be.dao.graph.datatype.GraphNode;
 import org.openecomp.sdc.be.dao.janusgraph.HealingJanusGraphGenericDao;
-import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
 import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
+import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.PropertyDefinition;
 import org.springframework.stereotype.Component;
@@ -52,15 +51,11 @@ public class CommonTypeOperations {
     }
 
     public <T extends GraphNode> void addType(T typeData, Class<T> clazz) {
-        janusGraphGenericDao.createNode(typeData, clazz)
-            .left()
-            .on(operationUtils::onJanusGraphOperationFailure);
+        janusGraphGenericDao.createNode(typeData, clazz).left().on(operationUtils::onJanusGraphOperationFailure);
     }
 
     public <T extends GraphNode> Optional<T> getType(String uniqueId, Class<T> clazz, NodeTypeEnum nodeType) {
-        T type = janusGraphGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), uniqueId, clazz)
-                .left()
-                .on(err -> null);
+        T type = janusGraphGenericDao.getNode(UniqueIdBuilder.getKeyByNodeType(nodeType), uniqueId, clazz).left().on(err -> null);
         return Optional.ofNullable(type);
     }
 
@@ -68,23 +63,16 @@ public class CommonTypeOperations {
         Map<String, Object> mapCriteria = new HashMap<>();
         mapCriteria.put(GraphPropertiesDictionary.TYPE.getProperty(), type);
         mapCriteria.put(GraphPropertiesDictionary.IS_HIGHEST_VERSION.getProperty(), true);
-        return janusGraphGenericDao.getByCriteria(nodeType, mapCriteria, clazz)
-                .left()
-                .on(err -> emptyList())
-                .stream()
-                .findFirst();
+        return janusGraphGenericDao.getByCriteria(nodeType, mapCriteria, clazz).left().on(err -> emptyList()).stream().findFirst();
     }
 
     public void addProperties(String uniqueId, NodeTypeEnum nodeType, List<PropertyDefinition> properties) {
-        propertyOperation.addPropertiesToElementType(uniqueId, nodeType, properties)
-            .left()
-            .on(operationUtils::onJanusGraphOperationFailure);
+        propertyOperation.addPropertiesToElementType(uniqueId, nodeType, properties).left().on(operationUtils::onJanusGraphOperationFailure);
     }
 
     public void fillProperties(String uniqueId, NodeTypeEnum nodeType, Consumer<List<PropertyDefinition>> propertySetter) {
-        JanusGraphOperationStatus
-            status = propertyOperation.fillPropertiesList(uniqueId, nodeType, propertySetter);
-        if (status!= JanusGraphOperationStatus.OK) {
+        JanusGraphOperationStatus status = propertyOperation.fillPropertiesList(uniqueId, nodeType, propertySetter);
+        if (status != JanusGraphOperationStatus.OK) {
             operationUtils.onJanusGraphOperationFailure(status);
         }
     }
@@ -92,14 +80,11 @@ public class CommonTypeOperations {
     /**
      * Handle update of type without dervidedFrom attribute
      */
-    public  <T extends GraphNode> void updateType(T typeData, List<PropertyDefinition> properties, Class<T> clazz, NodeTypeEnum nodeType) {
-        janusGraphGenericDao.updateNode(typeData, clazz)
-                .left()
-                .on(operationUtils::onJanusGraphOperationFailure);
+    public <T extends GraphNode> void updateType(T typeData, List<PropertyDefinition> properties, Class<T> clazz, NodeTypeEnum nodeType) {
+        janusGraphGenericDao.updateNode(typeData, clazz).left().on(operationUtils::onJanusGraphOperationFailure);
         Map<String, PropertyDefinition> newProperties = properties.stream()
-                .collect(Collectors.toMap(PropertyDefinition::getName, Function.identity()));
-        propertyOperation.mergePropertiesAssociatedToNode(nodeType, typeData.getUniqueId(), newProperties)
-                .left()
-                .on(operationUtils::onJanusGraphOperationFailure);
+            .collect(Collectors.toMap(PropertyDefinition::getName, Function.identity()));
+        propertyOperation.mergePropertiesAssociatedToNode(nodeType, typeData.getUniqueId(), newProperties).left()
+            .on(operationUtils::onJanusGraphOperationFailure);
     }
 }