From: Fiete Ostkamp Date: Sat, 21 Sep 2024 19:53:49 +0000 (+0200) Subject: Migrate JAXB to jakarta X-Git-Tag: 1.15.0~2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=51415ac5eb5c77809dc5eac5f50b5728b7dfd977;p=aai%2Ftraversal.git Migrate JAXB to jakarta - change javax.* JAXB packages to jakarta.* - bump snapshot version to 1.15.0-SNAPSHOT Issue-ID: AAI-4005 Change-Id: I5bf2735c5ef53c9162a56f6b5f78e02992a0e2a0 Signed-off-by: Fiete Ostkamp --- diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml index f572ac59..66ab01dc 100644 --- a/aai-traversal/pom.xml +++ b/aai-traversal/pom.xml @@ -26,7 +26,7 @@ org.onap.aai.traversal traversal - 1.14.7-SNAPSHOT + 1.15.0-SNAPSHOT org.onap.aai.traversal aai-traversal @@ -316,16 +316,12 @@ 2.1 - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api - com.sun.xml.bind - jaxb-impl - - - com.sun.xml.bind - jaxb-core + org.glassfish.jaxb + jaxb-runtime net.sf.jopt-simple @@ -637,7 +633,7 @@ org.projectlombok lombok - 1.18.30 + 1.18.34 provided diff --git a/aai-traversal/src/main/java/org/onap/aai/dbgraphgen/ModelBasedProcessing.java b/aai-traversal/src/main/java/org/onap/aai/dbgraphgen/ModelBasedProcessing.java index 005d3dcf..f262ac46 100644 --- a/aai-traversal/src/main/java/org/onap/aai/dbgraphgen/ModelBasedProcessing.java +++ b/aai-traversal/src/main/java/org/onap/aai/dbgraphgen/ModelBasedProcessing.java @@ -269,7 +269,7 @@ public class ModelBasedProcessing { try { Optional result = dbMethHelper.searchVertexByIdentityMap(modTopNodeType, startNodeFilterArrayOfHashes.get(i)); - if (!result.isPresent()) { + if (result.isEmpty()) { throw new AAIException("AAI_6114", "No Node of type " + modTopNodeType + " found for properties"); } @@ -710,7 +710,7 @@ public class ModelBasedProcessing { Optional result = dbMethHelper.searchVertexByIdentityMap(topNodeTypeVal, startNodeFilterHash); - if (!result.isPresent()) { + if (result.isEmpty()) { throw new AAIException("AAI_6114", "No Node of type " + topNodeTypeVal + " found for properties"); } @@ -741,7 +741,7 @@ public class ModelBasedProcessing { } Optional result = dbMethHelper.locateUniqueVertex(widgModNodeType, startNodeFilterHash); - if (!result.isPresent()) { + if (result.isEmpty()) { throw new AAIException("AAI_6114", "No Node of type " + topNType + " found for properties"); } @@ -794,7 +794,7 @@ public class ModelBasedProcessing { // Locate the starting node that we'll use to start looking for instance data Optional result = dbMethHelper.searchVertexByIdentityMap(topNType, startNodeFilterHash); - if (!result.isPresent()) { + if (result.isEmpty()) { throw new AAIException("AAI_6114", "No Node of type " + topNType + " found for properties"); } @@ -2093,7 +2093,7 @@ public class ModelBasedProcessing { propHash.put(targetProp, valFromInstance); Optional result = dbMethHelper.locateUniqueVertex(targetNodeType, propHash); - if (!result.isPresent()) { + if (result.isEmpty()) { // If it can't find the lookup node, don't fail, just log that it couldn't be found // --- logger.debug("WARNING - Could not find lookup node that corresponds to nodeType [" diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/CQ2GremlinTest.java b/aai-traversal/src/main/java/org/onap/aai/rest/CQ2GremlinTest.java index bade2cd0..76da9d83 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/CQ2GremlinTest.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/CQ2GremlinTest.java @@ -204,7 +204,7 @@ public class CQ2GremlinTest extends RESTAPI { protected void addStartNode(GraphTraversal g, CustomQueryTestDTO content) { Optional> startNodeVertex = content.getVerticesDtos().stream() .filter(map -> map.containsKey("start-node")).findFirst(); - if (!startNodeVertex.isPresent()) { + if (startNodeVertex.isEmpty()) { throw new IllegalArgumentException("start-node was not specified"); } startNodeVertex.get().forEach((k, v) -> { diff --git a/aai-traversal/src/main/java/org/onap/aai/rest/search/LocalCQConfig.java b/aai-traversal/src/main/java/org/onap/aai/rest/search/LocalCQConfig.java index ebf49d7b..ad5eb4ec 100644 --- a/aai-traversal/src/main/java/org/onap/aai/rest/search/LocalCQConfig.java +++ b/aai-traversal/src/main/java/org/onap/aai/rest/search/LocalCQConfig.java @@ -25,7 +25,6 @@ import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.Date; import java.util.Timer; import java.util.TimerTask; @@ -56,7 +55,7 @@ public class LocalCQConfig extends CQConfig { String filepath = storedQueriesLocation + AAIConstants.AAI_FILESEP + "stored-queries.json"; logger.info("Using the Local stored queries"); - Path path = Paths.get(filepath); + Path path = Path.of(filepath); String customQueryConfigJson = new String(Files.readAllBytes(path)); queryConfig = new GetCustomQueryConfig(customQueryConfigJson); @@ -72,7 +71,7 @@ public class LocalCQConfig extends CQConfig { protected void onChange(File file) { try { String filepath = storedQueriesLocation; - Path path = Paths.get(filepath); + Path path = Path.of(filepath); String customQueryConfigJson = new String(Files.readAllBytes(path)); queryConfig = new GetCustomQueryConfig(customQueryConfigJson); diff --git a/aai-traversal/src/main/java/org/onap/aai/service/AuthorizationService.java b/aai-traversal/src/main/java/org/onap/aai/service/AuthorizationService.java index 10bee2b4..c291551d 100644 --- a/aai-traversal/src/main/java/org/onap/aai/service/AuthorizationService.java +++ b/aai-traversal/src/main/java/org/onap/aai/service/AuthorizationService.java @@ -22,7 +22,7 @@ package org.onap.aai.service; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import java.util.Base64; import java.util.HashMap; import java.util.Map; @@ -53,7 +53,7 @@ public class AuthorizationService { String basicAuthFile = getBasicAuthFilePath(); - try (Stream stream = Files.lines(Paths.get(basicAuthFile))) { + try (Stream stream = Files.lines(Path.of(basicAuthFile))) { stream.filter(line -> !line.startsWith("#")).forEach(str -> { byte[] bytes = null; diff --git a/aai-traversal/src/test/java/org/onap/aai/dbgraphmap/SearchGraphNamedQueryTest.java b/aai-traversal/src/test/java/org/onap/aai/dbgraphmap/SearchGraphNamedQueryTest.java index e3351aeb..9b88c38b 100644 --- a/aai-traversal/src/test/java/org/onap/aai/dbgraphmap/SearchGraphNamedQueryTest.java +++ b/aai-traversal/src/test/java/org/onap/aai/dbgraphmap/SearchGraphNamedQueryTest.java @@ -29,7 +29,6 @@ import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -101,7 +100,7 @@ public class SearchGraphNamedQueryTest extends AAISetup { assert files != null; for (File file : files) { try { - Path path = Paths.get(widgetPath + AAIConstants.AAI_FILESEP + file.getName()); + Path path = Path.of(widgetPath + AAIConstants.AAI_FILESEP + file.getName()); String widgetPayload = new String(Files.readAllBytes(path)); String modelInvariantId = getJsonValue(widgetPayload, "model-invariant-id"); String widgetUri = @@ -126,7 +125,7 @@ public class SearchGraphNamedQueryTest extends AAISetup { assert files != null; for (File file : files) { try { - Path path = Paths.get(namedQueryPath + AAIConstants.AAI_FILESEP + file.getName()); + Path path = Path.of(namedQueryPath + AAIConstants.AAI_FILESEP + file.getName()); String namedQueryPayload = new String(Files.readAllBytes(path)); String namedQueryUuid = getJsonValue(namedQueryPayload, "named-query-uuid"); String namedQueryUri = diff --git a/pom.xml b/pom.xml index 0af26d20..6ab1d773 100644 --- a/pom.xml +++ b/pom.xml @@ -26,22 +26,23 @@ org.onap.aai.aai-common aai-parent - 1.14.7 + 1.15.0-SNAPSHOT org.onap.aai.traversal traversal - 1.14.7-SNAPSHOT + 1.15.0-SNAPSHOT aai-traversal pom aai-traversal + 11 - 1.14.7 + 1.15.0-SNAPSHOT https://nexus.onap.org /content/sites/site/org/onap/aai/traversal/${project.artifactId}/${project.version} /content/repositories/releases/ diff --git a/version.properties b/version.properties index e8f490ec..039d36d6 100644 --- a/version.properties +++ b/version.properties @@ -4,8 +4,8 @@ # because they are used in Jenkins, whose plug-in doesn't support major_version=1 -minor_version=14 -patch_version=7 +minor_version=15 +patch_version=0 base_version=${major_version}.${minor_version}.${patch_version}