Fix the bug in running migrations

Issue-ID: AAI-2385
Change-Id: Ia5a66d219b71a0515bdf08758f04a58ac76aed93
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>

diff --git a/src/main/java/org/onap/aai/dbgen/DupeTool.java b/src/main/java/org/onap/aai/dbgen/DupeTool.java
index 17f4405..800e9a4 100644 (file)
--- a/src/main/java/org/onap/aai/dbgen/DupeTool.java
+++ b/src/main/java/org/onap/aai/dbgen/DupeTool.java
@@ -528,7 +528,7 @@ public class DupeTool {
             throw aai;
         }
         LoaderFactory loaderFactory = ctx.getBean(LoaderFactory.class);
-        SchemaVersions schemaVersions = ctx.getBean(SchemaVersions.class);
+        SchemaVersions schemaVersions = (SchemaVersions) ctx.getBean("schemaVersions");
         DupeTool dupeTool = new DupeTool(loaderFactory, schemaVersions);
         dupeTool.execute(args);
     }// end of main()

diff --git a/src/main/java/org/onap/aai/dbgen/DynamicPayloadGenerator.java b/src/main/java/org/onap/aai/dbgen/DynamicPayloadGenerator.java
index ecd95a7..dec6a85 100644 (file)
--- a/src/main/java/org/onap/aai/dbgen/DynamicPayloadGenerator.java
+++ b/src/main/java/org/onap/aai/dbgen/DynamicPayloadGenerator.java
@@ -171,7 +171,7 @@ public class DynamicPayloadGenerator {
                }\r
                LoaderFactory loaderFactory = ctx.getBean(LoaderFactory.class);\r
                EdgeIngestor  edgeIngestor  = ctx.getBean(EdgeIngestor.class);\r
-               SchemaVersions schemaVersions = ctx.getBean(SchemaVersions.class);\r
+               SchemaVersions schemaVersions = (SchemaVersions) ctx.getBean("schemaVersions");\r
                run (loaderFactory, edgeIngestor, schemaVersions, args, true);\r
        }\r
        \r

diff --git a/src/main/java/org/onap/aai/dbgen/schemamod/SchemaMod.java b/src/main/java/org/onap/aai/dbgen/schemamod/SchemaMod.java
index 9fc18eb..d1c283f 100644 (file)
--- a/src/main/java/org/onap/aai/dbgen/schemamod/SchemaMod.java
+++ b/src/main/java/org/onap/aai/dbgen/schemamod/SchemaMod.java
@@ -182,7 +182,7 @@ public class SchemaMod {
                        throw aai;
                }
                LoaderFactory loaderFactory = ctx.getBean(LoaderFactory.class);
-               SchemaVersions schemaVersions = ctx.getBean(SchemaVersions.class);
+               SchemaVersions schemaVersions = (SchemaVersions) ctx.getBean("schemaVersions");
                SchemaMod schemaMod = new SchemaMod(loaderFactory, schemaVersions);
                schemaMod.execute(args);
 

diff --git a/src/main/java/org/onap/aai/migration/MigrationController.java b/src/main/java/org/onap/aai/migration/MigrationController.java
index ecc0434..abd4648 100644 (file)
--- a/src/main/java/org/onap/aai/migration/MigrationController.java
+++ b/src/main/java/org/onap/aai/migration/MigrationController.java
@@ -79,7 +79,7 @@ public class MigrationController {
                LoaderFactory loaderFactory   = ctx.getBean(LoaderFactory.class);
                EdgeIngestor   edgeIngestor   = ctx.getBean(EdgeIngestor.class);
                EdgeSerializer edgeSerializer = ctx.getBean(EdgeSerializer.class);
-               SchemaVersions schemaVersions = ctx.getBean(SchemaVersions.class);
+               SchemaVersions schemaVersions = (SchemaVersions) ctx.getBean("schemaVersions");
 
                MigrationControllerInternal internal = new MigrationControllerInternal(loaderFactory, edgeIngestor, edgeSerializer, schemaVersions);
 

diff --git a/src/main/java/org/onap/aai/util/SendDeleteMigrationNotificationsMain.java b/src/main/java/org/onap/aai/util/SendDeleteMigrationNotificationsMain.java
index e559a78..a94b435 100644 (file)
--- a/src/main/java/org/onap/aai/util/SendDeleteMigrationNotificationsMain.java
+++ b/src/main/java/org/onap/aai/util/SendDeleteMigrationNotificationsMain.java
@@ -67,7 +67,7 @@ public class SendDeleteMigrationNotificationsMain {
                        throw aai;
                }
                LoaderFactory loaderFactory = ctx.getBean(LoaderFactory.class);
-               SchemaVersions schemaVersions = ctx.getBean(SchemaVersions.class);
+               SchemaVersions schemaVersions = (SchemaVersions) ctx.getBean("schemaVersions");
                String basePath = ctx.getEnvironment().getProperty("schema.uri.base.path");
 
                CommandLineDeleteArgs cArgs = new CommandLineDeleteArgs();

diff --git a/src/main/java/org/onap/aai/util/SendMigrationNotificationsMain.java b/src/main/java/org/onap/aai/util/SendMigrationNotificationsMain.java
index 6ae2bb4..17a127a 100644 (file)
--- a/src/main/java/org/onap/aai/util/SendMigrationNotificationsMain.java
+++ b/src/main/java/org/onap/aai/util/SendMigrationNotificationsMain.java
@@ -68,7 +68,7 @@ public class SendMigrationNotificationsMain {
                        throw aai;
                }
                LoaderFactory loaderFactory = ctx.getBean(LoaderFactory.class);
-               SchemaVersions schemaVersions = ctx.getBean(SchemaVersions.class);
+               SchemaVersions schemaVersions = (SchemaVersions) ctx.getBean("schemaVersions");
                String basePath = ctx.getEnvironment().getProperty("schema.uri.base.path");
 
                CommandLineArgs cArgs = new CommandLineArgs();