From fb6d819a5175e154c56810e47282d7e7fd7ef9d8 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Sat, 21 Sep 2024 21:11:50 +0200 Subject: Migrate JAXB to jakarta - change javax.* JAXB packages to jakarta.* - bump snapshot version to 1.15.0-SNAPSHOT Issue-ID: AAI-4005 Change-Id: I2a208f717206a2ee8c2acaec8abb0a04fc620123 Signed-off-by: Fiete Ostkamp --- .../src/test/java/org/onap/aai/nodes/NodeIngestorLocalTest.java | 4 ++-- .../src/test/java/org/onap/aai/nodes/NodeIngestorTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'aai-schema-ingest/src') 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 6e00eb73..f26e603a 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 @@ -30,7 +30,7 @@ import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import javax.xml.bind.SchemaOutputResolver; import javax.xml.transform.OutputKeys; @@ -152,7 +152,7 @@ public class NodeIngestorLocalTest { ctx13.generateSchema(outputResolver13); ByteArrayOutputStream buffer = new ByteArrayOutputStream(); printDocument(nodeIngestor.getSchema(new SchemaVersion("v13")), buffer); - String content = new String(Files.readAllBytes(Paths.get("src/test/resources/forWiringTests/aai_oxm_v13.xml"))); + String content = new String(Files.readAllBytes(Path.of("src/test/resources/forWiringTests/aai_oxm_v13.xml"))); content = content.replaceAll("\\s+", ""); String expected = buffer.toString().replaceAll("\\s+", ""); 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 fff22116..053004bd 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 @@ -30,7 +30,7 @@ import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import javax.xml.bind.SchemaOutputResolver; import javax.xml.transform.OutputKeys; @@ -145,7 +145,7 @@ public class NodeIngestorTest { ctx13.generateSchema(outputResolver13); ByteArrayOutputStream buffer = new ByteArrayOutputStream(); printDocument(nodeIngestor.getSchema(new SchemaVersion("v13")), buffer); - String content = new String(Files.readAllBytes(Paths.get("src/test/resources/forWiringTests/aai_oxm_v13.xml"))); + String content = new String(Files.readAllBytes(Path.of("src/test/resources/forWiringTests/aai_oxm_v13.xml"))); content = content.replaceAll("\\s+", ""); String expected = buffer.toString().replaceAll("\\s+", ""); -- cgit