From: Fiete Ostkamp Date: Wed, 3 Jan 2024 13:49:42 +0000 (+0100) Subject: Update spring-boot to 2.4 X-Git-Tag: 1.13.1~5 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=109f5f03539b10121ead67320c333e06eda126f6;p=aai%2Ftraversal.git Update spring-boot to 2.4 - update spring-boot to 2.4 - add junit vintage engine dependency to keep supporting junit 4 tests - update mockito to version 3.4.0 Issue-ID: AAI-3681 Change-Id: I8b40529418f9d03179970edf1ab12992db1cb5e8 Signed-off-by: Fiete Ostkamp --- diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml index a09d14f9..125edea8 100644 --- a/aai-traversal/pom.xml +++ b/aai-traversal/pom.xml @@ -32,8 +32,6 @@ aai-traversal - 2.4.0 - 1.7.0RC2 1.8 org.onap.aai.TraversalApp @@ -96,15 +94,17 @@ /aai - 2.3.12.RELEASE - 5.2.15.RELEASE + 2.4.13 + 5.3.13 ${spring.version} ${spring.version} + 4.0.1 11.0.2 1.3.19 1.6.6 - 1.6.6 1.6.6 + 3.4.0 + 2.0.9 1.6.1 4.1.63.Final 4.1.63.Final @@ -312,9 +312,6 @@ - org.springframework.boot @@ -337,7 +334,7 @@ io.micrometer micrometer-registry-prometheus - ${micrometer-registry-prometheus.version} + io.micrometer @@ -459,15 +456,6 @@ org.codehaus.janino janino - - org.hamcrest - hamcrest-junit - - - junit - junit - test - com.google.guava guava @@ -540,10 +528,6 @@ org.freemarker freemarker - - javax.xml.bind - jaxb-api - org.eclipse.persistence eclipselink @@ -588,35 +572,39 @@ org.onap.aai.aai-common aai-core - - - org.onap.aai.aai-common - aai-aaf-auth - - - com.sun.jersey - jersey-core - - - org.codehaus.jackson - jackson-mapper-asl - - - org.eclipse.jetty - jetty-http - - - org.eclipse.jetty - jetty-server - - - org.springframework - spring-web - - - org.onap.aai - aai-logging - + + + org.onap.aai.aai-common + aai-aaf-auth + + + com.sun.jersey + jersey-core + + + org.codehaus.jackson + jackson-mapper-asl + + + org.eclipse.jetty + jetty-http + + + org.eclipse.jetty + jetty-server + + + org.springframework + spring-web + + + org.onap.aai + aai-logging + + + junit + junit + @@ -696,6 +684,23 @@ spring-boot-starter-jetty + org.springframework.boot + spring-boot-starter-test + test + + + + org.junit.vintage + junit-vintage-engine + test + + + org.hamcrest + hamcrest-core + + + + org.onap.aaf.authz aaf-cadi-aaf 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 8c730330..6bae6142 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 @@ -31,27 +31,20 @@ import java.util.Random; import java.util.UUID; import javax.annotation.Priority; -import javax.servlet.http.HttpServletRequest; 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.MultivaluedMap; import javax.ws.rs.core.UriInfo; -import org.apache.commons.io.Charsets; -import org.apache.commons.io.IOUtils; -import org.glassfish.jersey.message.internal.ReaderWriter; -import org.glassfish.jersey.server.ContainerException; import org.onap.aai.exceptions.AAIException; import org.onap.aai.interceptors.AAIContainerFilter; import org.onap.aai.interceptors.AAIHeaderProperties; import org.onap.aai.util.AAIConfig; import org.onap.aai.util.AAIConstants; import org.onap.aai.util.HbaseSaltPrefixer; -import org.springframework.util.StringUtils; +import org.springframework.util.ObjectUtils; -// Here @PreMatching @Priority(AAIRequestFilterPriority.REQUEST_TRANS_LOGGING) public class RequestTransactionLogging extends AAIContainerFilter @@ -85,7 +78,7 @@ public class RequestTransactionLogging extends AAIContainerFilter requestContext.getHeaders().putSingle(CONTENT_TYPE, DEFAULT_CONTENT_TYPE); } - if (WILDCARD.equals(acceptType) || StringUtils.isEmpty(acceptType) + if (WILDCARD.equals(acceptType) || ObjectUtils.isEmpty(acceptType) || acceptType.contains(TEXT_PLAIN)) { UriInfo uriInfo = requestContext.getUriInfo(); if (uriInfo != null) { diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/search/CustomQueryConfigDTO.java b/aai-traversal/src/main/java/org/onap/aai/rest/search/CustomQueryConfigDTO.java index 7f90566b..38b9b88b 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/search/CustomQueryConfigDTO.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/search/CustomQueryConfigDTO.java @@ -40,8 +40,7 @@ package org.onap.aai.rest.search; */ import com.fasterxml.jackson.annotation.JsonProperty; - -import org.springframework.util.StringUtils; +import org.springframework.util.ObjectUtils; public class CustomQueryConfigDTO { @@ -53,7 +52,7 @@ public class CustomQueryConfigDTO { public CustomQueryDTO getQueryDTO() { if (queryDTO == null) queryDTO = new CustomQueryDTO(); - if (!StringUtils.isEmpty(storedQuery)) { + if (!ObjectUtils.isEmpty(storedQuery)) { queryDTO.setQuery(storedQuery); } return queryDTO; diff --git a/aai-traversal/src/test/java/org/onap/aai/dbgraphgen/ModelBasedProcessingInvalidDataTest.java b/aai-traversal/src/test/java/org/onap/aai/dbgraphgen/ModelBasedProcessingInvalidDataTest.java index d6b43aa9..c228d03c 100644 --- a/aai-traversal/src/test/java/org/onap/aai/dbgraphgen/ModelBasedProcessingInvalidDataTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/dbgraphgen/ModelBasedProcessingInvalidDataTest.java @@ -82,7 +82,7 @@ public class ModelBasedProcessingInvalidDataTest extends AAISetup { @Before public void init() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); loader = loaderFactory.createLoaderForVersion(ModelType.MOXY, schemaVersions.getDefaultVersion()); processor = new ModelBasedProcessing(loader, dbEngine, serializer); diff --git a/aai-traversal/src/test/java/org/onap/aai/dbgraphgen/ModelBasedProcessingTest.java b/aai-traversal/src/test/java/org/onap/aai/dbgraphgen/ModelBasedProcessingTest.java index ab1ea0a4..fad65879 100644 --- a/aai-traversal/src/test/java/org/onap/aai/dbgraphgen/ModelBasedProcessingTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/dbgraphgen/ModelBasedProcessingTest.java @@ -98,7 +98,7 @@ public class ModelBasedProcessingTest extends AAISetup { @Before public void init() throws AAIException { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); version = schemaVersions.getDefaultVersion(); loader = loaderFactory.createLoaderForVersion(introspectorFactoryType, version); TransactionalGraphEngine newDbEngine = new JanusGraphDBEngine(queryStyle, loader); 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 eb8902ea..1efbce76 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 @@ -19,9 +19,9 @@ */ package org.onap.aai.rest; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; -import static org.hamcrest.junit.MatcherAssert.assertThat; import java.util.Base64; import java.util.Collections; diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/ConfigurationTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/ConfigurationTest.java index b0f98698..09925194 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/ConfigurationTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/ConfigurationTest.java @@ -35,6 +35,7 @@ import org.onap.aai.config.SpringContextAware; import org.onap.aai.restclient.PropertyPasswordConfiguration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.test.autoconfigure.actuate.metrics.AutoConfigureMetrics; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Import; import org.springframework.http.*; @@ -42,9 +43,12 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.springframework.web.client.RestTemplate; +import io.prometheus.client.exporter.common.TextFormat; + /** * Test REST requests against configuration resource */ +@AutoConfigureMetrics @TestPropertySource(locations = "classpath:application-test.properties") @ContextConfiguration( initializers = PropertyPasswordConfiguration.class, @@ -69,7 +73,6 @@ public class ConfigurationTest extends AbstractSpringRestTest { headers = new HttpHeaders(); - headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON)); headers.set("Accept", "text/plain"); headers.add("Real-Time", "true"); headers.add("X-FromAppId", "JUNIT"); @@ -85,13 +88,13 @@ public class ConfigurationTest extends AbstractSpringRestTest { @Test public void TestManagementEndpointConfiguration() { - ResponseEntity responseEntity = null; + ResponseEntity responseEntity = null; String responseBody = null; // set Accept as text/plain in order to get access of endpoint "/actuator/prometheus" responseEntity = restTemplate.exchange(actuatorurl + "/actuator/prometheus", HttpMethod.GET, httpEntity, String.class); - responseBody = (String) responseEntity.getBody(); + responseBody = responseEntity.getBody(); assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); System.out.println("responseBody---------" + responseBody); assertFalse(responseBody.contains("aai_uri")); diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/SpringExceptionHandlerTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/GlobalExceptionHandlerTest.java similarity index 98% rename from aai-traversal/src/test/java/org/onap/aai/rest/SpringExceptionHandlerTest.java rename to aai-traversal/src/test/java/org/onap/aai/rest/GlobalExceptionHandlerTest.java index b3d1ac97..75cc1a8f 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/SpringExceptionHandlerTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/GlobalExceptionHandlerTest.java @@ -47,7 +47,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; -public class SpringExceptionHandlerTest { +public class GlobalExceptionHandlerTest { private static final ObjectMapper objectMapper = new ObjectMapper(); @@ -61,7 +61,7 @@ public class SpringExceptionHandlerTest { @Before public void setup() { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); HttpServletRequest request = mock(HttpServletRequest.class); when(request.getMethod()).thenReturn("PUT"); when(request.getRequestURI()).thenReturn("/aai/v14/dsl"); diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/search/OnapQueryTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/search/OnapQueryTest.java index 6d12842d..44264c13 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/search/OnapQueryTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/search/OnapQueryTest.java @@ -142,7 +142,7 @@ public abstract class OnapQueryTest { System.setProperty("AJSC_HOME", "."); System.setProperty("BUNDLECONFIG_DIR", "src/main/resources"); logger = LoggerFactory.getLogger(getClass()); - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); graph = TinkerGraph.open(); gts = graph.traversal(); createGraph(); diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java index bdd52eeb..4574ca18 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/search/QueryTest.java @@ -142,7 +142,7 @@ public abstract class QueryTest { System.setProperty("AJSC_HOME", "."); System.setProperty("BUNDLECONFIG_DIR", "src/main/resources"); logger = LoggerFactory.getLogger(getClass()); - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); graph = TinkerGraph.open(); gts = graph.traversal(); createGraph(); diff --git a/aai-traversal/src/test/java/org/onap/aai/rest/search/SimpleFormatTest.java b/aai-traversal/src/test/java/org/onap/aai/rest/search/SimpleFormatTest.java index 0b53b722..dc33e072 100644 --- a/aai-traversal/src/test/java/org/onap/aai/rest/search/SimpleFormatTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/rest/search/SimpleFormatTest.java @@ -70,7 +70,7 @@ public class SimpleFormatTest extends AAISetup { @Before public void setUp() throws AAIException, NoEdgeRuleFoundException { - MockitoAnnotations.initMocks(this); + MockitoAnnotations.openMocks(this); graph = TinkerGraph.open(); loader = loaderFactory.createLoaderForVersion(ModelType.MOXY, schemaVersions.getRelatedLinkVersion());