fixed issue with --rundisabled flag5.0.2-ONAPelalto

also fixed issues for picking up the migrators without having migrator priority flag

Issue-ID: AAI-2387
Signed-off-by: Ankit Bhatt <ankit.bhatt@amdocs.com>
Change-Id: I992eea15299cbe10af5196e795f68d4a4b4d21b3
(cherry picked from commit 949046b14b13cbe52b7ad3aca7cd6aaf7d4c7038)

1 files changed, 8 insertions, 4 deletions

diff --git a/src/main/java/org/onap/aai/migration/MigrationControllerInternal.java b/src/main/java/org/onap/aai/migration/MigrationControllerInternal.java
index b94460a..55b03fb 100644
--- a/src/main/java/org/onap/aai/migration/MigrationControllerInternal.java
+++ b/src/main/java/org/onap/aai/migration/MigrationControllerInternal.java
@@ -317,7 +317,9 @@ public class MigrationControllerInternal {
 		return engine.asAdmin().getReadOnlyTraversalSource().V().has(AAIProperties.NODE_TYPE, VERTEX_TYPE).has(name, true).hasNext();
 	}
 	private Set<Class<? extends Migrator>> findClasses(Reflections reflections) {
-		Set<Class<? extends Migrator>> migratorClasses = reflections.getSubTypesOf(Migrator.class);
+		Set<Class<? extends Migrator>> migratorClasses = reflections.getSubTypesOf(Migrator.class).stream()
+				.filter(clazz -> clazz.isAnnotationPresent(MigrationPriority.class))
+				.collect(Collectors.toSet());
 		/*
 		 * TODO- Change this to make sure only classes in the specific $release are added in the runList
 		 * Or add a annotation like exclude which folks again need to remember to add ??
@@ -353,15 +355,17 @@ public class MigrationControllerInternal {
     private List<Class<? extends Migrator>> createMigratorList(CommandLineArgs cArgs,
             List<Class<? extends Migrator>> migratorClasses) {
         List<Class<? extends Migrator>> migratorClassesToRun = new ArrayList<>();
-        if (cArgs.scripts.isEmpty() && cArgs.runDisabled.isEmpty()) {
+        if (cArgs.scripts.isEmpty()) {
             return migratorClasses;
-
         }
+        
         for (Class<? extends Migrator> migratorClass : migratorClasses) {
-            if (migratorExplicitlySpecified(cArgs, migratorClass.getSimpleName()) || migratorToRunWhenDisabled(cArgs, migratorClass.getSimpleName())) {
+            if (migratorExplicitlySpecified(cArgs, migratorClass.getSimpleName()) 
+                    || migratorToRunWhenDisabled(cArgs, migratorClass.getSimpleName())) {
                 migratorClassesToRun.add(migratorClass);
             }
         }
+        
         return migratorClassesToRun;
     }