From: Jimmy Forsyth Date: Tue, 10 Mar 2020 15:25:48 +0000 (-0400) Subject: Move back to spring-boot 1.5 for bugfix X-Git-Tag: 1.6.10~1 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d9a489527750074eb8dd42bd2d0cfaef5de7c86f;p=aai%2Faai-common.git Move back to spring-boot 1.5 for bugfix Issue-ID: AAI-2831 Signed-off-by: Jimmy Forsyth Change-Id: I1e3d278fe343e4f05cdfd71d2443aef19c8541c2 --- diff --git a/aai-aaf-auth/pom.xml b/aai-aaf-auth/pom.xml index 883ed593..580f56eb 100644 --- a/aai-aaf-auth/pom.xml +++ b/aai-aaf-auth/pom.xml @@ -6,7 +6,7 @@ org.onap.aai.aai-common aai-parent - 1.6.9-SNAPSHOT + 1.6.10-SNAPSHOT ../aai-parent/pom.xml aai-aaf-auth diff --git a/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/AafAuthorizationFilter.java b/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/AafAuthorizationFilter.java index dfac48dd..46285396 100644 --- a/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/AafAuthorizationFilter.java +++ b/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/AafAuthorizationFilter.java @@ -23,7 +23,7 @@ package org.onap.aai.aaf.filters; import org.onap.aai.aaf.auth.ResponseFormatter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.web.servlet.filter.OrderedRequestContextFilter; +import org.springframework.boot.web.filter.OrderedRequestContextFilter; import org.springframework.context.annotation.Profile; import org.springframework.context.annotation.PropertySource; import org.springframework.stereotype.Component; @@ -79,6 +79,9 @@ public class AafAuthorizationFilter extends OrderedRequestContextFilter { @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws IOException, ServletException { + if(request.getRequestURI().matches("^.*/util/echo$")){ + filterChain.doFilter(request, response); + } if(request.getRequestURI().endsWith("/query")){ gremlinFilter.doBasicAuthFilter(request, response, filterChain); } else { diff --git a/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/AafCertAuthorizationFilter.java b/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/AafCertAuthorizationFilter.java index e0adf191..7ec6bb64 100644 --- a/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/AafCertAuthorizationFilter.java +++ b/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/AafCertAuthorizationFilter.java @@ -23,7 +23,7 @@ package org.onap.aai.aaf.filters; import org.onap.aai.aaf.auth.AafRequestFilter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.web.servlet.filter.OrderedRequestContextFilter; +import org.springframework.boot.web.filter.OrderedRequestContextFilter; import org.springframework.context.annotation.Profile; import org.springframework.context.annotation.PropertySource; import org.springframework.stereotype.Component; diff --git a/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/AafCertFilter.java b/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/AafCertFilter.java index 7a47b972..71238cfc 100644 --- a/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/AafCertFilter.java +++ b/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/AafCertFilter.java @@ -27,7 +27,7 @@ import org.onap.aaf.cadi.filter.CadiFilter; import org.onap.aai.aaf.auth.AafRequestFilter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.web.servlet.filter.OrderedRequestContextFilter; +import org.springframework.boot.web.filter.OrderedRequestContextFilter; import org.springframework.context.annotation.Profile; import org.springframework.context.annotation.PropertySource; import org.springframework.stereotype.Component; diff --git a/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/AafFilter.java b/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/AafFilter.java index e6769dda..16d9afd2 100644 --- a/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/AafFilter.java +++ b/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/AafFilter.java @@ -26,7 +26,7 @@ import org.onap.aaf.cadi.PropAccess; import org.onap.aaf.cadi.filter.CadiFilter; import org.onap.aai.aaf.auth.ResponseFormatter; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.web.servlet.filter.OrderedRequestContextFilter; +import org.springframework.boot.web.filter.OrderedRequestContextFilter; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; diff --git a/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/TwoWaySslAuthorization.java b/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/TwoWaySslAuthorization.java index 150802b8..0e206c50 100644 --- a/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/TwoWaySslAuthorization.java +++ b/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/TwoWaySslAuthorization.java @@ -26,7 +26,7 @@ import org.onap.aai.aaf.auth.CertUtil; import org.onap.aai.aaf.auth.ResponseFormatter; import org.onap.aai.exceptions.AAIException; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.web.servlet.filter.OrderedRequestContextFilter; +import org.springframework.boot.web.filter.OrderedRequestContextFilter; import org.springframework.context.annotation.Profile; import org.springframework.core.env.Environment; import org.springframework.stereotype.Component; diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml index 1db79303..e11c6196 100644 --- a/aai-annotations/pom.xml +++ b/aai-annotations/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.aai-common aai-parent - 1.6.9-SNAPSHOT + 1.6.10-SNAPSHOT ../aai-parent/pom.xml aai-annotations diff --git a/aai-auth/pom.xml b/aai-auth/pom.xml index 12c10aaf..0dbd11ab 100644 --- a/aai-auth/pom.xml +++ b/aai-auth/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.aai-common aai-parent - 1.6.9-SNAPSHOT + 1.6.10-SNAPSHOT ../aai-parent/pom.xml aai-auth diff --git a/aai-common-docker/aai-common-images/pom.xml b/aai-common-docker/aai-common-images/pom.xml index 57f845cd..31b878b1 100644 --- a/aai-common-docker/aai-common-images/pom.xml +++ b/aai-common-docker/aai-common-images/pom.xml @@ -25,11 +25,11 @@ org.onap.aai.aai-common aai-common-docker - 1.6.9-SNAPSHOT + 1.6.10-SNAPSHOT aai-common-images - 1.6.9-SNAPSHOT + 1.6.10-SNAPSHOT pom aai-aai-common-images Contains dockerfiles for aai-common images (alpine and ubuntu based). diff --git a/aai-common-docker/aai-haproxy-image/pom.xml b/aai-common-docker/aai-haproxy-image/pom.xml index cfda0299..d77f7f62 100644 --- a/aai-common-docker/aai-haproxy-image/pom.xml +++ b/aai-common-docker/aai-haproxy-image/pom.xml @@ -25,11 +25,11 @@ org.onap.aai.aai-common aai-common-docker - 1.6.9-SNAPSHOT + 1.6.10-SNAPSHOT aai-haproxy-image - 1.6.9-SNAPSHOT + 1.6.10-SNAPSHOT pom aai-aai-haproxy-image Contains dockerfiles for aai-haproxy image. diff --git a/aai-common-docker/pom.xml b/aai-common-docker/pom.xml index 009b4a04..1eec1141 100644 --- a/aai-common-docker/pom.xml +++ b/aai-common-docker/pom.xml @@ -26,7 +26,7 @@ org.onap.aai.aai-common aai-parent - 1.6.9-SNAPSHOT + 1.6.10-SNAPSHOT ../aai-parent/pom.xml diff --git a/aai-core/pom.xml b/aai-core/pom.xml index eb8e8ee7..84fb4dc8 100644 --- a/aai-core/pom.xml +++ b/aai-core/pom.xml @@ -28,7 +28,7 @@ limitations under the License. org.onap.aai.aai-common aai-parent - 1.6.9-SNAPSHOT + 1.6.10-SNAPSHOT ../aai-parent/pom.xml aai-core diff --git a/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationServiceNoAuthClient.java b/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationServiceNoAuthClient.java index 6173e4bd..d373ae78 100644 --- a/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationServiceNoAuthClient.java +++ b/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationServiceNoAuthClient.java @@ -26,7 +26,6 @@ import org.onap.aai.restclient.NoAuthRestClient; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; import org.springframework.util.MultiValueMap; diff --git a/aai-core/src/main/java/org/onap/aai/restcore/util/URITools.java b/aai-core/src/main/java/org/onap/aai/restcore/util/URITools.java index fc32f859..a757d3db 100644 --- a/aai-core/src/main/java/org/onap/aai/restcore/util/URITools.java +++ b/aai-core/src/main/java/org/onap/aai/restcore/util/URITools.java @@ -47,21 +47,25 @@ public class URITools { MultivaluedMap result = new MultivaluedHashMap<>(); String queryParams = uri.getRawQuery(); if (queryParams != null) { - String[] sections = queryParams.split("&"); - String[] query = null; - String key, value = ""; - for (String section : sections) { - query = section.split("="); - key = UriUtils.decode(query[0], "UTF-8"); - if (query[1] != null) { - query[1] = query[1].replaceAll("\\+", "%20"); - } - value = UriUtils.decode(query[1], "UTF-8"); - if (result.containsKey(key)) { - result.add(key, value); - } else { - result.putSingle(key, value); + try { + String[] sections = queryParams.split("&"); + String[] query = null; + String key, value = ""; + for (String section : sections) { + query = section.split("="); + key = UriUtils.decode(query[0], "UTF-8"); + if (query[1] != null) { + query[1] = query[1].replaceAll("\\+", "%20"); + } + value = UriUtils.decode(query[1], "UTF-8"); + if (result.containsKey(key)) { + result.add(key, value); + } else { + result.putSingle(key, value); + } } + } catch (UnsupportedEncodingException e) { + } } return result; diff --git a/aai-els-onap-logging/pom.xml b/aai-els-onap-logging/pom.xml index 0ac283dc..2dcc6f61 100644 --- a/aai-els-onap-logging/pom.xml +++ b/aai-els-onap-logging/pom.xml @@ -6,7 +6,7 @@ org.onap.aai.aai-common aai-parent - 1.6.9-SNAPSHOT + 1.6.10-SNAPSHOT ../aai-parent/pom.xml aai-els-onap-logging diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml index eecc370d..1a237e82 100644 --- a/aai-parent/pom.xml +++ b/aai-parent/pom.xml @@ -1,968 +1,966 @@ - 4.0.0 - - org.onap.aai.aai-common - aai-common - 1.6.9-SNAPSHOT - - aai-parent - aai-parent - pom - - - - - - - - ${aai.common.version} - 1.5.1 - 1.5.1 - 1.6.3 - - 2.1.15 - 4.7.2 - 5.15.11 - 1.9.13 - 1.9.4 - 1.4 - 1.19 - 1.10 - 2.6 - 2.6 - 3.9 - 3.6 - 1.8 - 0.31.0 - 1.1.9 - 4.0.2 - 2.6.2 - 1.0.1-oss - 2.3.29 - 19.0 - 3.2.3 - 2.5.8 - 2.8.6 - 2.0.0.0 - 2.2 - 2.10.1 - 0.2.3 - 1.2 - 2.2.12 - 2.0.1 - 1.78 - 1.19.4 - 2.1.11 - 0.0.24 - 5.0.4 - 1.5.0 - 1.9 - - 2.2.0 - 20190722 - 4.12 - 4.5.10 - 1.5.24 - 1.2.3 - 1.7.25 - 1.2.17 - 1.10.19 - 1.10.19 - 4.1.43.Final - 4.0.56.Final - 3.1 - 1.6.6 - 3.1.1 - 0.9.10 - 1.25 - - 1.5.22.RELEASE - 3.1.0 - 1.2 - - - - - - - 0.00 - - 0.8.5 - 3.2 - jacoco - ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml - **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** - - 3.7.0.1746 - - 5.1.13.RELEASE - 5.1.13.RELEASE - 5.1.13.RELEASE - 1.0.8.RELEASE - 1.1.1 - 2.0.4 - 1.9.1 - 1.5.1 - - - - - spring-boot-2-1 - - 2.1.12.RELEASE - - - - - - - - - com.googlecode.json-simple - json-simple - ${json.simple.version} - - - - org.onap.aai.aai-common - aai-schema-ingest - ${aai.release.version} - - - - org.onap.aai.aai-common - aai-core - ${aai.release.version} - - - - org.onap.aai.aai-common - aai-aaf-auth - ${aai.release.version} - - - - org.onap.aai.aai-common - aai-els-onap-logging - ${aai.release.version} - - - - org.onap.aai.aai-common - aai-annotations - ${aai.release.version} - - - - org.onap.aai.aai-common - aai-rest - ${aai.release.version} - - - - com.fasterxml.jackson - jackson-bom - ${jackson.bom.version} - pom - import - - - - org.springframework.boot - spring-boot-starter-web - ${spring.boot.version} - - - - org.springframework.boot - spring-boot-starter-parent - ${spring.boot.version} - pom - import - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - - org.springframework.boot - spring-boot-test - test - ${spring.boot.version} - - - - org.springframework - spring-test - ${spring.test.version} - - - - commons-configuration - commons-configuration - ${commons.configuration.version} - - - - org.apache.commons - commons-lang3 - ${commons.lang3.version} - - - - - commons-lang - commons-lang - ${commons.lang.version} - - - - com.att.eelf - eelf-core - ${eelf.core.version} - - - - ch.qos.logback - logback-core - ${logback.version} - - - - ch.qos.logback - logback-classic - ${logback.version} - - - - ch.qos.logback - logback-access - ${logback.version} - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - - org.hamcrest - java-hamcrest - ${hamcrest.junit.version} - - - - org.hamcrest - hamcrest-core - ${hamcrest.core.version} - - - - org.hamcrest - hamcrest-junit - ${hamcrest.junit.version} - - - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - provided - - - javax.annotation - javax.annotation-api - ${javax.annotation.version} - provided - - - - junit - junit - ${junit.version} - test - - - - com.google.guava - guava - ${google.guava.version} - - - - org.janusgraph - janusgraph-core - ${janusgraph.version} - - - - org.janusgraph - janusgraph-cassandra - ${janusgraph.version} - - - - org.janusgraph - janusgraph-cql - ${janusgraph.version} - - - - com.github.jnr - jnr-ffi - ${jnr.ffi.version} - - - - org.apache.tinkerpop - tinkergraph-gremlin - ${gremlin.version} - - - org.apache.tinkerpop - gremlin-core - ${gremlin.version} - - - org.apache.tinkerpop - gremlin-driver - ${gremlin.version} - - - - org.apache.tinkerpop - gremlin-groovy - ${gremlin.version} - - - - org.codehaus.groovy - groovy - ${groovy.version} - indy - - - - org.mockito - mockito-all - ${mockito.all.version} - - - - org.mockito - mockito-core - ${mockito.core.version} - test - - - org.powermock - powermock-module-junit4 - ${powermock.version} - - - - org.powermock - powermock-module-junit4-rule-agent - ${powermock.version} - - - - org.powermock - powermock-api-mockito2 - ${powermock.api.mockito2.version} - - - org.powermock - powermock-core - ${powermock.api.mockito2.version} - - - org.powermock - powermock-module-javaagent - ${powermock.version} - - - com.beust - jcommander - ${jcommander.version} - - - - org.antlr - antlr4-runtime - ${antlr.version} - - - org.antlr - antlr4-maven-plugin - ${antlr.version} - - - - org.json - json - ${json.version} - - - - org.freemarker - freemarker - ${freemarker.version} - - - - javax.xml.bind - jaxb-api - ${jaxb.version} - - - - org.apache.activemq - activemq-broker - ${activemq.version} - - - - org.apache.activemq - activemq-client - ${activemq.version} - - - - org.apache.activemq - activemq-openwire-legacy - ${activemq.version} - - - - org.onap.aaf.authz - aaf-cadi-core - ${aaf.version} - compile - - - org.onap.aaf.authz - aaf-cadi-aaf - ${aaf.version} - compile - - - - org.easymock - easymock - ${easy.mock.version} - test - - - - com.sun.xml.bind - jaxb-xjc - ${jaxb.version} - - - - org.eclipse.persistence - eclipselink - ${eclipse.persistence.version} - - - - org.eclipse.persistence - org.eclipse.persistence.moxy - ${eclipse.persistence.version} - - - - com.github.fge - json-patch - ${json.patch.version} - - - - com.jayway.jsonpath - json-path - ${json.path.version} - - - com.jayway.jsonpath - json-path-assert - ${json.path.version} - - - - org.javatuples - javatuples - ${javatuples.version} - - - - com.google.code.gson - gson - ${gson.version} - - - - - org.apache.commons - commons-text - ${commons.text.version} - - - - org.codehaus.jackson - jackson-core-asl - ${codehaus.jackson.version} - - - - com.sun.jersey - jersey-core - ${jersey.version} - - - - com.sun.jersey - jersey-client - ${jersey.version} - - - - com.sun.jersey - jersey-json - ${jersey.version} - - - - javax.ws.rs - javax.ws.rs-api - ${jaxrs.version} - - - - commons-cli - commons-cli - ${commons.cli.version} - - - - com.bazaarvoice.jolt - jolt-complete - ${jolt.version} - - - - com.opencsv - opencsv - ${opencsv.version} - - - - log4j - log4j - ${log4j.version} - - - - log4j - apache-log4j-extras - ${log4j.version} - - - - commons-io - commons-io - ${commons.io.version} - - - - org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - org.springframework - spring-orm - ${spring.version} - - - org.springframework - spring-oxm - ${spring.version} - - - org.springframework - spring-aspects - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - org.springframework - spring-webmvc - ${spring.version} - - - - org.springframework.security - spring-security-rsa - ${spring.security.rsa.version} - - - - org.springframework - spring-jms - ${spring.jms.version} - - - - org.onap.aai.logging-service - common-logging - ${aai.common.logging.version} - - - - org.onap.aai.logging-service - logging-api - ${aai.common.logging.version} - - - - org.onap.logging-analytics - logging-slf4j - ${logging.analytics.version} - - - - org.onap.aai - rest-client - ${aai.rest.client.version} - - - - net.sf.jopt-simple - jopt-simple - ${jopt.simple.version} - - - - io.swagger - swagger-core - ${io.swagger.version} - - - - org.aspectj - aspectjrt - ${aspectj.version} - - - - io.swagger - swagger-annotations - ${io.swagger.version} - - - - io.swagger - swagger-jersey-jaxrs - ${io.swagger.version} - - - - org.onap.dmaap.messagerouter.dmaapclient - dmaapClient - ${dmaap.client.version} - - - - io.netty - netty-handler - ${netty.handler.version} - - - - io.netty - netty-all - ${netty.version} - - - - org.onap.aai.schema-service - aai-schema - ${aai.schema.service.version} - - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - - - - org.skyscreamer - jsonassert - ${jsonassert.version} - test - - - - org.codehaus.plexus - plexus-utils - ${plexus.utils.version} - - - - org.yaml - snakeyaml - ${snakeyaml.version} - - - - org.apache.commons - commons-compress - ${commons.compress.version} - - - - org.reflections - reflections - ${reflections.version} - - - - commons-net - commons-net - ${commons.net.version} - - - - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - - io.fabric8 - docker-maven-plugin - ${docker.fabric.version} - - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - - **/gen/** - **/generated-sources/** - **/yang-gen/** - **/pax/** - - - - - - pre-unit-test - - prepare-agent - - - - ${project.build.directory}/code-coverage/jacoco-ut.exec - - surefireArgLine - - - - - post-unit-test - test - - report - - - - ${project.build.directory}/code-coverage/jacoco-ut.exec - - ${project.reporting.outputDirectory}/jacoco-ut - - - - pre-integration-test - pre-integration-test - - prepare-agent - - - - ${project.build.directory}/code-coverage/jacoco-it.exec - - failsafeArgLine - - - - - post-integration-test - post-integration-test - - report - - - - ${project.build.directory}/code-coverage/jacoco-it.exec - - ${project.reporting.outputDirectory}/jacoco-it - - - - default-check - - check - - - ${project.build.directory}/code-coverage/jacoco-ut.exec - - - BUNDLE - - - LINE - COVEREDRATIO - ${jacoco.line.coverage.limit} - - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M4 - - - ${surefireArgLine} - - - **/IT*.java - - - - - org.apache.maven.plugins - maven-failsafe-plugin - 3.0.0-M4 - - - - integration-tests - - integration-test - verify - - - - ${failsafeArgLine} - - - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - ${sonar.scanner.version} - - - - - - - - org.jacoco - jacoco-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + + org.onap.aai.aai-common + aai-common + 1.6.10-SNAPSHOT + + aai-parent + aai-parent + pom + + + + + + + + ${aai.common.version} + 1.5.1 + 1.5.1 + 1.6.4 + + 2.1.15 + 4.7.2 + 5.15.11 + 1.9.13 + 1.9.4 + 1.4 + 1.19 + 1.10 + 2.6 + 2.6 + 3.9 + 3.6 + 1.8 + 0.31.0 + 1.1.9 + 4.0.2 + 2.6.2 + 1.0.1-oss + 2.3.29 + 19.0 + 3.2.3 + 2.5.8 + 2.8.6 + 2.0.0.0 + 2.2 + 2.10.1 + 0.2.3 + 1.2 + 2.2.12 + 2.0.1 + 1.78 + 1.19.4 + 2.1.11 + 0.0.24 + 5.0.4 + 1.5.0 + 1.9 + + 2.2.0 + 20190722 + 4.12 + 4.5.10 + 1.5.24 + 1.2.3 + 1.7.25 + 1.2.17 + 1.10.19 + 2.15.0 + 4.1.43.Final + 4.0.56.Final + 3.1 + 1.6.6 + 3.1.1 + 0.9.10 + 1.25 + + 1.5.22.RELEASE + 3.1.0 + 1.2 + + + + + + + 0.00 + + 0.8.5 + 3.2 + jacoco + ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** + + 3.7.0.1746 + + 4.3.25.RELEASE + 4.3.25.RELEASE + 4.3.25.RELEASE + 1.0.8.RELEASE + 1.1.1 + 2.0.4 + 1.9.1 + 1.5.1 + + + + + spring-boot-2-1 + + 1.5.22.RELEASE + + + + + + + + + com.googlecode.json-simple + json-simple + ${json.simple.version} + + + + org.onap.aai.aai-common + aai-schema-ingest + ${aai.release.version} + + + + org.onap.aai.aai-common + aai-core + ${aai.release.version} + + + + org.onap.aai.aai-common + aai-aaf-auth + ${aai.release.version} + + + + org.onap.aai.aai-common + aai-els-onap-logging + ${aai.release.version} + + + + org.onap.aai.aai-common + aai-annotations + ${aai.release.version} + + + + org.onap.aai.aai-common + aai-rest + ${aai.release.version} + + + + com.fasterxml.jackson + jackson-bom + ${jackson.bom.version} + pom + import + + + + org.springframework.boot + spring-boot-starter-web + ${spring.boot.version} + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot.version} + pom + import + + + + org.springframework.boot + spring-boot-test + test + ${spring.boot.version} + + + + org.springframework + spring-test + ${spring.test.version} + + + + commons-configuration + commons-configuration + ${commons.configuration.version} + + + + org.apache.commons + commons-lang3 + ${commons.lang3.version} + + + + commons-lang + commons-lang + ${commons.lang.version} + + + + com.att.eelf + eelf-core + ${eelf.core.version} + + + + ch.qos.logback + logback-core + ${logback.version} + + + + ch.qos.logback + logback-classic + ${logback.version} + + + + ch.qos.logback + logback-access + ${logback.version} + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + + org.hamcrest + java-hamcrest + ${hamcrest.junit.version} + + + + org.hamcrest + hamcrest-core + ${hamcrest.core.version} + + + + org.hamcrest + hamcrest-junit + ${hamcrest.junit.version} + + + + javax.servlet + javax.servlet-api + ${javax.servlet.version} + provided + + + javax.annotation + javax.annotation-api + ${javax.annotation.version} + provided + + + + junit + junit + ${junit.version} + test + + + + com.google.guava + guava + ${google.guava.version} + + + + org.janusgraph + janusgraph-core + ${janusgraph.version} + + + + org.janusgraph + janusgraph-cassandra + ${janusgraph.version} + + + + org.janusgraph + janusgraph-cql + ${janusgraph.version} + + + + com.github.jnr + jnr-ffi + ${jnr.ffi.version} + + + + org.apache.tinkerpop + tinkergraph-gremlin + ${gremlin.version} + + + org.apache.tinkerpop + gremlin-core + ${gremlin.version} + + + org.apache.tinkerpop + gremlin-driver + ${gremlin.version} + + + + org.apache.tinkerpop + gremlin-groovy + ${gremlin.version} + + + + org.codehaus.groovy + groovy + ${groovy.version} + indy + + + + org.mockito + mockito-all + ${mockito.all.version} + + + + org.mockito + mockito-core + ${mockito.core.version} + test + + + org.powermock + powermock-module-junit4 + ${powermock.version} + + + + org.powermock + powermock-module-junit4-rule-agent + ${powermock.version} + + + + org.powermock + powermock-api-mockito2 + ${powermock.api.mockito2.version} + + + org.powermock + powermock-core + ${powermock.api.mockito2.version} + + + org.powermock + powermock-module-javaagent + ${powermock.version} + + + com.beust + jcommander + ${jcommander.version} + + + + org.antlr + antlr4-runtime + ${antlr.version} + + + org.antlr + antlr4-maven-plugin + ${antlr.version} + + + + org.json + json + ${json.version} + + + + org.freemarker + freemarker + ${freemarker.version} + + + + javax.xml.bind + jaxb-api + ${jaxb.version} + + + + org.apache.activemq + activemq-broker + ${activemq.version} + + + + org.apache.activemq + activemq-client + ${activemq.version} + + + + org.apache.activemq + activemq-openwire-legacy + ${activemq.version} + + + + org.onap.aaf.authz + aaf-cadi-core + ${aaf.version} + compile + + + org.onap.aaf.authz + aaf-cadi-aaf + ${aaf.version} + compile + + + + org.easymock + easymock + ${easy.mock.version} + test + + + + com.sun.xml.bind + jaxb-xjc + ${jaxb.version} + + + + org.eclipse.persistence + eclipselink + ${eclipse.persistence.version} + + + + org.eclipse.persistence + org.eclipse.persistence.moxy + ${eclipse.persistence.version} + + + + com.github.fge + json-patch + ${json.patch.version} + + + + com.jayway.jsonpath + json-path + ${json.path.version} + + + com.jayway.jsonpath + json-path-assert + ${json.path.version} + + + + org.javatuples + javatuples + ${javatuples.version} + + + + com.google.code.gson + gson + ${gson.version} + + + + org.apache.commons + commons-text + ${commons.text.version} + + + + org.codehaus.jackson + jackson-core-asl + ${codehaus.jackson.version} + + + + com.sun.jersey + jersey-core + ${jersey.version} + + + + com.sun.jersey + jersey-client + ${jersey.version} + + + + com.sun.jersey + jersey-json + ${jersey.version} + + + + javax.ws.rs + javax.ws.rs-api + ${jaxrs.version} + + + + commons-cli + commons-cli + ${commons.cli.version} + + + + com.bazaarvoice.jolt + jolt-complete + ${jolt.version} + + + + com.opencsv + opencsv + ${opencsv.version} + + + + log4j + log4j + ${log4j.version} + + + + log4j + apache-log4j-extras + ${log4j.version} + + + + commons-io + commons-io + ${commons.io.version} + + + + org.springframework + spring-web + ${spring.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + org.springframework + spring-orm + ${spring.version} + + + org.springframework + spring-oxm + ${spring.version} + + + org.springframework + spring-aspects + ${spring.version} + + + org.springframework + spring-tx + ${spring.version} + + + org.springframework + spring-webmvc + ${spring.version} + + + + org.springframework.security + spring-security-rsa + ${spring.security.rsa.version} + + + + org.springframework + spring-jms + ${spring.jms.version} + + + + org.onap.aai.logging-service + common-logging + ${aai.common.logging.version} + + + + org.onap.aai.logging-service + logging-api + ${aai.common.logging.version} + + + + org.onap.logging-analytics + logging-slf4j + ${logging.analytics.version} + + + + org.onap.aai + rest-client + ${aai.rest.client.version} + + + + net.sf.jopt-simple + jopt-simple + ${jopt.simple.version} + + + + io.swagger + swagger-core + ${io.swagger.version} + + + + org.aspectj + aspectjrt + ${aspectj.version} + + + + io.swagger + swagger-annotations + ${io.swagger.version} + + + + io.swagger + swagger-jersey-jaxrs + ${io.swagger.version} + + + + org.onap.dmaap.messagerouter.dmaapclient + dmaapClient + ${dmaap.client.version} + + + + io.netty + netty-handler + ${netty.handler.version} + + + + io.netty + netty-all + ${netty.version} + + + + org.onap.aai.schema-service + aai-schema + ${aai.schema.service.version} + + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + + + + org.skyscreamer + jsonassert + ${jsonassert.version} + test + + + + org.codehaus.plexus + plexus-utils + ${plexus.utils.version} + + + + org.yaml + snakeyaml + ${snakeyaml.version} + + + + org.apache.commons + commons-compress + ${commons.compress.version} + + + + org.reflections + reflections + ${reflections.version} + + + + commons-net + commons-net + ${commons.net.version} + + + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + + io.fabric8 + docker-maven-plugin + ${docker.fabric.version} + + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + + **/gen/** + **/generated-sources/** + **/yang-gen/** + **/pax/** + + + + + + pre-unit-test + + prepare-agent + + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + + surefireArgLine + + + + + post-unit-test + test + + report + + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + + ${project.reporting.outputDirectory}/jacoco-ut + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + + ${project.build.directory}/code-coverage/jacoco-it.exec + + failsafeArgLine + + + + + post-integration-test + post-integration-test + + report + + + + ${project.build.directory}/code-coverage/jacoco-it.exec + + ${project.reporting.outputDirectory}/jacoco-it + + + + default-check + + check + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + + + BUNDLE + + + LINE + COVEREDRATIO + ${jacoco.line.coverage.limit} + + + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M4 + + + ${surefireArgLine} + + + **/IT*.java + + + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.0.0-M4 + + + + integration-tests + + integration-test + verify + + + + ${failsafeArgLine} + + + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + ${sonar.scanner.version} + + + + + + + + org.jacoco + jacoco-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + diff --git a/aai-rest/pom.xml b/aai-rest/pom.xml index dbcb874a..89d3d3c2 100644 --- a/aai-rest/pom.xml +++ b/aai-rest/pom.xml @@ -29,7 +29,7 @@ org.onap.aai.aai-common aai-parent - 1.6.9-SNAPSHOT + 1.6.10-SNAPSHOT ../aai-parent/pom.xml aai-rest diff --git a/aai-rest/src/main/java/org/onap/aai/restclient/NoAuthRestClient.java b/aai-rest/src/main/java/org/onap/aai/restclient/NoAuthRestClient.java index b11b0333..68ff3e5e 100644 --- a/aai-rest/src/main/java/org/onap/aai/restclient/NoAuthRestClient.java +++ b/aai-rest/src/main/java/org/onap/aai/restclient/NoAuthRestClient.java @@ -26,7 +26,6 @@ import org.apache.http.client.HttpClient; import org.apache.http.impl.client.HttpClients; import org.onap.aai.aailog.filter.RestClientLoggingInterceptor; import org.springframework.boot.web.client.RestTemplateBuilder; -import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; import org.springframework.web.client.RestTemplate; @@ -40,8 +39,8 @@ public abstract class NoAuthRestClient extends RestClient { @PostConstruct public void init() throws Exception { - restTemplate = new RestTemplate(); - restTemplate.setRequestFactory(this.getHttpRequestFactory()); + restTemplate = + new RestTemplateBuilder().requestFactory(this.getHttpRequestFactory()).build(); restTemplate.setErrorHandler(new RestClientResponseErrorHandler()); RestClientLoggingInterceptor loggingInterceptor = new RestClientLoggingInterceptor(); restTemplate.getInterceptors().add(loggingInterceptor); diff --git a/aai-rest/src/main/java/org/onap/aai/restclient/OneWaySSLRestClient.java b/aai-rest/src/main/java/org/onap/aai/restclient/OneWaySSLRestClient.java index 5c359e27..b2534f57 100644 --- a/aai-rest/src/main/java/org/onap/aai/restclient/OneWaySSLRestClient.java +++ b/aai-rest/src/main/java/org/onap/aai/restclient/OneWaySSLRestClient.java @@ -42,8 +42,8 @@ public abstract class OneWaySSLRestClient extends RestClient { @PostConstruct public void init() throws Exception { - restTemplate = new RestTemplate(); - restTemplate.setRequestFactory(this.getHttpRequestFactory()); + restTemplate = + new RestTemplateBuilder().requestFactory(this.getHttpRequestFactory()).build(); restTemplate.setErrorHandler(new RestClientResponseErrorHandler()); RestClientLoggingInterceptor loggingInterceptor = new RestClientLoggingInterceptor(); diff --git a/aai-rest/src/main/java/org/onap/aai/restclient/TwoWaySSLRestClient.java b/aai-rest/src/main/java/org/onap/aai/restclient/TwoWaySSLRestClient.java index f43d21c8..58ee79f1 100644 --- a/aai-rest/src/main/java/org/onap/aai/restclient/TwoWaySSLRestClient.java +++ b/aai-rest/src/main/java/org/onap/aai/restclient/TwoWaySSLRestClient.java @@ -48,8 +48,9 @@ public abstract class TwoWaySSLRestClient extends RestClient { @PostConstruct public void init() throws Exception { - restTemplate = new RestTemplate(); - restTemplate.setRequestFactory(this.getHttpRequestFactory()); + restTemplate = + new RestTemplateBuilder().requestFactory(this.getHttpRequestFactory()).build(); + restTemplate.setErrorHandler(new RestClientResponseErrorHandler()); RestClientLoggingInterceptor loggingInterceptor = new RestClientLoggingInterceptor(); restTemplate.getInterceptors().add(loggingInterceptor); diff --git a/aai-schema-abstraction/pom.xml b/aai-schema-abstraction/pom.xml index eec7ce28..9c0eacde 100644 --- a/aai-schema-abstraction/pom.xml +++ b/aai-schema-abstraction/pom.xml @@ -28,7 +28,7 @@ org.onap.aai.aai-common aai-parent - 1.6.9-SNAPSHOT + 1.6.10-SNAPSHOT ../aai-parent/pom.xml diff --git a/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaProviderTest.java b/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaProviderTest.java index 6cfb5a7d..6c7364ae 100644 --- a/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaProviderTest.java +++ b/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaProviderTest.java @@ -30,14 +30,14 @@ import java.util.Set; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.onap.aai.schemaif.SchemaProviderException; import org.onap.aai.schemaif.definitions.EdgeSchema; import org.onap.aai.schemaif.definitions.PropertySchema; import org.onap.aai.schemaif.definitions.VertexSchema; import org.onap.aai.schemaif.definitions.types.DataType.Type; -@RunWith(MockitoJUnitRunner.class) +@RunWith(MockitoJUnitRunner.Silent.class) public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { @Test @@ -49,15 +49,15 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { VertexSchema vertSchema = schemaProvider.getVertexSchema("pserver", schemaProvider.getLatestSchemaVersion()); System.out.println(vertSchema.toString()); - EdgeSchema edgeSchema = schemaProvider.getEdgeSchema("org.onap.relationships.inventory.LocatedIn", + EdgeSchema edgeSchema = schemaProvider.getEdgeSchema("org.onap.relationships.inventory.LocatedIn", "cloud-region", "zone", schemaProvider.getLatestSchemaVersion()); System.out.println(edgeSchema.toString()); - + // Validate vertex schema assertTrue(vertSchema.getName().equals("pserver")); assertTrue(vertSchema.getAnnotationValue("nameProps").equals("pserver-name2")); assertTrue(vertSchema.getAnnotationValue("dependentOn") == null); - + PropertySchema propSchema = vertSchema.getPropertySchema("hostname"); assertTrue(propSchema.getName().equals("hostname")); assertTrue(propSchema.getDefaultValue().equals("")); @@ -66,7 +66,7 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(propSchema.getDataType().getType().compareTo(Type.STRING) == 0); Object obj = propSchema.validateValue("somestring"); assertTrue(obj instanceof String); - + propSchema = vertSchema.getPropertySchema("in-maint"); assertTrue(propSchema.getName().equals("in-maint")); assertTrue(propSchema.getDefaultValue().equals("false")); @@ -79,8 +79,8 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { obj = propSchema.validateValue("false"); assertTrue(obj instanceof Boolean); assertTrue(propSchema.getDataType().validateValue("badValue") == null); - - + + propSchema = vertSchema.getPropertySchema("aai-node-type"); assertTrue(propSchema.getName().equals("aai-node-type")); assertTrue(propSchema.getDefaultValue().equals("")); @@ -88,7 +88,7 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(!propSchema.isKey()); assertTrue(propSchema.isReserved()); assertTrue(propSchema.getDataType().getType().compareTo(Type.STRING) == 0); - + propSchema = vertSchema.getPropertySchema("pserver-id"); assertTrue(propSchema.getName().equals("pserver-id")); assertTrue(propSchema.getDefaultValue().equals("")); @@ -96,7 +96,7 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(!propSchema.isReserved()); assertTrue(propSchema.isKey()); assertTrue(propSchema.getDataType().getType().compareTo(Type.STRING) == 0); - + propSchema = vertSchema.getPropertySchema("number-of-cpus"); assertTrue(propSchema.getName().equals("number-of-cpus")); assertTrue(propSchema.getAnnotationValue("source-of-truth-type").equals("openstack")); @@ -107,7 +107,7 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(obj instanceof Integer); assertTrue(propSchema.getDataType().validateValue("5.5") == null); assertTrue(propSchema.getDataType().validateValue("xyz") == null); - + // Validate edge schema assertTrue(edgeSchema.getName().equals("org.onap.relationships.inventory.LocatedIn")); assertTrue(edgeSchema.getSource().equals("cloud-region")); @@ -115,7 +115,7 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(edgeSchema.getMultiplicity().equals(EdgeSchema.Multiplicity.MANY_2_ONE)); assertTrue(edgeSchema.getAnnotationValue("contains-other-v").equals("NONE")); assertTrue(edgeSchema.getPropertySchema("prevent-delete").getDataType().getType().equals(Type.STRING)); - + // Validate 'dependentOn' annotation vertSchema = schemaProvider.getVertexSchema("tenant", schemaProvider.getLatestSchemaVersion()); assertTrue(vertSchema.getAnnotationValue("dependentOn").equals("cloud-region")); @@ -128,19 +128,19 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(false); } } - + @Test public void testAdjacentEdges() throws SchemaProviderException { try { OxmSchemaProvider schemaProvider = new OxmSchemaProvider(); schemaProvider.loadSchema(); - Set edgeSchemaList = + Set edgeSchemaList = schemaProvider.getAdjacentEdgeSchema("snapshot", schemaProvider.getLatestSchemaVersion()); - + // Validate edge schema assertTrue(edgeSchemaList.size() == 2); - + for (EdgeSchema es : edgeSchemaList) { System.out.println(es.toString()); if (es.getName().equals("org.onap.relationships.inventory.BelongsTo")) { @@ -166,15 +166,15 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(false); } } - + @Test public void testValidSourceTargetEdge() throws SchemaProviderException { try { OxmSchemaProvider schemaProvider = new OxmSchemaProvider(); schemaProvider.loadSchema(); - Set edgeSchemaList = - schemaProvider.getEdgeSchemaForSourceTarget("service-instance", "customer", + Set edgeSchemaList = + schemaProvider.getEdgeSchemaForSourceTarget("service-instance", "customer", schemaProvider.getLatestSchemaVersion()); // Validate edge schema @@ -183,14 +183,14 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(edgeSchemaList.iterator().next().getSource().equals("service-instance")); assertTrue(edgeSchemaList.iterator().next().getTarget().equals("customer")); assertTrue(edgeSchemaList.iterator().next().getMultiplicity().equals(EdgeSchema.Multiplicity.MANY_2_MANY)); - - edgeSchemaList = - schemaProvider.getEdgeSchemaForSourceTarget("cloud-region", "complex", + + edgeSchemaList = + schemaProvider.getEdgeSchemaForSourceTarget("cloud-region", "complex", schemaProvider.getLatestSchemaVersion()); - + // Validate edge schema assertTrue(edgeSchemaList.size() == 2); - + for (EdgeSchema es : edgeSchemaList) { System.out.println(es.toString()); if (es.getName().equals("org.onap.relationships.inventory.FoundIn")) { @@ -207,11 +207,11 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(false); } } - - edgeSchemaList = - schemaProvider.getEdgeSchemaForSourceTarget("cloud-region", "bad-node", + + edgeSchemaList = + schemaProvider.getEdgeSchemaForSourceTarget("cloud-region", "bad-node", schemaProvider.getLatestSchemaVersion()); - + // Validate edge schema assertTrue(edgeSchemaList.size() == 0); } @@ -223,23 +223,23 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup { assertTrue(false); } } - + @Test public void testInvalidVertexOrEdge() throws SchemaProviderException { try { OxmSchemaProvider schemaProvider = new OxmSchemaProvider(); schemaProvider.loadSchema(); - VertexSchema vertSchema = + VertexSchema vertSchema = schemaProvider.getVertexSchema("bad-node", schemaProvider.getLatestSchemaVersion()); assertTrue(vertSchema == null); - EdgeSchema edgeSchema = schemaProvider.getEdgeSchema("org.onap.relationships.inventory.LocatedIn", + EdgeSchema edgeSchema = schemaProvider.getEdgeSchema("org.onap.relationships.inventory.LocatedIn", "cloud-region", "bad-node", schemaProvider.getLatestSchemaVersion()); assertTrue(edgeSchema == null); - - Set edgeSchemaList = - schemaProvider.getAdjacentEdgeSchema("org.onap.nodes.bad-node", + + Set edgeSchemaList = + schemaProvider.getAdjacentEdgeSchema("org.onap.nodes.bad-node", schemaProvider.getLatestSchemaVersion()); assertTrue(edgeSchemaList.isEmpty()); } diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml index 8c1b72fc..3e21f455 100644 --- a/aai-schema-ingest/pom.xml +++ b/aai-schema-ingest/pom.xml @@ -26,7 +26,7 @@ limitations under the License. org.onap.aai.aai-common aai-parent - 1.6.9-SNAPSHOT + 1.6.10-SNAPSHOT ../aai-parent/pom.xml aai-schema-ingest diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorTest.java index a9cd1f74..8fdce62b 100644 --- a/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorTest.java +++ b/aai-schema-ingest/src/test/java/org/onap/aai/edges/EdgeIngestorTest.java @@ -50,10 +50,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = {MockProvider.class, EdgesConfiguration.class}) @TestPropertySource( - properties = { - "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test.properties", - "spring.main.allow-bean-definition-overriding=true" - }) + properties = {"schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test.properties"}) + @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) @SpringBootTest public class EdgeIngestorTest { diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java index dc4e1e46..7035affd 100644 --- a/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java +++ b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java @@ -51,10 +51,7 @@ import org.w3c.dom.Document; @RunWith(SpringJUnit4ClassRunner.class) @TestPropertySource( - properties = { - "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-ss-wiring-test.properties", - "spring.main.allow-bean-definition-overriding=true" - }) + properties = {"schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-ss-wiring-test.properties"}) @ContextConfiguration(classes = {MockProvider.class, NodesConfiguration.class}) @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java index 2a5068f2..af94765f 100644 --- a/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java +++ b/aai-schema-ingest/src/test/java/org/onap/aai/setup/SchemaLocationsBeanXMLSetterWithPropFileTest.java @@ -23,14 +23,12 @@ package org.onap.aai.setup; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -@Ignore("Support of schema ingest via context configuration with prop file is removed as it won't work with spring boot 2") @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = {"classpath:forWiringTests/testUsingPropFileContext.xml"}) public class SchemaLocationsBeanXMLSetterWithPropFileTest { diff --git a/aai-schema-ingest/src/test/resources/forWiringTests/testUsingPropFileContext.xml b/aai-schema-ingest/src/test/resources/forWiringTests/testUsingPropFileContext.xml index b4e2c026..1d3e61e4 100644 --- a/aai-schema-ingest/src/test/resources/forWiringTests/testUsingPropFileContext.xml +++ b/aai-schema-ingest/src/test/resources/forWiringTests/testUsingPropFileContext.xml @@ -14,6 +14,6 @@ - + - + \ No newline at end of file diff --git a/aai-utils/pom.xml b/aai-utils/pom.xml index ec16328b..17a15256 100644 --- a/aai-utils/pom.xml +++ b/aai-utils/pom.xml @@ -29,7 +29,7 @@ org.onap.aai.aai-common aai-parent - 1.6.9-SNAPSHOT + 1.6.10-SNAPSHOT ../aai-parent/pom.xml aai-utils diff --git a/pom.xml b/pom.xml index d5840d72..ab6b7ffc 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ org.onap.aai.aai-common aai-common - 1.6.9-SNAPSHOT + 1.6.10-SNAPSHOT pom aai-aai-common Contains all of the common code for resources and traversal repos @@ -261,4 +261,3 @@ - diff --git a/version.properties b/version.properties index 5fc34cc4..c7bd1896 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ major_version=1 minor_version=6 -patch_version=9 +patch_version=10 base_version=${major_version}.${minor_version}.${patch_version}