[SDC-29] rebase continue work to align source

[sdc.git] / openecomp-be / tools / migration / 1702_to_1707_zusammen / src / main / java / org / openecomp / core / migration / MigrationMain.java

diff --git a/openecomp-be/tools/migration/1702_to_1707_zusammen/src/main/java/org/openecomp/core/migration/MigrationMain.java b/openecomp-be/tools/migration/1702_to_1707_zusammen/src/main/java/org/openecomp/core/migration/MigrationMain.java
index 283c9cf..c43cf32 100644 (file)
--- a/openecomp-be/tools/migration/1702_to_1707_zusammen/src/main/java/org/openecomp/core/migration/MigrationMain.java
+++ b/openecomp-be/tools/migration/1702_to_1707_zusammen/src/main/java/org/openecomp/core/migration/MigrationMain.java
@@ -78,7 +78,7 @@ public class MigrationMain {
     printMessage(logger, "Checking whether a migration has already been run.");
     if (MigrationMarker.isMigrated()) {
       printMessage(logger, "The DB has already been migrated, this script will now exit.");
-      return;
+      System.exit(status);
     }
     ItemCassandraDao itemCassandraDao = new ItemCassandraDao();
     VersionCassandraDao versionCassandraDao = new VersionCassandraDao();
@@ -243,7 +243,8 @@ public class MigrationMain {
         new OrchestrationTemplateCandidateCassandraLoader();
 
     orchestrationTemplateCandidateCassandraLoader.list().stream()
-        .filter(entity -> needMigration(entity.getId(), entity.getVersion()))
+        .filter(entity -> needMigration(entity.getId(), entity.getVersion()) &&
+            entity.getContentData()!=null && entity.getFilesDataStructure()!=null)
         .forEach(entity -> ElementHandler
             .save(context, cassandraElementRepository, entity.getId(), entity.getVersion(),
                 OrchestrationTemplateCandidateConvertor