Merge "Update traversal to use schema ingest changes"

6 files changed, 14 insertions, 12 deletions

diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml
index 0af4fa3..4dc1016 100644
--- a/aai-traversal/pom.xml
+++ b/aai-traversal/pom.xml
@@ -41,8 +41,9 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
 
-        <aai.schema.version>1.0.0</aai.schema.version>
-        <aai.core.version>1.4.1</aai.core.version>
+        <aai.schema.version>1.0.1</aai.schema.version>
+        <aai.core.version>1.4.2</aai.core.version>
+        <aai.rest.version>1.4.2</aai.rest.version>
 
         <spring.boot.version>1.5.20.RELEASE</spring.boot.version>
 
@@ -671,7 +672,7 @@
         <dependency>
             <groupId>org.onap.aai.aai-common</groupId>
             <artifactId>aai-rest</artifactId>
-            <version>1.4.1</version>
+	    <version>${aai.rest.version}</version>
         </dependency>
         <dependency>
             <groupId>org.skyscreamer</groupId>
diff --git a/aai-traversal/src/main/resources/application.properties b/aai-traversal/src/main/resources/application.properties
index 48fa5f1..1f57c7d 100644
--- a/aai-traversal/src/main/resources/application.properties
+++ b/aai-traversal/src/main/resources/application.properties
@@ -90,3 +90,4 @@ schema.service.ssl.key-store=${server.local.startpath}etc/auth/aai_keystore
 schema.service.ssl.trust-store=${server.local.startpath}etc/auth/aai_keystore
 schema.service.ssl.key-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0)
 schema.service.ssl.trust-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0)
+schema.service.versions.override=false
diff --git a/aai-traversal/src/test/java/org/onap/aai/AAISetup.java b/aai-traversal/src/test/java/org/onap/aai/AAISetup.java
index 42964eb..d43cde9 100644
--- a/aai-traversal/src/test/java/org/onap/aai/AAISetup.java
+++ b/aai-traversal/src/test/java/org/onap/aai/AAISetup.java
@@ -51,8 +51,7 @@ import org.springframework.test.context.junit4.rules.SpringClassRule;
 import org.springframework.test.context.junit4.rules.SpringMethodRule;
 
 @ContextConfiguration(classes = {
-		SchemaLocationsBean.class,
-        SchemaVersions.class,
+		ConfigConfiguration.class,
 		AAIConfigTranslator.class,
         EdgeIngestor.class,
         EdgeSerializer.class,
diff --git a/aai-traversal/src/test/java/org/onap/aai/HttpTestUtil.java b/aai-traversal/src/test/java/org/onap/aai/HttpTestUtil.java
index 79e6cac..cfe15a1 100644
--- a/aai-traversal/src/test/java/org/onap/aai/HttpTestUtil.java
+++ b/aai-traversal/src/test/java/org/onap/aai/HttpTestUtil.java
@@ -39,6 +39,7 @@ import org.onap.aai.setup.SchemaVersion;
 import org.onap.aai.setup.SchemaVersions;
 
 import javax.ws.rs.core.*;
+import javax.xml.validation.Schema;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.util.*;
@@ -68,7 +69,7 @@ public class HttpTestUtil extends RESTAPI {
 
     public void init(){
 
-        schemaVersions = SpringContextAware.getBean(SchemaVersions.class);
+        schemaVersions = (SchemaVersions) SpringContextAware.getBean("schemaVersions");
         httpHeaders         = Mockito.mock(HttpHeaders.class);
         uriInfo             = Mockito.mock(UriInfo.class);
 
diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/search/OnapQueryTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/search/OnapQueryTest.java
index 838489f..d92b902 100644
--- a/aai-traversal/src/test/java/org/onap/aai/rest/search/OnapQueryTest.java
+++ b/aai-traversal/src/test/java/org/onap/aai/rest/search/OnapQueryTest.java
@@ -34,6 +34,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.onap.aai.config.ConfigConfiguration;
 import org.onap.aai.config.IntrospectionConfig;
 import org.onap.aai.config.SearchConfiguration;
 import org.onap.aai.config.SpringContextAware;
@@ -71,8 +72,7 @@ import static org.mockito.Mockito.when;
 
 @RunWith(Parameterized.class)
 @ContextConfiguration(classes = {
-		SchemaLocationsBean.class,
-        SchemaVersions.class,
+		ConfigConfiguration.class,
 		AAIConfigTranslator.class,
         EdgeIngestor.class,
         EdgeSerializer.class,
diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java
index 0bc4dbe..005b5e7 100644
--- a/aai-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java
+++ b/aai-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java
@@ -34,6 +34,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.onap.aai.config.ConfigConfiguration;
 import org.onap.aai.config.IntrospectionConfig;
 import org.onap.aai.config.SearchConfiguration;
 import org.onap.aai.config.SpringContextAware;
@@ -48,7 +49,7 @@ import org.onap.aai.nodes.NodeIngestor;
 import org.onap.aai.setup.AAIConfigTranslator;
 import org.onap.aai.setup.SchemaLocationsBean;
 import org.onap.aai.setup.SchemaVersion;
-import org.onap.aai.setup.SchemaVersions;
+import org.onap.aai.setup.SchemaConfigVersions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
@@ -71,8 +72,7 @@ import static org.mockito.Mockito.when;
 
 @RunWith(Parameterized.class)
 @ContextConfiguration(classes = {
-		SchemaLocationsBean.class,
-        SchemaVersions.class,
+		ConfigConfiguration.class,
 		AAIConfigTranslator.class,
         EdgeIngestor.class,
         EdgeSerializer.class,
@@ -109,7 +109,7 @@ public abstract class QueryTest {
 	protected LoaderFactory loaderFactory;
 
 	@Autowired
-	protected SchemaVersions schemaVersions;
+	protected SchemaConfigVersions schemaVersions;
 
 	@Autowired
 	protected GremlinServerSingleton gremlinServerSingleton;