[SDC-29] rebase continue work to align source

[sdc.git] / asdctool / src / main / java / org / openecomp / sdc / asdctool / impl / migration / v1707 / jsonmodel / VersionMigration.java

diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/VersionMigration.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/VersionMigration.java
index 7dadd79..145ae28 100644 (file)
--- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/VersionMigration.java
+++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/impl/migration/v1707/jsonmodel/VersionMigration.java
@@ -1,9 +1,7 @@
 package org.openecomp.sdc.asdctool.impl.migration.v1707.jsonmodel;
 
 import fj.data.Either;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.openecomp.sdc.asdctool.impl.migration.MigrationException;
 import org.openecomp.sdc.asdctool.impl.migration.MigrationMsg;
 import org.openecomp.sdc.asdctool.impl.migration.v1707.MigrationUtils;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
@@ -13,7 +11,6 @@ import org.openecomp.sdc.be.dao.titan.TitanGenericDao;
 import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.model.Component;
-import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,8 +33,7 @@ public abstract class VersionMigration<T extends Component>  {
     private TitanDao titanDao;
 
     public boolean buildComponentsVersionChain(List<T> components) {
-        setMissingInvariantUid(components);
-        Map<String, List<T>> componentsByInvariant = components.stream().collect(Collectors.groupingBy(Component::getInvariantUUID));
+        Map<String, List<T>> componentsByInvariant = components.stream().filter(c -> c.getInvariantUUID() != null).collect(Collectors.groupingBy(Component::getInvariantUUID));
         for (List<T> componentsList : componentsByInvariant.values()) {
             boolean versionChainBuilt = buildVersionChainForInvariant(componentsList);
             if (!versionChainBuilt) {
@@ -63,7 +59,7 @@ public abstract class VersionMigration<T extends Component>  {
     }
 
     private void sortComponentsByVersion(List<T> components) {
-        Collections.sort(components, (o1, o2) -> o1.getVersion().compareTo(o2.getVersion()));
+        Collections.sort(components, (o1, o2) -> Double.valueOf(o1.getVersion()).compareTo(Double.valueOf(o2.getVersion())));
     }
 
     private boolean createVersionRelationIfNotExist(String fromUid, String toUid) {
@@ -74,10 +70,10 @@ public abstract class VersionMigration<T extends Component>  {
 
     private boolean createVersionRelation(String fromUid, String toUid) {
         LOGGER.debug(String.format("creating version edge between vertex %s and vertex %s", fromUid, toUid));
-        Either<GraphVertex, TitanOperationStatus> vertexById = titanDao.getVertexById(fromUid);
-        Either<GraphVertex, TitanOperationStatus> vertexById1 = titanDao.getVertexById(toUid);
-        if (vertexById1.isLeft() && vertexById.isLeft()) {
-            TitanOperationStatus versionCreated = titanDao.createEdge(vertexById.left().value(), vertexById1.left().value(), EdgeLabelEnum.VERSION, new HashMap<>());
+        Either<GraphVertex, TitanOperationStatus> fromVertex = titanDao.getVertexById(fromUid);
+        Either<GraphVertex, TitanOperationStatus> toVertex = titanDao.getVertexById(toUid);
+        if (toVertex.isLeft() && fromVertex.isLeft()) {
+            TitanOperationStatus versionCreated = titanDao.createEdge(fromVertex.left().value(), toVertex.left().value(), EdgeLabelEnum.VERSION, new HashMap<>());
             return versionCreated == TitanOperationStatus.OK;
         }
         return MigrationUtils.handleError(String.format("could not create version edge between vertex %s and vertex %s.", fromUid, toUid));
@@ -99,28 +95,4 @@ public abstract class VersionMigration<T extends Component>  {
     }
 
     abstract NodeTypeEnum getNodeTypeEnum();
-
-    //some invariatn uids are missing in production
-    private void setMissingInvariantUid(List<T> components) {
-        List<T> missingInvariantCmpts = getComponentsWithNoInvariantUids(components);
-        for (T missingInvariantCmpt : missingInvariantCmpts) {
-            String uuid = missingInvariantCmpt.getUUID();
-            missingInvariantCmpt.setInvariantUUID(findInvariantUidOrElseFail(components, uuid));
-        }
-    }
-
-    private List<T> getComponentsWithNoInvariantUids(List<T> components) {
-        List<T> cmptsWithoutInvariant = components.stream().filter(c -> c.getInvariantUUID() == null).collect(Collectors.toList());
-        LOGGER.info(String.format("the following components are missing invariant uids: %s", StringUtils.join(cmptsWithoutInvariant.stream().map(Component::getUniqueId).collect(Collectors.toList()), ",")));
-        return cmptsWithoutInvariant;
-    }
-
-    private String findInvariantUidOrElseFail(List<T> components, String uuid) {
-        return components.stream()
-                .filter(c -> c.getUUID().equals(uuid))
-                .map(Component::getInvariantUUID)
-                .filter(c -> c != null)
-                .findAny().orElseThrow(() -> new MigrationException(String.format("cannot find invariantuid for component with uuid %s", uuid)));
-    }
-
 }