diff options
| author |   Kajur, Harish (vk250x) <vk250x@att.com> | 2019-04-07 19:15:23 -0400 |
|---|---|---|
| committer | Kajur, Harish (vk250x) <vk250x@att.com> | 2019-04-09 15:23:08 -0400 |
| commit | 2c41efbe0bbad2e5befea3a24128187c17fc3eea (patch) | |
| tree | 9e8983f4c584c835f176c7be72b146a9a59092ae | |
| parent | 3cfa198db347c873b400067219dff4b9537437c0 (diff) | |
Update graphadmin to use schema ingest changes for
the application to not start if it doesn't start properly
Issue-ID: AAI-2329
Change-Id: Ie6b87de99e1a52eccd2762ec19661f1f42c8e083
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
| -rwxr-xr-x | pom.xml | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/aai/datagrooming/DataGrooming.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/aai/db/schema/ScriptDriver.java | 4 | ||||
| -rw-r--r-- | src/test/java/org/onap/aai/AAISetup.java | 5 |
4 files changed, 6 insertions, 7 deletions
@@ -99,7 +99,7 @@ <gson.version>2.7</gson.version> <json.version>20090211</json.version> - <aai.core.version>1.4.1</aai.core.version> + <aai.core.version>1.4.2</aai.core.version> <aai.schema.version>1.0.1</aai.schema.version> <netty.handler.version>4.1.9.Final</netty.handler.version> diff --git a/src/main/java/org/onap/aai/datagrooming/DataGrooming.java b/src/main/java/org/onap/aai/datagrooming/DataGrooming.java index e222228..7e667f4 100644 --- a/src/main/java/org/onap/aai/datagrooming/DataGrooming.java +++ b/src/main/java/org/onap/aai/datagrooming/DataGrooming.java @@ -316,7 +316,7 @@ public class DataGrooming { throw aai; } LoaderFactory loaderFactory = ctx.getBean(LoaderFactory.class); - SchemaVersions schemaVersions = ctx.getBean(SchemaVersions.class); + SchemaVersions schemaVersions = (SchemaVersions) ctx.getBean("schemaVersions"); DataGrooming dataGrooming = new DataGrooming(loaderFactory, schemaVersions); dataGrooming.execute(args); } diff --git a/src/main/java/org/onap/aai/db/schema/ScriptDriver.java b/src/main/java/org/onap/aai/db/schema/ScriptDriver.java index c45ad28..6b36adc 100644 --- a/src/main/java/org/onap/aai/db/schema/ScriptDriver.java +++ b/src/main/java/org/onap/aai/db/schema/ScriptDriver.java @@ -90,7 +90,7 @@ public class ScriptDriver { throw aai; } AuditorFactory auditorFactory = ctx.getBean(AuditorFactory.class); - SchemaVersions schemaVersions = ctx.getBean(SchemaVersions.class); + SchemaVersions schemaVersions = (SchemaVersions) ctx.getBean("schemaVersions"); EdgeIngestor edgeIngestor = ctx.getBean(EdgeIngestor.class); String config = cArgs.config; @@ -136,4 +136,4 @@ class CommandLineArgs { public String type = "graph"; -}
\ No newline at end of file +} diff --git a/src/test/java/org/onap/aai/AAISetup.java b/src/test/java/org/onap/aai/AAISetup.java index 5ceafa7..25e011b 100644 --- a/src/test/java/org/onap/aai/AAISetup.java +++ b/src/test/java/org/onap/aai/AAISetup.java @@ -50,9 +50,8 @@ import org.springframework.test.context.junit4.rules.SpringClassRule; import org.springframework.test.context.junit4.rules.SpringMethodRule; @ContextConfiguration(classes = { - SchemaLocationsBean.class, + ConfigConfiguration.class, AAIConfigTranslator.class, - SchemaVersions.class, NodeIngestor.class, EdgeIngestor.class, EdgeSerializer.class, @@ -135,4 +134,4 @@ public abstract class AAISetup { String resource = IOUtils.toString(inputStream); return resource; } -}
\ No newline at end of file +} |