diff options
220 files changed, 721 insertions, 685 deletions
diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml index 761caabc..9352ebf3 100644 --- a/aai-annotations/pom.xml +++ b/aai-annotations/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.15.5-SNAPSHOT</version> + <version>1.16.0-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> <artifactId>aai-annotations</artifactId> diff --git a/aai-auth/pom.xml b/aai-auth/pom.xml index f2bfe03a..7b450144 100644 --- a/aai-auth/pom.xml +++ b/aai-auth/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.15.5-SNAPSHOT</version> + <version>1.16.0-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> <artifactId>aai-auth</artifactId> @@ -41,8 +41,8 @@ <dependencies> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> + <groupId>org.apache.httpcomponents.client5</groupId> + <artifactId>httpclient5</artifactId> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/aai-auth/src/main/java/org/onap/aaiauth/auth/Auth.java b/aai-auth/src/main/java/org/onap/aaiauth/auth/Auth.java index a5b3b674..8c2d9e80 100644 --- a/aai-auth/src/main/java/org/onap/aaiauth/auth/Auth.java +++ b/aai-auth/src/main/java/org/onap/aaiauth/auth/Auth.java @@ -21,7 +21,7 @@ package org.onap.aaiauth.auth; -import org.apache.http.cookie.Cookie; +import org.apache.hc.client5.http.cookie.Cookie; public class Auth { diff --git a/aai-common-docker/aai-common-images/pom.xml b/aai-common-docker/aai-common-images/pom.xml index 381877c8..0b2ce37b 100644 --- a/aai-common-docker/aai-common-images/pom.xml +++ b/aai-common-docker/aai-common-images/pom.xml @@ -25,11 +25,11 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-common-docker</artifactId> - <version>1.15.5-SNAPSHOT</version> + <version>1.16.0-SNAPSHOT</version> </parent> <artifactId>aai-common-images</artifactId> - <version>1.15.5-SNAPSHOT</version> + <version>1.16.0-SNAPSHOT</version> <packaging>pom</packaging> <name>aai-aai-common-images</name> <description>Contains dockerfiles for aai-common images (alpine and ubuntu based).</description> diff --git a/aai-common-docker/aai-haproxy-image/pom.xml b/aai-common-docker/aai-haproxy-image/pom.xml index 8baed277..cbbccc01 100644 --- a/aai-common-docker/aai-haproxy-image/pom.xml +++ b/aai-common-docker/aai-haproxy-image/pom.xml @@ -25,11 +25,11 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-common-docker</artifactId> - <version>1.15.5-SNAPSHOT</version> + <version>1.16.0-SNAPSHOT</version> </parent> <artifactId>aai-haproxy-image</artifactId> - <version>1.15.5-SNAPSHOT</version> + <version>1.16.0-SNAPSHOT</version> <packaging>pom</packaging> <name>aai-aai-haproxy-image</name> <description>Contains dockerfiles for aai-haproxy image.</description> diff --git a/aai-common-docker/pom.xml b/aai-common-docker/pom.xml index f5e702e1..ff78a999 100644 --- a/aai-common-docker/pom.xml +++ b/aai-common-docker/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.15.5-SNAPSHOT</version> + <version>1.16.0-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> diff --git a/aai-core/pom.xml b/aai-core/pom.xml index 37bc75a3..420652bd 100644 --- a/aai-core/pom.xml +++ b/aai-core/pom.xml @@ -26,7 +26,7 @@ limitations under the License. <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.15.5-SNAPSHOT</version> + <version>1.16.0-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> <artifactId>aai-core</artifactId> @@ -164,12 +164,8 @@ limitations under the License. </dependency> <dependency> <groupId>org.glassfish</groupId> - <artifactId>javax.json</artifactId> - <version>1.1.4</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> + <artifactId>jakarta.json</artifactId> + <version>2.0.1</version> </dependency> <dependency> <groupId>org.janusgraph</groupId> @@ -196,8 +192,8 @@ limitations under the License. <scope>test</scope> </dependency> <dependency> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-json-provider</artifactId> + <groupId>com.fasterxml.jackson.jakarta.rs</groupId> + <artifactId>jackson-jakarta-rs-json-provider</artifactId> </dependency> <dependency> <groupId>org.springframework.kafka</groupId> @@ -244,7 +240,7 @@ limitations under the License. </dependency> <dependency> <groupId>com.fasterxml.jackson.module</groupId> - <artifactId>jackson-module-jaxb-annotations</artifactId> + <artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId> </dependency> <dependency> <groupId>org.glassfish.jersey.core</groupId> @@ -323,7 +319,7 @@ limitations under the License. </dependency> <dependency> <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-test</artifactId> + <artifactId>spring-boot-starter-test</artifactId> <scope>test</scope> </dependency> <dependency> @@ -338,8 +334,8 @@ limitations under the License. </exclusions> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> + <groupId>org.apache.httpcomponents.client5</groupId> + <artifactId>httpclient5</artifactId> </dependency> <dependency> <groupId>org.apache.tinkerpop</groupId> diff --git a/aai-core/src/main/java/org/onap/aai/config/RestBeanConfig.java b/aai-core/src/main/java/org/onap/aai/config/RestBeanConfig.java index 3cc1719c..f264ea85 100644 --- a/aai-core/src/main/java/org/onap/aai/config/RestBeanConfig.java +++ b/aai-core/src/main/java/org/onap/aai/config/RestBeanConfig.java @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Scope; import org.springframework.web.context.annotation.RequestScope; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule; +import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule; @Configuration public class RestBeanConfig { @@ -41,7 +41,7 @@ public class RestBeanConfig { @Bean public ObjectMapper objectMapper() { ObjectMapper objectMapper = new ObjectMapper(); - objectMapper.registerModule(new JaxbAnnotationModule()); + objectMapper.registerModule(new JakartaXmlBindAnnotationModule()); return objectMapper; } diff --git a/aai-core/src/main/java/org/onap/aai/dbgen/GraphSONPartialReader.java b/aai-core/src/main/java/org/onap/aai/dbgen/GraphSONPartialReader.java index 7ed8da4f..f18e77a7 100644 --- a/aai-core/src/main/java/org/onap/aai/dbgen/GraphSONPartialReader.java +++ b/aai-core/src/main/java/org/onap/aai/dbgen/GraphSONPartialReader.java @@ -115,7 +115,7 @@ public final class GraphSONPartialReader implements GraphReader { if (supportsTx && counter.incrementAndGet() % batchSize == 0) graphToWriteTo.tx().commit(); } catch (Exception ex) { - LOGGER.info(String.format("Error in reading vertex from graphson%s", vertex.toString())); + LOGGER.info("Error in reading vertex from graphson%s".formatted(vertex.toString())); } }); @@ -134,13 +134,13 @@ public final class GraphSONPartialReader implements GraphReader { : cachedOutV.addEdge(e.label(), cachedInV); e.properties().forEachRemaining(p -> newEdge.property(p.key(), p.value())); } else { - LOGGER.debug(String.format("Ghost edges from %s to %s", cachedOutV, cachedInV)); + LOGGER.debug("Ghost edges from %s to %s".formatted(cachedOutV, cachedInV)); } if (supportsTx && counter.incrementAndGet() % batchSize == 0) graphToWriteTo.tx().commit(); } catch (Exception ex) { - LOGGER.info(String.format("Error in writing vertex into graph%s", e.toString())); + LOGGER.info("Error in writing vertex into graph%s".formatted(e.toString())); } })); @@ -258,7 +258,7 @@ public final class GraphSONPartialReader implements GraphReader { final JsonNode root = mapper.readTree(inputStream); final JsonNode vertices = root.get(GraphSONTokens.VERTICES); if (!vertices.getNodeType().equals(JsonNodeType.ARRAY)) - throw new IOException(String.format("The '%s' key must be an array", GraphSONTokens.VERTICES)); + throw new IOException("The '%s' key must be an array".formatted(GraphSONTokens.VERTICES)); return IteratorUtils.stream(vertices.elements()).map(Object::toString); } else { final BufferedReader br = new BufferedReader(new InputStreamReader(inputStream)); diff --git a/aai-core/src/main/java/org/onap/aai/dbmap/AAIGraph.java b/aai-core/src/main/java/org/onap/aai/dbmap/AAIGraph.java index 0db67860..55636317 100644 --- a/aai-core/src/main/java/org/onap/aai/dbmap/AAIGraph.java +++ b/aai-core/src/main/java/org/onap/aai/dbmap/AAIGraph.java @@ -138,7 +138,7 @@ public class AAIGraph { transaction.tx().commit(); logger.info("Snapshot loaded to inmemory graph."); } catch (Exception e) { - logger.info(String.format("ERROR: Could not load datasnapshot to in memory graph. %n%s", + logger.info("ERROR: Could not load datasnapshot to in memory graph. %n%s".formatted( ExceptionUtils.getStackTrace(e))); throw new RuntimeException(e); } diff --git a/aai-core/src/main/java/org/onap/aai/dbmap/InMemoryGraph.java b/aai-core/src/main/java/org/onap/aai/dbmap/InMemoryGraph.java index 6e4ce147..5fa9e5ad 100644 --- a/aai-core/src/main/java/org/onap/aai/dbmap/InMemoryGraph.java +++ b/aai-core/src/main/java/org/onap/aai/dbmap/InMemoryGraph.java @@ -73,7 +73,7 @@ public class InMemoryGraph { } } catch (Exception e) { - LOGGER.error(String.format("ERROR: Could not load datasnapshot to in memory graph. %n%s", + LOGGER.error("ERROR: Could not load datasnapshot to in memory graph. %n%s".formatted( LogFormatTools.getStackTop(e))); throw new IllegalStateException("Could not load datasnapshot to in memory graph"); diff --git a/aai-core/src/main/java/org/onap/aai/domain/notificationEvent/NotificationEvent.java b/aai-core/src/main/java/org/onap/aai/domain/notificationEvent/NotificationEvent.java index e349009e..b930d1da 100644 --- a/aai-core/src/main/java/org/onap/aai/domain/notificationEvent/NotificationEvent.java +++ b/aai-core/src/main/java/org/onap/aai/domain/notificationEvent/NotificationEvent.java @@ -19,7 +19,7 @@ */ package org.onap.aai.domain.notificationEvent; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/aai-core/src/main/java/org/onap/aai/domain/notificationEvent/ObjectFactory.java b/aai-core/src/main/java/org/onap/aai/domain/notificationEvent/ObjectFactory.java index 84f720d0..7d448702 100644 --- a/aai-core/src/main/java/org/onap/aai/domain/notificationEvent/ObjectFactory.java +++ b/aai-core/src/main/java/org/onap/aai/domain/notificationEvent/ObjectFactory.java @@ -26,7 +26,7 @@ package org.onap.aai.domain.notificationEvent; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** * This object contains factory methods for each diff --git a/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessage.java b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessage.java index 53311990..e8f7cf26 100644 --- a/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessage.java +++ b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessage.java @@ -20,7 +20,7 @@ package org.onap.aai.domain.responseMessage; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; @XmlAccessorType(XmlAccessType.FIELD) @XmlType( diff --git a/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageData.java b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageData.java index f7fe13b5..a2501326 100644 --- a/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageData.java +++ b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageData.java @@ -32,7 +32,7 @@ package org.onap.aai.domain.responseMessage; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = {"aaiResponseMessageDatum", "any"}) diff --git a/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageDatum.java b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageDatum.java index a8adffde..2c73f1af 100644 --- a/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageDatum.java +++ b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessageDatum.java @@ -20,7 +20,7 @@ package org.onap.aai.domain.responseMessage; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = {"aaiResponseMessageDatumKey", "aaiResponseMessageDatumValue", diff --git a/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessages.java b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessages.java index f5068742..f68df208 100644 --- a/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessages.java +++ b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/AAIResponseMessages.java @@ -30,7 +30,7 @@ package org.onap.aai.domain.responseMessage; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** * <p> diff --git a/aai-core/src/main/java/org/onap/aai/domain/responseMessage/package-info.java b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/package-info.java index 7c4dd4df..526815a9 100644 --- a/aai-core/src/main/java/org/onap/aai/domain/responseMessage/package-info.java +++ b/aai-core/src/main/java/org/onap/aai/domain/responseMessage/package-info.java @@ -24,7 +24,7 @@ // Generated on: 2015.06.15 at 03:03:58 PM EDT // -@javax.xml.bind.annotation.XmlSchema( +@jakarta.xml.bind.annotation.XmlSchema( namespace = "http://org.onap.aai.inventory", - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.onap.aai.domain.responseMessage; diff --git a/aai-core/src/main/java/org/onap/aai/domain/translog/TransactionLogEntries.java b/aai-core/src/main/java/org/onap/aai/domain/translog/TransactionLogEntries.java index d1caf511..771f47a1 100644 --- a/aai-core/src/main/java/org/onap/aai/domain/translog/TransactionLogEntries.java +++ b/aai-core/src/main/java/org/onap/aai/domain/translog/TransactionLogEntries.java @@ -29,10 +29,10 @@ package org.onap.aai.domain.translog; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * <p> diff --git a/aai-core/src/main/java/org/onap/aai/domain/translog/TransactionLogEntry.java b/aai-core/src/main/java/org/onap/aai/domain/translog/TransactionLogEntry.java index 37a1eeff..e1c5cc18 100644 --- a/aai-core/src/main/java/org/onap/aai/domain/translog/TransactionLogEntry.java +++ b/aai-core/src/main/java/org/onap/aai/domain/translog/TransactionLogEntry.java @@ -20,7 +20,7 @@ package org.onap.aai.domain.translog; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import org.eclipse.persistence.oxm.annotations.XmlCDATA; diff --git a/aai-core/src/main/java/org/onap/aai/extensions/AAIExtensionMap.java b/aai-core/src/main/java/org/onap/aai/extensions/AAIExtensionMap.java index a6d7ac17..58dab7cc 100644 --- a/aai-core/src/main/java/org/onap/aai/extensions/AAIExtensionMap.java +++ b/aai-core/src/main/java/org/onap/aai/extensions/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-core/src/main/java/org/onap/aai/introspection/MoxyLoader.java b/aai-core/src/main/java/org/onap/aai/introspection/MoxyLoader.java index ec3151b5..ca93635f 100644 --- a/aai-core/src/main/java/org/onap/aai/introspection/MoxyLoader.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/MoxyLoader.java @@ -29,8 +29,8 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import javax.xml.transform.stream.StreamSource; import org.eclipse.persistence.dynamic.DynamicEntity; @@ -78,7 +78,7 @@ public class MoxyLoader extends Loader { /** * {@inheritDoc} - * + * * @throws AAIUnknownObjectException */ @Override diff --git a/aai-core/src/main/java/org/onap/aai/introspection/MoxyStrategy.java b/aai-core/src/main/java/org/onap/aai/introspection/MoxyStrategy.java index 55980c3b..9b1cec72 100644 --- a/aai-core/src/main/java/org/onap/aai/introspection/MoxyStrategy.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/MoxyStrategy.java @@ -35,8 +35,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import org.eclipse.persistence.descriptors.ClassDescriptor; import org.eclipse.persistence.dynamic.DynamicEntity; diff --git a/aai-core/src/main/java/org/onap/aai/introspection/exceptions/AAIUnknownObjectException.java b/aai-core/src/main/java/org/onap/aai/introspection/exceptions/AAIUnknownObjectException.java index 9f3fbe0d..c770c013 100644 --- a/aai-core/src/main/java/org/onap/aai/introspection/exceptions/AAIUnknownObjectException.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/exceptions/AAIUnknownObjectException.java @@ -20,10 +20,13 @@ package org.onap.aai.introspection.exceptions; +import java.io.Serial; + import org.onap.aai.exceptions.AAIException; public class AAIUnknownObjectException extends AAIException { + @Serial private static final long serialVersionUID = -504200228742133774L; public AAIUnknownObjectException() { diff --git a/aai-core/src/main/java/org/onap/aai/introspection/exceptions/AAIUnmarshallingException.java b/aai-core/src/main/java/org/onap/aai/introspection/exceptions/AAIUnmarshallingException.java index 0cf19962..b901a42d 100644 --- a/aai-core/src/main/java/org/onap/aai/introspection/exceptions/AAIUnmarshallingException.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/exceptions/AAIUnmarshallingException.java @@ -20,10 +20,13 @@ package org.onap.aai.introspection.exceptions; +import java.io.Serial; + import org.onap.aai.exceptions.AAIException; public class AAIUnmarshallingException extends AAIException { + @Serial private static final long serialVersionUID = -5615651557821878103L; private static final String AAI_MSG = "AAI_3000"; diff --git a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataCopy.java b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataCopy.java index d7780928..a843e2d1 100644 --- a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataCopy.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataCopy.java @@ -29,7 +29,7 @@ import java.util.Map.Entry; import java.util.Objects; import java.util.Optional; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.onap.aai.exceptions.AAIException; diff --git a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataLinkReader.java b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataLinkReader.java index 42b361dd..225d831e 100644 --- a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataLinkReader.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataLinkReader.java @@ -30,7 +30,7 @@ import java.util.Map.Entry; import java.util.Optional; import java.util.regex.Matcher; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.onap.aai.db.props.AAIProperties; diff --git a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataLinkWriter.java b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataLinkWriter.java index 16f30531..b8365317 100644 --- a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataLinkWriter.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/DataLinkWriter.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map.Entry; import java.util.Optional; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.onap.aai.db.props.AAIProperties; diff --git a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/PrivateEdge.java b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/PrivateEdge.java index e58ff9bc..d142b5d2 100644 --- a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/PrivateEdge.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/PrivateEdge.java @@ -32,7 +32,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Optional; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; @@ -109,11 +109,11 @@ public class PrivateEdge extends SideEffect { Multimap<String, EdgeRule> edgeRulesMap = edgeIngestor.getRules(edgeQuery); if (edgeRulesMap.isEmpty()) { - String message = String.format("Unable to find edge between %s and %s", obj.getName(), + String message = "Unable to find edge between %s and %s".formatted(obj.getName(), otherVProperty.value().toString()); throw new AAIException("AAI_6127", message); } else if (edgeRulesMap.size() > 1) { - String message = String.format("Found multiple edges between %s and %s", obj.getName(), + String message = "Found multiple edges between %s and %s".formatted(obj.getName(), otherVProperty.value().toString()); throw new EdgeMultiplicityException(message); } diff --git a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/exceptions/AAIMissingRequiredPropertyException.java b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/exceptions/AAIMissingRequiredPropertyException.java index 06f82404..c8f3c7ba 100644 --- a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/exceptions/AAIMissingRequiredPropertyException.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/exceptions/AAIMissingRequiredPropertyException.java @@ -20,10 +20,13 @@ package org.onap.aai.introspection.sideeffect.exceptions; +import java.io.Serial; + import org.onap.aai.exceptions.AAIException; public class AAIMissingRequiredPropertyException extends AAIException { + @Serial private static final long serialVersionUID = -8907079650472014019L; public AAIMissingRequiredPropertyException() { diff --git a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/exceptions/AAIMultiplePropertiesException.java b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/exceptions/AAIMultiplePropertiesException.java index 369ee8fc..8bfd7512 100644 --- a/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/exceptions/AAIMultiplePropertiesException.java +++ b/aai-core/src/main/java/org/onap/aai/introspection/sideeffect/exceptions/AAIMultiplePropertiesException.java @@ -20,10 +20,13 @@ package org.onap.aai.introspection.sideeffect.exceptions; +import java.io.Serial; + import org.onap.aai.exceptions.AAIException; public class AAIMultiplePropertiesException extends AAIException { + @Serial private static final long serialVersionUID = 2098371383166008345L; public AAIMultiplePropertiesException() { diff --git a/aai-core/src/main/java/org/onap/aai/parsers/exceptions/AAIIdentityMapParseException.java b/aai-core/src/main/java/org/onap/aai/parsers/exceptions/AAIIdentityMapParseException.java index b09165ea..9ac97746 100644 --- a/aai-core/src/main/java/org/onap/aai/parsers/exceptions/AAIIdentityMapParseException.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/exceptions/AAIIdentityMapParseException.java @@ -20,10 +20,13 @@ package org.onap.aai.parsers.exceptions; +import java.io.Serial; + import org.onap.aai.exceptions.AAIException; public class AAIIdentityMapParseException extends AAIException { + @Serial private static final long serialVersionUID = -888876613879411865L; public AAIIdentityMapParseException(String message) { diff --git a/aai-core/src/main/java/org/onap/aai/parsers/exceptions/AmbiguousMapAAIException.java b/aai-core/src/main/java/org/onap/aai/parsers/exceptions/AmbiguousMapAAIException.java index edd0b7fb..33c18b51 100644 --- a/aai-core/src/main/java/org/onap/aai/parsers/exceptions/AmbiguousMapAAIException.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/exceptions/AmbiguousMapAAIException.java @@ -20,10 +20,13 @@ package org.onap.aai.parsers.exceptions; +import java.io.Serial; + import org.onap.aai.exceptions.AAIException; public class AmbiguousMapAAIException extends AAIException { + @Serial private static final long serialVersionUID = -878581771971431246L; public AmbiguousMapAAIException(String message) { diff --git a/aai-core/src/main/java/org/onap/aai/parsers/exceptions/DoesNotStartWithValidNamespaceException.java b/aai-core/src/main/java/org/onap/aai/parsers/exceptions/DoesNotStartWithValidNamespaceException.java index dedfa4c5..e944039b 100644 --- a/aai-core/src/main/java/org/onap/aai/parsers/exceptions/DoesNotStartWithValidNamespaceException.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/exceptions/DoesNotStartWithValidNamespaceException.java @@ -20,10 +20,13 @@ package org.onap.aai.parsers.exceptions; +import java.io.Serial; + import org.onap.aai.exceptions.AAIException; public class DoesNotStartWithValidNamespaceException extends AAIException { + @Serial private static final long serialVersionUID = -888876613879411865L; public DoesNotStartWithValidNamespaceException(String message) { diff --git a/aai-core/src/main/java/org/onap/aai/parsers/query/LegacyQueryParser.java b/aai-core/src/main/java/org/onap/aai/parsers/query/LegacyQueryParser.java index dfa7c95a..5818d18d 100644 --- a/aai-core/src/main/java/org/onap/aai/parsers/query/LegacyQueryParser.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/query/LegacyQueryParser.java @@ -26,7 +26,7 @@ import java.net.URISyntaxException; import java.util.*; import java.util.Map.Entry; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.onap.aai.edges.enums.EdgeType; import org.onap.aai.exceptions.AAIException; diff --git a/aai-core/src/main/java/org/onap/aai/parsers/query/QueryParserStrategy.java b/aai-core/src/main/java/org/onap/aai/parsers/query/QueryParserStrategy.java index 18600b95..37fd52f0 100644 --- a/aai-core/src/main/java/org/onap/aai/parsers/query/QueryParserStrategy.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/query/QueryParserStrategy.java @@ -23,7 +23,7 @@ package org.onap.aai.parsers.query; import java.io.UnsupportedEncodingException; import java.net.URI; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.onap.aai.exceptions.AAIException; import org.onap.aai.introspection.Introspector; diff --git a/aai-core/src/main/java/org/onap/aai/parsers/query/TraversalStrategy.java b/aai-core/src/main/java/org/onap/aai/parsers/query/TraversalStrategy.java index a0311c70..55b24ac9 100644 --- a/aai-core/src/main/java/org/onap/aai/parsers/query/TraversalStrategy.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/query/TraversalStrategy.java @@ -23,7 +23,7 @@ package org.onap.aai.parsers.query; import java.io.UnsupportedEncodingException; import java.net.URI; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.onap.aai.exceptions.AAIException; import org.onap.aai.introspection.Introspector; diff --git a/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueStrategy.java b/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueStrategy.java index 16403c00..9b290dc9 100644 --- a/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueStrategy.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueStrategy.java @@ -23,7 +23,7 @@ package org.onap.aai.parsers.query; import java.io.UnsupportedEncodingException; import java.net.URI; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.onap.aai.exceptions.AAIException; import org.onap.aai.introspection.Introspector; diff --git a/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueURIQueryParser.java b/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueURIQueryParser.java index 33baa40a..0f568b41 100644 --- a/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueURIQueryParser.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/query/UniqueURIQueryParser.java @@ -23,8 +23,8 @@ package org.onap.aai.parsers.query; import java.io.UnsupportedEncodingException; import java.net.URI; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriBuilder; import org.onap.aai.edges.enums.EdgeType; import org.onap.aai.exceptions.AAIException; diff --git a/aai-core/src/main/java/org/onap/aai/parsers/relationship/RelationshipToURI.java b/aai-core/src/main/java/org/onap/aai/parsers/relationship/RelationshipToURI.java index af9d8aa1..de516e38 100644 --- a/aai-core/src/main/java/org/onap/aai/parsers/relationship/RelationshipToURI.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/relationship/RelationshipToURI.java @@ -28,7 +28,7 @@ import java.util.HashMap; import java.util.List; import java.util.Optional; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import org.apache.tinkerpop.gremlin.structure.Direction; import org.onap.aai.config.SpringContextAware; diff --git a/aai-core/src/main/java/org/onap/aai/parsers/uri/Parsable.java b/aai-core/src/main/java/org/onap/aai/parsers/uri/Parsable.java index 3bc40fd3..99b5db50 100644 --- a/aai-core/src/main/java/org/onap/aai/parsers/uri/Parsable.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/uri/Parsable.java @@ -20,7 +20,7 @@ package org.onap.aai.parsers.uri; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.onap.aai.edges.enums.EdgeType; import org.onap.aai.exceptions.AAIException; diff --git a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIParser.java b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIParser.java index 0d25a15e..c59f83a2 100644 --- a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIParser.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIParser.java @@ -26,9 +26,9 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.Set; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriBuilder; import org.onap.aai.edges.enums.EdgeType; import org.onap.aai.exceptions.AAIException; diff --git a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToDBKey.java b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToDBKey.java index ae0b4911..031dbd1f 100644 --- a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToDBKey.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToDBKey.java @@ -27,7 +27,7 @@ import java.net.URI; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.onap.aai.edges.enums.EdgeType; import org.onap.aai.exceptions.AAIException; diff --git a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToExtensionInformation.java b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToExtensionInformation.java index f3da24c3..b30c416a 100644 --- a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToExtensionInformation.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToExtensionInformation.java @@ -28,7 +28,7 @@ import java.net.URI; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.onap.aai.edges.enums.EdgeType; import org.onap.aai.exceptions.AAIException; diff --git a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToObject.java b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToObject.java index 11a028bf..c474c2b8 100644 --- a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToObject.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToObject.java @@ -26,7 +26,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.onap.aai.edges.enums.EdgeType; import org.onap.aai.exceptions.AAIException; diff --git a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToRelationshipObject.java b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToRelationshipObject.java index 57f48d4c..334c9c46 100644 --- a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToRelationshipObject.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIToRelationshipObject.java @@ -26,7 +26,7 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.List; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.onap.aai.config.SpringContextAware; import org.onap.aai.edges.enums.EdgeType; diff --git a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIValidate.java b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIValidate.java index 367fc578..88e5dc03 100644 --- a/aai-core/src/main/java/org/onap/aai/parsers/uri/URIValidate.java +++ b/aai-core/src/main/java/org/onap/aai/parsers/uri/URIValidate.java @@ -20,7 +20,7 @@ package org.onap.aai.parsers.uri; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.onap.aai.edges.enums.EdgeType; import org.onap.aai.exceptions.AAIException; diff --git a/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationService.java b/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationService.java index 9d8f5fdb..866912a0 100644 --- a/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationService.java +++ b/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationService.java @@ -38,9 +38,9 @@ import java.util.UUID; import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; -import org.apache.http.conn.ConnectTimeoutException; +import org.apache.hc.client5.http.ConnectTimeoutException; import org.onap.aai.domain.notificationEvent.NotificationEvent; import org.onap.aai.domain.notificationEvent.NotificationEvent.EventHeader; import org.onap.aai.exceptions.AAIException; @@ -225,12 +225,12 @@ public class ValidationService { // resources microservice shouldn't be blocked because of validation service // is taking too long or if the validation service is down // Any other exception it should block the request from passing? - if (e.getCause() instanceof SocketTimeoutException) { + if (e.getCause() instanceof ConnectTimeoutException) { + LOGGER.error(CONNECTION_TIMEOUT_STRING, e.getCause()); + } else if (e.getCause() instanceof SocketTimeoutException) { LOGGER.error(REQUEST_TIMEOUT_STRING, e.getCause()); } else if (e.getCause() instanceof ConnectException) { LOGGER.error(CONNECTION_REFUSED_STRING, e.getCause()); - } else if (e.getCause() instanceof ConnectTimeoutException) { - LOGGER.error(CONNECTION_TIMEOUT_STRING, e.getCause()); } else { LOGGER.error("Unknown exception thrown please investigate", e.getCause()); } diff --git a/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationServiceNoAuthClient.java b/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationServiceNoAuthClient.java index f899e9fe..2c5f42d8 100644 --- a/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationServiceNoAuthClient.java +++ b/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationServiceNoAuthClient.java @@ -47,6 +47,7 @@ public class ValidationServiceNoAuthClient extends NoAuthRestClient { protected HttpComponentsClientHttpRequestFactory getHttpRequestFactory() throws Exception { HttpComponentsClientHttpRequestFactory requestFactory = super.getHttpRequestFactory(); requestFactory.setConnectionRequestTimeout(timeout); + // Manual migration to `SocketConfig.Builder.setSoTimeout(Timeout)` necessary; see: https://docs.spring.io/spring-framework/docs/6.0.0/javadoc-api/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.html#setReadTimeout(int) requestFactory.setReadTimeout(timeout); requestFactory.setConnectTimeout(timeout); return requestFactory; diff --git a/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationServiceOneWayClient.java b/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationServiceOneWayClient.java index e148cee7..77e464d9 100644 --- a/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationServiceOneWayClient.java +++ b/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationServiceOneWayClient.java @@ -48,6 +48,7 @@ public class ValidationServiceOneWayClient extends OneWaySSLRestClient { protected HttpComponentsClientHttpRequestFactory getHttpRequestFactory() throws Exception { HttpComponentsClientHttpRequestFactory requestFactory = super.getHttpRequestFactory(); requestFactory.setConnectionRequestTimeout(timeout); + // Manual migration to `SocketConfig.Builder.setSoTimeout(Timeout)` necessary; see: https://docs.spring.io/spring-framework/docs/6.0.0/javadoc-api/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.html#setReadTimeout(int) requestFactory.setReadTimeout(timeout); requestFactory.setConnectTimeout(timeout); return requestFactory; diff --git a/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationServiceRestClient.java b/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationServiceRestClient.java index a1ca4b46..61cc57f5 100644 --- a/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationServiceRestClient.java +++ b/aai-core/src/main/java/org/onap/aai/prevalidation/ValidationServiceRestClient.java @@ -49,6 +49,7 @@ public class ValidationServiceRestClient extends TwoWaySSLRestClient { protected HttpComponentsClientHttpRequestFactory getHttpRequestFactory() throws Exception { HttpComponentsClientHttpRequestFactory requestFactory = super.getHttpRequestFactory(); requestFactory.setConnectionRequestTimeout(timeout); + // Manual migration to `SocketConfig.Builder.setSoTimeout(Timeout)` necessary; see: https://docs.spring.io/spring-framework/docs/6.0.0/javadoc-api/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.html#setReadTimeout(int) requestFactory.setReadTimeout(timeout); requestFactory.setConnectTimeout(timeout); return requestFactory; diff --git a/aai-core/src/main/java/org/onap/aai/query/builder/GraphTraversalBuilder.java b/aai-core/src/main/java/org/onap/aai/query/builder/GraphTraversalBuilder.java index 4ea0c074..bb69ba55 100644 --- a/aai-core/src/main/java/org/onap/aai/query/builder/GraphTraversalBuilder.java +++ b/aai-core/src/main/java/org/onap/aai/query/builder/GraphTraversalBuilder.java @@ -290,8 +290,8 @@ public abstract class GraphTraversalBuilder<E> extends QueryBuilder<E> { if (value instanceof String) {// "true" bValue = Boolean.valueOf(value.toString()); - } else if (value instanceof Boolean) {// true - bValue = (Boolean) value; + } else if (value instanceof Boolean boolean1) {// true + bValue = boolean1; } this.vertexHas(key, bValue); @@ -1046,7 +1046,7 @@ public abstract class GraphTraversalBuilder<E> extends QueryBuilder<E> { } else if (vertices instanceof Vertex) { results = Collections.singletonList((E) vertices); } else { - String msg = String.format("Results must be a list or a vertex, but was %s", vertices.getClass().getName()); + String msg = "Results must be a list or a vertex, but was %s".formatted(vertices.getClass().getName()); LOGGER.error(msg); throw new IllegalArgumentException(msg); } @@ -1055,12 +1055,12 @@ public abstract class GraphTraversalBuilder<E> extends QueryBuilder<E> { } private long parseCount(Object count) { - if(count instanceof String) { - return Long.parseLong((String) count); - } else if(count instanceof Integer) { - return Long.valueOf((int) count); - } else if (count instanceof Long) { - return (long) count; + if(count instanceof String string) { + return Long.parseLong(string); + } else if(count instanceof Integer integer) { + return Long.valueOf(integer); + } else if (count instanceof Long long1) { + return long1; } else { throw new IllegalArgumentException("Count must be a string, integer, or long"); } diff --git a/aai-core/src/main/java/org/onap/aai/query/builder/GremlinQueryBuilder.java b/aai-core/src/main/java/org/onap/aai/query/builder/GremlinQueryBuilder.java index 292d88fd..f3805647 100644 --- a/aai-core/src/main/java/org/onap/aai/query/builder/GremlinQueryBuilder.java +++ b/aai-core/src/main/java/org/onap/aai/query/builder/GremlinQueryBuilder.java @@ -159,8 +159,8 @@ public abstract class GremlinQueryBuilder<E> extends QueryBuilder<E> { boolean bValue = false; if (value instanceof String) { bValue = Boolean.valueOf(value.toString()); - } else if (value instanceof Boolean) { - bValue = (Boolean) value; + } else if (value instanceof Boolean boolean1) { + bValue = boolean1; } this.vertexHas(key, bValue); diff --git a/aai-core/src/main/java/org/onap/aai/query/builder/GremlinTraversal.java b/aai-core/src/main/java/org/onap/aai/query/builder/GremlinTraversal.java index 710db480..75d67365 100644 --- a/aai-core/src/main/java/org/onap/aai/query/builder/GremlinTraversal.java +++ b/aai-core/src/main/java/org/onap/aai/query/builder/GremlinTraversal.java @@ -25,7 +25,7 @@ import java.net.URI; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Vertex; diff --git a/aai-core/src/main/java/org/onap/aai/query/builder/GremlinUnique.java b/aai-core/src/main/java/org/onap/aai/query/builder/GremlinUnique.java index 2b117c49..70c754fc 100644 --- a/aai-core/src/main/java/org/onap/aai/query/builder/GremlinUnique.java +++ b/aai-core/src/main/java/org/onap/aai/query/builder/GremlinUnique.java @@ -25,7 +25,7 @@ import java.net.URI; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Vertex; diff --git a/aai-core/src/main/java/org/onap/aai/query/builder/HistoryGremlinTraversal.java b/aai-core/src/main/java/org/onap/aai/query/builder/HistoryGremlinTraversal.java index 49772b08..ecfb086f 100644 --- a/aai-core/src/main/java/org/onap/aai/query/builder/HistoryGremlinTraversal.java +++ b/aai-core/src/main/java/org/onap/aai/query/builder/HistoryGremlinTraversal.java @@ -25,7 +25,7 @@ import java.net.URI; import java.util.ArrayList; import java.util.List; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Vertex; diff --git a/aai-core/src/main/java/org/onap/aai/query/builder/QueryBuilder.java b/aai-core/src/main/java/org/onap/aai/query/builder/QueryBuilder.java index a22fc388..e593db5a 100644 --- a/aai-core/src/main/java/org/onap/aai/query/builder/QueryBuilder.java +++ b/aai-core/src/main/java/org/onap/aai/query/builder/QueryBuilder.java @@ -28,7 +28,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.tinkerpop.gremlin.process.traversal.Path; import org.apache.tinkerpop.gremlin.process.traversal.Pop; diff --git a/aai-core/src/main/java/org/onap/aai/query/builder/TraversalQuery.java b/aai-core/src/main/java/org/onap/aai/query/builder/TraversalQuery.java index ca9d232c..4866b99e 100644 --- a/aai-core/src/main/java/org/onap/aai/query/builder/TraversalQuery.java +++ b/aai-core/src/main/java/org/onap/aai/query/builder/TraversalQuery.java @@ -27,7 +27,7 @@ import java.net.URI; import java.util.List; import java.util.stream.Collectors; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.tinkerpop.gremlin.process.traversal.Step; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; @@ -184,8 +184,8 @@ public class TraversalQuery<E> extends GraphTraversalBuilder<E> { : start; for (int i = start; i < end - 1; i++) { Step step = steps.get(start); - if (step instanceof HasStep) { - List<HasContainer> hasContainers = ((HasStep) step).getHasContainers(); + if (step instanceof HasStep hasStep) { + List<HasContainer> hasContainers = hasStep.getHasContainers(); int hasContainerSize = hasContainers.size(); boolean isEndWithinHasContainer = isEndWithinHasContainer(end, i, hasContainers); if (isEndWithinHasContainer) { @@ -220,11 +220,11 @@ public class TraversalQuery<E> extends GraphTraversalBuilder<E> { int adjustedIndex = start; for (int i = 0; i < start; i++) { Step step = steps.get(i); - if (step instanceof HasStep) { - if(isEndWithinHasContainer(adjustedIndex, i, ((HasStep) step).getHasContainers())){ + if (step instanceof HasStep hasStep) { + if(isEndWithinHasContainer(adjustedIndex, i, hasStep.getHasContainers())){ adjustedIndex -= 1; } - adjustedIndex -= ((HasStep) step).getHasContainers().size(); + adjustedIndex -= hasStep.getHasContainers().size(); } } return adjustedIndex; diff --git a/aai-core/src/main/java/org/onap/aai/query/builder/TraversalURIOptimizedQuery.java b/aai-core/src/main/java/org/onap/aai/query/builder/TraversalURIOptimizedQuery.java index b96847c2..e261f989 100644 --- a/aai-core/src/main/java/org/onap/aai/query/builder/TraversalURIOptimizedQuery.java +++ b/aai-core/src/main/java/org/onap/aai/query/builder/TraversalURIOptimizedQuery.java @@ -119,9 +119,9 @@ public class TraversalURIOptimizedQuery<E> extends TraversalQuery<E> { for (int i = adjustedIndex; i < steps.size(); i++) { Step step = steps.get(i); boolean isFirstStep = i == adjustedIndex; - if (isFirstStep && step instanceof HasStep) { + if (isFirstStep && step instanceof HasStep<?> hasStep) { int splitPosition = indexAndStepCountTuple.getValue(); - List<HasContainer> newContainers = ((HasStep<?>) step).getHasContainers().stream() + List<HasContainer> newContainers = hasStep.getHasContainers().stream() .skip(splitPosition) .collect(Collectors.toList()); traversalAdminStart @@ -148,8 +148,8 @@ public class TraversalURIOptimizedQuery<E> extends TraversalQuery<E> { int stepCount = 0; for (int j = 0; j <= lastURIStepIndex; j++) { Step step = steps.get(j); - if (step instanceof HasStep) { - stepCount += ((HasStep<?>) step).getHasContainers().size(); + if (step instanceof HasStep<?> hasStep) { + stepCount += hasStep.getHasContainers().size(); } else { stepCount++; } diff --git a/aai-core/src/main/java/org/onap/aai/rest/db/DBRequest.java b/aai-core/src/main/java/org/onap/aai/rest/db/DBRequest.java index e25a9062..a2c073ea 100644 --- a/aai-core/src/main/java/org/onap/aai/rest/db/DBRequest.java +++ b/aai-core/src/main/java/org/onap/aai/rest/db/DBRequest.java @@ -23,8 +23,8 @@ package org.onap.aai.rest.db; import java.net.URI; import java.util.Optional; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.UriInfo; import org.onap.aai.aailog.logs.DBRequestWrapper; import org.onap.aai.introspection.Introspector; diff --git a/aai-core/src/main/java/org/onap/aai/rest/db/HttpEntry.java b/aai-core/src/main/java/org/onap/aai/rest/db/HttpEntry.java index c481e2cd..ba1766bf 100644 --- a/aai-core/src/main/java/org/onap/aai/rest/db/HttpEntry.java +++ b/aai-core/src/main/java/org/onap/aai/rest/db/HttpEntry.java @@ -36,8 +36,8 @@ import java.net.URISyntaxException; import java.util.*; import java.util.stream.Collectors; -import javax.ws.rs.core.*; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.*; +import jakarta.ws.rs.core.Response.Status; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.janusgraph.core.JanusGraphException; @@ -422,7 +422,7 @@ public class HttpEntry { // The format is purposefully %s/%s%s due to the fact // that every aai-uri will have a slash at the beginning // If that assumption isn't true, then its best to change this code - String curUri = String.format("%s/%s%s", basePath, version, entry.getKey()); + String curUri = "%s/%s%s".formatted(basePath, version, entry.getKey()); Introspector curObj = entry.getValue().getValue0(); HashMap<String, Introspector> curObjRelated = entry.getValue().getValue1(); notification.createNotificationEvent(transactionId, sourceOfTruth, diff --git a/aai-core/src/main/java/org/onap/aai/rest/notification/NotificationService.java b/aai-core/src/main/java/org/onap/aai/rest/notification/NotificationService.java index c2770692..a6bc2839 100644 --- a/aai-core/src/main/java/org/onap/aai/rest/notification/NotificationService.java +++ b/aai-core/src/main/java/org/onap/aai/rest/notification/NotificationService.java @@ -27,7 +27,7 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.onap.aai.db.props.AAIProperties; @@ -129,7 +129,7 @@ public class NotificationService { Introspector curObj = serializer.getLatestVersionView(vertex, eventDepth); String aaiUri = vertex.<String>property(AAIProperties.AAI_URI).value(); - String uri = String.format("%s/%s%s", basePath, schemaVersion, aaiUri); + String uri = "%s/%s%s".formatted(basePath, schemaVersion, aaiUri); HashMap<String, Introspector> curRelatedObjs = new HashMap<>(); if (!curObj.isTopLevel()) { curRelatedObjs = serializer.getRelatedObjects(queryEngine, vertex, curObj, loaderFactory.getMoxyLoaderInstance().get(schemaVersion)); diff --git a/aai-core/src/main/java/org/onap/aai/rest/notification/UEBNotification.java b/aai-core/src/main/java/org/onap/aai/rest/notification/UEBNotification.java index 61be76c8..21c3fbea 100644 --- a/aai-core/src/main/java/org/onap/aai/rest/notification/UEBNotification.java +++ b/aai-core/src/main/java/org/onap/aai/rest/notification/UEBNotification.java @@ -30,7 +30,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.onap.aai.domain.notificationEvent.NotificationEvent; import org.onap.aai.domain.notificationEvent.NotificationEvent.EventHeader; diff --git a/aai-core/src/main/java/org/onap/aai/restcore/CustomJacksonJaxBJsonProvider.java b/aai-core/src/main/java/org/onap/aai/restcore/CustomJacksonJaxBJsonProvider.java index 1e9bb05b..aa71c8c7 100644 --- a/aai-core/src/main/java/org/onap/aai/restcore/CustomJacksonJaxBJsonProvider.java +++ b/aai-core/src/main/java/org/onap/aai/restcore/CustomJacksonJaxBJsonProvider.java @@ -24,16 +24,16 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; -import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule; +import com.fasterxml.jackson.jakarta.rs.json.JacksonXmlBindJsonProvider; +import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.Provider; /** * The Class CustomJacksonJaxBJsonProvider. */ @Provider -public class CustomJacksonJaxBJsonProvider extends JacksonJaxbJsonProvider { +public class CustomJacksonJaxBJsonProvider extends JacksonXmlBindJsonProvider { private static ObjectMapper commonMapper = null; @@ -53,7 +53,7 @@ public class CustomJacksonJaxBJsonProvider extends JacksonJaxbJsonProvider { mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, false); - mapper.registerModule(new JaxbAnnotationModule()); + mapper.registerModule(new JakartaXmlBindAnnotationModule()); commonMapper = mapper; } diff --git a/aai-core/src/main/java/org/onap/aai/restcore/RESTAPI.java b/aai-core/src/main/java/org/onap/aai/restcore/RESTAPI.java index 31805fd4..f4da0175 100644 --- a/aai-core/src/main/java/org/onap/aai/restcore/RESTAPI.java +++ b/aai-core/src/main/java/org/onap/aai/restcore/RESTAPI.java @@ -33,10 +33,10 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -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.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.onap.aai.db.props.AAIProperties; import org.onap.aai.exceptions.AAIException; @@ -314,7 +314,7 @@ public class RESTAPI { response = handler.get(timeoutLimit, TimeUnit.MILLISECONDS); } catch (TimeoutException e) { AAIException ex = new AAIException("AAI_7406", - String.format("Timeout limit of %s seconds reached.", timeoutLimit / 1000)); + "Timeout limit of %s seconds reached.".formatted(timeoutLimit / 1000)); response = consumerExceptionResponseGenerator(headers, info, method, ex); handler.cancel(true); } catch (InterruptedException e) { diff --git a/aai-core/src/main/java/org/onap/aai/restcore/util/URITools.java b/aai-core/src/main/java/org/onap/aai/restcore/util/URITools.java index 962d2e99..6693f2b2 100644 --- a/aai-core/src/main/java/org/onap/aai/restcore/util/URITools.java +++ b/aai-core/src/main/java/org/onap/aai/restcore/util/URITools.java @@ -30,8 +30,8 @@ import java.util.Set; 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.onap.aai.introspection.Introspector; import org.onap.aai.introspection.sideeffect.exceptions.AAIMissingRequiredPropertyException; diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/DBSerializer.java b/aai-core/src/main/java/org/onap/aai/serialization/db/DBSerializer.java index 3a694759..b74ae60e 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/db/DBSerializer.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/db/DBSerializer.java @@ -47,7 +47,7 @@ import java.util.concurrent.Future; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import org.apache.commons.lang3.StringUtils; import org.apache.tinkerpop.gremlin.process.traversal.Path; @@ -909,7 +909,7 @@ public class DBSerializer { List<Vertex> results = parser.getQueryBuilder().toList(); if (results.isEmpty()) { final AAIException ex = - new AAIException(AAI_6129, String.format("Node of type %s. Could not find object at: %s", + new AAIException(AAI_6129, "Node of type %s. Could not find object at: %s".formatted( parser.getResultType(), parser.getUri())); ex.getTemplateVars().add(parser.getResultType()); ex.getTemplateVars().add(parser.getUri().toString()); @@ -939,7 +939,7 @@ public class DBSerializer { // rule } throw new AAIException("AAI_6120", - String.format("No EdgeRule found for passed nodeTypes: %s, %s.", aNodeType, bNodeType)); + "No EdgeRule found for passed nodeTypes: %s, %s.".formatted(aNodeType, bNodeType)); } else { try { final List<EdgeRule> rules = new ArrayList<>(edgeIngestor.getRules(ruleQuery).values()); @@ -1034,7 +1034,7 @@ public class DBSerializer { if (!edgeRules.hasRule(baseQ.build())) { throw new AAIException("AAI_6120", - String.format("No EdgeRule found for passed nodeTypes: %s, %s%s.", aNodeType, cousinType, + "No EdgeRule found for passed nodeTypes: %s, %s%s.".formatted(aNodeType, cousinType, label != null ? (" with label " + label) : "")); } else if (edgeRules.hasRule(baseQ.edgeType(EdgeType.TREE).build()) && !edgeRules.hasRule(baseQ.edgeType(EdgeType.COUSIN).build())) { diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/EdgePropertyMap.java b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgePropertyMap.java index 777ddd87..f8c21d25 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/db/EdgePropertyMap.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/db/EdgePropertyMap.java @@ -20,6 +20,7 @@ package org.onap.aai.serialization.db; +import java.io.Serial; import java.util.HashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -28,6 +29,7 @@ import org.apache.tinkerpop.gremlin.structure.Direction; public class EdgePropertyMap<K, V> extends HashMap<K, V> { + @Serial private static final long serialVersionUID = -8298355506617458683L; private static final Pattern variablePattern = Pattern.compile("(!)?\\$\\{(\\w+)\\}"); diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/EdgeMultiplicityException.java b/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/EdgeMultiplicityException.java index 675dfb77..b67fd6ff 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/EdgeMultiplicityException.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/EdgeMultiplicityException.java @@ -20,10 +20,13 @@ package org.onap.aai.serialization.db.exceptions; +import java.io.Serial; + import org.onap.aai.exceptions.AAIException; public class EdgeMultiplicityException extends AAIException { + @Serial private static final long serialVersionUID = -5575661036426538012L; public EdgeMultiplicityException(String message) { diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/MultipleEdgeRuleFoundException.java b/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/MultipleEdgeRuleFoundException.java index c2a3c1a2..ba903a75 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/MultipleEdgeRuleFoundException.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/MultipleEdgeRuleFoundException.java @@ -20,10 +20,13 @@ package org.onap.aai.serialization.db.exceptions; +import java.io.Serial; + import org.onap.aai.exceptions.AAIException; public class MultipleEdgeRuleFoundException extends AAIException { + @Serial private static final long serialVersionUID = -906843868234976763L; public MultipleEdgeRuleFoundException(String message) { diff --git a/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/NoEdgeRuleFoundException.java b/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/NoEdgeRuleFoundException.java index 0f2a044d..ba10cdb6 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/NoEdgeRuleFoundException.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/db/exceptions/NoEdgeRuleFoundException.java @@ -20,10 +20,13 @@ package org.onap.aai.serialization.db.exceptions; +import java.io.Serial; + import org.onap.aai.exceptions.AAIException; public class NoEdgeRuleFoundException extends AAIException { + @Serial private static final long serialVersionUID = -906843868234976763L; public NoEdgeRuleFoundException(String message) { diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Aggregate.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Aggregate.java index 54fc4eb0..ff83443b 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Aggregate.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Aggregate.java @@ -210,7 +210,7 @@ public class Aggregate extends MultiFormatMapper { JsonArray inner = new JsonArray(); for (Vertex o : (ArrayList<Vertex>) l) { if (o instanceof Vertex) { - Optional<JsonObject> obj = this.getJsonFromVertex((Vertex) o, properties); + Optional<JsonObject> obj = this.getJsonFromVertex(o, properties); if (obj.isPresent()) { inner.add(obj.get()); } else { diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Count.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Count.java index c736eab8..d6849709 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Count.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Count.java @@ -66,15 +66,14 @@ public class Count implements FormatMapper { Pair<String, Long> pair = null; - if (o instanceof Vertex) { - Vertex v = (Vertex) o; + if (o instanceof Vertex v) { pair = Pair.with(v.property(AAIProperties.NODE_TYPE).value().toString(), 1L); } else if (o instanceof Tree) { pair = Pair.with("trees", 1L); } else if (o instanceof Path) { pair = Pair.with("paths", 1L); - } else if (o instanceof Long) { - pair = Pair.with("count", (Long) o); + } else if (o instanceof Long long1) { + pair = Pair.with("count", long1); } if (pair == null) { diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/FormatFactory.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/FormatFactory.java index e102f1f4..2e54280d 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/FormatFactory.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/FormatFactory.java @@ -20,8 +20,8 @@ package org.onap.aai.serialization.queryformats; -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.onap.aai.exceptions.AAIException; import org.onap.aai.introspection.Loader; diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Formatter.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Formatter.java index 10f1edc4..e31753c1 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Formatter.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Formatter.java @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Stream; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.onap.aai.logging.LogFormatTools; import org.onap.aai.serialization.queryformats.exceptions.AAIFormatQueryResultFormatNotSupported; diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/HistoryFormat.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/HistoryFormat.java index 02c4041f..6cb7beb1 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/HistoryFormat.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/HistoryFormat.java @@ -103,12 +103,12 @@ public abstract class HistoryFormat extends MultiFormatMapper { } protected JsonObject mapPropertyValues(JsonObject json, String propertyKey, Object propertyValue) { - if (propertyValue instanceof String) { - json.addProperty(propertyKey, (String) propertyValue); - } else if (propertyValue instanceof Boolean) { - json.addProperty(propertyKey, (Boolean) propertyValue); - } else if (propertyValue instanceof Number) { - json.addProperty(propertyKey, (Number) propertyValue); + if (propertyValue instanceof String string) { + json.addProperty(propertyKey, string); + } else if (propertyValue instanceof Boolean boolean1) { + json.addProperty(propertyKey, boolean1); + } else if (propertyValue instanceof Number number) { + json.addProperty(propertyKey, number); } else { if (!(propertyValue instanceof List)) { return json; diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/IdURL.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/IdURL.java index b9ba00eb..cad929f8 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/IdURL.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/IdURL.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.onap.aai.db.props.AAIProperties; diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/MultiFormatMapper.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/MultiFormatMapper.java index 186816e0..778d4cf6 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/MultiFormatMapper.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/MultiFormatMapper.java @@ -55,19 +55,19 @@ public abstract class MultiFormatMapper implements FormatMapper { @Override public Optional<JsonObject> formatObject(Object input) throws AAIFormatVertexException, AAIFormatQueryResultFormatNotSupported { - if (input instanceof Vertex) { + if (input instanceof Vertex vertex) { logger.debug("Formatting vertex object"); - return this.getJsonFromVertex((Vertex) input); - } else if (input instanceof Tree) { + return this.getJsonFromVertex(vertex); + } else if (input instanceof Tree<?> tree) { logger.debug("Formatting tree object"); if (isTree) { - return this.getRelatedNodesFromTree((Tree<?>) input, null); + return this.getRelatedNodesFromTree(tree, null); } else { - return this.getJsonFromTree((Tree<?>) input); + return this.getJsonFromTree(tree); } - } else if (input instanceof Path) { + } else if (input instanceof Path path) { logger.debug("Formatting path object"); - return this.getJsonFromPath((Path) input); + return this.getJsonFromPath(path); } else { throw new AAIFormatQueryResultFormatNotSupported(); } @@ -76,19 +76,19 @@ public abstract class MultiFormatMapper implements FormatMapper { @Override public Optional<JsonObject> formatObject(Object input, Map<String, List<String>> properties) throws AAIFormatVertexException, AAIFormatQueryResultFormatNotSupported { - if (input instanceof Vertex) { + if (input instanceof Vertex vertex) { logger.debug("Formatting vertex object with properties map filter"); - return this.getJsonFromVertex((Vertex) input, properties); - } else if (input instanceof Tree) { + return this.getJsonFromVertex(vertex, properties); + } else if (input instanceof Tree<?> tree) { logger.debug("Formatting tree object with properties map filter"); if (isTree) { - return this.getRelatedNodesFromTree((Tree<?>) input, properties); + return this.getRelatedNodesFromTree(tree, properties); } else { - return this.getJsonFromTree((Tree<?>) input); + return this.getJsonFromTree(tree); } - } else if (input instanceof Path) { + } else if (input instanceof Path path) { logger.debug("Formatting path object"); - return this.getJsonFromPath((Path) input); + return this.getJsonFromPath(path); } else { throw new AAIFormatQueryResultFormatNotSupported(); } @@ -106,8 +106,8 @@ public abstract class MultiFormatMapper implements FormatMapper { JsonArray ja = new JsonArray(); for (Object o : path) { - if (o instanceof Vertex) { - Optional<JsonObject> obj = this.getJsonFromVertex((Vertex) o); + if (o instanceof Vertex vertex) { + Optional<JsonObject> obj = this.getJsonFromVertex(vertex); obj.ifPresent(ja::add); } } diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/PathedURL.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/PathedURL.java index 0331925c..b0162dcc 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/PathedURL.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/PathedURL.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.onap.aai.db.props.AAIProperties; diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Resource.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Resource.java index 1a69bed3..557e4ef9 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Resource.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/Resource.java @@ -32,7 +32,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree; import org.apache.tinkerpop.gremlin.structure.Vertex; diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/TreeFormat.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/TreeFormat.java index 0cebca70..68be2415 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/TreeFormat.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/TreeFormat.java @@ -202,8 +202,8 @@ public class TreeFormat extends MultiFormatMapper { } } // Gremlin Query - else if (o instanceof Vertex) { - Optional<JsonObject> obj = this.getJsonFromVertex((Vertex) o); + else if (o instanceof Vertex vertex) { + Optional<JsonObject> obj = this.getJsonFromVertex(vertex); if (obj.isPresent()) { jsonObject = obj.get(); for (Map.Entry<String, JsonElement> mapEntry : jsonObject.entrySet()) { @@ -239,8 +239,8 @@ public class TreeFormat extends MultiFormatMapper { for (Map.Entry<Object, Tree<Object>> entry : tree.entrySet()) { Object o = entry.getKey(); - if (o instanceof Vertex) { - processVertex(relatedNodes, entry, (Vertex) o); + if (o instanceof Vertex vertex) { + processVertex(relatedNodes, entry, vertex); } } return Optional.of(relatedNodes); diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/AAIFormatQueryResultFormatNotSupported.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/AAIFormatQueryResultFormatNotSupported.java index add62644..79497fee 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/AAIFormatQueryResultFormatNotSupported.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/AAIFormatQueryResultFormatNotSupported.java @@ -20,8 +20,11 @@ package org.onap.aai.serialization.queryformats.exceptions; +import java.io.Serial; + public class AAIFormatQueryResultFormatNotSupported extends Exception { + @Serial private static final long serialVersionUID = -5814240842844624097L; public AAIFormatQueryResultFormatNotSupported() { diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/AAIFormatVertexException.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/AAIFormatVertexException.java index 9c5f92a6..bf0d1ff2 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/AAIFormatVertexException.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/AAIFormatVertexException.java @@ -20,8 +20,11 @@ package org.onap.aai.serialization.queryformats.exceptions; +import java.io.Serial; + public class AAIFormatVertexException extends Exception { + @Serial private static final long serialVersionUID = -5814240841844624097L; public AAIFormatVertexException() { diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/QueryParamInjectionException.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/QueryParamInjectionException.java index 58e60e61..cf71d772 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/QueryParamInjectionException.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/exceptions/QueryParamInjectionException.java @@ -20,10 +20,13 @@ package org.onap.aai.serialization.queryformats.exceptions; +import java.io.Serial; + import org.onap.aai.exceptions.AAIException; public class QueryParamInjectionException extends AAIException { + @Serial private static final long serialVersionUID = -5575661036426538012L; public QueryParamInjectionException(String message) { diff --git a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjector.java b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjector.java index a0693a8e..947636d5 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjector.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjector.java @@ -23,7 +23,7 @@ package org.onap.aai.serialization.queryformats.utils; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.onap.aai.serialization.queryformats.exceptions.QueryParamInjectionException; import org.onap.aai.serialization.queryformats.params.*; diff --git a/aai-core/src/main/java/org/onap/aai/serialization/tinkerpop/TreeBackedEdge.java b/aai-core/src/main/java/org/onap/aai/serialization/tinkerpop/TreeBackedEdge.java index 50174d03..1812b403 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/tinkerpop/TreeBackedEdge.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/tinkerpop/TreeBackedEdge.java @@ -20,6 +20,7 @@ package org.onap.aai.serialization.tinkerpop; +import java.io.Serial; import java.util.Iterator; import org.apache.tinkerpop.gremlin.structure.Direction; @@ -35,8 +36,9 @@ import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils; * These objects are not mutable and can only be used to read information out. * */ -public class TreeBackedEdge extends DetachedEdge implements Edge { +public class TreeBackedEdge extends DetachedEdge { + @Serial private static final long serialVersionUID = 5419650145562077538L; private TreeBackedVertex inVertex; private TreeBackedVertex outVertex; diff --git a/aai-core/src/main/java/org/onap/aai/serialization/tinkerpop/TreeBackedVertex.java b/aai-core/src/main/java/org/onap/aai/serialization/tinkerpop/TreeBackedVertex.java index 700005ac..3560af05 100644 --- a/aai-core/src/main/java/org/onap/aai/serialization/tinkerpop/TreeBackedVertex.java +++ b/aai-core/src/main/java/org/onap/aai/serialization/tinkerpop/TreeBackedVertex.java @@ -20,6 +20,7 @@ package org.onap.aai.serialization.tinkerpop; +import java.io.Serial; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; @@ -36,8 +37,9 @@ import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex; * */ -public class TreeBackedVertex extends DetachedVertex implements Vertex { +public class TreeBackedVertex extends DetachedVertex { + @Serial private static final long serialVersionUID = -976854460992756953L; private final transient Tree<Element> tree; private final transient Vertex self; diff --git a/aai-core/src/main/java/org/onap/aai/service/NodeValidationService.java b/aai-core/src/main/java/org/onap/aai/service/NodeValidationService.java index ca4666ae..aa36d42f 100644 --- a/aai-core/src/main/java/org/onap/aai/service/NodeValidationService.java +++ b/aai-core/src/main/java/org/onap/aai/service/NodeValidationService.java @@ -20,7 +20,7 @@ package org.onap.aai.service; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.onap.aai.validation.nodes.NodeValidator; import org.slf4j.Logger; diff --git a/aai-core/src/main/java/org/onap/aai/util/Entity.java b/aai-core/src/main/java/org/onap/aai/util/Entity.java index 52a78d3c..f1638327 100644 --- a/aai-core/src/main/java/org/onap/aai/util/Entity.java +++ b/aai-core/src/main/java/org/onap/aai/util/Entity.java @@ -32,7 +32,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Generated; +import jakarta.annotation.Generated; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/aai-core/src/main/java/org/onap/aai/util/EntityList.java b/aai-core/src/main/java/org/onap/aai/util/EntityList.java index e2bab6f5..c9fe2ee8 100644 --- a/aai-core/src/main/java/org/onap/aai/util/EntityList.java +++ b/aai-core/src/main/java/org/onap/aai/util/EntityList.java @@ -32,7 +32,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Generated; +import jakarta.annotation.Generated; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/aai-core/src/main/java/org/onap/aai/util/GraphChecker.java b/aai-core/src/main/java/org/onap/aai/util/GraphChecker.java index 35cc832f..cceedbd4 100644 --- a/aai-core/src/main/java/org/onap/aai/util/GraphChecker.java +++ b/aai-core/src/main/java/org/onap/aai/util/GraphChecker.java @@ -19,9 +19,7 @@ package org.onap.aai.util; import org.janusgraph.core.JanusGraph; -import org.janusgraph.core.JanusGraphException; import org.janusgraph.core.JanusGraphTransaction; -import org.onap.aai.logging.ErrorLogHelper; import org.springframework.stereotype.Component; import lombok.RequiredArgsConstructor; diff --git a/aai-core/src/main/java/org/onap/aai/util/KeyValueList.java b/aai-core/src/main/java/org/onap/aai/util/KeyValueList.java index 8c9ea52b..606003ef 100644 --- a/aai-core/src/main/java/org/onap/aai/util/KeyValueList.java +++ b/aai-core/src/main/java/org/onap/aai/util/KeyValueList.java @@ -30,7 +30,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import java.util.HashMap; import java.util.Map; -import javax.annotation.Generated; +import jakarta.annotation.Generated; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/aai-core/src/main/java/org/onap/aai/util/PojoUtils.java b/aai-core/src/main/java/org/onap/aai/util/PojoUtils.java index 4c2ce942..3bab941a 100644 --- a/aai-core/src/main/java/org/onap/aai/util/PojoUtils.java +++ b/aai-core/src/main/java/org/onap/aai/util/PojoUtils.java @@ -28,7 +28,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule; +import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule; import com.google.common.base.CaseFormat; import com.google.common.collect.Multimap; @@ -46,9 +46,9 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Random; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import org.apache.commons.io.output.ByteArrayOutputStream; import org.eclipse.persistence.dynamic.DynamicEntity; @@ -126,7 +126,7 @@ public class PojoUtils { public <T> String getJsonFromObject(T clazz, boolean wrapRoot, boolean indent) throws JsonGenerationException, JsonMappingException, IOException { ObjectMapper mapper = JsonMapper.builder() - .addModule(new JaxbAnnotationModule()) + .addModule(new JakartaXmlBindAnnotationModule()) .addModule(new JavaTimeModule()) .serializationInclusion(JsonInclude.Include.NON_NULL) .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false) diff --git a/aai-core/src/test/java/org/onap/aai/AAIJunitRunner.java b/aai-core/src/test/java/org/onap/aai/AAIJunitRunner.java index da7446bb..fa08c78c 100644 --- a/aai-core/src/test/java/org/onap/aai/AAIJunitRunner.java +++ b/aai-core/src/test/java/org/onap/aai/AAIJunitRunner.java @@ -31,7 +31,7 @@ public class AAIJunitRunner extends Parameterized { public AAIJunitRunner(Class<?> klass) throws Throwable { super(klass); setProps(); - modifyOxmHome(); + // modifyOxmHome(); } public void setProps() { @@ -39,20 +39,12 @@ public class AAIJunitRunner extends Parameterized { System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); } - public void modifyOxmHome() { - try { - Field aaiConstantsField = AAIConstants.class.getField("AAI_HOME_ETC_OXM"); - setFinalStatic(aaiConstantsField, "../aai-schema/src/main/resources/oxm/"); - } catch (Exception e) { - e.printStackTrace(); - } - } - - public void setFinalStatic(Field field, Object newValue) throws Exception { - field.setAccessible(true); - Field modifiersField = Field.class.getDeclaredField("modifiers"); - modifiersField.setAccessible(true); - modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL); - field.set(null, newValue); - } + // public void modifyOxmHome() { + // try { + // Field aaiConstantsField = AAIConstants.class.getField("AAI_HOME_ETC_OXM"); + // setFinalStatic(aaiConstantsField, "../aai-schema/src/main/resources/oxm/"); + // } catch (Exception e) { + // e.printStackTrace(); + // } + // } } diff --git a/aai-core/src/test/java/org/onap/aai/AAISetup.java b/aai-core/src/test/java/org/onap/aai/AAISetup.java index e280d889..282406dc 100644 --- a/aai-core/src/test/java/org/onap/aai/AAISetup.java +++ b/aai-core/src/test/java/org/onap/aai/AAISetup.java @@ -20,6 +20,7 @@ package org.onap.aai; +import java.lang.reflect.Field; import java.util.Map; import org.junit.BeforeClass; @@ -98,8 +99,9 @@ public abstract class AAISetup { System.setProperty("AJSC_HOME", "."); System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); System.setProperty("aai.service.name", SERVICE_NAME); - QueryFormatTestHelper.setFinalStatic(AAIConstants.class.getField("AAI_HOME_ETC_OXM"), - "src/test/resources/bundleconfig-local/etc/oxm/"); + // Field etcHomeField = AAIConstants.class.getField("AAI_HOME_ETC_OXM"); + // QueryFormatTestHelper.setFinalStatic(etcHomeField, + // "src/test/resources/bundleconfig-local/etc/oxm/"); } } diff --git a/aai-core/src/test/java/org/onap/aai/AAISetupForSwagger.java b/aai-core/src/test/java/org/onap/aai/AAISetupForSwagger.java index c11a5b2d..4fa5821d 100644 --- a/aai-core/src/test/java/org/onap/aai/AAISetupForSwagger.java +++ b/aai-core/src/test/java/org/onap/aai/AAISetupForSwagger.java @@ -58,8 +58,6 @@ public abstract class AAISetupForSwagger { System.setProperty("AJSC_HOME", "."); System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); System.setProperty("aai.service.name", SERVICE_NAME); - QueryFormatTestHelper.setFinalStatic(AAIConstants.class.getField("AAI_HOME_ETC_OXM"), - "src/test/resources/bundleconfig-local/etc/oxm/"); } } diff --git a/aai-core/src/test/java/org/onap/aai/DataLinkSetup.java b/aai-core/src/test/java/org/onap/aai/DataLinkSetup.java index 5ede5c22..b4348ee1 100644 --- a/aai-core/src/test/java/org/onap/aai/DataLinkSetup.java +++ b/aai-core/src/test/java/org/onap/aai/DataLinkSetup.java @@ -96,8 +96,6 @@ public abstract class DataLinkSetup { System.setProperty("AJSC_HOME", "."); System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); System.setProperty("aai.service.name", SERVICE_NAME); - QueryFormatTestHelper.setFinalStatic(AAIConstants.class.getField("AAI_HOME_ETC_OXM"), - "src/test/resources/bundleconfig-local/etc/oxm/"); } } diff --git a/aai-core/src/test/java/org/onap/aai/HttpTestUtil.java b/aai-core/src/test/java/org/onap/aai/HttpTestUtil.java index 2759ab99..399fb157 100644 --- a/aai-core/src/test/java/org/onap/aai/HttpTestUtil.java +++ b/aai-core/src/test/java/org/onap/aai/HttpTestUtil.java @@ -32,14 +32,6 @@ import java.util.List; import java.util.Map; 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 org.javatuples.Pair; import org.mockito.Mockito; import org.onap.aai.config.SpringContextAware; @@ -61,6 +53,14 @@ import org.onap.aai.setup.SchemaVersions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +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; + public class HttpTestUtil extends RESTAPI { protected HttpEntry traversalHttpEntry; diff --git a/aai-core/src/test/java/org/onap/aai/introspection/IntrospectorSerializationTest.java b/aai-core/src/test/java/org/onap/aai/introspection/IntrospectorSerializationTest.java index 60749ddd..4346b8c2 100644 --- a/aai-core/src/test/java/org/onap/aai/introspection/IntrospectorSerializationTest.java +++ b/aai-core/src/test/java/org/onap/aai/introspection/IntrospectorSerializationTest.java @@ -34,7 +34,7 @@ import org.onap.aai.setup.SchemaVersion; import org.skyscreamer.jsonassert.JSONAssert; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule; +import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule; public class IntrospectorSerializationTest extends AAISetup { @@ -59,7 +59,7 @@ public class IntrospectorSerializationTest extends AAISetup { @Test public void serializeNotificationEvent() throws IOException, AAIUnmarshallingException { mapper = new ObjectMapper(); - mapper.registerModule(new JaxbAnnotationModule()); + mapper.registerModule(new JakartaXmlBindAnnotationModule()); String pserver = new String(Files.readAllBytes(Path.of("src/test/resources/payloads/templates/pserver.json"))).replace("${hostname}", "pserver1"); Introspector introspector = loader.unmarshal("pserver", pserver); diff --git a/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataLinkTest.java b/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataLinkTest.java index 368a9466..413f5ad6 100644 --- a/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataLinkTest.java +++ b/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/DataLinkTest.java @@ -37,7 +37,7 @@ import java.util.Collection; import java.util.List; import java.util.UUID; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; diff --git a/aai-core/src/test/java/org/onap/aai/introspection/tools/CreateUUIDTest.java b/aai-core/src/test/java/org/onap/aai/introspection/tools/CreateUUIDTest.java index 49baf789..61ec03ef 100644 --- a/aai-core/src/test/java/org/onap/aai/introspection/tools/CreateUUIDTest.java +++ b/aai-core/src/test/java/org/onap/aai/introspection/tools/CreateUUIDTest.java @@ -28,7 +28,6 @@ import org.junit.Test; import org.onap.aai.AAISetup; import org.onap.aai.introspection.Introspector; import org.onap.aai.introspection.Loader; -import org.onap.aai.introspection.LoaderFactory; import org.onap.aai.introspection.ModelType; import org.onap.aai.introspection.exceptions.AAIUnknownObjectException; import org.springframework.test.annotation.DirtiesContext; diff --git a/aai-core/src/test/java/org/onap/aai/introspection/tools/DefaultFieldsTest.java b/aai-core/src/test/java/org/onap/aai/introspection/tools/DefaultFieldsTest.java index 704f02a1..86e51bf9 100644 --- a/aai-core/src/test/java/org/onap/aai/introspection/tools/DefaultFieldsTest.java +++ b/aai-core/src/test/java/org/onap/aai/introspection/tools/DefaultFieldsTest.java @@ -30,7 +30,6 @@ import org.junit.Test; import org.onap.aai.AAISetup; import org.onap.aai.introspection.Introspector; import org.onap.aai.introspection.Loader; -import org.onap.aai.introspection.LoaderFactory; import org.onap.aai.introspection.ModelType; import org.onap.aai.introspection.exceptions.AAIUnknownObjectException; import org.springframework.test.annotation.DirtiesContext; diff --git a/aai-core/src/test/java/org/onap/aai/introspection/tools/InjectKeysFromURITest.java b/aai-core/src/test/java/org/onap/aai/introspection/tools/InjectKeysFromURITest.java index 15ba9a5e..0348d0c2 100644 --- a/aai-core/src/test/java/org/onap/aai/introspection/tools/InjectKeysFromURITest.java +++ b/aai-core/src/test/java/org/onap/aai/introspection/tools/InjectKeysFromURITest.java @@ -33,7 +33,6 @@ import org.junit.Test; import org.onap.aai.AAISetup; import org.onap.aai.introspection.Introspector; import org.onap.aai.introspection.Loader; -import org.onap.aai.introspection.LoaderFactory; import org.onap.aai.introspection.ModelType; import org.onap.aai.introspection.exceptions.AAIUnknownObjectException; import org.springframework.test.annotation.DirtiesContext; diff --git a/aai-core/src/test/java/org/onap/aai/introspection/tools/RemoveNonVisiblePropertyTest.java b/aai-core/src/test/java/org/onap/aai/introspection/tools/RemoveNonVisiblePropertyTest.java index 2ca97007..7a0832f6 100644 --- a/aai-core/src/test/java/org/onap/aai/introspection/tools/RemoveNonVisiblePropertyTest.java +++ b/aai-core/src/test/java/org/onap/aai/introspection/tools/RemoveNonVisiblePropertyTest.java @@ -29,7 +29,6 @@ import org.junit.Test; import org.onap.aai.AAISetup; import org.onap.aai.introspection.Introspector; import org.onap.aai.introspection.Loader; -import org.onap.aai.introspection.LoaderFactory; import org.onap.aai.introspection.ModelType; import org.onap.aai.introspection.exceptions.AAIUnknownObjectException; import org.springframework.test.annotation.DirtiesContext; diff --git a/aai-core/src/test/java/org/onap/aai/kafka/AAIKafkaEventIntegrationTest.java b/aai-core/src/test/java/org/onap/aai/kafka/AAIKafkaEventIntegrationTest.java index d00fa818..7e8bcdd1 100644 --- a/aai-core/src/test/java/org/onap/aai/kafka/AAIKafkaEventIntegrationTest.java +++ b/aai-core/src/test/java/org/onap/aai/kafka/AAIKafkaEventIntegrationTest.java @@ -27,15 +27,11 @@ import java.io.IOException; import java.net.URI; import java.nio.file.Files; import java.nio.file.Path; +import java.time.Duration; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriInfo; - import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerRecords; import org.junit.Before; @@ -66,6 +62,10 @@ import org.springframework.test.context.TestPropertySource; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriInfo; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -120,7 +120,7 @@ public class AAIKafkaEventIntegrationTest extends AAISetup { String expectedResponse = PayloadUtil.getExpectedPayload("aai-event.json"); messageProducer.sendNotification(event); - ConsumerRecords<String, String> consumerRecords = KafkaTestUtils.getRecords(consumer, 10000); + ConsumerRecords<String, String> consumerRecords = KafkaTestUtils.getRecords(consumer, Duration.ofSeconds(10)); assertFalse(consumerRecords.isEmpty()); consumerRecords.forEach(consumerRecord -> { JSONAssert.assertEquals(expectedResponse, consumerRecord.value(), JSONCompareMode.NON_EXTENSIBLE); @@ -141,7 +141,7 @@ public class AAIKafkaEventIntegrationTest extends AAISetup { traversalUriHttpEntry.process(dbRequests, "test"); - ConsumerRecords<String, String> consumerRecords = KafkaTestUtils.getRecords(consumer, 100000); + ConsumerRecords<String, String> consumerRecords = KafkaTestUtils.getRecords(consumer, Duration.ofSeconds(10)); assertFalse(consumerRecords.isEmpty()); String expectedResponse = PayloadUtil.getExpectedPayload("pserver-event.json"); diff --git a/aai-core/src/test/java/org/onap/aai/logging/ErrorObjectTest.java b/aai-core/src/test/java/org/onap/aai/logging/ErrorObjectTest.java index 82522d50..f82de91d 100644 --- a/aai-core/src/test/java/org/onap/aai/logging/ErrorObjectTest.java +++ b/aai-core/src/test/java/org/onap/aai/logging/ErrorObjectTest.java @@ -23,7 +23,7 @@ package org.onap.aai.logging; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.junit.Test; diff --git a/aai-core/src/test/java/org/onap/aai/parsers/query/GraphTraversalTest.java b/aai-core/src/test/java/org/onap/aai/parsers/query/GraphTraversalTest.java index 7651d409..389f8608 100644 --- a/aai-core/src/test/java/org/onap/aai/parsers/query/GraphTraversalTest.java +++ b/aai-core/src/test/java/org/onap/aai/parsers/query/GraphTraversalTest.java @@ -32,9 +32,9 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriBuilder; import org.apache.tinkerpop.gremlin.process.traversal.P; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; diff --git a/aai-core/src/test/java/org/onap/aai/parsers/query/LegacyQueryTest.java b/aai-core/src/test/java/org/onap/aai/parsers/query/LegacyQueryTest.java index 82ad2943..4ee55b40 100644 --- a/aai-core/src/test/java/org/onap/aai/parsers/query/LegacyQueryTest.java +++ b/aai-core/src/test/java/org/onap/aai/parsers/query/LegacyQueryTest.java @@ -25,9 +25,6 @@ import static org.junit.Assert.assertEquals; import java.io.UnsupportedEncodingException; import java.net.URI; -import javax.ws.rs.core.UriBuilder; -import javax.xml.bind.JAXBException; - import org.junit.Ignore; import org.junit.Test; import org.onap.aai.AAISetup; @@ -38,6 +35,9 @@ import org.onap.aai.serialization.engines.QueryStyle; import org.onap.aai.serialization.engines.TransactionalGraphEngine; import org.onap.aai.setup.SchemaVersion; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.xml.bind.JAXBException; + @Ignore public class LegacyQueryTest extends AAISetup { diff --git a/aai-core/src/test/java/org/onap/aai/parsers/query/RelationshipGremlinQueryTest.java b/aai-core/src/test/java/org/onap/aai/parsers/query/RelationshipGremlinQueryTest.java index 2675045c..e8a5191c 100644 --- a/aai-core/src/test/java/org/onap/aai/parsers/query/RelationshipGremlinQueryTest.java +++ b/aai-core/src/test/java/org/onap/aai/parsers/query/RelationshipGremlinQueryTest.java @@ -26,8 +26,8 @@ import static org.junit.Assert.assertEquals; import java.io.StringReader; import java.io.UnsupportedEncodingException; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import javax.xml.transform.stream.StreamSource; import org.eclipse.persistence.dynamic.DynamicEntity; @@ -42,7 +42,6 @@ import org.onap.aai.AAISetup; import org.onap.aai.exceptions.AAIException; import org.onap.aai.introspection.Introspector; import org.onap.aai.introspection.IntrospectorFactory; -import org.onap.aai.introspection.LoaderFactory; import org.onap.aai.introspection.ModelType; import org.onap.aai.nodes.NodeIngestor; import org.onap.aai.serialization.engines.JanusGraphDBEngine; diff --git a/aai-core/src/test/java/org/onap/aai/parsers/query/RelationshipQueryTest.java b/aai-core/src/test/java/org/onap/aai/parsers/query/RelationshipQueryTest.java index accb471c..d3cc1e8f 100644 --- a/aai-core/src/test/java/org/onap/aai/parsers/query/RelationshipQueryTest.java +++ b/aai-core/src/test/java/org/onap/aai/parsers/query/RelationshipQueryTest.java @@ -25,8 +25,8 @@ import static org.junit.Assert.assertEquals; import java.io.StringReader; import java.io.UnsupportedEncodingException; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import javax.xml.transform.stream.StreamSource; import org.eclipse.persistence.dynamic.DynamicEntity; @@ -39,7 +39,6 @@ import org.onap.aai.AAISetup; import org.onap.aai.exceptions.AAIException; import org.onap.aai.introspection.Introspector; import org.onap.aai.introspection.IntrospectorFactory; -import org.onap.aai.introspection.LoaderFactory; import org.onap.aai.introspection.ModelType; import org.onap.aai.serialization.engines.JanusGraphDBEngine; import org.onap.aai.serialization.engines.QueryStyle; diff --git a/aai-core/src/test/java/org/onap/aai/parsers/query/UniqueRelationshipQueryTest.java b/aai-core/src/test/java/org/onap/aai/parsers/query/UniqueRelationshipQueryTest.java index a2f04c76..95a4d67f 100644 --- a/aai-core/src/test/java/org/onap/aai/parsers/query/UniqueRelationshipQueryTest.java +++ b/aai-core/src/test/java/org/onap/aai/parsers/query/UniqueRelationshipQueryTest.java @@ -25,8 +25,8 @@ import static org.junit.Assert.assertEquals; import java.io.StringReader; import java.io.UnsupportedEncodingException; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import javax.xml.transform.stream.StreamSource; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; @@ -42,7 +42,6 @@ import org.onap.aai.AAISetup; import org.onap.aai.exceptions.AAIException; import org.onap.aai.introspection.Introspector; import org.onap.aai.introspection.IntrospectorFactory; -import org.onap.aai.introspection.LoaderFactory; import org.onap.aai.introspection.ModelType; import org.onap.aai.nodes.NodeIngestor; import org.onap.aai.serialization.engines.JanusGraphDBEngine; diff --git a/aai-core/src/test/java/org/onap/aai/parsers/query/UniqueURIQueryTest.java b/aai-core/src/test/java/org/onap/aai/parsers/query/UniqueURIQueryTest.java index 1782c817..c0c94a3b 100644 --- a/aai-core/src/test/java/org/onap/aai/parsers/query/UniqueURIQueryTest.java +++ b/aai-core/src/test/java/org/onap/aai/parsers/query/UniqueURIQueryTest.java @@ -25,7 +25,7 @@ import static org.junit.Assert.assertEquals; import java.io.UnsupportedEncodingException; import java.net.URI; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; diff --git a/aai-core/src/test/java/org/onap/aai/parsers/uri/URIParserTest.java b/aai-core/src/test/java/org/onap/aai/parsers/uri/URIParserTest.java index ebef3cc3..c87df1b4 100644 --- a/aai-core/src/test/java/org/onap/aai/parsers/uri/URIParserTest.java +++ b/aai-core/src/test/java/org/onap/aai/parsers/uri/URIParserTest.java @@ -31,11 +31,6 @@ import static org.mockito.Mockito.verify; import java.io.UnsupportedEncodingException; import java.net.URI; -import javax.annotation.PostConstruct; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.UriBuilder; -import javax.xml.bind.JAXBException; - import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -48,6 +43,11 @@ import org.onap.aai.introspection.Loader; import org.onap.aai.introspection.ModelType; import org.onap.aai.setup.SchemaVersion; +import jakarta.annotation.PostConstruct; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.xml.bind.JAXBException; + public class URIParserTest extends AAISetup { diff --git a/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToDBKeyTest.java b/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToDBKeyTest.java index 4bac547d..2f49f13c 100644 --- a/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToDBKeyTest.java +++ b/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToDBKeyTest.java @@ -27,20 +27,19 @@ import static org.junit.Assert.assertEquals; import java.io.UnsupportedEncodingException; import java.net.URI; -import javax.annotation.PostConstruct; -import javax.ws.rs.core.UriBuilder; -import javax.xml.bind.JAXBException; - import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.onap.aai.AAISetup; import org.onap.aai.exceptions.AAIException; import org.onap.aai.introspection.Loader; -import org.onap.aai.introspection.LoaderFactory; import org.onap.aai.introspection.ModelType; import org.onap.aai.parsers.exceptions.DoesNotStartWithValidNamespaceException; +import jakarta.annotation.PostConstruct; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.xml.bind.JAXBException; + public class URIToDBKeyTest extends AAISetup { private Loader loader; diff --git a/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToExtensionInformationTest.java b/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToExtensionInformationTest.java index 3bd44df9..1ec7d00f 100644 --- a/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToExtensionInformationTest.java +++ b/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToExtensionInformationTest.java @@ -25,10 +25,6 @@ import static org.junit.Assert.assertEquals; import java.io.UnsupportedEncodingException; import java.net.URI; -import javax.annotation.PostConstruct; -import javax.ws.rs.core.UriBuilder; -import javax.xml.bind.JAXBException; - import org.junit.Test; import org.onap.aai.AAISetup; import org.onap.aai.exceptions.AAIException; @@ -38,6 +34,10 @@ import org.onap.aai.restcore.HttpMethod; import org.onap.aai.setup.SchemaVersion; import org.springframework.test.annotation.DirtiesContext; +import jakarta.annotation.PostConstruct; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.xml.bind.JAXBException; + @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) public class URIToExtensionInformationTest extends AAISetup { diff --git a/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToObjectTest.java b/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToObjectTest.java index 2aad37a0..6094ef97 100644 --- a/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToObjectTest.java +++ b/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToObjectTest.java @@ -28,10 +28,6 @@ import java.io.UnsupportedEncodingException; import java.net.URI; import java.util.HashMap; -import javax.annotation.PostConstruct; -import javax.ws.rs.core.UriBuilder; -import javax.xml.bind.JAXBException; - import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; @@ -40,12 +36,15 @@ import org.onap.aai.AAISetup; import org.onap.aai.exceptions.AAIException; import org.onap.aai.introspection.Introspector; import org.onap.aai.introspection.Loader; -import org.onap.aai.introspection.LoaderFactory; import org.onap.aai.introspection.ModelType; import org.onap.aai.introspection.exceptions.AAIUnknownObjectException; import org.onap.aai.setup.SchemaVersion; import org.springframework.test.annotation.DirtiesContext; +import jakarta.annotation.PostConstruct; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.xml.bind.JAXBException; + @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) public class URIToObjectTest extends AAISetup { diff --git a/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToRelationshipObjectTest.java b/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToRelationshipObjectTest.java index f94d9241..ec3d67bc 100644 --- a/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToRelationshipObjectTest.java +++ b/aai-core/src/test/java/org/onap/aai/parsers/uri/URIToRelationshipObjectTest.java @@ -29,10 +29,6 @@ import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; -import javax.annotation.PostConstruct; -import javax.ws.rs.core.UriBuilder; -import javax.xml.bind.JAXBException; - import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -40,11 +36,14 @@ import org.onap.aai.AAISetup; import org.onap.aai.exceptions.AAIException; import org.onap.aai.introspection.Introspector; import org.onap.aai.introspection.Loader; -import org.onap.aai.introspection.LoaderFactory; import org.onap.aai.introspection.ModelType; import org.onap.aai.setup.SchemaVersion; import org.springframework.test.annotation.DirtiesContext; +import jakarta.annotation.PostConstruct; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.xml.bind.JAXBException; + @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) public class URIToRelationshipObjectTest extends AAISetup { diff --git a/aai-core/src/test/java/org/onap/aai/prevalidation/ValidationServiceTest.java b/aai-core/src/test/java/org/onap/aai/prevalidation/ValidationServiceTest.java index db9ee961..9463b544 100644 --- a/aai-core/src/test/java/org/onap/aai/prevalidation/ValidationServiceTest.java +++ b/aai-core/src/test/java/org/onap/aai/prevalidation/ValidationServiceTest.java @@ -31,7 +31,7 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule; +import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule; import com.google.gson.Gson; import java.io.IOException; @@ -39,7 +39,7 @@ import java.net.ConnectException; import java.net.SocketTimeoutException; import java.util.List; -import org.apache.http.conn.ConnectTimeoutException; +import org.apache.hc.client5.http.ConnectTimeoutException; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -69,7 +69,7 @@ public class ValidationServiceTest { @Before public void setUp() throws Exception { mapper = new ObjectMapper(); - mapper.registerModule(new JaxbAnnotationModule()); + mapper.registerModule(new JakartaXmlBindAnnotationModule()); gson = new Gson(); restClient = Mockito.mock(RestClient.class); validationService = Mockito.spy(new ValidationService(restClient, "JUNIT", "generic-vnf", null, mapper)); diff --git a/aai-core/src/test/java/org/onap/aai/query/builder/QueryBuilderTestAbstraction.java b/aai-core/src/test/java/org/onap/aai/query/builder/QueryBuilderTestAbstraction.java index 7685360b..dded8893 100644 --- a/aai-core/src/test/java/org/onap/aai/query/builder/QueryBuilderTestAbstraction.java +++ b/aai-core/src/test/java/org/onap/aai/query/builder/QueryBuilderTestAbstraction.java @@ -94,8 +94,6 @@ public abstract class QueryBuilderTestAbstraction { public static void setup() throws Exception { System.setProperty("AJSC_HOME", "."); System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); - QueryFormatTestHelper.setFinalStatic(AAIConstants.class.getField("AAI_HOME_ETC_OXM"), - "src/test/resources/bundleconfig-local/etc/oxm/"); graph = JanusGraphFactory.build().set("storage.backend", "inmemory").open(); } diff --git a/aai-core/src/test/java/org/onap/aai/query/builder/optimization/AbstractGraphTraversalBuilderTestQueryiesToRun.java b/aai-core/src/test/java/org/onap/aai/query/builder/optimization/AbstractGraphTraversalBuilderTestQueryiesToRun.java index 28e7a7f8..85e4e041 100644 --- a/aai-core/src/test/java/org/onap/aai/query/builder/optimization/AbstractGraphTraversalBuilderTestQueryiesToRun.java +++ b/aai-core/src/test/java/org/onap/aai/query/builder/optimization/AbstractGraphTraversalBuilderTestQueryiesToRun.java @@ -23,8 +23,8 @@ package org.onap.aai.query.builder.optimization; import java.lang.reflect.Method; import java.net.URI; -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.structure.Vertex; import org.junit.Before; diff --git a/aai-core/src/test/java/org/onap/aai/rest/CloudRegionTest.java b/aai-core/src/test/java/org/onap/aai/rest/CloudRegionTest.java index e410f529..937213a6 100644 --- a/aai-core/src/test/java/org/onap/aai/rest/CloudRegionTest.java +++ b/aai-core/src/test/java/org/onap/aai/rest/CloudRegionTest.java @@ -22,14 +22,10 @@ package org.onap.aai.rest; import static org.junit.Assert.assertEquals; -import com.jayway.jsonpath.JsonPath; - import java.io.IOException; import java.util.Arrays; import java.util.Collection; -import javax.ws.rs.core.Response; - import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -42,6 +38,10 @@ import org.onap.aai.exceptions.AAIException; import org.onap.aai.serialization.engines.QueryStyle; import org.skyscreamer.jsonassert.JSONAssert; +import com.jayway.jsonpath.JsonPath; + +import jakarta.ws.rs.core.Response; + /** * <b>CloudRegionTest</b> is testing if you put a cloud region with all * children nodes associated to it then you should be able to diff --git a/aai-core/src/test/java/org/onap/aai/rest/EdgeNotValidAnymoreTest.java b/aai-core/src/test/java/org/onap/aai/rest/EdgeNotValidAnymoreTest.java index 68fae9ce..ea316ee2 100644 --- a/aai-core/src/test/java/org/onap/aai/rest/EdgeNotValidAnymoreTest.java +++ b/aai-core/src/test/java/org/onap/aai/rest/EdgeNotValidAnymoreTest.java @@ -28,8 +28,6 @@ import static org.junit.Assert.assertThat; import java.io.IOException; import java.util.UUID; -import javax.ws.rs.core.Response; - import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Vertex; @@ -48,6 +46,8 @@ import org.onap.aai.edges.enums.EdgeProperty; import org.onap.aai.exceptions.AAIException; import org.onap.aai.serialization.engines.QueryStyle; +import jakarta.ws.rs.core.Response; + public class EdgeNotValidAnymoreTest extends AAISetup { private HttpTestUtil testUtil; diff --git a/aai-core/src/test/java/org/onap/aai/rest/EntitlementTest.java b/aai-core/src/test/java/org/onap/aai/rest/EntitlementTest.java index c992a946..10ac269a 100644 --- a/aai-core/src/test/java/org/onap/aai/rest/EntitlementTest.java +++ b/aai-core/src/test/java/org/onap/aai/rest/EntitlementTest.java @@ -22,15 +22,11 @@ package org.onap.aai.rest; import static org.junit.Assert.assertEquals; -import com.jayway.jsonpath.JsonPath; - import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.Arrays; import java.util.Collection; -import javax.ws.rs.core.Response; - import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -44,6 +40,10 @@ import org.onap.aai.serialization.engines.QueryStyle; import org.skyscreamer.jsonassert.JSONAssert; import org.springframework.test.annotation.DirtiesContext; +import com.jayway.jsonpath.JsonPath; + +import jakarta.ws.rs.core.Response; + @RunWith(value = Parameterized.class) @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) public class EntitlementTest extends AAISetup { diff --git a/aai-core/src/test/java/org/onap/aai/rest/GenericVnfLInterfaceTest.java b/aai-core/src/test/java/org/onap/aai/rest/GenericVnfLInterfaceTest.java index d6202f24..b3761025 100644 --- a/aai-core/src/test/java/org/onap/aai/rest/GenericVnfLInterfaceTest.java +++ b/aai-core/src/test/java/org/onap/aai/rest/GenericVnfLInterfaceTest.java @@ -28,8 +28,6 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.Response; - import org.json.JSONObject; import org.junit.After; import org.junit.Before; @@ -44,6 +42,8 @@ import org.onap.aai.serialization.engines.QueryStyle; import org.skyscreamer.jsonassert.JSONAssert; import org.springframework.test.annotation.DirtiesContext; +import jakarta.ws.rs.core.Response; + @RunWith(value = Parameterized.class) @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) public class GenericVnfLInterfaceTest extends AAISetup { diff --git a/aai-core/src/test/java/org/onap/aai/rest/HPACapabilityTest.java b/aai-core/src/test/java/org/onap/aai/rest/HPACapabilityTest.java index 8cf112ab..e52f35e3 100644 --- a/aai-core/src/test/java/org/onap/aai/rest/HPACapabilityTest.java +++ b/aai-core/src/test/java/org/onap/aai/rest/HPACapabilityTest.java @@ -22,11 +22,12 @@ package org.onap.aai.rest; import static org.junit.Assert.assertEquals; -import com.jayway.jsonpath.JsonPath; - -import java.util.*; - -import javax.ws.rs.core.Response; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; import org.junit.Before; import org.junit.Ignore; @@ -41,6 +42,10 @@ import org.skyscreamer.jsonassert.JSONAssert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.jayway.jsonpath.JsonPath; + +import jakarta.ws.rs.core.Response; + @Ignore @RunWith(AAIJunitRunner.class) public class HPACapabilityTest { diff --git a/aai-core/src/test/java/org/onap/aai/rest/ImpliedDeleteIntegrationTest.java b/aai-core/src/test/java/org/onap/aai/rest/ImpliedDeleteIntegrationTest.java index 48c3e60a..b3840911 100644 --- a/aai-core/src/test/java/org/onap/aai/rest/ImpliedDeleteIntegrationTest.java +++ b/aai-core/src/test/java/org/onap/aai/rest/ImpliedDeleteIntegrationTest.java @@ -23,15 +23,15 @@ package org.onap.aai.rest; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNot.not; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; -import javax.ws.rs.core.Response; - import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.janusgraph.core.JanusGraphTransaction; import org.json.JSONObject; @@ -54,6 +54,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.test.annotation.DirtiesContext; +import jakarta.ws.rs.core.Response; + @RunWith(value = Parameterized.class) @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) public class ImpliedDeleteIntegrationTest extends AAISetup { diff --git a/aai-core/src/test/java/org/onap/aai/rest/ModelElementTest.java b/aai-core/src/test/java/org/onap/aai/rest/ModelElementTest.java index a5bcb2e5..79dfb4d9 100644 --- a/aai-core/src/test/java/org/onap/aai/rest/ModelElementTest.java +++ b/aai-core/src/test/java/org/onap/aai/rest/ModelElementTest.java @@ -22,15 +22,11 @@ package org.onap.aai.rest; import static org.junit.Assert.assertEquals; -import com.jayway.jsonpath.JsonPath; - import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.Arrays; import java.util.Collection; -import javax.ws.rs.core.Response; - import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -44,6 +40,10 @@ import org.onap.aai.serialization.engines.QueryStyle; import org.skyscreamer.jsonassert.JSONAssert; import org.springframework.test.annotation.DirtiesContext; +import com.jayway.jsonpath.JsonPath; + +import jakarta.ws.rs.core.Response; + @RunWith(value = Parameterized.class) @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) public class ModelElementTest extends AAISetup { diff --git a/aai-core/src/test/java/org/onap/aai/rest/NotificationDmaapEventTest.java b/aai-core/src/test/java/org/onap/aai/rest/NotificationDmaapEventTest.java index 50a81767..6afaebdc 100644 --- a/aai-core/src/test/java/org/onap/aai/rest/NotificationDmaapEventTest.java +++ b/aai-core/src/test/java/org/onap/aai/rest/NotificationDmaapEventTest.java @@ -38,7 +38,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Vertex; diff --git a/aai-core/src/test/java/org/onap/aai/rest/PrivateEdgeIntegrationOldClientTest.java b/aai-core/src/test/java/org/onap/aai/rest/PrivateEdgeIntegrationOldClientTest.java index 0232c5aa..08a02ddb 100644 --- a/aai-core/src/test/java/org/onap/aai/rest/PrivateEdgeIntegrationOldClientTest.java +++ b/aai-core/src/test/java/org/onap/aai/rest/PrivateEdgeIntegrationOldClientTest.java @@ -30,7 +30,7 @@ import com.jayway.jsonpath.JsonPath; import java.util.*; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.tinkerpop.gremlin.structure.Edge; import org.junit.Before; diff --git a/aai-core/src/test/java/org/onap/aai/rest/PrivateEdgeIntegrationTest.java b/aai-core/src/test/java/org/onap/aai/rest/PrivateEdgeIntegrationTest.java index 13611aba..0034c1a1 100644 --- a/aai-core/src/test/java/org/onap/aai/rest/PrivateEdgeIntegrationTest.java +++ b/aai-core/src/test/java/org/onap/aai/rest/PrivateEdgeIntegrationTest.java @@ -33,7 +33,7 @@ import com.jayway.jsonpath.JsonPath; import java.util.*; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Edge; diff --git a/aai-core/src/test/java/org/onap/aai/rest/PserverDuplicateTest.java b/aai-core/src/test/java/org/onap/aai/rest/PserverDuplicateTest.java index 2afa6036..236ad551 100644 --- a/aai-core/src/test/java/org/onap/aai/rest/PserverDuplicateTest.java +++ b/aai-core/src/test/java/org/onap/aai/rest/PserverDuplicateTest.java @@ -33,8 +33,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.IntStream; -import javax.ws.rs.core.Response; - import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.janusgraph.core.JanusGraph; @@ -48,6 +46,8 @@ import org.onap.aai.serialization.engines.QueryStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.ws.rs.core.Response; + public class PserverDuplicateTest extends AAISetup { private static final Logger LOGGER = LoggerFactory.getLogger(PserverDuplicateTest.class); diff --git a/aai-core/src/test/java/org/onap/aai/rest/PserverTest.java b/aai-core/src/test/java/org/onap/aai/rest/PserverTest.java index 6e2c2ab2..01c5078b 100644 --- a/aai-core/src/test/java/org/onap/aai/rest/PserverTest.java +++ b/aai-core/src/test/java/org/onap/aai/rest/PserverTest.java @@ -33,7 +33,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -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; diff --git a/aai-core/src/test/java/org/onap/aai/rest/TenantTest.java b/aai-core/src/test/java/org/onap/aai/rest/TenantTest.java index f8172b02..9fbb8485 100644 --- a/aai-core/src/test/java/org/onap/aai/rest/TenantTest.java +++ b/aai-core/src/test/java/org/onap/aai/rest/TenantTest.java @@ -22,11 +22,11 @@ package org.onap.aai.rest; import static org.junit.Assert.assertEquals; -import com.jayway.jsonpath.JsonPath; - -import java.util.*; - -import javax.ws.rs.core.Response; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; import org.junit.Before; import org.junit.ClassRule; @@ -43,6 +43,10 @@ import org.skyscreamer.jsonassert.JSONAssert; import org.springframework.test.context.junit4.rules.SpringClassRule; import org.springframework.test.context.junit4.rules.SpringMethodRule; +import com.jayway.jsonpath.JsonPath; + +import jakarta.ws.rs.core.Response; + @RunWith(value = Parameterized.class) public class TenantTest extends AAISetup { diff --git a/aai-core/src/test/java/org/onap/aai/rest/VipAddressListTest.java b/aai-core/src/test/java/org/onap/aai/rest/VipAddressListTest.java index a88e7b6d..f9f7fee7 100644 --- a/aai-core/src/test/java/org/onap/aai/rest/VipAddressListTest.java +++ b/aai-core/src/test/java/org/onap/aai/rest/VipAddressListTest.java @@ -28,7 +28,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.Collection; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.junit.Before; import org.junit.Test; diff --git a/aai-core/src/test/java/org/onap/aai/rest/VnfcRelationshipIssueTest.java b/aai-core/src/test/java/org/onap/aai/rest/VnfcRelationshipIssueTest.java index 1bfc8b74..59f35466 100644 --- a/aai-core/src/test/java/org/onap/aai/rest/VnfcRelationshipIssueTest.java +++ b/aai-core/src/test/java/org/onap/aai/rest/VnfcRelationshipIssueTest.java @@ -26,11 +26,13 @@ import static org.junit.Assert.assertEquals; import java.util.Arrays; import java.util.Collection; -import javax.ws.rs.core.Response; - import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.janusgraph.core.JanusGraphTransaction; -import org.junit.*; +import org.junit.After; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.onap.aai.AAISetup; @@ -43,6 +45,8 @@ import org.slf4j.LoggerFactory; import org.springframework.test.context.junit4.rules.SpringClassRule; import org.springframework.test.context.junit4.rules.SpringMethodRule; +import jakarta.ws.rs.core.Response; + @RunWith(value = Parameterized.class) public class VnfcRelationshipIssueTest extends AAISetup { diff --git a/aai-core/src/test/java/org/onap/aai/rest/db/HttpEntryNotificationIntegrationTest.java b/aai-core/src/test/java/org/onap/aai/rest/db/HttpEntryNotificationIntegrationTest.java index ba7fcae3..bb6a97b3 100644 --- a/aai-core/src/test/java/org/onap/aai/rest/db/HttpEntryNotificationIntegrationTest.java +++ b/aai-core/src/test/java/org/onap/aai/rest/db/HttpEntryNotificationIntegrationTest.java @@ -34,13 +34,13 @@ import java.util.Collections; 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.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.javatuples.Pair; diff --git a/aai-core/src/test/java/org/onap/aai/rest/db/HttpEntryTest.java b/aai-core/src/test/java/org/onap/aai/rest/db/HttpEntryTest.java index 2578eef4..730b34ed 100644 --- a/aai-core/src/test/java/org/onap/aai/rest/db/HttpEntryTest.java +++ b/aai-core/src/test/java/org/onap/aai/rest/db/HttpEntryTest.java @@ -50,13 +50,13 @@ import static org.mockito.Mockito.times; 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.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.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; diff --git a/aai-core/src/test/java/org/onap/aai/rest/db/HttpEntryTransactionTest.java b/aai-core/src/test/java/org/onap/aai/rest/db/HttpEntryTransactionTest.java index 0c2b22ea..02ba34dd 100644 --- a/aai-core/src/test/java/org/onap/aai/rest/db/HttpEntryTransactionTest.java +++ b/aai-core/src/test/java/org/onap/aai/rest/db/HttpEntryTransactionTest.java @@ -31,10 +31,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.janusgraph.core.JanusGraphException; diff --git a/aai-core/src/test/java/org/onap/aai/rest/notification/NotificationServiceTest.java b/aai-core/src/test/java/org/onap/aai/rest/notification/NotificationServiceTest.java index a042d5da..add36be7 100644 --- a/aai-core/src/test/java/org/onap/aai/rest/notification/NotificationServiceTest.java +++ b/aai-core/src/test/java/org/onap/aai/rest/notification/NotificationServiceTest.java @@ -36,7 +36,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.util.detached.DetachedVertex; diff --git a/aai-core/src/test/java/org/onap/aai/rest/notification/UEBNotificationTest.java b/aai-core/src/test/java/org/onap/aai/rest/notification/UEBNotificationTest.java index e176f1cb..0512801f 100644 --- a/aai-core/src/test/java/org/onap/aai/rest/notification/UEBNotificationTest.java +++ b/aai-core/src/test/java/org/onap/aai/rest/notification/UEBNotificationTest.java @@ -28,7 +28,7 @@ import java.net.URISyntaxException; import java.util.HashMap; import java.util.UUID; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.junit.Before; import org.junit.Test; diff --git a/aai-core/src/test/java/org/onap/aai/restcore/RESTAPITest.java b/aai-core/src/test/java/org/onap/aai/restcore/RESTAPITest.java index 4b73a7d7..e375c072 100644 --- a/aai-core/src/test/java/org/onap/aai/restcore/RESTAPITest.java +++ b/aai-core/src/test/java/org/onap/aai/restcore/RESTAPITest.java @@ -27,11 +27,11 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; -import javax.ws.rs.core.HttpHeaders; -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.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializer_needsFakeRulesTest.java b/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializer_needsFakeRulesTest.java index 6db9e4fa..91fc7d10 100644 --- a/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializer_needsFakeRulesTest.java +++ b/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializer_needsFakeRulesTest.java @@ -109,8 +109,6 @@ public class DbSerializer_needsFakeRulesTest { graph = JanusGraphFactory.build().set("storage.backend", "inmemory").open(); System.setProperty("AJSC_HOME", "."); System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local"); - QueryFormatTestHelper.setFinalStatic(AAIConstants.class.getField("AAI_HOME_ETC_OXM"), - "src/test/resources/bundleconfig-local/etc/oxm/"); } diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/MultiFormatTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/MultiFormatTest.java index 58fc0146..731abad4 100644 --- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/MultiFormatTest.java +++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/MultiFormatTest.java @@ -26,13 +26,8 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; - import java.io.UnsupportedEncodingException; -import javax.ws.rs.core.MultivaluedHashMap; - import org.apache.tinkerpop.gremlin.process.traversal.Path; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree; @@ -61,6 +56,11 @@ import org.onap.aai.setup.SchemaVersion; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.annotation.DirtiesContext; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + +import jakarta.ws.rs.core.MultivaluedHashMap; + @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) public class MultiFormatTest extends AAISetup { diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/QueryFormatTestHelper.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/QueryFormatTestHelper.java index 7cb390aa..9e0cbf9b 100644 --- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/QueryFormatTestHelper.java +++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/QueryFormatTestHelper.java @@ -62,13 +62,4 @@ public class QueryFormatTestHelper { return graph; } - public static void setFinalStatic(Field field, Object newValue) throws Exception { - field.setAccessible(true); - // remove final modifier from field - Field modifiersField = Field.class.getDeclaredField("modifiers"); - modifiersField.setAccessible(true); - modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL); - field.set(null, newValue); - } - } diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceFormatTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceFormatTest.java index 587d943f..e4da601d 100644 --- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceFormatTest.java +++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceFormatTest.java @@ -26,13 +26,8 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import com.google.gson.JsonObject; - import java.util.Arrays; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; - import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.T; @@ -54,6 +49,11 @@ import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexExcepti import org.onap.aai.serialization.queryformats.utils.UrlBuilder; import org.springframework.test.annotation.DirtiesContext; +import com.google.gson.JsonObject; + +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; + @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) public class ResourceFormatTest extends AAISetup { diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/SimpleFormatTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/SimpleFormatTest.java index bfe41e1b..5d0f0698 100644 --- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/SimpleFormatTest.java +++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/SimpleFormatTest.java @@ -31,14 +31,9 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import com.google.gson.JsonObject; - import java.io.UnsupportedEncodingException; import java.util.Arrays; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; - import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.T; @@ -62,6 +57,11 @@ import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexExcepti import org.onap.aai.serialization.queryformats.utils.UrlBuilder; import org.springframework.test.annotation.DirtiesContext; +import com.google.gson.JsonObject; + +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; + @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS) public class SimpleFormatTest extends AAISetup { diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjectorTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjectorTest.java index 9b0639f1..8fb4955b 100644 --- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjectorTest.java +++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjectorTest.java @@ -22,9 +22,6 @@ package org.onap.aai.serialization.queryformats.utils; import static org.junit.Assert.assertEquals; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; - import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -35,6 +32,9 @@ import org.onap.aai.introspection.Loader; import org.onap.aai.serialization.db.DBSerializer; import org.onap.aai.serialization.queryformats.Resource.Builder; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; + @RunWith(MockitoJUnitRunner.class) public class QueryParamInjectorTest { diff --git a/aai-core/src/test/java/org/onap/aai/util/PojoUtilsTest.java b/aai-core/src/test/java/org/onap/aai/util/PojoUtilsTest.java index a6a8c33d..dd17502e 100644 --- a/aai-core/src/test/java/org/onap/aai/util/PojoUtilsTest.java +++ b/aai-core/src/test/java/org/onap/aai/util/PojoUtilsTest.java @@ -24,10 +24,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import com.google.common.collect.ImmutableListMultimap; -import com.google.common.collect.Lists; -import com.google.common.collect.Multimap; - import java.io.IOException; import java.time.LocalDateTime; import java.time.Month; @@ -37,8 +33,6 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; -import javax.xml.bind.JAXBException; - import org.eclipse.persistence.dynamic.DynamicEntity; import org.eclipse.persistence.jaxb.JAXBContext; import org.eclipse.persistence.jaxb.JAXBMarshaller; @@ -47,6 +41,12 @@ import org.junit.Test; import org.mockito.Mockito; import org.onap.aai.domain.notificationEvent.NotificationEvent; +import com.google.common.collect.ImmutableListMultimap; +import com.google.common.collect.Lists; +import com.google.common.collect.Multimap; + +import jakarta.xml.bind.JAXBException; + public class PojoUtilsTest { private PojoUtils pojoUtils; diff --git a/aai-els-onap-logging/pom.xml b/aai-els-onap-logging/pom.xml index 1f818661..b2c80166 100644 --- a/aai-els-onap-logging/pom.xml +++ b/aai-els-onap-logging/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.15.5-SNAPSHOT</version> + <version>1.16.0-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> <artifactId>aai-els-onap-logging</artifactId> @@ -65,18 +65,18 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>jakarta.annotation</groupId> - <artifactId>jakarta.annotation-api</artifactId> - <scope>provided</scope> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <scope>compile</scope> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -91,7 +91,7 @@ </dependency> <dependency> <groupId>com.fasterxml.jackson.module</groupId> - <artifactId>jackson-module-jaxb-annotations</artifactId> + <artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId> </dependency> <dependency> <groupId>org.apache.commons</groupId> @@ -108,7 +108,7 @@ <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> - <version>1.18.34</version> + <version>1.18.36</version> <scope>provided</scope> </dependency> <dependency> @@ -153,6 +153,6 @@ <artifactId>hamcrest-core</artifactId> </exclusion> </exclusions> - </dependency> + </dependency> </dependencies> </project> diff --git a/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/filter/AaiAuditLogContainerFilter.java b/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/filter/AaiAuditLogContainerFilter.java index cddf953c..15e57f32 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/filter/AaiAuditLogContainerFilter.java +++ b/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/filter/AaiAuditLogContainerFilter.java @@ -20,12 +20,12 @@ package org.onap.aai.aailog.filter; -import javax.annotation.Priority; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.UriInfo; +import jakarta.annotation.Priority; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.UriInfo; import org.onap.aai.aailog.logs.ServiceName; import org.onap.logging.filter.base.AuditLogContainerFilter; diff --git a/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/filter/RestControllerClientRequestLoggingInterceptor.java b/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/filter/RestControllerClientRequestLoggingInterceptor.java index 7a90aff0..d1153360 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/filter/RestControllerClientRequestLoggingInterceptor.java +++ b/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/filter/RestControllerClientRequestLoggingInterceptor.java @@ -26,9 +26,9 @@ import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.util.UUID; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; import org.glassfish.jersey.client.ClientResponse; import org.onap.aai.aailog.logs.ServiceName; import org.onap.logging.filter.base.Constants; diff --git a/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/filter/RestControllerClientResponseLoggingInterceptor.java b/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/filter/RestControllerClientResponseLoggingInterceptor.java index f35e9490..91479fd9 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/filter/RestControllerClientResponseLoggingInterceptor.java +++ b/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/filter/RestControllerClientResponseLoggingInterceptor.java @@ -23,10 +23,10 @@ package org.onap.aai.aailog.filter; import java.io.IOException; import java.util.UUID; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.client.ClientResponseFilter; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientResponseContext; +import jakarta.ws.rs.client.ClientResponseFilter; +import jakarta.ws.rs.core.MultivaluedMap; import org.onap.logging.filter.base.Constants; import org.onap.logging.filter.base.MDCSetup; diff --git a/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/logs/AaiDBMetricLog.java b/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/logs/AaiDBMetricLog.java index da5923d6..3a37a898 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/logs/AaiDBMetricLog.java +++ b/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/logs/AaiDBMetricLog.java @@ -20,8 +20,8 @@ package org.onap.aai.aailog.logs; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.onap.logging.filter.base.AbstractMetricLogFilter; import org.onap.logging.filter.base.ONAPComponents; diff --git a/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/logs/AaiScheduledTaskAuditLog.java b/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/logs/AaiScheduledTaskAuditLog.java index 75b602ec..c548083f 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/logs/AaiScheduledTaskAuditLog.java +++ b/aai-els-onap-logging/src/main/java/org/onap/aai/aailog/logs/AaiScheduledTaskAuditLog.java @@ -23,7 +23,7 @@ package org.onap.aai.aailog.logs; import java.util.UUID; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.onap.logging.filter.base.MDCSetup; import org.onap.logging.ref.slf4j.ONAPLogConstants; diff --git a/aai-els-onap-logging/src/main/java/org/onap/aai/domain/errorResponse/Fault.java b/aai-els-onap-logging/src/main/java/org/onap/aai/domain/errorResponse/Fault.java index acccaa26..22c9c046 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/aai/domain/errorResponse/Fault.java +++ b/aai-els-onap-logging/src/main/java/org/onap/aai/domain/errorResponse/Fault.java @@ -21,7 +21,7 @@ package org.onap.aai.domain.errorResponse; import java.util.Map; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/aai-els-onap-logging/src/main/java/org/onap/aai/exceptions/AAIException.java b/aai-els-onap-logging/src/main/java/org/onap/aai/exceptions/AAIException.java index 6c30dd07..93f70dfe 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/aai/exceptions/AAIException.java +++ b/aai-els-onap-logging/src/main/java/org/onap/aai/exceptions/AAIException.java @@ -23,6 +23,7 @@ package org.onap.aai.exceptions; +import java.io.Serial; import java.util.Collection; import java.util.LinkedList; @@ -32,6 +33,7 @@ import org.onap.aai.logging.ErrorObject; public class AAIException extends Exception { public static final String DEFAULT_EXCEPTION_CODE = "AAI_4000"; + @Serial private static final long serialVersionUID = 1L; private final String code; diff --git a/aai-els-onap-logging/src/main/java/org/onap/aai/logging/CNName.java b/aai-els-onap-logging/src/main/java/org/onap/aai/logging/CNName.java index bdf5346d..49629222 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/aai/logging/CNName.java +++ b/aai-els-onap-logging/src/main/java/org/onap/aai/logging/CNName.java @@ -28,7 +28,7 @@ import ch.qos.logback.access.spi.IAccessEvent; import java.security.cert.X509Certificate; import javax.security.auth.x500.X500Principal; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,12 +46,12 @@ public class CNName extends AccessConverter { return "INACTIVE_HEADER_CONV"; } - String cipherSuite = (String) accessEvent.getRequest().getAttribute("javax.servlet.request.cipher_suite"); + String cipherSuite = (String) accessEvent.getRequest().getAttribute("jakarta.servlet.request.cipher_suite"); String authUser = null; if (cipherSuite != null) { try { X509Certificate certChain[] = (X509Certificate[]) accessEvent.getRequest() - .getAttribute("javax.servlet.request.X509Certificate"); + .getAttribute("jakarta.servlet.request.X509Certificate"); if (certChain == null || certChain.length == 0) { HttpServletRequest request = accessEvent.getRequest(); diff --git a/aai-els-onap-logging/src/main/java/org/onap/aai/logging/ErrorLogHelper.java b/aai-els-onap-logging/src/main/java/org/onap/aai/logging/ErrorLogHelper.java index bb2fe268..a4fd604f 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/aai/logging/ErrorLogHelper.java +++ b/aai-els-onap-logging/src/main/java/org/onap/aai/logging/ErrorLogHelper.java @@ -34,7 +34,7 @@ import java.util.stream.Collectors; import java.util.Properties; import java.util.Map.Entry; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.commons.lang3.StringUtils; import org.onap.aai.domain.errorResponse.ErrorMessage; diff --git a/aai-els-onap-logging/src/main/java/org/onap/aai/logging/ErrorObject.java b/aai-els-onap-logging/src/main/java/org/onap/aai/logging/ErrorObject.java index 20068e9e..7c2c227c 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/aai/logging/ErrorObject.java +++ b/aai-els-onap-logging/src/main/java/org/onap/aai/logging/ErrorObject.java @@ -20,7 +20,7 @@ package org.onap.aai.logging; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; /** * diff --git a/aai-els-onap-logging/src/main/java/org/onap/aai/logging/ErrorObjectFormatException.java b/aai-els-onap-logging/src/main/java/org/onap/aai/logging/ErrorObjectFormatException.java index 8d53f2e3..3c5b8085 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/aai/logging/ErrorObjectFormatException.java +++ b/aai-els-onap-logging/src/main/java/org/onap/aai/logging/ErrorObjectFormatException.java @@ -20,8 +20,11 @@ package org.onap.aai.logging; +import java.io.Serial; + public class ErrorObjectFormatException extends Exception { + @Serial private static final long serialVersionUID = 3732705544448553685L; public ErrorObjectFormatException() { diff --git a/aai-els-onap-logging/src/main/java/org/onap/aai/logging/ErrorObjectNotFoundException.java b/aai-els-onap-logging/src/main/java/org/onap/aai/logging/ErrorObjectNotFoundException.java index 3daf7137..5f43eaf8 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/aai/logging/ErrorObjectNotFoundException.java +++ b/aai-els-onap-logging/src/main/java/org/onap/aai/logging/ErrorObjectNotFoundException.java @@ -20,8 +20,11 @@ package org.onap.aai.logging; +import java.io.Serial; + public class ErrorObjectNotFoundException extends Exception { + @Serial private static final long serialVersionUID = 4115316781400786740L; public ErrorObjectNotFoundException() { diff --git a/aai-els-onap-logging/src/main/java/org/onap/aai/logging/LoggingContextNotExistsException.java b/aai-els-onap-logging/src/main/java/org/onap/aai/logging/LoggingContextNotExistsException.java index f1d4c59c..f143a19f 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/aai/logging/LoggingContextNotExistsException.java +++ b/aai-els-onap-logging/src/main/java/org/onap/aai/logging/LoggingContextNotExistsException.java @@ -20,7 +20,10 @@ package org.onap.aai.logging; +import java.io.Serial; + public class LoggingContextNotExistsException extends RuntimeException { + @Serial private static final long serialVersionUID = -4965807709525739623L; } diff --git a/aai-els-onap-logging/src/main/java/org/onap/aai/logging/StopWatchNotStartedException.java b/aai-els-onap-logging/src/main/java/org/onap/aai/logging/StopWatchNotStartedException.java index e4819c5c..015bbb8c 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/aai/logging/StopWatchNotStartedException.java +++ b/aai-els-onap-logging/src/main/java/org/onap/aai/logging/StopWatchNotStartedException.java @@ -20,8 +20,11 @@ package org.onap.aai.logging; +import java.io.Serial; + public class StopWatchNotStartedException extends RuntimeException { + @Serial private static final long serialVersionUID = -4540164295822859408L; public StopWatchNotStartedException() { diff --git a/aai-els-onap-logging/src/main/java/org/onap/aai/util/MapperUtil.java b/aai-els-onap-logging/src/main/java/org/onap/aai/util/MapperUtil.java index 9373eb71..2967a190 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/aai/util/MapperUtil.java +++ b/aai-els-onap-logging/src/main/java/org/onap/aai/util/MapperUtil.java @@ -22,13 +22,13 @@ package org.onap.aai.util; +import org.onap.aai.exceptions.AAIException; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule; - -import org.onap.aai.exceptions.AAIException; +import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule; public class MapperUtil { @@ -69,7 +69,7 @@ public class MapperUtil { public static <T> T readWithDashesAsObjectOf(Class<T> clazz, String value) throws AAIException { ObjectMapper mapper = new ObjectMapper(); try { - mapper.registerModule(new JaxbAnnotationModule()); + mapper.registerModule(new JakartaXmlBindAnnotationModule()); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, false); @@ -114,7 +114,7 @@ public class MapperUtil { mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, false); - mapper.registerModule(new JaxbAnnotationModule()); + mapper.registerModule(new JakartaXmlBindAnnotationModule()); return mapper.writeValueAsString(obj); } catch (Exception e) { throw new AAIException("AAI_4008", e); diff --git a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/AbstractAuditLogFilter.java b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/AbstractAuditLogFilter.java index b99c8d80..04743cab 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/AbstractAuditLogFilter.java +++ b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/AbstractAuditLogFilter.java @@ -20,7 +20,7 @@ package org.onap.logging.filter.base; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.onap.logging.ref.slf4j.ONAPLogConstants; import org.slf4j.Logger; diff --git a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/AbstractServletFilter.java b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/AbstractServletFilter.java index 7f8017f7..3f9cc7e4 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/AbstractServletFilter.java +++ b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/AbstractServletFilter.java @@ -22,9 +22,9 @@ package org.onap.logging.filter.base; import java.util.Enumeration; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.core.HttpHeaders; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.core.HttpHeaders; public abstract class AbstractServletFilter { diff --git a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/AuditLogContainerFilter.java b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/AuditLogContainerFilter.java index 270f786e..b452762b 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/AuditLogContainerFilter.java +++ b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/AuditLogContainerFilter.java @@ -22,14 +22,14 @@ package org.onap.logging.filter.base; import java.io.IOException; -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.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.core.Context; -import javax.ws.rs.ext.Providers; +import jakarta.annotation.Priority; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.ext.Providers; import org.onap.logging.ref.slf4j.ONAPLogConstants; import org.slf4j.MDC; diff --git a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/AuditLogServletFilter.java b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/AuditLogServletFilter.java index c2d8a96f..e194c7ac 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/AuditLogServletFilter.java +++ b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/AuditLogServletFilter.java @@ -24,14 +24,14 @@ package org.onap.logging.filter.base; import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.onap.logging.ref.slf4j.ONAPLogConstants; import org.slf4j.MDC; @@ -48,13 +48,13 @@ public class AuditLogServletFilter extends AbstractAuditLogFilter<HttpServletReq public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain filterChain) throws IOException, ServletException { try { - if (request != null && request instanceof HttpServletRequest) { - pre((HttpServletRequest) request); + if (request != null && request instanceof HttpServletRequest servletRequest) { + pre(servletRequest); } filterChain.doFilter(request, response); } finally { - if (request != null && request instanceof HttpServletRequest) { - post((HttpServletRequest) request, (HttpServletResponse) response); + if (request != null && request instanceof HttpServletRequest servletRequest) { + post(servletRequest, (HttpServletResponse) response); } MDC.clear(); } diff --git a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/MDCSetup.java b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/MDCSetup.java index 1b48eb9b..9e15256a 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/MDCSetup.java +++ b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/MDCSetup.java @@ -28,9 +28,9 @@ import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; import java.util.UUID; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.onap.logging.ref.slf4j.ONAPLogConstants; import org.slf4j.Logger; diff --git a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/MetricLogClientFilter.java b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/MetricLogClientFilter.java index 986d1895..ce3c7589 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/MetricLogClientFilter.java +++ b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/MetricLogClientFilter.java @@ -20,14 +20,14 @@ package org.onap.logging.filter.base; -import javax.annotation.Priority; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.client.ClientResponseFilter; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.Providers; +import jakarta.annotation.Priority; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientResponseContext; +import jakarta.ws.rs.client.ClientResponseFilter; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Providers; @Priority(0) public class MetricLogClientFilter diff --git a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/PayloadLoggingClientFilter.java b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/PayloadLoggingClientFilter.java index 1908d45f..73743d95 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/PayloadLoggingClientFilter.java +++ b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/PayloadLoggingClientFilter.java @@ -29,16 +29,16 @@ import java.io.OutputStream; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.client.ClientResponseFilter; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.WriterInterceptor; -import javax.ws.rs.ext.WriterInterceptorContext; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientResponseContext; +import jakarta.ws.rs.client.ClientResponseFilter; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.WriterInterceptor; +import jakarta.ws.rs.ext.WriterInterceptorContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/PayloadLoggingServletFilter.java b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/PayloadLoggingServletFilter.java index cae4ebd6..5d35250b 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/PayloadLoggingServletFilter.java +++ b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/PayloadLoggingServletFilter.java @@ -31,20 +31,20 @@ import java.io.InputStreamReader; import java.io.PrintWriter; import java.util.zip.GZIPInputStream; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ReadListener; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletOutputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.WriteListener; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.WriteListener; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; public class PayloadLoggingServletFilter extends AbstractServletFilter implements Filter { diff --git a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/SimpleJaxrsHeadersMap.java b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/SimpleJaxrsHeadersMap.java index 50074782..74292151 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/SimpleJaxrsHeadersMap.java +++ b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/SimpleJaxrsHeadersMap.java @@ -20,7 +20,7 @@ package org.onap.logging.filter.base; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.MultivaluedMap; public class SimpleJaxrsHeadersMap implements SimpleMap { MultivaluedMap<String, String> map; diff --git a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/SimpleServletHeadersMap.java b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/SimpleServletHeadersMap.java index e6a91fbe..3a053808 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/SimpleServletHeadersMap.java +++ b/aai-els-onap-logging/src/main/java/org/onap/logging/filter/base/SimpleServletHeadersMap.java @@ -20,7 +20,7 @@ package org.onap.logging.filter.base; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public class SimpleServletHeadersMap implements SimpleMap { private HttpServletRequest request; diff --git a/aai-els-onap-logging/src/main/java/org/onap/logging/ref/slf4j/ONAPLogAdapter.java b/aai-els-onap-logging/src/main/java/org/onap/logging/ref/slf4j/ONAPLogAdapter.java index 4670f500..50b98282 100644 --- a/aai-els-onap-logging/src/main/java/org/onap/logging/ref/slf4j/ONAPLogAdapter.java +++ b/aai-els-onap-logging/src/main/java/org/onap/logging/ref/slf4j/ONAPLogAdapter.java @@ -26,7 +26,7 @@ import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.util.UUID; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.MDC; diff --git a/aai-els-onap-logging/src/test/java/org/onap/aai/aailog/filter/AaiAuditLogContainerFilterTest.java b/aai-els-onap-logging/src/test/java/org/onap/aai/aailog/filter/AaiAuditLogContainerFilterTest.java index fd770347..4dc80a1b 100644 --- a/aai-els-onap-logging/src/test/java/org/onap/aai/aailog/filter/AaiAuditLogContainerFilterTest.java +++ b/aai-els-onap-logging/src/test/java/org/onap/aai/aailog/filter/AaiAuditLogContainerFilterTest.java @@ -25,12 +25,6 @@ import static org.mockito.Mockito.when; import java.net.URI; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriInfo; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -42,6 +36,12 @@ import org.onap.logging.filter.base.Constants; import org.onap.logging.ref.slf4j.ONAPLogConstants; import org.slf4j.MDC; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriInfo; + @ExtendWith(MockitoExtension.class) public class AaiAuditLogContainerFilterTest { @Mock diff --git a/aai-els-onap-logging/src/test/java/org/onap/aai/aailog/filter/RestControllerClientLoggingInterceptorTest.java b/aai-els-onap-logging/src/test/java/org/onap/aai/aailog/filter/RestControllerClientLoggingInterceptorTest.java index 006b3c4a..d0b7b372 100644 --- a/aai-els-onap-logging/src/test/java/org/onap/aai/aailog/filter/RestControllerClientLoggingInterceptorTest.java +++ b/aai-els-onap-logging/src/test/java/org/onap/aai/aailog/filter/RestControllerClientLoggingInterceptorTest.java @@ -29,10 +29,6 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.UnknownHostException; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; - import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -44,6 +40,10 @@ import org.onap.logging.filter.base.Constants; import org.onap.logging.ref.slf4j.ONAPLogConstants; import org.slf4j.MDC; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; + @RunWith(MockitoJUnitRunner.class) public class RestControllerClientLoggingInterceptorTest { @@ -56,7 +56,7 @@ public class RestControllerClientLoggingInterceptorTest { @Before public void init() throws URISyntaxException { - System.setProperty("javax.ws.rs.ext.RuntimeDelegate", "com.sun.ws.rs.ext.RuntimeDelegateImpl"); + System.setProperty("jakarta.ws.rs.ext.RuntimeDelegate", "com.sun.ws.rs.ext.RuntimeDelegateImpl"); when(clientRequest.getHeaders()).thenReturn(new MultivaluedHashMap<String, Object>()); when(clientRequest.getUri()) .thenReturn(new URI("https://localhost:9999/aai/v1/cloud-infrastructure/complexes/complex/complex-1")); diff --git a/aai-els-onap-logging/src/test/java/org/onap/aai/exceptions/AAIExceptionTest.java b/aai-els-onap-logging/src/test/java/org/onap/aai/exceptions/AAIExceptionTest.java index 5d7b989d..28461889 100644 --- a/aai-els-onap-logging/src/test/java/org/onap/aai/exceptions/AAIExceptionTest.java +++ b/aai-els-onap-logging/src/test/java/org/onap/aai/exceptions/AAIExceptionTest.java @@ -25,12 +25,12 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.IOException; -import javax.ws.rs.core.Response; - import org.junit.jupiter.api.Test; import org.onap.aai.logging.AaiElsErrorCode; import org.onap.aai.logging.ErrorObject; +import jakarta.ws.rs.core.Response; + public class AAIExceptionTest { private AAIException aaiException; diff --git a/aai-els-onap-logging/src/test/java/org/onap/aai/logging/CNNameTest.java b/aai-els-onap-logging/src/test/java/org/onap/aai/logging/CNNameTest.java index 906bd5db..70e86404 100644 --- a/aai-els-onap-logging/src/test/java/org/onap/aai/logging/CNNameTest.java +++ b/aai-els-onap-logging/src/test/java/org/onap/aai/logging/CNNameTest.java @@ -60,8 +60,8 @@ public class CNNameTest { MockHttpServletRequest https = new MockHttpServletRequest(); https.addHeader("Authorization", "Basic dXNlcjpwYXNzd29yZA=="); - https.setAttribute("javax.servlet.request.cipher_suite", ""); - https.setAttribute("javax.servlet.request.X509Certificate", null); + https.setAttribute("jakarta.servlet.request.cipher_suite", ""); + https.setAttribute("jakarta.servlet.request.X509Certificate", null); when(accessEvent.getRequest()).thenReturn(https); assertEquals("user", cnName.convert(accessEvent)); @@ -74,8 +74,8 @@ public class CNNameTest { MockHttpServletRequest https = new MockHttpServletRequest(); https.addHeader("Authorization", "dXNlcjpwYXNzd29yZA=="); - https.setAttribute("javax.servlet.request.cipher_suite", ""); - https.setAttribute("javax.servlet.request.X509Certificate", null); + https.setAttribute("jakarta.servlet.request.cipher_suite", ""); + https.setAttribute("jakarta.servlet.request.X509Certificate", null); when(accessEvent.getRequest()).thenReturn(https); assertEquals("-", cnName.convert(accessEvent)); @@ -88,8 +88,8 @@ public class CNNameTest { MockHttpServletRequest https = new MockHttpServletRequest(); https.addHeader("Authorization", "Basic dXNlcjpwYXNzd29yZA=="); - https.setAttribute("javax.servlet.request.cipher_suite", null); - https.setAttribute("javax.servlet.request.X509Certificate", null); + https.setAttribute("jakarta.servlet.request.cipher_suite", null); + https.setAttribute("jakarta.servlet.request.X509Certificate", null); when(accessEvent.getRequest()).thenReturn(https); assertEquals("-", cnName.convert(accessEvent)); @@ -102,8 +102,8 @@ public class CNNameTest { X509Certificate[] certChain = {cert}; MockHttpServletRequest https = new MockHttpServletRequest(); - https.setAttribute("javax.servlet.request.cipher_suite", ""); - https.setAttribute("javax.servlet.request.X509Certificate", certChain); + https.setAttribute("jakarta.servlet.request.cipher_suite", ""); + https.setAttribute("jakarta.servlet.request.X509Certificate", certChain); when(accessEvent.getRequest()).thenReturn(https); when(cert.getSubjectX500Principal()).thenReturn(new X500Principal(testSubject)); diff --git a/aai-els-onap-logging/src/test/java/org/onap/aai/logging/ErrorLogHelperTest.java b/aai-els-onap-logging/src/test/java/org/onap/aai/logging/ErrorLogHelperTest.java index 226e4b22..de5aeab3 100644 --- a/aai-els-onap-logging/src/test/java/org/onap/aai/logging/ErrorLogHelperTest.java +++ b/aai-els-onap-logging/src/test/java/org/onap/aai/logging/ErrorLogHelperTest.java @@ -32,7 +32,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -188,7 +188,7 @@ public class ErrorLogHelperTest { org.onap.aai.domain.errorResponse.Fault restResponse = objectMapper.readValue(errorResponse, org.onap.aai.domain.errorResponse.Fault.class); - + Map<ExceptionType, ErrorMessage> requestError = restResponse.getRequestError(); assertNotNull(requestError); ErrorMessage errorMessage = requestError.get(ExceptionType.SERVICE); @@ -244,7 +244,7 @@ public class ErrorLogHelperTest { @Test public void thatInvalidMediaTypeWillReturnInvalidAcceptHeaderException() throws ErrorObjectNotFoundException, JsonMappingException, JsonProcessingException { String errorResponse = ErrorLogHelper.getRESTAPIErrorResponse(Collections.singletonList(MediaType.TEXT_PLAIN_TYPE), new AAIException(), new ArrayList<>()); - + Fault restResponse = objectMapper.readValue(errorResponse, Fault.class); assertNotNull(restResponse); diff --git a/aai-els-onap-logging/src/test/java/org/onap/aai/logging/ErrorObjectTest.java b/aai-els-onap-logging/src/test/java/org/onap/aai/logging/ErrorObjectTest.java index 6c2b12e0..93ba7382 100644 --- a/aai-els-onap-logging/src/test/java/org/onap/aai/logging/ErrorObjectTest.java +++ b/aai-els-onap-logging/src/test/java/org/onap/aai/logging/ErrorObjectTest.java @@ -22,10 +22,10 @@ package org.onap.aai.logging; import static org.junit.jupiter.api.Assertions.assertEquals; -import javax.ws.rs.core.Response; - import org.junit.jupiter.api.Test; +import jakarta.ws.rs.core.Response; + public class ErrorObjectTest { private ErrorObject errorObject; private static final String ERROR_DISPOSITION = "5"; diff --git a/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/AuditLogContainerFilterTest.java b/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/AuditLogContainerFilterTest.java index a8903c41..2e60ada0 100644 --- a/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/AuditLogContainerFilterTest.java +++ b/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/AuditLogContainerFilterTest.java @@ -7,9 +7,9 @@ * 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. @@ -23,12 +23,6 @@ package org.onap.logging.filter.base; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.when; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriInfo; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -41,12 +35,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriInfo; + @ExtendWith(MockitoExtension.class) public class AuditLogContainerFilterTest { protected static final Logger logger = LoggerFactory.getLogger(AbstractMetricLogFilter.class); @Mock - private ContainerRequestContext containerRequest; + private jakarta.ws.rs.container.ContainerRequestContext containerRequest; @Mock private ContainerResponseContext containerResponse; diff --git a/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/AuditLogServletFilterTest.java b/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/AuditLogServletFilterTest.java index 6f724a09..2c9aacd9 100644 --- a/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/AuditLogServletFilterTest.java +++ b/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/AuditLogServletFilterTest.java @@ -7,9 +7,9 @@ * 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. @@ -23,10 +23,10 @@ package org.onap.logging.filter.base; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.when; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/LoggingContainerFilterTest.java b/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/LoggingContainerFilterTest.java index defc7855..4b5318a4 100644 --- a/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/LoggingContainerFilterTest.java +++ b/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/LoggingContainerFilterTest.java @@ -7,9 +7,9 @@ * 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. @@ -22,8 +22,8 @@ package org.onap.logging.filter.base; import static org.junit.jupiter.api.Assertions.assertEquals; -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.junit.jupiter.api.Test; import org.onap.logging.ref.slf4j.ONAPLogConstants; diff --git a/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/MDCSetupTest.java b/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/MDCSetupTest.java index e3245fa9..1e327fc7 100644 --- a/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/MDCSetupTest.java +++ b/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/MDCSetupTest.java @@ -7,9 +7,9 @@ * 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. @@ -25,10 +25,10 @@ import static org.mockito.Mockito.when; import java.util.HashMap; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/MetricLogClientFilterTest.java b/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/MetricLogClientFilterTest.java index 6f23d9b5..64f2581a 100644 --- a/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/MetricLogClientFilterTest.java +++ b/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/MetricLogClientFilterTest.java @@ -7,9 +7,9 @@ * 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. @@ -30,9 +30,9 @@ import java.time.ZoneOffset; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/PayloadLoggingClientFilterTest.java b/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/PayloadLoggingClientFilterTest.java index 74463a7b..626a3629 100644 --- a/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/PayloadLoggingClientFilterTest.java +++ b/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/PayloadLoggingClientFilterTest.java @@ -7,9 +7,9 @@ * 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. @@ -26,9 +26,9 @@ import static org.mockito.Mockito.when; import java.io.IOException; import java.net.URISyntaxException; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/SimpleJaxrsHeadersMapTest.java b/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/SimpleJaxrsHeadersMapTest.java index 660bd3ce..369a31cd 100644 --- a/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/SimpleJaxrsHeadersMapTest.java +++ b/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/SimpleJaxrsHeadersMapTest.java @@ -7,9 +7,9 @@ * 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. @@ -22,8 +22,8 @@ package org.onap.logging.filter.base; import static org.junit.jupiter.api.Assertions.assertEquals; -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.junit.jupiter.api.Test; import org.onap.logging.ref.slf4j.ONAPLogConstants; diff --git a/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/SimpleServletHeadersMapTest.java b/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/SimpleServletHeadersMapTest.java index c2a271a7..7c289a3c 100644 --- a/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/SimpleServletHeadersMapTest.java +++ b/aai-els-onap-logging/src/test/java/org/onap/logging/filter/base/SimpleServletHeadersMapTest.java @@ -7,9 +7,9 @@ * 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. @@ -23,7 +23,7 @@ package org.onap.logging.filter.base; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.when; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/aai-els-onap-logging/src/test/java/org/onap/logging/ref/slf4j/ONAPLogAdapterTest.java b/aai-els-onap-logging/src/test/java/org/onap/logging/ref/slf4j/ONAPLogAdapterTest.java index f3d0ed95..c8a7f4db 100644 --- a/aai-els-onap-logging/src/test/java/org/onap/logging/ref/slf4j/ONAPLogAdapterTest.java +++ b/aai-els-onap-logging/src/test/java/org/onap/logging/ref/slf4j/ONAPLogAdapterTest.java @@ -35,8 +35,6 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import javax.xml.bind.DatatypeConverter; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.slf4j.Logger; @@ -45,6 +43,8 @@ import org.slf4j.MDC; import org.slf4j.event.Level; import org.springframework.mock.web.MockHttpServletRequest; +import jakarta.xml.bind.DatatypeConverter; + /** * Tests for {@link ONAPLogAdapter}. */ diff --git a/aai-failover/pom.xml b/aai-failover/pom.xml index 300feeaa..9c84a538 100644 --- a/aai-failover/pom.xml +++ b/aai-failover/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.15.5-SNAPSHOT</version> + <version>1.16.0-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml index d4a608b1..41172a03 100644 --- a/aai-parent/pom.xml +++ b/aai-parent/pom.xml @@ -27,7 +27,7 @@ limitations under the License. <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-common</artifactId> - <version>1.15.5-SNAPSHOT</version> + <version>1.16.0-SNAPSHOT</version> </parent> <artifactId>aai-parent</artifactId> <name>aai-parent</name> @@ -53,7 +53,7 @@ limitations under the License. <commons.net.version>3.8.0</commons.net.version> <commons.text.version>1.10.0</commons.text.version> <docker.fabric.version>0.40.2</docker.fabric.version> - <eclipse.persistence.version>2.7.15</eclipse.persistence.version> + <eclipse.persistence.version>3.0.1</eclipse.persistence.version> <google.guava.version>33.4.0-jre</google.guava.version> <gremlin.version>3.7.3</gremlin.version> <janusgraph.version>1.1.0</janusgraph.version> @@ -79,24 +79,22 @@ limitations under the License. Please don't upgrade to 2.3.0 or above for nexus iq or security scans as it could potentially break our code --> - <spring.boot.version>2.7.18</spring.boot.version> + <spring.boot.version>3.0.13</spring.boot.version> <json.path.version>2.2.0</json.path.version> <json.version>20240303</json.version> <junit.version>4.12</junit.version> - <httpclient.version>4.5.13</httpclient.version> - <io.swagger.version>1.5.24</io.swagger.version> - <logback.version>1.2.13</logback.version> - <slf4j.version>1.7.36</slf4j.version> + <logback.version>1.4.10</logback.version> + <slf4j.version>2.0.7</slf4j.version> <mockito.all.version>3.4.0</mockito.all.version> <mockito.core.version>3.4.0</mockito.core.version> <opencsv.version>3.1</opencsv.version> <plexus.utils.version>3.1.1</plexus.utils.version> <reflections.version>0.9.10</reflections.version> <snakeyaml.version>1.29</snakeyaml.version> - <lombok.version>1.18.34</lombok.version> + <lombok.version>1.18.36</lombok.version> <testcontainers.version>1.20.4</testcontainers.version> - <javax.servlet.version>3.1.0</javax.servlet.version> + <jakarta.servlet.version>3.1.0</jakarta.servlet.version> <javax.annotation.version>1.2</javax.annotation.version> <sonar.jacoco.reportPath /> @@ -231,17 +229,10 @@ limitations under the License. <artifactId>hamcrest-junit</artifactId> <version>${hamcrest.junit.version}</version> </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>${javax.servlet.version}</version> - <scope>provided</scope> - </dependency> <dependency> <groupId>jakarta.annotation</groupId> <artifactId>jakarta.annotation-api</artifactId> - <version>1.3.5</version> + <version>2.1.1</version> </dependency> <dependency> @@ -354,12 +345,12 @@ limitations under the License. <dependency> <groupId>jakarta.xml.bind</groupId> <artifactId>jakarta.xml.bind-api</artifactId> - <version>2.3.3</version> + <version>3.0.1</version> </dependency> <dependency> <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-runtime</artifactId> - <version>2.3.9</version> + <version>3.0.1</version> </dependency> <dependency> @@ -404,12 +395,6 @@ limitations under the License. </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <version>${jaxrs.version}</version> - </dependency> - - <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> <version>${commons.cli.version}</version> @@ -469,12 +454,6 @@ limitations under the License. </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>${httpclient.version}</version> - </dependency> - - <dependency> <groupId>org.skyscreamer</groupId> <artifactId>jsonassert</artifactId> <version>${jsonassert.version}</version> @@ -677,14 +656,9 @@ limitations under the License. </executions> </plugin> <plugin> - <groupId>org.sonarsource.scanner.maven</groupId> - <artifactId>sonar-maven-plugin</artifactId> - <version>${sonar.scanner.version}</version> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>3.0.0</version> + <version>3.3.1</version> <configuration> <skip>True</skip> </configuration> diff --git a/aai-rest/pom.xml b/aai-rest/pom.xml index 3623f51c..b865b1cc 100644 --- a/aai-rest/pom.xml +++ b/aai-rest/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.15.5-SNAPSHOT</version> + <version>1.16.0-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> <artifactId>aai-rest</artifactId> @@ -49,12 +49,12 @@ <artifactId>spring-boot-autoconfigure</artifactId> </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> + <groupId>org.apache.httpcomponents.client5</groupId> + <artifactId>httpclient5</artifactId> </dependency> <dependency> <groupId>org.springframework.boot</groupId> @@ -73,8 +73,8 @@ <scope>compile</scope> <exclusions> <exclusion> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </exclusion> </exclusions> </dependency> diff --git a/aai-rest/src/main/java/org/onap/aai/restclient/AAIRestClient.java b/aai-rest/src/main/java/org/onap/aai/restclient/AAIRestClient.java index c4b95090..5a179651 100644 --- a/aai-rest/src/main/java/org/onap/aai/restclient/AAIRestClient.java +++ b/aai-rest/src/main/java/org/onap/aai/restclient/AAIRestClient.java @@ -22,9 +22,6 @@ package org.onap.aai.restclient; import java.util.Collections; import java.util.Map; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.http.HttpHeaders; diff --git a/aai-rest/src/main/java/org/onap/aai/restclient/NoAuthRestClient.java b/aai-rest/src/main/java/org/onap/aai/restclient/NoAuthRestClient.java index 09792bbb..f24cd00e 100644 --- a/aai-rest/src/main/java/org/onap/aai/restclient/NoAuthRestClient.java +++ b/aai-rest/src/main/java/org/onap/aai/restclient/NoAuthRestClient.java @@ -20,13 +20,10 @@ package org.onap.aai.restclient; -import javax.annotation.PostConstruct; - -import org.apache.http.client.HttpClient; -import org.apache.http.impl.client.HttpClients; +import jakarta.annotation.PostConstruct; +import org.apache.hc.client5.http.classic.HttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClients; import org.onap.aai.aailog.filter.RestClientLoggingInterceptor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; import org.springframework.web.client.RestTemplate; diff --git a/aai-rest/src/main/java/org/onap/aai/restclient/OneWaySSLRestClient.java b/aai-rest/src/main/java/org/onap/aai/restclient/OneWaySSLRestClient.java index 80d32137..ac08c215 100644 --- a/aai-rest/src/main/java/org/onap/aai/restclient/OneWaySSLRestClient.java +++ b/aai-rest/src/main/java/org/onap/aai/restclient/OneWaySSLRestClient.java @@ -20,17 +20,17 @@ package org.onap.aai.restclient; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; +import org.apache.hc.client5.http.classic.HttpClient; + 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.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.onap.aai.aailog.filter.RestClientLoggingInterceptor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; -import org.springframework.util.ResourceUtils; import org.springframework.web.client.RestTemplate; public abstract class OneWaySSLRestClient extends RestClient { @@ -53,16 +53,18 @@ public abstract class OneWaySSLRestClient extends RestClient { } protected HttpClient getClient() throws Exception { - - SSLContext sslContext = SSLContextBuilder.create().build(); - - HttpClient client = - HttpClients.custom() - .setSSLContext(sslContext) - .setSSLHostnameVerifier((s, sslSession) -> true) - .build(); - - return client; + SSLContext sslContext = SSLContext.getDefault(); + PoolingHttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder.create() + .setSSLSocketFactory( + SSLConnectionSocketFactoryBuilder.create() + .setSslContext(sslContext) + .build() + ) + .build(); + return HttpClients + .custom() + .setConnectionManager(connectionManager) + .build(); } @Override diff --git a/aai-rest/src/main/java/org/onap/aai/restclient/TwoWaySSLRestClient.java b/aai-rest/src/main/java/org/onap/aai/restclient/TwoWaySSLRestClient.java index 7d759107..62d10690 100644 --- a/aai-rest/src/main/java/org/onap/aai/restclient/TwoWaySSLRestClient.java +++ b/aai-rest/src/main/java/org/onap/aai/restclient/TwoWaySSLRestClient.java @@ -20,12 +20,17 @@ package org.onap.aai.restclient; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; +import org.apache.hc.client5.http.classic.HttpClient; + 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.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.DefaultClientTlsStrategy; +import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactoryBuilder; +import org.apache.hc.core5.ssl.SSLContextBuilder; import org.onap.aai.aailog.filter.RestClientLoggingInterceptor; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; import org.springframework.web.client.RestTemplate; @@ -50,14 +55,18 @@ public abstract class TwoWaySSLRestClient extends RestClient { protected HttpClient getClient() throws Exception { - SSLContext sslContext = - SSLContextBuilder.create().build(); - - HttpClient client = - HttpClients.custom() - .setSSLContext(sslContext) - .setSSLHostnameVerifier((s, sslSession) -> true) - .build(); + SSLContext sslContext = SSLContext.getDefault(); + PoolingHttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder.create() + .setSSLSocketFactory( + SSLConnectionSocketFactoryBuilder.create() + .setSslContext(sslContext) + .build() + ) + .build(); + HttpClient client = HttpClients + .custom() + .setConnectionManager(connectionManager) + .build(); return client; } diff --git a/aai-schema-abstraction/pom.xml b/aai-schema-abstraction/pom.xml index 36654f71..3722b283 100644 --- a/aai-schema-abstraction/pom.xml +++ b/aai-schema-abstraction/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.15.5-SNAPSHOT</version> + <version>1.16.0-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> @@ -67,17 +67,6 @@ <artifactId>jackson-databind</artifactId> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-junit</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter</artifactId> <scope>test</scope> diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/SchemaProviderException.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/SchemaProviderException.java index 4fb99f0e..858c1cbb 100644 --- a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/SchemaProviderException.java +++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/SchemaProviderException.java @@ -21,8 +21,11 @@ package org.onap.aai.schemaif; +import java.io.Serial; + public class SchemaProviderException extends Exception { + @Serial private static final long serialVersionUID = 8162385108397238865L; public SchemaProviderException() { diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/JsonSchemaProvider.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/JsonSchemaProvider.java index 5647d6df..468fdf1d 100644 --- a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/JsonSchemaProvider.java +++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/JsonSchemaProvider.java @@ -36,7 +36,6 @@ import java.util.zip.ZipInputStream; import org.onap.aai.schemaif.SchemaProvider; import org.onap.aai.schemaif.SchemaProviderException; -import org.onap.aai.schemaif.SchemaProviderMsgs; import org.onap.aai.schemaif.definitions.EdgeSchema; import org.onap.aai.schemaif.definitions.VertexSchema; import org.onap.aai.schemaif.json.definitions.JsonEdgeSchema; diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmSchemaLoader.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmSchemaLoader.java index f564a89b..566f44b7 100644 --- a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmSchemaLoader.java +++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmSchemaLoader.java @@ -35,7 +35,6 @@ import org.eclipse.persistence.internal.oxm.mappings.Descriptor; import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext; import org.onap.aai.nodes.NodeIngestor; import org.onap.aai.schemaif.SchemaProviderException; -import org.onap.aai.schemaif.SchemaProviderMsgs; import org.onap.aai.schemaif.definitions.VertexSchema; import org.onap.aai.setup.SchemaVersion; import org.onap.aai.setup.Translator; diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml index c9d19d12..20a8441d 100644 --- a/aai-schema-ingest/pom.xml +++ b/aai-schema-ingest/pom.xml @@ -26,7 +26,7 @@ limitations under the License. <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.15.5-SNAPSHOT</version> + <version>1.16.0-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> <artifactId>aai-schema-ingest</artifactId> @@ -82,8 +82,8 @@ limitations under the License. <artifactId>json-path</artifactId> </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> </dependency> <dependency> <groupId>org.springframework</groupId> @@ -106,8 +106,12 @@ limitations under the License. <artifactId>spring-webmvc</artifactId> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents.client5</groupId> + <artifactId>httpclient5</artifactId> </dependency> <dependency> <groupId>ch.qos.logback</groupId> diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/config/ConfigConfiguration.java b/aai-schema-ingest/src/main/java/org/onap/aai/config/ConfigConfiguration.java index e4d18650..3723a0c8 100644 --- a/aai-schema-ingest/src/main/java/org/onap/aai/config/ConfigConfiguration.java +++ b/aai-schema-ingest/src/main/java/org/onap/aai/config/ConfigConfiguration.java @@ -25,6 +25,7 @@ package org.onap.aai.config; import org.onap.aai.setup.SchemaConfigVersions; import org.onap.aai.setup.SchemaLocationsBean; import org.onap.aai.setup.SchemaVersions; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -37,6 +38,7 @@ import org.springframework.context.annotation.PropertySource; public class ConfigConfiguration { @Bean(name = "schemaConfigVersions") + @ConditionalOnMissingBean public SchemaConfigVersions schemaConfigVersions() { return new SchemaConfigVersions(); } diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeIngestor.java b/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeIngestor.java index e2b5e75f..2a0d5e3b 100644 --- a/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeIngestor.java +++ b/aai-schema-ingest/src/main/java/org/onap/aai/edges/EdgeIngestor.java @@ -38,7 +38,7 @@ import java.util.Map.Entry; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.apache.tinkerpop.gremlin.structure.Direction; import org.onap.aai.edges.enums.DirectionNotation; diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/nodes/NodeIngestor.java b/aai-schema-ingest/src/main/java/org/onap/aai/nodes/NodeIngestor.java index 8db80999..bdacb40e 100644 --- a/aai-schema-ingest/src/main/java/org/onap/aai/nodes/NodeIngestor.java +++ b/aai-schema-ingest/src/main/java/org/onap/aai/nodes/NodeIngestor.java @@ -22,8 +22,6 @@ package org.onap.aai.nodes; -import com.google.common.base.CaseFormat; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -36,9 +34,7 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.PostConstruct; import javax.xml.XMLConstants; -import javax.xml.bind.JAXBException; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -59,6 +55,11 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; +import com.google.common.base.CaseFormat; + +import jakarta.annotation.PostConstruct; +import jakarta.xml.bind.JAXBException; + @Component /* * NodeIngestor - ingests A&AI OXM files per given config, serves DynamicJAXBContext per version diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/restclient/SchemaServiceRestClient.java b/aai-schema-ingest/src/main/java/org/onap/aai/restclient/SchemaServiceRestClient.java index 44ad9a37..205b6584 100644 --- a/aai-schema-ingest/src/main/java/org/onap/aai/restclient/SchemaServiceRestClient.java +++ b/aai-schema-ingest/src/main/java/org/onap/aai/restclient/SchemaServiceRestClient.java @@ -25,9 +25,6 @@ package org.onap.aai.restclient; import java.util.Collections; import java.util.Map; import java.util.UUID; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaConfigVersions.java b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaConfigVersions.java index 2d9d557b..6f899d76 100644 --- a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaConfigVersions.java +++ b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaConfigVersions.java @@ -23,7 +23,7 @@ package org.onap.aai.setup; import java.util.List; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaServiceTranslator.java b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaServiceTranslator.java index ec6e41a7..62dfce55 100644 --- a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaServiceTranslator.java +++ b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaServiceTranslator.java @@ -36,6 +36,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.core.io.Resource; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Component; @@ -82,7 +83,7 @@ public class SchemaServiceTranslator extends Translator { verifySchemaServiceResponse(schemaResponse.getStatusCode()); LOGGER.debug("SchemaResponse Status code" + schemaResponse.getStatusCode()); - + Resource resultBody = schemaResponse.getBody(); return resultBody != null ? Collections.singletonList(resultBody.getInputStream()) @@ -105,8 +106,8 @@ public class SchemaServiceTranslator extends Translator { } - private void verifySchemaServiceResponse(HttpStatus statusCode) throws IOException { - if (statusCode != HttpStatus.OK) { + private void verifySchemaServiceResponse(HttpStatusCode statusCode) throws IOException { + if (!statusCode.equals(HttpStatusCode.valueOf(HttpStatus.OK.value()))) { LOGGER.error("Please check the Schema Service. It returned with the status code {}", statusCode); throw new IOException("SchemaService is not available"); } diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaServiceVersions.java b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaServiceVersions.java index f39042d4..195f8bb9 100644 --- a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaServiceVersions.java +++ b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaServiceVersions.java @@ -23,7 +23,7 @@ package org.onap.aai.setup; import java.util.List; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.context.annotation.PropertySource; diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaVersionsBean.java b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaVersionsBean.java index 90b05e38..ff2d535f 100644 --- a/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaVersionsBean.java +++ b/aai-schema-ingest/src/main/java/org/onap/aai/setup/SchemaVersionsBean.java @@ -28,7 +28,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.onap.aai.restclient.RestClient; import org.springframework.beans.factory.annotation.Autowired; diff --git a/aai-schema-ingest/src/main/java/org/onap/aai/validation/nodes/DefaultDuplicateNodeDefinitionValidationModule.java b/aai-schema-ingest/src/main/java/org/onap/aai/validation/nodes/DefaultDuplicateNodeDefinitionValidationModule.java index 6181c52d..a1b46be8 100644 --- a/aai-schema-ingest/src/main/java/org/onap/aai/validation/nodes/DefaultDuplicateNodeDefinitionValidationModule.java +++ b/aai-schema-ingest/src/main/java/org/onap/aai/validation/nodes/DefaultDuplicateNodeDefinitionValidationModule.java @@ -20,9 +20,6 @@ package org.onap.aai.validation.nodes; -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.Multimap; - import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; @@ -39,6 +36,9 @@ import org.w3c.dom.Document; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; + /** * Default duplicate rules for A&AI - * node types may never have a duplicate definition diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorLocalTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorLocalTest.java index 90d614b6..e105f3aa 100644 --- a/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorLocalTest.java +++ b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorLocalTest.java @@ -23,7 +23,10 @@ package org.onap.aai.nodes; import static java.nio.charset.StandardCharsets.UTF_8; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayOutputStream; import java.io.File; @@ -33,7 +36,6 @@ import java.io.OutputStreamWriter; import java.nio.file.Files; import java.nio.file.Path; -import javax.xml.bind.SchemaOutputResolver; import javax.xml.transform.OutputKeys; import javax.xml.transform.Result; import javax.xml.transform.Transformer; @@ -55,6 +57,8 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; import org.w3c.dom.Document; +import jakarta.xml.bind.SchemaOutputResolver; + @TestPropertySource( properties = { "schema.ingest.file = src/test/resources/forWiringTests/schema-ingest-wiring-test-local-node.properties"}) diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java index 6e62505b..def844a3 100644 --- a/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java +++ b/aai-schema-ingest/src/test/java/org/onap/aai/nodes/NodeIngestorTest.java @@ -33,7 +33,7 @@ import java.io.OutputStreamWriter; import java.nio.file.Files; import java.nio.file.Path; -import javax.xml.bind.SchemaOutputResolver; +import jakarta.xml.bind.SchemaOutputResolver; import javax.xml.transform.OutputKeys; import javax.xml.transform.Result; import javax.xml.transform.Transformer; diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockRestClient.java b/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockRestClient.java index 5ef0ebeb..5d20b457 100644 --- a/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockRestClient.java +++ b/aai-schema-ingest/src/test/java/org/onap/aai/restclient/MockRestClient.java @@ -70,7 +70,7 @@ public class MockRestClient extends RestClient { .removeIf(converter -> MappingJackson2XmlHttpMessageConverter.class.isAssignableFrom(converter.getClass())); } }); - restTemplate = restTemplateBuilder.build(); + restTemplate = restTemplateBuilder.detectRequestFactory(false).build(); mockRestServiceServer = MockRestServiceServer.createServer(restTemplate); JsonObject payload = null; @@ -80,7 +80,7 @@ public class MockRestClient extends RestClient { e.printStackTrace(); } JsonArray mockUris = payload.getAsJsonArray("mock-uri"); - + String url = "https://localhost:8447/aai/v14"; for (int i = 0; i < mockUris.size(); i++) { diff --git a/aai-schema-ingest/src/test/java/org/onap/aai/validation/nodes/NodeValidatorSchemaIncompleteTest.java b/aai-schema-ingest/src/test/java/org/onap/aai/validation/nodes/NodeValidatorSchemaIncompleteTest.java index aa8aabc3..c95c74f8 100644 --- a/aai-schema-ingest/src/test/java/org/onap/aai/validation/nodes/NodeValidatorSchemaIncompleteTest.java +++ b/aai-schema-ingest/src/test/java/org/onap/aai/validation/nodes/NodeValidatorSchemaIncompleteTest.java @@ -1,4 +1,4 @@ -/** +/** * ============LICENSE_START======================================================= * org.onap.aai * ================================================================================ diff --git a/aai-utils/pom.xml b/aai-utils/pom.xml index a5ae25d4..0de7b7c0 100644 --- a/aai-utils/pom.xml +++ b/aai-utils/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-parent</artifactId> - <version>1.15.5-SNAPSHOT</version> + <version>1.16.0-SNAPSHOT</version> <relativePath>../aai-parent/pom.xml</relativePath> </parent> <artifactId>aai-utils</artifactId> @@ -39,8 +39,8 @@ <dependencies> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> + <groupId>org.apache.httpcomponents.client5</groupId> + <artifactId>httpclient5</artifactId> </dependency> <dependency> <groupId>org.eclipse.persistence</groupId> @@ -74,17 +74,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-junit</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter</artifactId> <scope>test</scope> diff --git a/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoader.java b/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoader.java index f10a4fde..81a8ffdd 100644 --- a/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoader.java +++ b/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoader.java @@ -34,7 +34,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import org.eclipse.persistence.jaxb.JAXBContextProperties; import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext; diff --git a/docs/release-notes.rst b/docs/release-notes.rst index dc7bf740..516a784b 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -15,6 +15,34 @@ This document provides release notes for the Active and Available Inventory Proj Release Data ============ +Version: 15.X.X +--------------- + +General +------- + +Features +^^^^^^^^ + +- Janusgraph upgrade (`0.6.4` -> `1.0.0`) +- rework Kafka message publishing to be more efficient and support tracing +- reduce log noise +- various security fixes + +Version: 14.X.X +--------------- + +General +------- + +Features +^^^^^^^^ + +- Java upgrade (`8` -> `11`) +- Janusgraph upgrade (`0.2.3` -> `0.6.4`) +- Spring-boot upgrade (`2.4.13` -> `2.5.15`) +- add db-backed pagination which greatly improves performance of this type of requests + Version: 13.0.1 --------------- @@ -30,7 +30,7 @@ <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-common</artifactId> - <version>1.15.5-SNAPSHOT</version> + <version>1.16.0-SNAPSHOT</version> <packaging>pom</packaging> <name>aai-aai-common</name> <description>Contains all of the common code for resources and traversal repos</description> @@ -60,6 +60,7 @@ <properties> <aai.common.version>${project.version}</aai.common.version> <aai.generate.schema>true</aai.generate.schema> + <maven.compiler.release>17</maven.compiler.release> <sitePath>/content/sites/site/org/onap/aai/aai-common/${project.artifactId}/${project.version}</sitePath> <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <onap.nexus.snapshot.path>/content/repositories/snapshots/</onap.nexus.snapshot.path> @@ -109,7 +110,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <release>11</release> + <release>17</release> </configuration> </plugin> <plugin> diff --git a/releases/1.15.5-maven-release.yaml b/releases/1.15.5-maven-release.yaml new file mode 100644 index 00000000..39f31aa8 --- /dev/null +++ b/releases/1.15.5-maven-release.yaml @@ -0,0 +1,4 @@ +distribution_type: maven +log_dir: aai-aai-common-maven-stage-master/1475/ +project: aai-common +version: 1.15.5 |