From 3029b6b3043e6dbe4c7090384a8e49b0b00081a6 Mon Sep 17 00:00:00 2001 From: Igor Dysko Date: Tue, 25 Aug 2020 20:06:23 +0200 Subject: Update to spring boot 2 Update of dependencies and source code to spring boot 2 Issue-ID: AAI-3106 Signed-off-by: Igor Dysko Change-Id: Ie12c330af37d3cc841913c22a3703bcc3ae8a5d5 --- pom.xml | 150 +++++++++++---------- .../org/onap/aai/validation/ValidationCmd.java | 2 +- .../validation/ValidationServiceApplication.java | 2 +- src/main/resources/application.properties | 3 +- .../org/onap/aai/validation/TestApplication.java | 9 +- .../controller/TestValidationController.java | 32 +++-- .../modeldriven/validator/TestInstanceReader.java | 2 +- .../validator/TestModelDrivenValidator.java | 2 +- .../aai/validation/reader/TestEventReader.java | 2 +- .../onap/aai/validation/reader/TestOxmReader.java | 2 +- .../validation/result/TestValidationResult.java | 2 +- .../ruledriven/mock/TestDefaultRules.java | 9 +- .../ruledriven/validator/TestDataDictionary.java | 2 +- .../validator/TestRuleDrivenValidator.java | 2 +- .../aai/validation/services/TestInfoService.java | 2 +- .../data-dictionary/schemaIngest.properties | 42 ------ .../data-dictionary/test-data-dictionary-beans.xml | 2 +- src/test/resources/oxm-reader/oxm-reader-beans.xml | 2 +- .../resources/oxm-reader/schemaIngest.properties | 32 ----- src/test/resources/schema-ingest.properties | 48 +++++++ 20 files changed, 168 insertions(+), 181 deletions(-) delete mode 100644 src/test/resources/data-dictionary/schemaIngest.properties delete mode 100644 src/test/resources/oxm-reader/schemaIngest.properties create mode 100644 src/test/resources/schema-ingest.properties diff --git a/pom.xml b/pom.xml index 3c5790e..0845361 100644 --- a/pom.xml +++ b/pom.xml @@ -30,66 +30,55 @@ aai-validation 1.7.0-SNAPSHOT - org.onap.oparent - oparent - 2.1.0 - + org.onap.aai.aai-common + aai-parent + 1.7.0-SNAPSHOT - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - - 1.5.21.RELEASE org.onap.aai.validation.ValidationServiceApplication 9500 9501 - 1.2.2 - 1.4.0 - 1.4.0 - 1.0 - 2.7 - 2.2.0 - 1.10 - 1.1.6 - 4.5.2 2.4.3-01 2.9.2-01 - 2.6.2 - 1.3 - 20160212 - 1.6.6 - 1.4.1 + ${project.build.directory}/bundleconfig/etc/oxm/ - 2.23 ${basedir}/target - - - - - - 0.90 - 0.8.5 - 3.2 - jacoco - ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml - **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** - - 3.7.0.1746 - - 0.80 + 0.55 + + net.bytebuddy + byte-buddy + 1.10.14 + + + net.bytebuddy + byte-buddy-agent + 1.10.14 + + + org.mockito + mockito-core + 2.23.4 + test + + + org.hamcrest + hamcrest + 2.2 + test + + + org.powermock + powermock-api-mockito2 + + + org.powermock + powermock-core + + org.springframework.boot spring-boot-starter-web @@ -115,25 +104,24 @@ org.codehaus.groovy groovy-all + 2.4.17 javax.ws.rs javax.ws.rs-api - 2.0.1 commons-io commons-io - 2.4 org.apache.commons commons-lang3 - 3.7 commons-collections commons-collections + 3.2.2 org.dom4j @@ -155,37 +143,49 @@ org.onap.aai.logging-service logging-api - ${version.org.onap.aai.logging-service} org.onap.aai.logging-service common-logging - ${version.org.onap.aai.logging-service} org.onap.aai.logging-service eelf-logging - ${version.org.onap.aai.logging-service} + ${aai.common.logging.version} com.att.eelf eelf-core - 1.0.1-oss + + + org.powermock + powermock-module-junit4 + + + org.powermock + powermock-api-mockito + + org.onap.aai rest-client - ${version.aai.rest.client} + + + + org.onap.dmaap.messagerouter.dmaapclient + dmaapClient + 1.1.5 org.onap.aai.event-client event-client-dmaap - ${version.org.onap.aai.event.client} + 1.4.0 @@ -201,7 +201,6 @@ commons-configuration commons-configuration - ${version.commons-configuration} @@ -217,13 +216,11 @@ org.eclipse.persistence org.eclipse.persistence.moxy - ${version.org.eclipse.persistence.moxy} org.json json - ${version.org.json.json} @@ -234,32 +231,47 @@ org.onap.aai.aai-common aai-schema-ingest - ${version.aai.aai-schema-ingest} org.springframework.boot spring-boot-starter-tomcat + + org.powermock + powermock-module-junit4 + + junit junit test - - org.hamcrest - hamcrest-library - test - - org.springframework.boot spring-boot-starter-test test + + javax.xml.bind + jaxb-api + + + com.sun.xml.bind + jaxb-core + + + com.sun.xml.bind + jaxb-impl + + + javax.activation + activation + 1.1.1 + @@ -272,7 +284,6 @@ org.springframework.boot spring-boot-maven-plugin - ${spring-boot.version} ${start-class} true @@ -288,7 +299,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + 3.8.1 groovy-eclipse-compiler true @@ -324,7 +335,7 @@ org.onap.aai.schema-service aai-schema - ${version.aai.aai-schema} + ${aai.schema.service.version} jar onap/oxm/**/ ${aai.oxm.target.folder} @@ -435,7 +446,6 @@ org.jacoco jacoco-maven-plugin - ${jacoco.version} diff --git a/src/main/java/org/onap/aai/validation/ValidationCmd.java b/src/main/java/org/onap/aai/validation/ValidationCmd.java index 92ed5ad..c8d33cc 100644 --- a/src/main/java/org/onap/aai/validation/ValidationCmd.java +++ b/src/main/java/org/onap/aai/validation/ValidationCmd.java @@ -33,7 +33,7 @@ import org.onap.aai.validation.result.ValidationResult; import org.onap.aai.validation.result.Violation; import org.onap.aai.validation.ruledriven.RuleDrivenValidator; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.web.support.SpringBootServletInitializer; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/org/onap/aai/validation/ValidationServiceApplication.java b/src/main/java/org/onap/aai/validation/ValidationServiceApplication.java index 52cb339..45d93c4 100644 --- a/src/main/java/org/onap/aai/validation/ValidationServiceApplication.java +++ b/src/main/java/org/onap/aai/validation/ValidationServiceApplication.java @@ -30,7 +30,7 @@ import org.onap.aai.validation.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.support.SpringBootServletInitializer; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.ImportResource; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 2c93762..905d920 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -45,4 +45,5 @@ publisher.topic.names=poa-audit-result topics.properties.location=${CONFIG_HOME}/topics/ schema.translator.list=schema-service -spring.application.name=aai-validation \ No newline at end of file +spring.application.name=aai-validation +spring.main.allow-bean-definition-overriding=true diff --git a/src/test/java/org/onap/aai/validation/TestApplication.java b/src/test/java/org/onap/aai/validation/TestApplication.java index 9f66df9..13dc999 100644 --- a/src/test/java/org/onap/aai/validation/TestApplication.java +++ b/src/test/java/org/onap/aai/validation/TestApplication.java @@ -27,17 +27,20 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * Invoke the Spring Boot Application (primarily for code coverage). * */ -@SpringBootTest(classes = ValidationServiceApplication.class) -@TestPropertySource(locations = {"classpath:oxm-reader/schemaIngest.properties", "classpath:test-application.properties"}) -@ContextConfiguration(locations = {"classpath:validation-service-beans.xml"}) +@SpringBootTest +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(locations = {"classpath:data-dictionary/test-data-dictionary-beans.xml"}) +@TestPropertySource(locations = {"classpath:schema-ingest.properties", "classpath:test-application.properties"}) public class TestApplication { @Rule diff --git a/src/test/java/org/onap/aai/validation/controller/TestValidationController.java b/src/test/java/org/onap/aai/validation/controller/TestValidationController.java index b35ed17..cab1cbb 100644 --- a/src/test/java/org/onap/aai/validation/controller/TestValidationController.java +++ b/src/test/java/org/onap/aai/validation/controller/TestValidationController.java @@ -17,26 +17,17 @@ */ package org.onap.aai.validation.controller; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.stubbing.OngoingStubbing; import org.onap.aai.validation.Validator; import org.onap.aai.validation.config.ValidationControllerConfig; import org.onap.aai.validation.exception.ValidationServiceError; @@ -49,7 +40,11 @@ import org.onap.aai.validation.result.ValidationResult; import org.onap.aai.validation.result.ValidationResultBuilder; import org.onap.aai.validation.result.Violation; -@RunWith(MockitoJUnitRunner.class) +import java.util.*; + +import static org.mockito.Mockito.*; + +@RunWith(MockitoJUnitRunner.Silent.class) public class TestValidationController { private static final String AAI_EVENT = "AAI-EVENT"; @@ -105,7 +100,6 @@ public class TestValidationController { @Before public void setupMocks() throws ValidationServiceException { - Map> validationResultsMap = setupTestData(); when(ruleDrivenValidator.validate(TESTDATA_EVENTTYPE_AAI)) @@ -263,16 +257,19 @@ public class TestValidationController { @Test public void testExecuteForNullDomain() throws Exception { - doVerifyMockInteractionsTest(TESTDATA_DOMAIN_NULL, TEST); + doVerifyMockInteractionsTest(TESTDATA_DOMAIN_NULL, TEST, 2); } - private void doVerifyMockInteractionsTest(String event, String eventSource) throws Exception { + private void doVerifyMockInteractionsTest(String event, String eventSource, int eventReaderCallsCount) throws Exception { validationController.execute(event, eventSource); - verify(eventReader, times(1)).getEventType(Mockito.anyString()); + verify(eventReader, times(eventReaderCallsCount)).getEventType(Mockito.anyString()); verify(ruleDrivenValidator, times(0)).validate(Mockito.anyString()); verify(modelDrivenValidator, times(0)).validate(Mockito.anyString()); verify(messagePublisher, times(0)).publishMessage(Mockito.anyString()); + } + private void doVerifyMockInteractionsTest(String event, String eventSource) throws Exception { + doVerifyMockInteractionsTest(event, eventSource, 1); } @Test @@ -318,7 +315,7 @@ public class TestValidationController { @Test public void testExecuteForEndEventType() throws Exception { - doVerifyMockInteractionsTest(TESTDATA_EVENTTYPE_END_EVENT, TEST); + doVerifyMockInteractionsTest(TESTDATA_EVENTTYPE_END_EVENT, TEST, 2); } @Test @@ -391,4 +388,5 @@ public class TestValidationController { when(entity.getEntityLink()).thenReturn(ENTITY_LINK); when(entity.getResourceVersion()).thenReturn(Optional.of(resourceVersion)); } + } diff --git a/src/test/java/org/onap/aai/validation/modeldriven/validator/TestInstanceReader.java b/src/test/java/org/onap/aai/validation/modeldriven/validator/TestInstanceReader.java index 4d076da..772ccd6 100644 --- a/src/test/java/org/onap/aai/validation/modeldriven/validator/TestInstanceReader.java +++ b/src/test/java/org/onap/aai/validation/modeldriven/validator/TestInstanceReader.java @@ -45,7 +45,7 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) -@TestPropertySource(locations = {"classpath:oxm-reader/schemaIngest.properties"}) +@TestPropertySource(locations = {"classpath:schema-ingest.properties"}) @ContextConfiguration(locations = {"classpath:model-validation/instance-reader/test-validation-service-beans.xml"}) public class TestInstanceReader { diff --git a/src/test/java/org/onap/aai/validation/modeldriven/validator/TestModelDrivenValidator.java b/src/test/java/org/onap/aai/validation/modeldriven/validator/TestModelDrivenValidator.java index 5a58f41..ea98a02 100644 --- a/src/test/java/org/onap/aai/validation/modeldriven/validator/TestModelDrivenValidator.java +++ b/src/test/java/org/onap/aai/validation/modeldriven/validator/TestModelDrivenValidator.java @@ -55,7 +55,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @SpringBootTest @RunWith(SpringJUnit4ClassRunner.class) -@TestPropertySource(locations = {"classpath:oxm-reader/schemaIngest.properties"}) +@TestPropertySource(locations = {"classpath:schema-ingest.properties"}) @ContextConfiguration(locations = {"classpath:model-validation/instance-validator/test-validation-service-beans.xml"}) public class TestModelDrivenValidator { diff --git a/src/test/java/org/onap/aai/validation/reader/TestEventReader.java b/src/test/java/org/onap/aai/validation/reader/TestEventReader.java index 844c010..1625cd2 100644 --- a/src/test/java/org/onap/aai/validation/reader/TestEventReader.java +++ b/src/test/java/org/onap/aai/validation/reader/TestEventReader.java @@ -45,7 +45,7 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) -@TestPropertySource(locations = {"classpath:oxm-reader/schemaIngest.properties"}) +@TestPropertySource(locations = {"classpath:schema-ingest.properties"}) @ContextConfiguration(locations = {"classpath:event-reader/test-validation-service-beans.xml"}) public class TestEventReader { diff --git a/src/test/java/org/onap/aai/validation/reader/TestOxmReader.java b/src/test/java/org/onap/aai/validation/reader/TestOxmReader.java index bbceae5..4432dfa 100644 --- a/src/test/java/org/onap/aai/validation/reader/TestOxmReader.java +++ b/src/test/java/org/onap/aai/validation/reader/TestOxmReader.java @@ -31,7 +31,7 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) -@TestPropertySource(locations = {"classpath:oxm-reader/schemaIngest.properties"}) +@TestPropertySource(locations = {"classpath:schema-ingest.properties"}) @ContextConfiguration(locations = {"classpath:oxm-reader/oxm-reader-beans.xml"}) public class TestOxmReader { diff --git a/src/test/java/org/onap/aai/validation/result/TestValidationResult.java b/src/test/java/org/onap/aai/validation/result/TestValidationResult.java index 7ce0b34..d1833f0 100644 --- a/src/test/java/org/onap/aai/validation/result/TestValidationResult.java +++ b/src/test/java/org/onap/aai/validation/result/TestValidationResult.java @@ -54,7 +54,7 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) -@TestPropertySource(locations = {"classpath:oxm-reader/schemaIngest.properties"}) +@TestPropertySource(locations = {"classpath:schema-ingest.properties"}) @ContextConfiguration(locations = {"classpath:validation-result/test-validation-service-beans.xml"}) public class TestValidationResult { diff --git a/src/test/java/org/onap/aai/validation/ruledriven/mock/TestDefaultRules.java b/src/test/java/org/onap/aai/validation/ruledriven/mock/TestDefaultRules.java index b87e4af..3695fca 100644 --- a/src/test/java/org/onap/aai/validation/ruledriven/mock/TestDefaultRules.java +++ b/src/test/java/org/onap/aai/validation/ruledriven/mock/TestDefaultRules.java @@ -24,8 +24,9 @@ package org.onap.aai.validation.ruledriven.mock; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.anyListOf; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyListOf; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.when; import com.google.gson.JsonObject; @@ -41,7 +42,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.invocation.InvocationOnMock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.mockito.stubbing.Answer; import org.onap.aai.validation.Validator; import org.onap.aai.validation.exception.ValidationServiceException; @@ -58,7 +59,7 @@ import org.onap.aai.validation.ruledriven.RuleDrivenValidator; * for both a supported and an unsupported entity type. * */ -@RunWith(MockitoJUnitRunner.class) +@RunWith(MockitoJUnitRunner.Silent.class) public class TestDefaultRules { static { diff --git a/src/test/java/org/onap/aai/validation/ruledriven/validator/TestDataDictionary.java b/src/test/java/org/onap/aai/validation/ruledriven/validator/TestDataDictionary.java index 7292dec..108ee30 100644 --- a/src/test/java/org/onap/aai/validation/ruledriven/validator/TestDataDictionary.java +++ b/src/test/java/org/onap/aai/validation/ruledriven/validator/TestDataDictionary.java @@ -46,7 +46,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * */ @RunWith(SpringJUnit4ClassRunner.class) -@TestPropertySource(locations = {"classpath:oxm-reader/schemaIngest.properties"}) +@TestPropertySource(locations = {"classpath:schema-ingest.properties"}) @ContextConfiguration(locations = {"classpath:data-dictionary/test-data-dictionary-beans.xml"}) public class TestDataDictionary { diff --git a/src/test/java/org/onap/aai/validation/ruledriven/validator/TestRuleDrivenValidator.java b/src/test/java/org/onap/aai/validation/ruledriven/validator/TestRuleDrivenValidator.java index 27039a0..f33e9e9 100644 --- a/src/test/java/org/onap/aai/validation/ruledriven/validator/TestRuleDrivenValidator.java +++ b/src/test/java/org/onap/aai/validation/ruledriven/validator/TestRuleDrivenValidator.java @@ -53,7 +53,7 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) -@TestPropertySource(locations = {"classpath:oxm-reader/schemaIngest.properties"}) +@TestPropertySource(locations = {"classpath:schema-ingest.properties"}) @ContextConfiguration( locations = {"classpath:" + TestRuleDrivenValidator.UNIT_TEST_FOLDER + "/test-rule-driven-validator-beans.xml"}) public class TestRuleDrivenValidator { diff --git a/src/test/java/org/onap/aai/validation/services/TestInfoService.java b/src/test/java/org/onap/aai/validation/services/TestInfoService.java index c975d16..6090576 100644 --- a/src/test/java/org/onap/aai/validation/services/TestInfoService.java +++ b/src/test/java/org/onap/aai/validation/services/TestInfoService.java @@ -47,7 +47,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @SpringBootTest @RunWith(SpringJUnit4ClassRunner.class) -@TestPropertySource(locations = {"classpath:oxm-reader/schemaIngest.properties", "classpath:application.properties"}) +@TestPropertySource(locations = {"classpath:schema-ingest.properties", "classpath:application.properties"}) @ContextConfiguration(locations = {"classpath:/info-service/test-validation-service-beans.xml"}) public class TestInfoService { diff --git a/src/test/resources/data-dictionary/schemaIngest.properties b/src/test/resources/data-dictionary/schemaIngest.properties deleted file mode 100644 index 317f478..0000000 --- a/src/test/resources/data-dictionary/schemaIngest.properties +++ /dev/null @@ -1,42 +0,0 @@ -# ============LICENSE_START=================================================== -# Copyright (c) 2018-2019 European Software Marketing Ltd. -# ============================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END===================================================== - -# Properties for the org.onap.aai.setup.SchemaLocationsBean -# Schema related attributes for the oxm and edges -# Any additional schema related attributes should start with prefix schema -schema.configuration.location=N/A -schema.nodes.location=src/test/resources/oxm-reader/single/oxm -schema.edges.location=src/test/resources/oxm-reader/single/dbedgerules - -# Schema Version Related Attributes - -# Lists all of the versions in the schema -schema.version.list=v8,v9,v10 -# Specifies from which version should the depth parameter to default to zero -schema.version.depth.start=v9 -# Specifies from which version should the related link be displayed in response payload -schema.version.related.link.start=v10 -# Specifies from which version should the client see only the uri excluding host info -# Before this version server base will also be included -schema.version.app.root.start=v10 -# Specifies from which version should the namespace be changed -schema.version.namespace.change.start=v10 -# Specifies from which version should the client start seeing the edge label in payload -schema.version.edge.label.start=v10 -# Specifies the version that the application should default to -schema.version.api.default=v9 - - diff --git a/src/test/resources/data-dictionary/test-data-dictionary-beans.xml b/src/test/resources/data-dictionary/test-data-dictionary-beans.xml index 78a92f1..4bbb1af 100644 --- a/src/test/resources/data-dictionary/test-data-dictionary-beans.xml +++ b/src/test/resources/data-dictionary/test-data-dictionary-beans.xml @@ -18,7 +18,7 @@ classpath:aai-environment.properties, classpath:data-dictionary/validation-service.properties, classpath:data-dictionary/validation-service-auth.properties, - classpath:data-dictionary/schemaIngest.properties, + classpath:schema-ingest.properties, classpath:data-dictionary/rule-indexing.properties" ignore-unresolvable="true" /> diff --git a/src/test/resources/oxm-reader/oxm-reader-beans.xml b/src/test/resources/oxm-reader/oxm-reader-beans.xml index 93a2ff7..a85c081 100644 --- a/src/test/resources/oxm-reader/oxm-reader-beans.xml +++ b/src/test/resources/oxm-reader/oxm-reader-beans.xml @@ -7,7 +7,7 @@ - + diff --git a/src/test/resources/oxm-reader/schemaIngest.properties b/src/test/resources/oxm-reader/schemaIngest.properties deleted file mode 100644 index 34c8796..0000000 --- a/src/test/resources/oxm-reader/schemaIngest.properties +++ /dev/null @@ -1,32 +0,0 @@ -# Properties for the org.onap.aai.setup.SchemaLocationsBean -# Schema related attributes for the oxm and edges -# Any additional schema related attributes should start with prefix schema -schema.configuration.location=N/A -schema.nodes.location=src/test/resources/oxm-reader/single/oxm -schema.edges.location=src/test/resources/oxm-reader/single/dbedgerules - -# Schema Version Related Attributes - -# Lists all of the versions in the schema -schema.version.list=v8,v9,v10 -# Specifies from which version should the depth parameter to default to zero -schema.version.depth.start=v9 -# Specifies from which version should the related link be displayed in response payload -schema.version.related.link.start=v10 -# Specifies from which version should the client see only the uri excluding host info -# Before this version server base will also be included -schema.version.app.root.start=v10 -# Specifies from which version should the namespace be changed -schema.version.namespace.change.start=v10 -# Specifies from which version should the client start seeing the edge label in payload -schema.version.edge.label.start=v10 -# Specifies the version that the application should default to -schema.version.api.default=v9 - -schema.service.base.url=https://localhost:8452/aai/schema-service/v1/ -schema.service.nodes.endpoint=nodes?version= -schema.service.edges.endpoint=edgerules?version= -schema.service.versions.endpoint=versions - -schema.service.ssl.key-store= -schema.service.ssl.trust-store= \ No newline at end of file diff --git a/src/test/resources/schema-ingest.properties b/src/test/resources/schema-ingest.properties new file mode 100644 index 0000000..bdde478 --- /dev/null +++ b/src/test/resources/schema-ingest.properties @@ -0,0 +1,48 @@ +# ============LICENSE_START=================================================== +# Copyright (c) 2018-2019 European Software Marketing Ltd. +# ============================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END===================================================== + +# Properties for the org.onap.aai.setup.SchemaLocationsBean +# Schema related attributes for the oxm and edges +# Any additional schema related attributes should start with prefix schema +schema.configuration.location=N/A +schema.nodes.location=src/test/resources/oxm-reader/single/oxm +schema.edges.location=src/test/resources/oxm-reader/single/dbedgerules + +# Schema Version Related Attributes + +# Lists all of the versions in the schema +schema.version.list=v8,v9,v10 +# Specifies from which version should the depth parameter to default to zero +schema.version.depth.start=v9 +# Specifies from which version should the related link be displayed in response payload +schema.version.related.link.start=v10 +# Specifies from which version should the client see only the uri excluding host info +# Before this version server base will also be included +schema.version.app.root.start=v10 +# Specifies from which version should the namespace be changed +schema.version.namespace.change.start=v10 +# Specifies from which version should the client start seeing the edge label in payload +schema.version.edge.label.start=v10 +# Specifies the version that the application should default to +schema.version.api.default=v9 + +schema.service.base.url=https://localhost:8452/aai/schema-service/v1/ +schema.service.nodes.endpoint=nodes?version= +schema.service.edges.endpoint=edgerules?version= +schema.service.versions.endpoint=versions + +schema.service.ssl.key-store= +schema.service.ssl.trust-store= \ No newline at end of file -- cgit 1.2.3-korg