From 06cdb18d75ba3bb8f50731859111d1696663aec8 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Sun, 2 Feb 2025 12:47:41 +0100 Subject: [PATCH] Spring-boot 3 upgrade in traversal Issue-ID: AAI-4115 Change-Id: I509bcc0a7893bb84ae46a774cea10b9169d7083c Signed-off-by: Fiete Ostkamp --- aai-traversal/pom.xml | 102 +++++---------------- aai-traversal/src/main/docker/Dockerfile | 2 +- aai-traversal/src/main/docker/docker-entrypoint.sh | 5 +- .../src/main/java/org/onap/aai/TraversalApp.java | 8 +- .../java/org/onap/aai/config/AuthProperties.java | 2 +- .../java/org/onap/aai/config/ErrorHandler.java | 10 +- .../java/org/onap/aai/config/SecurityConfig.java | 6 +- .../java/org/onap/aai/dbgraphmap/SearchGraph.java | 10 +- .../interceptors/post/InvalidResponseStatus.java | 10 +- .../post/ResponseHeaderManipulation.java | 10 +- .../post/ResponseTransactionLogging.java | 10 +- .../aai/interceptors/pre/HeaderValidation.java | 12 +-- .../interceptors/pre/HttpHeaderInterceptor.java | 10 +- .../pre/RequestHeaderManipulation.java | 10 +- .../aai/interceptors/pre/RequestModification.java | 12 +-- .../pre/RequestTransactionLogging.java | 12 +-- .../aai/interceptors/pre/RetiredInterceptor.java | 10 +- .../aai/interceptors/pre/VersionInterceptor.java | 10 +- .../interceptors/pre/VersionLatestInterceptor.java | 8 +- .../main/java/org/onap/aai/rest/CQ2Gremlin.java | 19 ++-- .../java/org/onap/aai/rest/CQ2GremlinTest.java | 21 ++--- .../main/java/org/onap/aai/rest/DslConsumer.java | 6 +- .../org/onap/aai/rest/GlobalExceptionHandler.java | 4 +- .../main/java/org/onap/aai/rest/QueryConsumer.java | 46 +++++----- .../java/org/onap/aai/rest/RecentAPIConsumer.java | 26 +++--- .../java/org/onap/aai/rest/TraversalConsumer.java | 10 +- .../src/main/java/org/onap/aai/rest/dsl/Edge.java | 2 +- .../org/onap/aai/rest/dsl/V1DslQueryProcessor.java | 4 +- .../org/onap/aai/rest/dsl/V2DslQueryProcessor.java | 4 +- .../aai/rest/search/GenericQueryProcessor.java | 4 +- .../org/onap/aai/rest/search/LocalCQConfig.java | 2 +- .../search/ModelAndNamedQueryRestProvider.java | 22 ++--- .../onap/aai/rest/search/NodeQueryProcessor.java | 4 +- .../aai/rest/search/SchemaServiceCQConfig.java | 2 +- .../org/onap/aai/rest/search/SearchProvider.java | 24 ++--- .../org/onap/aai/rest/util/AAIExtensionMap.java | 10 +- .../java/org/onap/aai/rest/util/EchoResponse.java | 22 ++--- .../org/onap/aai/rest/util/ValidateEncoding.java | 4 +- .../java/org/onap/aai/service/RetiredService.java | 2 +- .../org/onap/aai/util/GenericQueryBuilder.java | 2 +- .../java/org/onap/aai/util/NodesQueryBuilder.java | 2 +- .../java/org/onap/aai/web/JerseyConfiguration.java | 7 +- .../java/org/onap/aai/web/LocalHostAccessLog.java | 66 ------------- .../src/main/resources/application.properties | 15 +-- .../java/org/onap/aai/AAIGremlinQueryTest.java | 1 - .../src/test/java/org/onap/aai/HttpTestUtil.java | 14 +-- .../test/java/org/onap/aai/QueryParameterTest.java | 3 +- .../test/java/org/onap/aai/SubgraphPruneTest.java | 5 +- .../org/onap/aai/TraversalTestConfiguration.java | 31 ++++--- .../java/org/onap/aai/WebClientConfiguration.java | 4 +- .../aai/dbgraphmap/SearchGraphNamedQueryTest.java | 12 +-- .../org/onap/aai/dbgraphmap/SearchGraphTest.java | 4 +- .../post/InvalidResponseStatusTest.java | 4 +- .../post/ResponseHeaderManipulationTest.java | 8 +- .../aai/interceptors/pre/HeaderValidationTest.java | 6 +- .../pre/HttpHeaderInterceptorTest.java | 2 +- .../interceptors/pre/RequestModificationTest.java | 12 +-- .../pre/RequestTransactionLoggingTest.java | 9 +- .../interceptors/pre/RetiredInterceptorTest.java | 7 +- .../interceptors/pre/VersionInterceptorTest.java | 6 +- .../org/onap/aai/rest/AbstractSpringRestTest.java | 2 +- .../java/org/onap/aai/rest/BadQueryFormatTest.java | 3 +- .../aai/rest/GfpVserverDataStoredQueryTest.java | 15 ++- .../onap/aai/rest/GlobalExceptionHandlerTest.java | 6 +- .../java/org/onap/aai/rest/QueryConsumerTest.java | 4 +- .../org/onap/aai/rest/SearchProviderRestTest.java | 1 + .../java/org/onap/aai/rest/dsl/EdgeLabelTest.java | 3 +- .../test/java/org/onap/aai/rest/dsl/EdgeTest.java | 3 +- .../history/AbstractSpringHistoryRestTest.java | 3 +- .../CloudRegionsByGenericVnfHGPairsTest.java | 3 +- .../aai/rest/search/GetCustomQueryConfigTest.java | 2 +- .../aai/rest/search/GetDHVLogicalLinkTest.java | 3 +- .../aai/rest/search/GetServiceTopologyTest.java | 3 +- .../onap/aai/rest/search/GroovyShellImplTest.java | 10 +- .../search/ModelAndNamedQueryRestProviderTest.java | 14 +-- .../onap/aai/rest/search/SearchProviderTest.java | 12 +-- .../org/onap/aai/rest/util/EchoResponseTest.java | 14 +-- .../onap/aai/rest/util/ValidateEncodingTest.java | 8 +- .../LowerHyphenToLowerCamelConverterTest.java | 2 +- .../src/test/resources/application-test.properties | 8 +- onap-java-formatter.xml | 6 +- pom.xml | 8 +- version.properties | 4 +- 83 files changed, 369 insertions(+), 485 deletions(-) delete mode 100644 aai-traversal/src/main/java/org/onap/aai/web/LocalHostAccessLog.java diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml index 68d9af82..3e129e4d 100644 --- a/aai-traversal/pom.xml +++ b/aai-traversal/pom.xml @@ -26,18 +26,18 @@ org.onap.aai.traversal traversal - 1.15.5-SNAPSHOT + 1.16.0-SNAPSHOT org.onap.aai.traversal aai-traversal - 11 + 17 org.onap.aai.TraversalApp true - 11 - 11 + 17 + 17 @@ -92,7 +92,7 @@ - 2021.0.9 + 2022.0.5 @@ -101,15 +101,9 @@ 4.17.0 1.5.1 - - 4.0.1 4.13.2 - 1.6.14 - 1.6.6 3.4.0 - 1.6.1 - true @@ -303,9 +297,12 @@ 1.8.13 - javax.ws.rs - javax.ws.rs-api - 2.1 + org.apache.httpcomponents.client5 + httpclient5 + + + jakarta.ws.rs + jakarta.ws.rs-api jakarta.xml.bind @@ -343,42 +340,25 @@ org.glassfish - javax.json - 1.1.4 + jakarta.json + 2.0.1 org.janusgraph janusgraph-cql - - - org.slf4j - slf4j-log4j12 - - - org.hibernate - hibernate-validator - - org.janusgraph janusgraph-inmemory - ${janusgraph.version} test org.apache.tinkerpop gremlin-driver - - - org.codehaus.groovy - groovy - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider + com.fasterxml.jackson.jakarta.rs + jackson-jakarta-rs-json-provider com.fasterxml.jackson.dataformat @@ -391,7 +371,6 @@ org.eclipse.persistence org.eclipse.persistence.moxy - compile org.javatuples @@ -414,26 +393,10 @@ org.onap.aai.aai-common aai-core - - org.eclipse.jetty - jetty-http - - - org.eclipse.jetty - jetty-server - org.springframework spring-web - - org.onap.aai - aai-logging - - - junit - junit - @@ -443,16 +406,10 @@ org.springframework.boot spring-boot-starter-jersey - - - org.springframework.boot - spring-boot-starter-tomcat - - - - org.springframework.boot - spring-boot-starter-validation + + org.springframework.boot + spring-boot-starter-validation org.springframework.boot @@ -465,16 +422,13 @@ test - org.springframework.boot - spring-boot-starter-jetty - - - org.springframework.cloud - spring-cloud-starter-sleuth + io.micrometer + micrometer-tracing-bridge-brave + 1.0.12 - org.springframework.cloud - spring-cloud-sleuth-zipkin + io.zipkin.reporter2 + zipkin-reporter-brave org.springframework.boot @@ -538,7 +492,7 @@ org.projectlombok lombok - 1.18.34 + 1.18.36 provided @@ -562,11 +516,6 @@ java-driver-query-builder ${cassandra-driver.version} - - com.datastax.oss - native-protocol - ${datastax.native-protocol.version} - @@ -654,7 +603,6 @@ com.mycila license-maven-plugin - 3.0
LICENSE.TXT
@@ -881,7 +829,6 @@ com.mycila license-maven-plugin - 3.0
LICENSE.TXT
@@ -896,7 +843,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 ${project.build.outputDirectory} diff --git a/aai-traversal/src/main/docker/Dockerfile b/aai-traversal/src/main/docker/Dockerfile index 3bd8e4ea..0815e6a5 100644 --- a/aai-traversal/src/main/docker/Dockerfile +++ b/aai-traversal/src/main/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:11-jre-alpine +FROM eclipse-temurin:17-jre-alpine # curl is used in the putTool script # (PUT's can't be done using the busybox wget) RUN apk --no-cache add curl diff --git a/aai-traversal/src/main/docker/docker-entrypoint.sh b/aai-traversal/src/main/docker/docker-entrypoint.sh index 9325ec64..1579e9d5 100644 --- a/aai-traversal/src/main/docker/docker-entrypoint.sh +++ b/aai-traversal/src/main/docker/docker-entrypoint.sh @@ -43,7 +43,7 @@ JAVA_CMD="exec java"; JVM_OPTS="${PRE_JVM_ARGS}"; JVM_OPTS="${JVM_OPTS} -XX:HeapDumpPath=/opt/app/aai-traversal/logs/ajsc-jetty/heap-dump"; JVM_OPTS="${JVM_OPTS} -XX:MaxMetaspaceSize=${MAX_METASPACE_SIZE}"; -JVM_OPTS="${JVM_OPTS} -XX:MaxRAMPercentage=${MAX_RAM_PERCENTAGE:-60}"; +JVM_OPTS="${JVM_OPTS} -XX:MaxRAMPercentage=${MAX_RAM_PERCENTAGE:-70}"; JVM_OPTS="${JVM_OPTS} -server"; JVM_OPTS="${JVM_OPTS} -XX:NewSize=512m"; @@ -51,9 +51,6 @@ JVM_OPTS="${JVM_OPTS} -XX:MaxNewSize=512m"; JVM_OPTS="${JVM_OPTS} -XX:SurvivorRatio=8"; JVM_OPTS="${JVM_OPTS} -XX:+DisableExplicitGC"; JVM_OPTS="${JVM_OPTS} -XX:+UseG1GC"; -JVM_OPTS="${JVM_OPTS} -XX:+CMSParallelRemarkEnabled"; -JVM_OPTS="${JVM_OPTS} -XX:+CMSClassUnloadingEnabled"; -JVM_OPTS="${JVM_OPTS} -XX:-UseBiasedLocking"; JVM_OPTS="${JVM_OPTS} -XX:ParallelGCThreads=4"; JVM_OPTS="${JVM_OPTS} -XX:LargePageSizeInBytes=128m"; JVM_OPTS="${JVM_OPTS} -Dsun.net.inetaddr.ttl=180"; diff --git a/aai-traversal/src/main/java/org/onap/aai/TraversalApp.java b/aai-traversal/src/main/java/org/onap/aai/TraversalApp.java index 619bee9e..4c7a6a69 100644 --- a/aai-traversal/src/main/java/org/onap/aai/TraversalApp.java +++ b/aai-traversal/src/main/java/org/onap/aai/TraversalApp.java @@ -20,8 +20,8 @@ package org.onap.aai; import java.util.Map; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import org.apache.commons.lang3.exception.ExceptionUtils; import org.onap.aai.aailog.logs.AaiDebugLog; import org.onap.aai.config.SpringContextAware; @@ -45,6 +45,7 @@ import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfigurat import org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; import org.springframework.core.env.Profiles; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; @@ -68,6 +69,7 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe basePackages = {"org.onap.aai.config", "org.onap.aai.web", "org.onap.aai.setup", "org.onap.aai.tasks", "org.onap.aai.service", "org.onap.aai.rest", "org.onap.aai.aaf", "org.onap.aai.aailog", "org.onap.aai.introspection", "org.onap.aai.rest.notification"}) +@Configuration public class TraversalApp { private static final Logger logger = LoggerFactory.getLogger(TraversalApp.class.getName()); @@ -141,7 +143,7 @@ public class TraversalApp { ErrorLogHelper.logException(aai); ErrorLogHelper.logError(aai.getCode(), ex.getMessage() + ", resolve and restart Traversal"); - throw aai; + throw ex; } MDC.setContextMap(contextMap); diff --git a/aai-traversal/src/main/java/org/onap/aai/config/AuthProperties.java b/aai-traversal/src/main/java/org/onap/aai/config/AuthProperties.java index 1ecffb6f..7ed7051f 100644 --- a/aai-traversal/src/main/java/org/onap/aai/config/AuthProperties.java +++ b/aai-traversal/src/main/java/org/onap/aai/config/AuthProperties.java @@ -22,7 +22,7 @@ package org.onap.aai.config; import java.util.List; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotEmpty; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/aai-traversal/src/main/java/org/onap/aai/config/ErrorHandler.java b/aai-traversal/src/main/java/org/onap/aai/config/ErrorHandler.java index 40a0eee8..dcb225ec 100644 --- a/aai-traversal/src/main/java/org/onap/aai/config/ErrorHandler.java +++ b/aai-traversal/src/main/java/org/onap/aai/config/ErrorHandler.java @@ -23,11 +23,11 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.core.MediaType; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.core.MediaType; import org.onap.aai.exceptions.AAIException; import org.onap.aai.logging.ErrorLogHelper; diff --git a/aai-traversal/src/main/java/org/onap/aai/config/SecurityConfig.java b/aai-traversal/src/main/java/org/onap/aai/config/SecurityConfig.java index 62bcba32..fa45b103 100644 --- a/aai-traversal/src/main/java/org/onap/aai/config/SecurityConfig.java +++ b/aai-traversal/src/main/java/org/onap/aai/config/SecurityConfig.java @@ -20,6 +20,8 @@ package org.onap.aai.config; +import static org.springframework.security.config.Customizer.withDefaults; + import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -37,11 +39,11 @@ public class SecurityConfig { SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception{ httpSecurity.csrf(csrf -> csrf.disable()) .authorizeHttpRequests(requests -> requests - .antMatchers("/util/echo", "/actuator/**") + .requestMatchers("/util/echo", "/actuator/**") .permitAll() .anyRequest() .authenticated()) - .httpBasic(); + .httpBasic(withDefaults()); return httpSecurity.build(); } diff --git a/aai-traversal/src/main/java/org/onap/aai/dbgraphmap/SearchGraph.java b/aai-traversal/src/main/java/org/onap/aai/dbgraphmap/SearchGraph.java index 23e82e57..f0a1d2a2 100644 --- a/aai-traversal/src/main/java/org/onap/aai/dbgraphmap/SearchGraph.java +++ b/aai-traversal/src/main/java/org/onap/aai/dbgraphmap/SearchGraph.java @@ -27,10 +27,10 @@ import java.net.URI; import java.util.*; import java.util.stream.Stream; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.xml.bind.JAXBException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.xml.bind.JAXBException; import org.apache.commons.lang3.StringUtils; import org.apache.tinkerpop.gremlin.process.traversal.P; @@ -159,7 +159,7 @@ public class SearchGraph { } List results = queryBuilder.toList(); if (results.isEmpty()) { - String errorMessage = String.format("No Node of type %s ", + String errorMessage = "No Node of type %s ".formatted( genericQueryBuilder.getStartNodeType(), " found for properties: %s", genericQueryBuilder.getStartNodeKeyParams().toString()); throw new AAIException("AAI_6114", errorMessage); diff --git a/aai-traversal/src/main/java/org/onap/aai/interceptors/post/InvalidResponseStatus.java b/aai-traversal/src/main/java/org/onap/aai/interceptors/post/InvalidResponseStatus.java index b28f0dd2..c3a60e92 100644 --- a/aai-traversal/src/main/java/org/onap/aai/interceptors/post/InvalidResponseStatus.java +++ b/aai-traversal/src/main/java/org/onap/aai/interceptors/post/InvalidResponseStatus.java @@ -23,11 +23,11 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.core.MediaType; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.core.MediaType; import org.onap.aai.exceptions.AAIException; import org.onap.aai.interceptors.AAIContainerFilter; diff --git a/aai-traversal/src/main/java/org/onap/aai/interceptors/post/ResponseHeaderManipulation.java b/aai-traversal/src/main/java/org/onap/aai/interceptors/post/ResponseHeaderManipulation.java index d13b122c..f3f45c9b 100644 --- a/aai-traversal/src/main/java/org/onap/aai/interceptors/post/ResponseHeaderManipulation.java +++ b/aai-traversal/src/main/java/org/onap/aai/interceptors/post/ResponseHeaderManipulation.java @@ -21,11 +21,11 @@ package org.onap.aai.interceptors.post; import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.core.MediaType; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.core.MediaType; import org.onap.aai.interceptors.AAIContainerFilter; import org.onap.aai.interceptors.AAIHeaderProperties; diff --git a/aai-traversal/src/main/java/org/onap/aai/interceptors/post/ResponseTransactionLogging.java b/aai-traversal/src/main/java/org/onap/aai/interceptors/post/ResponseTransactionLogging.java index 06c10e69..cecbf525 100644 --- a/aai-traversal/src/main/java/org/onap/aai/interceptors/post/ResponseTransactionLogging.java +++ b/aai-traversal/src/main/java/org/onap/aai/interceptors/post/ResponseTransactionLogging.java @@ -24,11 +24,11 @@ import com.google.gson.JsonObject; import java.io.IOException; import java.util.*; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.core.PathSegment; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.core.PathSegment; import org.onap.aai.exceptions.AAIException; import org.onap.aai.interceptors.AAIContainerFilter; diff --git a/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/HeaderValidation.java b/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/HeaderValidation.java index ed13863a..aff54dd1 100644 --- a/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/HeaderValidation.java +++ b/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/HeaderValidation.java @@ -24,12 +24,12 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.onap.aai.exceptions.AAIException; import org.onap.aai.interceptors.AAIContainerFilter; diff --git a/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/HttpHeaderInterceptor.java b/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/HttpHeaderInterceptor.java index 5d9c1fff..c61d0191 100644 --- a/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/HttpHeaderInterceptor.java +++ b/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/HttpHeaderInterceptor.java @@ -21,11 +21,11 @@ package org.onap.aai.interceptors.pre; import java.io.IOException; -import javax.annotation.Priority; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; +import jakarta.annotation.Priority; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; import org.onap.aai.interceptors.AAIContainerFilter; import org.onap.aai.interceptors.AAIHeaderProperties; diff --git a/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/RequestHeaderManipulation.java b/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/RequestHeaderManipulation.java index 4946e7d2..6094c7de 100644 --- a/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/RequestHeaderManipulation.java +++ b/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/RequestHeaderManipulation.java @@ -22,11 +22,11 @@ package org.onap.aai.interceptors.pre; import java.util.Collections; import java.util.regex.Matcher; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.MultivaluedMap; import org.onap.aai.interceptors.AAIContainerFilter; import org.onap.aai.interceptors.AAIHeaderProperties; diff --git a/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/RequestModification.java b/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/RequestModification.java index f7d863dd..0e238c39 100644 --- a/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/RequestModification.java +++ b/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/RequestModification.java @@ -26,12 +26,12 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriBuilder; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriBuilder; import org.onap.aai.interceptors.AAIContainerFilter; diff --git a/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/RequestTransactionLogging.java b/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/RequestTransactionLogging.java index 88774842..c0448e42 100644 --- a/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/RequestTransactionLogging.java +++ b/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/RequestTransactionLogging.java @@ -25,12 +25,12 @@ import java.security.SecureRandom; import java.util.Random; import java.util.UUID; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.UriInfo; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.UriInfo; import org.onap.aai.exceptions.AAIException; import org.onap.aai.interceptors.AAIContainerFilter; diff --git a/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/RetiredInterceptor.java b/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/RetiredInterceptor.java index d1aa2e98..769c7827 100644 --- a/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/RetiredInterceptor.java +++ b/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/RetiredInterceptor.java @@ -25,11 +25,11 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.Response; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.Response; import org.onap.aai.exceptions.AAIException; import org.onap.aai.interceptors.AAIContainerFilter; diff --git a/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/VersionInterceptor.java b/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/VersionInterceptor.java index 944d9997..ac1a9cc3 100644 --- a/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/VersionInterceptor.java +++ b/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/VersionInterceptor.java @@ -25,11 +25,11 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.Response; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.Response; import org.onap.aai.exceptions.AAIException; import org.onap.aai.interceptors.AAIContainerFilter; diff --git a/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/VersionLatestInterceptor.java b/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/VersionLatestInterceptor.java index 22f923d7..67f0bcf1 100644 --- a/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/VersionLatestInterceptor.java +++ b/aai-traversal/src/main/java/org/onap/aai/interceptors/pre/VersionLatestInterceptor.java @@ -21,10 +21,10 @@ package org.onap.aai.interceptors.pre; import java.net.URI; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; import org.onap.aai.interceptors.AAIContainerFilter; import org.onap.aai.setup.SchemaVersions; diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/CQ2Gremlin.java b/aai-traversal/src/main/java/org/onap/aai/rest/CQ2Gremlin.java index 6b8382b0..0997f1cd 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/CQ2Gremlin.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/CQ2Gremlin.java @@ -23,15 +23,15 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.onap.aai.config.SpringContextAware; import org.onap.aai.introspection.LoaderFactory; @@ -66,7 +66,6 @@ public class CQ2Gremlin extends RESTAPI { } @PUT - @Path("") @Consumes({MediaType.APPLICATION_JSON}) @Produces({MediaType.APPLICATION_JSON}) public Response getC2Qgremlin(@RequestBody Map content, diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/CQ2GremlinTest.java b/aai-traversal/src/main/java/org/onap/aai/rest/CQ2GremlinTest.java index 76da9d83..21b3ca8e 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/CQ2GremlinTest.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/CQ2GremlinTest.java @@ -29,15 +29,15 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; -import javax.ws.rs.Consumes; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; @@ -90,7 +90,6 @@ public class CQ2GremlinTest extends RESTAPI { } @PUT - @Path("") @Consumes({MediaType.APPLICATION_JSON}) @Produces({MediaType.APPLICATION_JSON}) public Response getC2Qgremlin(@RequestBody CustomQueryTestDTO content, @@ -161,7 +160,7 @@ public class CQ2GremlinTest extends RESTAPI { StringBuilder vertexIdentifier = new StringBuilder(); List keyValues = new ArrayList<>(); keyValues.add(T.id.toString()); - keyValues.add(String.format("%02d", verticesMap.size() * 10)); + keyValues.add("%02d".formatted(verticesMap.size() * 10)); AtomicInteger index = new AtomicInteger(0); vertex.forEach((k, v) -> { if (index.get() == 1) diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/DslConsumer.java b/aai-traversal/src/main/java/org/onap/aai/rest/DslConsumer.java index 43ad1ff2..aa8cd163 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/DslConsumer.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/DslConsumer.java @@ -30,9 +30,9 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.javatuples.Pair; diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/GlobalExceptionHandler.java b/aai-traversal/src/main/java/org/onap/aai/rest/GlobalExceptionHandler.java index c934e8c3..4e18ebce 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/GlobalExceptionHandler.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/GlobalExceptionHandler.java @@ -24,8 +24,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.MediaType; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.MediaType; import org.janusgraph.core.SchemaViolationException; import org.onap.aai.exceptions.AAIException; diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/QueryConsumer.java b/aai-traversal/src/main/java/org/onap/aai/rest/QueryConsumer.java index f775e0fc..c1120016 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/QueryConsumer.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/QueryConsumer.java @@ -28,22 +28,22 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriInfo; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriInfo; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Vertex; @@ -91,15 +91,11 @@ public class QueryConsumer extends TraversalConsumer { private static final Logger LOGGER = LoggerFactory.getLogger(QueryConsumer.class); - private HttpEntry traversalUriHttpEntry; - - private SchemaVersions schemaVersions; - - private String basePath; - - private GremlinServerSingleton gremlinServerSingleton; - - private XmlFormatTransformer xmlFormatTransformer; + private final HttpEntry traversalUriHttpEntry; + private final SchemaVersions schemaVersions; + private final String basePath; + private final GremlinServerSingleton gremlinServerSingleton; + private final XmlFormatTransformer xmlFormatTransformer; @Autowired public QueryConsumer(HttpEntry traversalUriHttpEntry, SchemaVersions schemaVersions, diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/RecentAPIConsumer.java b/aai-traversal/src/main/java/org/onap/aai/rest/RecentAPIConsumer.java index a74aeb71..f36c7f1b 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/RecentAPIConsumer.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/RecentAPIConsumer.java @@ -22,19 +22,19 @@ package org.onap.aai.rest; import java.util.List; import java.util.concurrent.TimeUnit; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriInfo; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriInfo; import org.onap.aai.concurrent.AaiCallable; import org.onap.aai.exceptions.AAIException; diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/TraversalConsumer.java b/aai-traversal/src/main/java/org/onap/aai/rest/TraversalConsumer.java index df7d580d..f6be3dca 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/TraversalConsumer.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/TraversalConsumer.java @@ -19,14 +19,9 @@ */ package org.onap.aai.rest; -import java.security.Principal; -import java.util.Collections; import java.util.Set; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; -import javax.ws.rs.core.MultivaluedMap; -import org.apache.commons.lang3.ObjectUtils; -import org.apache.commons.lang3.StringUtils; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; @@ -34,12 +29,12 @@ import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.Subgra import org.onap.aai.config.SpringContextAware; import org.onap.aai.db.props.AAIProperties; import org.onap.aai.exceptions.AAIException; -import org.onap.aai.introspection.sideeffect.OwnerCheck; import org.onap.aai.rest.db.HttpEntry; import org.onap.aai.restcore.RESTAPI; import org.onap.aai.serialization.engines.QueryStyle; import org.onap.aai.serialization.engines.TransactionalGraphEngine; import org.onap.aai.serialization.queryformats.Format; +import org.springframework.beans.factory.annotation.Autowired; public abstract class TraversalConsumer extends RESTAPI { @@ -52,6 +47,7 @@ public abstract class TraversalConsumer extends RESTAPI { private Long endTime = null; private Long furthestInThePast = null; + @Autowired public TraversalConsumer() { this.historyTruncateWindow = Integer.parseInt(SpringContextAware.getApplicationContext() .getEnvironment().getProperty("history.truncate.window.days", "365")); diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/dsl/Edge.java b/aai-traversal/src/main/java/org/onap/aai/rest/dsl/Edge.java index 111c188d..27c26b03 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/dsl/Edge.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/dsl/Edge.java @@ -52,7 +52,7 @@ public class Edge { @Override public String toString() { - return String.format("labels: %s, direction: %s ", + return "labels: %s, direction: %s ".formatted( labels.stream().map(EdgeLabel::getLabel).collect(Collectors.joining(",")), this.getDirection().name()); } diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/dsl/V1DslQueryProcessor.java b/aai-traversal/src/main/java/org/onap/aai/rest/dsl/V1DslQueryProcessor.java index 95abbda2..45f93593 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/dsl/V1DslQueryProcessor.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/dsl/V1DslQueryProcessor.java @@ -27,7 +27,9 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; -import org.antlr.v4.runtime.*; +import org.antlr.v4.runtime.CharStreams; +import org.antlr.v4.runtime.CommonTokenStream; +import org.antlr.v4.runtime.Lexer; import org.antlr.v4.runtime.tree.ParseTree; import org.antlr.v4.runtime.tree.ParseTreeWalker; import org.onap.aai.config.SpringContextAware; diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/dsl/V2DslQueryProcessor.java b/aai-traversal/src/main/java/org/onap/aai/rest/dsl/V2DslQueryProcessor.java index 5fed1409..5970f06c 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/dsl/V2DslQueryProcessor.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/dsl/V2DslQueryProcessor.java @@ -29,7 +29,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.antlr.v4.runtime.*; +import org.antlr.v4.runtime.CharStreams; +import org.antlr.v4.runtime.CommonTokenStream; +import org.antlr.v4.runtime.Lexer; import org.antlr.v4.runtime.tree.ParseTree; import org.antlr.v4.runtime.tree.ParseTreeWalker; import org.onap.aai.config.SpringContextAware; diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/search/GenericQueryProcessor.java b/aai-traversal/src/main/java/org/onap/aai/rest/search/GenericQueryProcessor.java index a6f87892..5349ea82 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/search/GenericQueryProcessor.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/search/GenericQueryProcessor.java @@ -25,8 +25,8 @@ import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/search/LocalCQConfig.java b/aai-traversal/src/main/java/org/onap/aai/rest/search/LocalCQConfig.java index 0ddf3b08..eca84254 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/search/LocalCQConfig.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/search/LocalCQConfig.java @@ -27,7 +27,7 @@ import java.util.Date; import java.util.Timer; import java.util.TimerTask; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.onap.aai.exceptions.AAIException; import org.onap.aai.logging.ErrorLogHelper; diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/search/ModelAndNamedQueryRestProvider.java b/aai-traversal/src/main/java/org/onap/aai/rest/search/ModelAndNamedQueryRestProvider.java index cb31d1ab..b76b74ce 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/search/ModelAndNamedQueryRestProvider.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/search/ModelAndNamedQueryRestProvider.java @@ -23,17 +23,17 @@ import java.net.URI; import java.util.ArrayList; import java.util.Optional; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriInfo; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriInfo; import org.onap.aai.aailog.logs.AaiDBTraversalMetricLog; import org.onap.aai.concurrent.AaiCallable; diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/search/NodeQueryProcessor.java b/aai-traversal/src/main/java/org/onap/aai/rest/search/NodeQueryProcessor.java index 910102ae..54ff2339 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/search/NodeQueryProcessor.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/search/NodeQueryProcessor.java @@ -24,8 +24,8 @@ import java.util.*; import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.structure.Vertex; diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/search/SchemaServiceCQConfig.java b/aai-traversal/src/main/java/org/onap/aai/rest/search/SchemaServiceCQConfig.java index 143d2a8b..40fb51d3 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/search/SchemaServiceCQConfig.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/search/SchemaServiceCQConfig.java @@ -22,7 +22,7 @@ package org.onap.aai.rest.search; import java.util.HashMap; import java.util.Map; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.onap.aai.restclient.RestClient; import org.slf4j.Logger; diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/search/SearchProvider.java b/aai-traversal/src/main/java/org/onap/aai/rest/search/SearchProvider.java index 27fccb8b..a8c95591 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/search/SearchProvider.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/search/SearchProvider.java @@ -24,18 +24,18 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriInfo; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriInfo; import org.onap.aai.aailog.logs.AaiDBTraversalMetricLog; import org.onap.aai.concurrent.AaiCallable; diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/util/AAIExtensionMap.java b/aai-traversal/src/main/java/org/onap/aai/rest/util/AAIExtensionMap.java index 4e5651d4..4eda2629 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/util/AAIExtensionMap.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/util/AAIExtensionMap.java @@ -24,9 +24,9 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.HashMap; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.UriInfo; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.Vertex; @@ -53,9 +53,9 @@ public class AAIExtensionMap { // ----------------------------------------------------------------------- // postExtErrorCallback | java.lang.reflect.Method (RW) // ----------------------------------------------------------------------- - // servletRequest | javax.servlet.http.HttpServletRequest (RO) + // servletRequest | jakarta.servlet.http.HttpServletRequest (RO) // ----------------------------------------------------------------------- - // headers | javax.ws.rs.core.HttpHeaders (RO) + // headers | jakarta.ws.rs.core.HttpHeaders (RO) // ----------------------------------------------------------------------- // objFromRequestType | String (ex. ?org.onap.aai.domain.yang.Vce?) (RO) // ----------------------------------------------------------------------- diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/util/EchoResponse.java b/aai-traversal/src/main/java/org/onap/aai/rest/util/EchoResponse.java index e0c646ab..03b60e70 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/util/EchoResponse.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/util/EchoResponse.java @@ -20,16 +20,16 @@ package org.onap.aai.rest.util; import java.util.ArrayList; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.onap.aai.exceptions.AAIException; import org.onap.aai.logging.ErrorLogHelper; @@ -52,7 +52,7 @@ public class EchoResponse extends RESTAPI { public EchoResponse(AaiGraphChecker aaiGraphChecker) { this.aaiGraphChecker = aaiGraphChecker; } - + private static final String UP_RESPONSE="{\"status\":\"UP\",\"groups\":[\"liveness\",\"readiness\"]}"; /** diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/util/ValidateEncoding.java b/aai-traversal/src/main/java/org/onap/aai/rest/util/ValidateEncoding.java index fcf7e42c..93ffc212 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/util/ValidateEncoding.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/util/ValidateEncoding.java @@ -22,8 +22,8 @@ package org.onap.aai.rest.util; import java.io.UnsupportedEncodingException; import java.net.URI; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriInfo; import org.springframework.web.util.UriUtils; diff --git a/aai-traversal/src/main/java/org/onap/aai/service/RetiredService.java b/aai-traversal/src/main/java/org/onap/aai/service/RetiredService.java index dd95f0fd..23950c96 100644 --- a/aai-traversal/src/main/java/org/onap/aai/service/RetiredService.java +++ b/aai-traversal/src/main/java/org/onap/aai/service/RetiredService.java @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.List; import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.PropertySource; import org.springframework.stereotype.Service; diff --git a/aai-traversal/src/main/java/org/onap/aai/util/GenericQueryBuilder.java b/aai-traversal/src/main/java/org/onap/aai/util/GenericQueryBuilder.java index 08f59710..7cf83d38 100644 --- a/aai-traversal/src/main/java/org/onap/aai/util/GenericQueryBuilder.java +++ b/aai-traversal/src/main/java/org/onap/aai/util/GenericQueryBuilder.java @@ -20,7 +20,7 @@ package org.onap.aai.util; import java.util.List; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import org.onap.aai.introspection.Loader; import org.onap.aai.serialization.engines.TransactionalGraphEngine; import org.onap.aai.serialization.queryformats.utils.UrlBuilder; diff --git a/aai-traversal/src/main/java/org/onap/aai/util/NodesQueryBuilder.java b/aai-traversal/src/main/java/org/onap/aai/util/NodesQueryBuilder.java index 099a8c6b..935fbd0b 100644 --- a/aai-traversal/src/main/java/org/onap/aai/util/NodesQueryBuilder.java +++ b/aai-traversal/src/main/java/org/onap/aai/util/NodesQueryBuilder.java @@ -21,7 +21,7 @@ package org.onap.aai.util; import java.util.List; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import org.onap.aai.introspection.Loader; import org.onap.aai.serialization.engines.TransactionalGraphEngine; import org.onap.aai.serialization.queryformats.utils.UrlBuilder; diff --git a/aai-traversal/src/main/java/org/onap/aai/web/JerseyConfiguration.java b/aai-traversal/src/main/java/org/onap/aai/web/JerseyConfiguration.java index 959089b2..7bdfd9f5 100644 --- a/aai-traversal/src/main/java/org/onap/aai/web/JerseyConfiguration.java +++ b/aai-traversal/src/main/java/org/onap/aai/web/JerseyConfiguration.java @@ -27,9 +27,12 @@ import java.util.Collection; import java.util.Comparator; import java.util.Set; import java.util.logging.Logger; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import org.glassfish.jersey.server.ResourceConfig; -import org.onap.aai.rest.*; +import org.onap.aai.rest.CQ2Gremlin; +import org.onap.aai.rest.CQ2GremlinTest; +import org.onap.aai.rest.QueryConsumer; +import org.onap.aai.rest.RecentAPIConsumer; import org.onap.aai.rest.search.ModelAndNamedQueryRestProvider; import org.onap.aai.rest.search.SearchProvider; import org.onap.aai.rest.util.EchoResponse; diff --git a/aai-traversal/src/main/java/org/onap/aai/web/LocalHostAccessLog.java b/aai-traversal/src/main/java/org/onap/aai/web/LocalHostAccessLog.java deleted file mode 100644 index 6027c24c..00000000 --- a/aai-traversal/src/main/java/org/onap/aai/web/LocalHostAccessLog.java +++ /dev/null @@ -1,66 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * org.onap.aai - * ================================================================================ - * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * 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========================================================= - */ -package org.onap.aai.web; - -import ch.qos.logback.access.jetty.RequestLogImpl; -import java.util.Arrays; -import org.eclipse.jetty.server.handler.HandlerCollection; -import org.eclipse.jetty.server.handler.RequestLogHandler; -import org.eclipse.jetty.util.thread.QueuedThreadPool; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.web.embedded.jetty.JettyServletWebServerFactory; -import org.springframework.boot.web.servlet.server.AbstractServletWebServerFactory; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class LocalHostAccessLog { - - @Bean - public AbstractServletWebServerFactory jettyConfigBean( - @Value("${jetty.threadPool.maxThreads:200}") final String maxThreads, - @Value("${jetty.threadPool.minThreads:8}") final String minThreads) { - - JettyServletWebServerFactory jef = new JettyServletWebServerFactory(); - jef.addServerCustomizers( - (org.springframework.boot.web.embedded.jetty.JettyServerCustomizer) server -> { - - HandlerCollection handlers = new HandlerCollection(); - - Arrays.stream(server.getHandlers()).forEach(handlers::addHandler); - - RequestLogHandler requestLogHandler = new RequestLogHandler(); - requestLogHandler.setServer(server); - - RequestLogImpl requestLogImpl = new RequestLogImpl(); - requestLogImpl.setResource("/localhost-access-logback.xml"); - requestLogImpl.start(); - - requestLogHandler.setRequestLog(requestLogImpl); - handlers.addHandler(requestLogHandler); - server.setHandler(handlers); - - final QueuedThreadPool threadPool = server.getBean(QueuedThreadPool.class); - threadPool.setMaxThreads(Integer.valueOf(maxThreads)); - threadPool.setMinThreads(Integer.valueOf(minThreads)); - }); - return jef; - } -} diff --git a/aai-traversal/src/main/resources/application.properties b/aai-traversal/src/main/resources/application.properties index 0f371511..7d624b52 100644 --- a/aai-traversal/src/main/resources/application.properties +++ b/aai-traversal/src/main/resources/application.properties @@ -8,12 +8,10 @@ spring.application.name=aai-traversal spring.jersey.type=filter spring.main.allow-bean-definition-overriding=true -spring.zipkin.baseUrl=http://jaeger-collector.istio-system:9411 -spring.sleuth.trace-id128=true -spring.sleuth.sampler.probability=1.0 -spring.sleuth.propagation.type=w3c,b3 -spring.sleuth.supports-join=false -spring.sleuth.web.skip-pattern=/aai/util.* +management.tracing.enabled=false +management.tracing.sampling.probability=1.0 +management.tracing.propagation.type=w3c, b3 +management.zipkin.tracing.endpoint=http://jaeger-collector.istio-system:9411 server.servlet.context-path=${schema.uri.base.path} spring.autoconfigure.exclude=\ @@ -28,6 +26,8 @@ spring.jersey.application-path=/ jetty.threadPool.maxThreads=200 #The minimum number of threads always kept alive jetty.threadPool.minThreads=8 +# Logging pattern containing traceId and spanId; no longer provided through Sleuth by default +logging.pattern.level="%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-}]" #The number of milliseconds before an idle thread shutsdown, unless the number of active threads are less or equal to minSpareThreads server.tomcat.max-idle-time=60000 @@ -103,7 +103,8 @@ management.server.port=8448 management.endpoints.enabled-by-default=true #To Enable Actuator Endpoint, you can override this in OOM Charts management.endpoints.web.exposure.include=info, health, prometheus -management.metrics.web.server.request.autotime.enabled=false +# This property is deprecated: Should be applied at the ObservationRegistry level. +# management.metrics.web.server.request.autotime.enabled=false management.metrics.tags.group_id=aai management.info.env.enabled=true # management.metrics.tags.app_id=${info.build.artifact} diff --git a/aai-traversal/src/test/java/org/onap/aai/AAIGremlinQueryTest.java b/aai-traversal/src/test/java/org/onap/aai/AAIGremlinQueryTest.java index 57930f85..4ee4c359 100644 --- a/aai-traversal/src/test/java/org/onap/aai/AAIGremlinQueryTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/AAIGremlinQueryTest.java @@ -58,7 +58,6 @@ import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.rules.SpringClassRule; import org.springframework.test.context.junit4.rules.SpringMethodRule; 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 d57454d6..243b389c 100644 --- a/aai-traversal/src/test/java/org/onap/aai/HttpTestUtil.java +++ b/aai-traversal/src/test/java/org/onap/aai/HttpTestUtil.java @@ -29,13 +29,13 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import org.javatuples.Pair; import org.mockito.Mockito; diff --git a/aai-traversal/src/test/java/org/onap/aai/QueryParameterTest.java b/aai-traversal/src/test/java/org/onap/aai/QueryParameterTest.java index f030f7af..6071faf6 100644 --- a/aai-traversal/src/test/java/org/onap/aai/QueryParameterTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/QueryParameterTest.java @@ -35,10 +35,9 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration; import org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Import; import org.springframework.http.*; -import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.client.RestTemplate; diff --git a/aai-traversal/src/test/java/org/onap/aai/SubgraphPruneTest.java b/aai-traversal/src/test/java/org/onap/aai/SubgraphPruneTest.java index 4955bad9..c97889ce 100644 --- a/aai-traversal/src/test/java/org/onap/aai/SubgraphPruneTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/SubgraphPruneTest.java @@ -24,7 +24,7 @@ import static org.junit.Assert.assertThat; import java.util.*; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.junit.Before; import org.junit.Test; @@ -34,10 +34,9 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration; import org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Import; import org.springframework.http.*; -import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.client.RestTemplate; diff --git a/aai-traversal/src/test/java/org/onap/aai/TraversalTestConfiguration.java b/aai-traversal/src/test/java/org/onap/aai/TraversalTestConfiguration.java index 5bc2b887..697546b4 100644 --- a/aai-traversal/src/test/java/org/onap/aai/TraversalTestConfiguration.java +++ b/aai-traversal/src/test/java/org/onap/aai/TraversalTestConfiguration.java @@ -19,16 +19,15 @@ */ package org.onap.aai; -import java.io.File; -import java.io.FileInputStream; import java.io.IOException; -import java.io.InputStream; import javax.net.ssl.SSLContext; -import org.apache.http.client.HttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.ssl.SSLContextBuilder; +import org.apache.hc.client5.http.classic.HttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClients; +import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; +import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder; +import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactoryBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -43,7 +42,6 @@ import org.springframework.core.env.Profiles; import org.springframework.http.HttpStatus; import org.springframework.http.client.ClientHttpResponse; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; -import org.springframework.util.ResourceUtils; import org.springframework.web.client.ResponseErrorHandler; import org.springframework.web.client.RestTemplate; @@ -66,15 +64,20 @@ public class TraversalTestConfiguration { RestTemplate restTemplate = null; if (env.acceptsProfiles(Profiles.of("one-way-ssl", "two-way-ssl"))) { - SSLContext sslContext = SSLContextBuilder.create().build(); - - HttpClient client = HttpClients.custom() - .setSSLContext(sslContext) - .setSSLHostnameVerifier((s, sslSession) -> true) + SSLContext sslContext = SSLContext.getDefault(); + PoolingHttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder.create() + .setSSLSocketFactory( + SSLConnectionSocketFactoryBuilder.create() + .setSslContext(sslContext) + .build() + ) + .build(); + HttpClient client = HttpClients + .custom() + .setConnectionManager(connectionManager) .build(); - restTemplate = builder - .requestFactory(() -> new HttpComponentsClientHttpRequestFactory(client)).build(); + restTemplate = builder.requestFactory(() -> new HttpComponentsClientHttpRequestFactory(client)).build(); } else { restTemplate = builder.build(); } diff --git a/aai-traversal/src/test/java/org/onap/aai/WebClientConfiguration.java b/aai-traversal/src/test/java/org/onap/aai/WebClientConfiguration.java index 4bedf3f6..4413122e 100644 --- a/aai-traversal/src/test/java/org/onap/aai/WebClientConfiguration.java +++ b/aai-traversal/src/test/java/org/onap/aai/WebClientConfiguration.java @@ -25,7 +25,7 @@ import java.util.Collections; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.context.TestConfiguration; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Primary; @@ -51,7 +51,7 @@ public class WebClientConfiguration { }) .build(); } - + @Lazy @Bean WebTestClient mgmtClient(@Value("${local.management.port}") int port) { diff --git a/aai-traversal/src/test/java/org/onap/aai/dbgraphmap/SearchGraphNamedQueryTest.java b/aai-traversal/src/test/java/org/onap/aai/dbgraphmap/SearchGraphNamedQueryTest.java index 9b88c38b..61372e2b 100644 --- a/aai-traversal/src/test/java/org/onap/aai/dbgraphmap/SearchGraphNamedQueryTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/dbgraphmap/SearchGraphNamedQueryTest.java @@ -36,12 +36,12 @@ import java.util.List; import java.util.Set; import java.util.UUID; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.junit.Before; import org.junit.Test; diff --git a/aai-traversal/src/test/java/org/onap/aai/dbgraphmap/SearchGraphTest.java b/aai-traversal/src/test/java/org/onap/aai/dbgraphmap/SearchGraphTest.java index cdafcb5f..bebe7a5a 100644 --- a/aai-traversal/src/test/java/org/onap/aai/dbgraphmap/SearchGraphTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/dbgraphmap/SearchGraphTest.java @@ -41,8 +41,8 @@ import org.onap.aai.serialization.queryformats.utils.UrlBuilder; import org.onap.aai.setup.SchemaVersion; import org.onap.aai.util.GenericQueryBuilder; import org.onap.aai.util.NodesQueryBuilder; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.*; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.*; import java.net.URI; import java.util.*; import java.util.stream.Stream; diff --git a/aai-traversal/src/test/java/org/onap/aai/interceptors/post/InvalidResponseStatusTest.java b/aai-traversal/src/test/java/org/onap/aai/interceptors/post/InvalidResponseStatusTest.java index 1564aab9..caf64865 100644 --- a/aai-traversal/src/test/java/org/onap/aai/interceptors/post/InvalidResponseStatusTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/interceptors/post/InvalidResponseStatusTest.java @@ -24,8 +24,8 @@ import org.junit.Test; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; import java.io.IOException; import static org.junit.Assert.*; import static org.mockito.Mockito.*; diff --git a/aai-traversal/src/test/java/org/onap/aai/interceptors/post/ResponseHeaderManipulationTest.java b/aai-traversal/src/test/java/org/onap/aai/interceptors/post/ResponseHeaderManipulationTest.java index 33608260..ed6dd8ec 100644 --- a/aai-traversal/src/test/java/org/onap/aai/interceptors/post/ResponseHeaderManipulationTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/interceptors/post/ResponseHeaderManipulationTest.java @@ -24,10 +24,10 @@ import org.junit.Test; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; import java.io.IOException; import java.util.Collections; import static org.junit.Assert.*; diff --git a/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/HeaderValidationTest.java b/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/HeaderValidationTest.java index 068cf09a..85ee13c2 100644 --- a/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/HeaderValidationTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/HeaderValidationTest.java @@ -30,9 +30,9 @@ import org.onap.logging.filter.base.Constants; import org.onap.logging.ref.slf4j.ONAPLogConstants; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.TestPropertySource; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/HttpHeaderInterceptorTest.java b/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/HttpHeaderInterceptorTest.java index e7a39235..ae23835d 100644 --- a/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/HttpHeaderInterceptorTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/HttpHeaderInterceptorTest.java @@ -21,7 +21,7 @@ package org.onap.aai.interceptors.pre; import org.junit.jupiter.api.Test; import org.onap.aai.interceptors.AAIHeaderProperties; -import javax.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestContext; import static org.mockito.Mockito.*; class HttpHeaderInterceptorTest { diff --git a/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/RequestModificationTest.java b/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/RequestModificationTest.java index 2701822c..43a61b11 100644 --- a/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/RequestModificationTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/RequestModificationTest.java @@ -25,15 +25,15 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.List; import java.util.Map; import java.util.Set; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; @@ -116,4 +116,4 @@ public class RequestModificationTest { assertTrue(true, "All blacklisted query parameters should have been processed."); } -} \ No newline at end of file +} diff --git a/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/RequestTransactionLoggingTest.java b/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/RequestTransactionLoggingTest.java index 8d146136..c5fd3d5a 100644 --- a/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/RequestTransactionLoggingTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/RequestTransactionLoggingTest.java @@ -34,12 +34,13 @@ import org.springframework.context.annotation.Bean; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringExtension; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriInfo; import java.io.IOException; import java.lang.reflect.Method; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.*; @ExtendWith(SpringExtension.class) diff --git a/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/RetiredInterceptorTest.java b/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/RetiredInterceptorTest.java index caaaf226..6fd7d50a 100644 --- a/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/RetiredInterceptorTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/RetiredInterceptorTest.java @@ -24,9 +24,9 @@ import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.onap.aai.service.RetiredService; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; @@ -109,4 +109,3 @@ class RetiredInterceptorTest { assertEquals(null, extractedVersion); } } - diff --git a/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/VersionInterceptorTest.java b/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/VersionInterceptorTest.java index 19181707..968169e8 100644 --- a/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/VersionInterceptorTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/interceptors/pre/VersionInterceptorTest.java @@ -26,9 +26,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.onap.aai.setup.SchemaVersion; import org.onap.aai.setup.SchemaVersions; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import java.util.Arrays; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/AbstractSpringRestTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/AbstractSpringRestTest.java index 21a7862e..bd3cda9d 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/AbstractSpringRestTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/AbstractSpringRestTest.java @@ -42,7 +42,7 @@ import org.onap.aai.nodes.NodeIngestor; import org.onap.aai.util.AAIConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Import; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/BadQueryFormatTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/BadQueryFormatTest.java index 28789459..a989eef2 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/BadQueryFormatTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/BadQueryFormatTest.java @@ -40,10 +40,9 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration; import org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Import; import org.springframework.http.*; -import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.client.RestTemplate; diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/GfpVserverDataStoredQueryTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/GfpVserverDataStoredQueryTest.java index d539a77f..218991e9 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/GfpVserverDataStoredQueryTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/GfpVserverDataStoredQueryTest.java @@ -36,13 +36,13 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.janusgraph.core.JanusGraph; @@ -61,7 +61,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.springframework.test.context.ContextConfiguration; @DirtiesContext(classMode = ClassMode.BEFORE_CLASS) public class GfpVserverDataStoredQueryTest extends AAISetup { diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/GlobalExceptionHandlerTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/GlobalExceptionHandlerTest.java index 75cc1a8f..bf6bacd2 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/GlobalExceptionHandlerTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/GlobalExceptionHandlerTest.java @@ -24,7 +24,7 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.janusgraph.core.SchemaViolationException; import org.junit.Before; @@ -75,7 +75,7 @@ public class GlobalExceptionHandlerTest { ResponseEntity response = springExceptionHandler.handleJsonException(exception, webRequest); AAIErrorResponse responseEntity = objectMapper.readValue(response.getBody(), AAIErrorResponse.class); assertEquals(HttpStatus.BAD_REQUEST, response.getStatusCode()); - + assertEquals("SVC3102",responseEntity.getRequestError().getServiceException().getMessageId()); assertEquals("Error parsing input performing %1 on %2 (msg=%3) (ec=%4)",responseEntity.getRequestError().getServiceException().getText()); assertEquals("PUT",responseEntity.getRequestError().getServiceException().getVariables().get(0)); @@ -90,7 +90,7 @@ public class GlobalExceptionHandlerTest { ResponseEntity response = springExceptionHandler.handleSchemaViolationException(exception, webRequest); AAIErrorResponse responseEntity = objectMapper.readValue(response.getBody(), AAIErrorResponse.class); assertEquals(HttpStatus.BAD_REQUEST, response.getStatusCode()); - + assertEquals("SVC3002",responseEntity.getRequestError().getServiceException().getMessageId()); assertEquals("Error writing output performing %1 on %2 (msg=%3) (ec=%4)",responseEntity.getRequestError().getServiceException().getText()); assertEquals("PUT",responseEntity.getRequestError().getServiceException().getVariables().get(0)); diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/QueryConsumerTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/QueryConsumerTest.java index 847753f4..90a60b0e 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/QueryConsumerTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/QueryConsumerTest.java @@ -30,7 +30,7 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.janusgraph.core.JanusGraphTransaction; @@ -52,7 +52,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration; import org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Import; import org.springframework.http.*; import org.springframework.test.context.TestPropertySource; diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/SearchProviderRestTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/SearchProviderRestTest.java index 8fc3fb04..5826e85d 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/SearchProviderRestTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/SearchProviderRestTest.java @@ -87,6 +87,7 @@ public class SearchProviderRestTest extends AbstractSpringRestTest { headers.setContentType(MediaType.APPLICATION_JSON); headers.add("Real-Time", "true"); headers.add("X-TransactionId", "JUNIT"); + headers.setBasicAuth("AAI","AAI"); httpEntity = new HttpEntity(headers); String endpoint = "/aai/latest/search/generic-query"; diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/dsl/EdgeLabelTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/dsl/EdgeLabelTest.java index 808d56b3..7a845ea6 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/dsl/EdgeLabelTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/dsl/EdgeLabelTest.java @@ -19,7 +19,8 @@ */ package org.onap.aai.rest.dsl; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import org.junit.After; import org.junit.Before; diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/dsl/EdgeTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/dsl/EdgeTest.java index 77f5c55e..4adf54df 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/dsl/EdgeTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/dsl/EdgeTest.java @@ -19,7 +19,8 @@ */ package org.onap.aai.rest.dsl; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import java.util.ArrayList; import java.util.List; diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/history/AbstractSpringHistoryRestTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/history/AbstractSpringHistoryRestTest.java index 6c48c25b..2fbaad58 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/history/AbstractSpringHistoryRestTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/history/AbstractSpringHistoryRestTest.java @@ -39,12 +39,11 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration; import org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.annotation.Import; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.rules.SpringClassRule; import org.springframework.test.context.junit4.rules.SpringMethodRule; diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/search/CloudRegionsByGenericVnfHGPairsTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/search/CloudRegionsByGenericVnfHGPairsTest.java index 9bf61e2c..04d8ac85 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/search/CloudRegionsByGenericVnfHGPairsTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/search/CloudRegionsByGenericVnfHGPairsTest.java @@ -20,7 +20,8 @@ package org.onap.aai.rest.search; * ============LICENSE_END========================================================= */ -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.LinkedHashMap; diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/search/GetCustomQueryConfigTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/search/GetCustomQueryConfigTest.java index 3ab960f7..0691924e 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/search/GetCustomQueryConfigTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/search/GetCustomQueryConfigTest.java @@ -19,7 +19,7 @@ */ package org.onap.aai.rest.search; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import com.google.common.collect.Lists; diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/search/GetDHVLogicalLinkTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/search/GetDHVLogicalLinkTest.java index 717ceed8..5b74d80f 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/search/GetDHVLogicalLinkTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/search/GetDHVLogicalLinkTest.java @@ -19,7 +19,8 @@ */ package org.onap.aai.rest.search; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.util.Map; diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/search/GetServiceTopologyTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/search/GetServiceTopologyTest.java index c69fd3b3..88c8f241 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/search/GetServiceTopologyTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/search/GetServiceTopologyTest.java @@ -19,7 +19,8 @@ */ package org.onap.aai.rest.search; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.Map; diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/search/GroovyShellImplTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/search/GroovyShellImplTest.java index edb2db1c..2813e8a5 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/search/GroovyShellImplTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/search/GroovyShellImplTest.java @@ -35,11 +35,11 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriInfo; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.structure.Vertex; diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/search/ModelAndNamedQueryRestProviderTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/search/ModelAndNamedQueryRestProviderTest.java index 2f2a7034..e88c536d 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/search/ModelAndNamedQueryRestProviderTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/search/ModelAndNamedQueryRestProviderTest.java @@ -35,13 +35,13 @@ import java.util.List; import java.util.Set; import java.util.UUID; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.apache.commons.io.IOUtils; import org.junit.Before; diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/search/SearchProviderTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/search/SearchProviderTest.java index cb627199..16e3dfe1 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/search/SearchProviderTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/search/SearchProviderTest.java @@ -34,12 +34,12 @@ import java.util.List; import java.util.Set; import java.util.UUID; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.junit.Before; import org.junit.Ignore; diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/util/EchoResponseTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/util/EchoResponseTest.java index 26b775fa..551e6282 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/util/EchoResponseTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/util/EchoResponseTest.java @@ -32,12 +32,12 @@ import java.util.List; import java.util.Set; import java.util.UUID; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.junit.Before; import org.junit.Test; @@ -159,4 +159,4 @@ public class EchoResponseTest { assertNotNull(response); assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatus()); } -} \ No newline at end of file +} diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/util/ValidateEncodingTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/util/ValidateEncodingTest.java index d627072e..95a06fa5 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/util/ValidateEncodingTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/util/ValidateEncodingTest.java @@ -19,13 +19,13 @@ */ package org.onap.aai.rest.util; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.io.UnsupportedEncodingException; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriInfo; import org.junit.Test; import org.mockito.Mockito; diff --git a/aai-traversal/src/test/java/org/onap/aai/transforms/LowerHyphenToLowerCamelConverterTest.java b/aai-traversal/src/test/java/org/onap/aai/transforms/LowerHyphenToLowerCamelConverterTest.java index f8b46134..f4a3db78 100644 --- a/aai-traversal/src/test/java/org/onap/aai/transforms/LowerHyphenToLowerCamelConverterTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/transforms/LowerHyphenToLowerCamelConverterTest.java @@ -19,7 +19,7 @@ */ package org.onap.aai.transforms; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.util.Arrays; import java.util.Collection; diff --git a/aai-traversal/src/test/resources/application-test.properties b/aai-traversal/src/test/resources/application-test.properties index e65d7087..0c4d7010 100644 --- a/aai-traversal/src/test/resources/application-test.properties +++ b/aai-traversal/src/test/resources/application-test.properties @@ -18,7 +18,7 @@ spring.jersey.application-path=/ spring.profiles.active=production -spring.sleuth.enabled=false +management.tracing.enabled=false #The max number of active threads in this pool server.tomcat.threads.max=200 @@ -36,7 +36,8 @@ server.local.startpath=src/main/resources server.basic.auth.location=${server.local.startpath}/etc/auth/realm.properties server.port=8446 -security.require-ssl=false +# This property is deprecated: The security auto-configuration is no longer customizable. Provide your own WebSecurityConfigurer bean instead. +# security.require-ssl=false server.ssl.enabled=false # Schema related attributes for the oxm and edges @@ -77,7 +78,8 @@ schema.translator.list=config management.server.port=0 management.endpoints.enabled-by-default=true management.endpoints.web.exposure.include=info, health, prometheus -management.metrics.web.server.request.autotime.enabled=false +# This property is deprecated: Should be applied at the ObservationRegistry level. +# management.metrics.web.server.request.autotime.enabled=false scrape.uri.metrics=true aai.notifications.enabled=false diff --git a/onap-java-formatter.xml b/onap-java-formatter.xml index 29dbb9ab..2be801d9 100644 --- a/onap-java-formatter.xml +++ b/onap-java-formatter.xml @@ -2,11 +2,11 @@ - - + + - + diff --git a/pom.xml b/pom.xml index 5625f7f6..b54aace5 100644 --- a/pom.xml +++ b/pom.xml @@ -26,23 +26,23 @@ org.onap.aai.aai-common aai-parent - 1.15.5 + 1.16.0-SNAPSHOT org.onap.aai.traversal traversal - 1.15.5-SNAPSHOT + 1.16.0-SNAPSHOT aai-traversal pom aai-traversal - 11 + 17 - 1.15.5 + 1.16.0-SNAPSHOT https://nexus.onap.org /content/sites/site/org/onap/aai/traversal/${project.artifactId}/${project.version} /content/repositories/releases/ diff --git a/version.properties b/version.properties index 73ddb41f..85d1d0c1 100644 --- a/version.properties +++ b/version.properties @@ -4,8 +4,8 @@ # because they are used in Jenkins, whose plug-in doesn't support major_version=1 -minor_version=15 -patch_version=5 +minor_version=16 +patch_version=0 base_version=${major_version}.${minor_version}.${patch_version} -- 2.16.6