Reformat catalog-model

[sdc.git] / catalog-model / src / main / java / org / openecomp / sdc / be / model / operations / impl / OperationUtils.java

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/OperationUtils.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/OperationUtils.java
index 4be429f..947b216 100644 (file)
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/OperationUtils.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/OperationUtils.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,46 +17,35 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.be.model.operations.impl;
 
 import fj.data.Either;
-import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
+import java.util.Map;
 import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.PropertyDefinition;
 import org.openecomp.sdc.be.model.operations.StorageException;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.springframework.stereotype.Component;
 
-import java.util.Map;
-
 @Component
 public class OperationUtils {
 
-    private final JanusGraphDao janusGraphDao;
-
     private static final Logger logger = Logger.getLogger(OperationUtils.class.getName());
+    private final JanusGraphDao janusGraphDao;
 
     public OperationUtils(JanusGraphDao janusGraphDao) {
         this.janusGraphDao = janusGraphDao;
     }
 
-    public <T> T onJanusGraphOperationFailure(JanusGraphOperationStatus status) {
-        janusGraphDao.rollback();
-        throw new StorageException(status);
-    }
-
-    static Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> fillProperties(String uniqueId,
-                                                                                             PropertyOperation propertyOperation,
+    static Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> fillProperties(String uniqueId, PropertyOperation propertyOperation,
                                                                                              NodeTypeEnum nodeTypeEnum) {
-
-        Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> findPropertiesOfNode =
-                propertyOperation.findPropertiesOfNode(nodeTypeEnum, uniqueId);
+        Either<Map<String, PropertyDefinition>, JanusGraphOperationStatus> findPropertiesOfNode = propertyOperation
+            .findPropertiesOfNode(nodeTypeEnum, uniqueId);
         if (findPropertiesOfNode.isRight()) {
             JanusGraphOperationStatus janusGraphOperationStatus = findPropertiesOfNode.right().value();
-            logger.debug("After looking for properties of vertex {}. status is {}", uniqueId,
-                janusGraphOperationStatus);
+            logger.debug("After looking for properties of vertex {}. status is {}", uniqueId, janusGraphOperationStatus);
             if (JanusGraphOperationStatus.NOT_FOUND.equals(janusGraphOperationStatus)) {
                 return Either.right(JanusGraphOperationStatus.OK);
             } else {
@@ -66,4 +55,9 @@ public class OperationUtils {
             return Either.left(findPropertiesOfNode.left().value());
         }
     }
+
+    public <T> T onJanusGraphOperationFailure(JanusGraphOperationStatus status) {
+        janusGraphDao.rollback();
+        throw new StorageException(status);
+    }
 }