<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.19.RELEASE</spring.boot.version>
<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>
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
import org.springframework.test.context.junit4.rules.SpringMethodRule;
@ContextConfiguration(classes = {
- SchemaLocationsBean.class,
- SchemaVersions.class,
+ ConfigConfiguration.class,
AAIConfigTranslator.class,
EdgeIngestor.class,
EdgeSerializer.class,
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.*;
public void init(){
- schemaVersions = SpringContextAware.getBean(SchemaVersions.class);
+ schemaVersions = (SchemaVersions) SpringContextAware.getBean("schemaVersions");
httpHeaders = Mockito.mock(HttpHeaders.class);
uriInfo = Mockito.mock(UriInfo.class);
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;
@RunWith(Parameterized.class)
@ContextConfiguration(classes = {
- SchemaLocationsBean.class,
- SchemaVersions.class,
+ ConfigConfiguration.class,
AAIConfigTranslator.class,
EdgeIngestor.class,
EdgeSerializer.class,
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;
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;
@RunWith(Parameterized.class)
@ContextConfiguration(classes = {
- SchemaLocationsBean.class,
- SchemaVersions.class,
+ ConfigConfiguration.class,
AAIConfigTranslator.class,
EdgeIngestor.class,
EdgeSerializer.class,
protected LoaderFactory loaderFactory;
@Autowired
- protected SchemaVersions schemaVersions;
+ protected SchemaConfigVersions schemaVersions;
@Autowired
protected GremlinServerSingleton gremlinServerSingleton;