diff options
Diffstat (limited to 'aai-resources/src')
3 files changed, 7 insertions, 7 deletions
diff --git a/aai-resources/src/main/java/org/onap/aai/service/AuthorizationService.java b/aai-resources/src/main/java/org/onap/aai/service/AuthorizationService.java index 31dd953..0c219a7 100644 --- a/aai-resources/src/main/java/org/onap/aai/service/AuthorizationService.java +++ b/aai-resources/src/main/java/org/onap/aai/service/AuthorizationService.java @@ -23,7 +23,7 @@ package org.onap.aai.service; import java.io.IOException; import java.io.UnsupportedEncodingException; 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; @@ -54,7 +54,7 @@ public class AuthorizationService { String basicAuthFile = getBasicAuthFilePath(); - try (Stream<String> stream = Files.lines(Paths.get(basicAuthFile))) { + try (Stream<String> stream = Files.lines(Path.of(basicAuthFile))) { stream.filter(line -> !line.startsWith("#")).forEach(str -> { byte[] bytes = null; diff --git a/aai-resources/src/main/resources/application.properties b/aai-resources/src/main/resources/application.properties index 6487dee..f4eccca 100644 --- a/aai-resources/src/main/resources/application.properties +++ b/aai-resources/src/main/resources/application.properties @@ -81,7 +81,7 @@ schema.ingest.file=${server.local.startpath}/application.properties schema.uri.base.path=/aai # Lists all of the versions in the schema -schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,v25,v26,v27,v28,v29 +schema.version.list=v10,v11,v12,v13,v14,v15,v23,v29 # Specifies from which version should the depth parameter to default to zero schema.version.depth.start=v10 # Specifies from which version should the related link be displayed in response payload diff --git a/aai-resources/src/test/java/org/onap/aai/rest/ModelDistributionTest.java b/aai-resources/src/test/java/org/onap/aai/rest/ModelDistributionTest.java index 2177dac..1ba8652 100644 --- a/aai-resources/src/test/java/org/onap/aai/rest/ModelDistributionTest.java +++ b/aai-resources/src/test/java/org/onap/aai/rest/ModelDistributionTest.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.MethodOrderer; @@ -73,7 +73,7 @@ public class ModelDistributionTest { .expectStatus() .isNotFound(); - String modelPayload = new String(Files.readAllBytes(Paths.get(MODEL_FILE))); + String modelPayload = new String(Files.readAllBytes(Path.of(MODEL_FILE))); webClient.put() .uri(uri) .accept(MediaType.APPLICATION_XML) @@ -126,7 +126,7 @@ public class ModelDistributionTest { .expectStatus() .isNotFound(); - String modelPayload = new String(Files.readAllBytes(Paths.get(MODEL_FILE))); + String modelPayload = new String(Files.readAllBytes(Path.of(MODEL_FILE))); webClient.put() .uri(modelUri) .accept(MediaType.APPLICATION_XML) @@ -148,7 +148,7 @@ public class ModelDistributionTest { ModelVersion modelVersion = objectMapper.readValue(modelVersionResponse, ModelVersion.class); assertNull(modelVersion.getModelElements()); - String updatePayload = new String(Files.readAllBytes(Paths.get(UPDATE_MODEL_FILE))) + String updatePayload = new String(Files.readAllBytes(Path.of(UPDATE_MODEL_FILE))) .replace("resourceVersion", modelVersion.getResourceVersion()); webClient.put() .uri(modelVersionUri) |