diff options
Diffstat (limited to 'src/main/java/org')
58 files changed, 186 insertions, 277 deletions
diff --git a/src/main/java/org/onap/aai/GraphAdminApp.java b/src/main/java/org/onap/aai/GraphAdminApp.java index 036f216..5d80f2d 100644 --- a/src/main/java/org/onap/aai/GraphAdminApp.java +++ b/src/main/java/org/onap/aai/GraphAdminApp.java @@ -43,8 +43,8 @@ import org.springframework.core.env.Environment; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; @SpringBootApplication // Scan the specific packages that has the beans/components @@ -124,7 +124,7 @@ public class GraphAdminApp { AAIException aai = ExceptionTranslator.schemaServiceExceptionTranslator(ex); ErrorLogHelper.logException(aai); ErrorLogHelper.logError(aai.getCode(), ex.getMessage() + ", resolve and restart GraphAdmin"); - throw aai; + throw ex; } LOGGER.info( "Application '{}' is running on {}!" , diff --git a/src/main/java/org/onap/aai/audit/AuditGraphson2Sql.java b/src/main/java/org/onap/aai/audit/AuditGraphson2Sql.java index 73c07b8..07a25dc 100644 --- a/src/main/java/org/onap/aai/audit/AuditGraphson2Sql.java +++ b/src/main/java/org/onap/aai/audit/AuditGraphson2Sql.java @@ -30,7 +30,6 @@ import java.io.FileWriter; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Collection; @@ -53,7 +52,6 @@ import org.onap.aai.setup.SchemaVersions; import org.onap.aai.util.FormatDate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @Component @@ -70,7 +68,6 @@ public class AuditGraphson2Sql { public static final String DEFAULT_OUTPUT_DIR = "logs/data/audit"; //DEBUG -- should be getting default-src-dir, default-output-dir and rdbms-db-name from param file - @Autowired public AuditGraphson2Sql( EdgeIngestor ei, SchemaVersions schemaVersions, LoaderFactory loaderFactory, ApertureService apertureService) { this.schemaVersions = schemaVersions; this.loader = loaderFactory.createLoaderForVersion(ModelType.MOXY, schemaVersions.getDefaultVersion()); @@ -411,7 +408,7 @@ public class AuditGraphson2Sql { throw new Exception(msg); } - final List<File> graphsons = Files.walk(Paths.get(graphsonDir)) + final List<File> graphsons = Files.walk(Path.of(graphsonDir)) .filter(Files::isRegularFile) .map(Path::toFile) .sorted() diff --git a/src/main/java/org/onap/aai/config/SecurityConfig.java b/src/main/java/org/onap/aai/config/SecurityConfig.java index 98d6bbd..6673f37 100644 --- a/src/main/java/org/onap/aai/config/SecurityConfig.java +++ b/src/main/java/org/onap/aai/config/SecurityConfig.java @@ -20,6 +20,8 @@ package org.onap.aai.config; +import static org.springframework.security.web.util.matcher.AntPathRequestMatcher.antMatcher; + import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -39,7 +41,7 @@ public class SecurityConfig { SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception{ httpSecurity.csrf(csrf -> csrf.disable()) .authorizeHttpRequests(requests -> requests - .antMatchers("/util/echo", "/actuator/**") + .requestMatchers(antMatcher("/util/echo"), antMatcher("/actuator/**")) .permitAll() .anyRequest() .authenticated()) diff --git a/src/main/java/org/onap/aai/dataexport/DataExportTasks.java b/src/main/java/org/onap/aai/dataexport/DataExportTasks.java index e9fba2f..d638570 100644 --- a/src/main/java/org/onap/aai/dataexport/DataExportTasks.java +++ b/src/main/java/org/onap/aai/dataexport/DataExportTasks.java @@ -47,7 +47,6 @@ import org.onap.aai.setup.SchemaVersions; import org.onap.aai.util.AAIConfig; import org.onap.aai.util.AAIConstants; import org.onap.logging.filter.base.ONAPComponents; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.PropertySource; import org.springframework.scheduling.annotation.Scheduled; @@ -83,7 +82,6 @@ public class DataExportTasks { private EdgeIngestor edgeIngestor; private SchemaVersions schemaVersions; - @Autowired public DataExportTasks(LoaderFactory loaderFactory, EdgeIngestor edgeIngestor, SchemaVersions schemaVersions){ this.loaderFactory = loaderFactory; this.edgeIngestor = edgeIngestor; diff --git a/src/main/java/org/onap/aai/datagrooming/DataGrooming.java b/src/main/java/org/onap/aai/datagrooming/DataGrooming.java index 74f4310..c092751 100644 --- a/src/main/java/org/onap/aai/datagrooming/DataGrooming.java +++ b/src/main/java/org/onap/aai/datagrooming/DataGrooming.java @@ -1855,8 +1855,8 @@ public class DataGrooming { Vertex nullVtx = null; Vertex preferredVtx = null; - Long vidA = new Long(vtxA.id().toString()); - Long vidB = new Long(vtxB.id().toString()); + Long vidA = Long.valueOf(vtxA.id().toString()); + Long vidB = Long.valueOf(vtxB.id().toString()); String vtxANodeType = ""; String vtxBNodeType = ""; diff --git a/src/main/java/org/onap/aai/datasnapshot/PrintVertexDetails.java b/src/main/java/org/onap/aai/datasnapshot/PrintVertexDetails.java index ff6835b..9fb1654 100644 --- a/src/main/java/org/onap/aai/datasnapshot/PrintVertexDetails.java +++ b/src/main/java/org/onap/aai/datasnapshot/PrintVertexDetails.java @@ -77,7 +77,7 @@ public class PrintVertexDetails implements Runnable{ try(FileOutputStream subFileStr = new FileOutputStream(fname)) { int okCount = 0; int failCount = 0; - Long debugDelayMsL = new Long(debugDelayMs); + Long debugDelayMsL = Long.valueOf(debugDelayMs); GraphWriter graphWriter = null; if ("gryo".equalsIgnoreCase(snapshotType)) { diff --git a/src/main/java/org/onap/aai/dbgen/DupeTool.java b/src/main/java/org/onap/aai/dbgen/DupeTool.java index db53caf..d07485d 100644 --- a/src/main/java/org/onap/aai/dbgen/DupeTool.java +++ b/src/main/java/org/onap/aai/dbgen/DupeTool.java @@ -795,7 +795,7 @@ public class DupeTool { vtx = ed.outVertex(); } if (vtx == null) { - retArr.add(String.format(" >>> COULD NOT FIND VERTEX on the other side of this edge edgeId = %s <<< ", ed.id())); + retArr.add(" >>> COULD NOT FIND VERTEX on the other side of this edge edgeId = %s <<< ".formatted(ed.id())); } else { String nType = vtx.<String>property("aai-node-type").orElse(null); if (displayAllVidsFlag) { @@ -901,7 +901,7 @@ public class DupeTool { } if (retVertList.size() == 0) { - logger.debug(String.format("DEBUG No node found for nodeType = [%s], propsAndVal = %s", nodeType, propsAndValuesForMsg)); + logger.debug("DEBUG No node found for nodeType = [%s], propsAndVal = %s".formatted(nodeType, propsAndValuesForMsg)); } return retVertList; @@ -988,7 +988,7 @@ public class DupeTool { } if (retVertList.size() == 0) { - logger.debug(String.format("DEBUG No node found for: [%s, with aai-created-ts > %d", qStringForMsg, windowStartTime)); + logger.debug("DEBUG No node found for: [%s, with aai-created-ts > %d".formatted(qStringForMsg, windowStartTime)); } return retVertList; @@ -1104,8 +1104,8 @@ public class DupeTool { Vertex nullVtx = null; Vertex preferredVtx = null; - Long vidA = new Long(vtxA.id().toString()); - Long vidB = new Long(vtxB.id().toString()); + Long vidA = Long.valueOf(vtxA.id().toString()); + Long vidB = Long.valueOf(vtxB.id().toString()); String vtxANodeType = ""; String vtxBNodeType = ""; @@ -1548,7 +1548,7 @@ public class DupeTool { String origVid = origVtx.id().toString(); if (ob == null || ob.toString().equals("")) { // It is missing its aai-uri - eLogger.debug(String.format("DEBUG No [aai-uri] property found for vid = [%s] ", origVid)); + eLogger.debug("DEBUG No [aai-uri] property found for vid = [%s] ".formatted(origVid)); return false; } else { @@ -1560,16 +1560,16 @@ public class DupeTool { Vertex foundV = verts.next(); String foundVid = foundV.id().toString(); if( !origVid.equals(foundVid) ){ - eLogger.debug(String.format("DEBUG aai-uri key property [%s] for vid = [%s] brought back different vertex with vid = [%s].", aaiUriStr, origVid, foundVid)); + eLogger.debug("DEBUG aai-uri key property [%s] for vid = [%s] brought back different vertex with vid = [%s].".formatted(aaiUriStr, origVid, foundVid)); return false; } } if( count == 0 ){ - eLogger.debug(String.format("DEBUG aai-uri key property [%s] for vid = [%s] could not be used to query for that vertex. ", aaiUriStr, origVid)); + eLogger.debug("DEBUG aai-uri key property [%s] for vid = [%s] could not be used to query for that vertex. ".formatted(aaiUriStr, origVid)); return false; } else if( count > 1 ){ - eLogger.debug(String.format("DEBUG aai-uri key property [%s] for vid = [%s] brought back multiple (%d) vertices instead of just one. ", aaiUriStr, origVid, count)); + eLogger.debug("DEBUG aai-uri key property [%s] for vid = [%s] brought back multiple (%d) vertices instead of just one. ".formatted(aaiUriStr, origVid, count)); return false; } } diff --git a/src/main/java/org/onap/aai/dbgen/DynamicPayloadGenerator.java b/src/main/java/org/onap/aai/dbgen/DynamicPayloadGenerator.java index 7ee9372..de8a230 100644 --- a/src/main/java/org/onap/aai/dbgen/DynamicPayloadGenerator.java +++ b/src/main/java/org/onap/aai/dbgen/DynamicPayloadGenerator.java @@ -69,7 +69,6 @@ import java.net.URI; import java.nio.file.Files; import java.nio.file.InvalidPathException; import java.nio.file.Path; -import java.nio.file.Paths; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; @@ -472,7 +471,7 @@ public class DynamicPayloadGenerator { // FileLocation Path pathDir = null; try { - pathDir = Paths.get(dirName); + pathDir = Path.of(dirName); } catch (InvalidPathException i) { String emsg = "Directory " + dirName + " could not be found."; LOGGER.error(emsg); diff --git a/src/main/java/org/onap/aai/dbgen/GraphSONPartialReader.java b/src/main/java/org/onap/aai/dbgen/GraphSONPartialReader.java index a170453..80edd7b 100644 --- a/src/main/java/org/onap/aai/dbgen/GraphSONPartialReader.java +++ b/src/main/java/org/onap/aai/dbgen/GraphSONPartialReader.java @@ -288,7 +288,7 @@ public final class GraphSONPartialReader implements GraphReader { if (unwrapAdjacencyList) { 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)); + if (!vertices.getNodeType().equals(JsonNodeType.ARRAY)) 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/src/main/java/org/onap/aai/dbgen/UpdatePropertyToolInternal.java b/src/main/java/org/onap/aai/dbgen/UpdatePropertyToolInternal.java index 3b7c4b8..d93e923 100644 --- a/src/main/java/org/onap/aai/dbgen/UpdatePropertyToolInternal.java +++ b/src/main/java/org/onap/aai/dbgen/UpdatePropertyToolInternal.java @@ -270,7 +270,7 @@ public class UpdatePropertyToolInternal { logAndPrint("All vertex IDs from file " + filePath + ":\n" + allVertexIdsString); } catch (IOException ioe) { if(ioe instanceof FileNotFoundException) { - logErrorAndPrint(String.format("File %s not found.", filePath)); + logErrorAndPrint("File %s not found.".formatted(filePath)); } else { logErrorAndPrint("ERROR reading in text file failed.", ioe); } diff --git a/src/main/java/org/onap/aai/interceptors/post/InvalidResponseStatus.java b/src/main/java/org/onap/aai/interceptors/post/InvalidResponseStatus.java index 7fd0b9c..5b414fc 100644 --- a/src/main/java/org/onap/aai/interceptors/post/InvalidResponseStatus.java +++ b/src/main/java/org/onap/aai/interceptors/post/InvalidResponseStatus.java @@ -23,11 +23,11 @@ import org.onap.aai.exceptions.AAIException; import org.onap.aai.interceptors.AAIContainerFilter; import org.onap.aai.logging.ErrorLogHelper; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.core.MediaType; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.core.MediaType; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/onap/aai/interceptors/post/ResponseHeaderManipulation.java b/src/main/java/org/onap/aai/interceptors/post/ResponseHeaderManipulation.java index 9d4efe7..222bccf 100644 --- a/src/main/java/org/onap/aai/interceptors/post/ResponseHeaderManipulation.java +++ b/src/main/java/org/onap/aai/interceptors/post/ResponseHeaderManipulation.java @@ -22,11 +22,11 @@ package org.onap.aai.interceptors.post; import org.onap.aai.interceptors.AAIContainerFilter; import org.onap.aai.interceptors.AAIHeaderProperties; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import javax.ws.rs.core.MediaType; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; +import jakarta.ws.rs.core.MediaType; import java.io.IOException; @Priority(AAIResponseFilterPriority.HEADER_MANIPULATION) diff --git a/src/main/java/org/onap/aai/interceptors/post/ResponseTransactionLogging.java b/src/main/java/org/onap/aai/interceptors/post/ResponseTransactionLogging.java index a544a90..31c9669 100644 --- a/src/main/java/org/onap/aai/interceptors/post/ResponseTransactionLogging.java +++ b/src/main/java/org/onap/aai/interceptors/post/ResponseTransactionLogging.java @@ -29,11 +29,11 @@ import org.onap.aai.logging.ErrorLogHelper; import org.onap.aai.util.AAIConfig; import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.Priority; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; +import jakarta.annotation.Priority; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerResponseContext; +import jakarta.ws.rs.container.ContainerResponseFilter; import java.io.IOException; import java.util.Objects; import java.util.Optional; diff --git a/src/main/java/org/onap/aai/interceptors/pre/HeaderValidation.java b/src/main/java/org/onap/aai/interceptors/pre/HeaderValidation.java index 0182f2c..17da7dc 100644 --- a/src/main/java/org/onap/aai/interceptors/pre/HeaderValidation.java +++ b/src/main/java/org/onap/aai/interceptors/pre/HeaderValidation.java @@ -26,14 +26,14 @@ import org.onap.aai.logging.ErrorLogHelper; import org.onap.logging.filter.base.Constants; import org.onap.logging.ref.slf4j.ONAPLogConstants; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/onap/aai/interceptors/pre/HttpHeaderInterceptor.java b/src/main/java/org/onap/aai/interceptors/pre/HttpHeaderInterceptor.java index 94d8ca1..cb3309e 100644 --- a/src/main/java/org/onap/aai/interceptors/pre/HttpHeaderInterceptor.java +++ b/src/main/java/org/onap/aai/interceptors/pre/HttpHeaderInterceptor.java @@ -22,13 +22,13 @@ package org.onap.aai.interceptors.pre; import org.onap.aai.interceptors.AAIContainerFilter; import org.onap.aai.interceptors.AAIHeaderProperties; -import javax.annotation.Priority; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import java.io.IOException; /** diff --git a/src/main/java/org/onap/aai/interceptors/pre/RequestHeaderManipulation.java b/src/main/java/org/onap/aai/interceptors/pre/RequestHeaderManipulation.java index ee4807e..578d449 100644 --- a/src/main/java/org/onap/aai/interceptors/pre/RequestHeaderManipulation.java +++ b/src/main/java/org/onap/aai/interceptors/pre/RequestHeaderManipulation.java @@ -22,12 +22,12 @@ package org.onap.aai.interceptors.pre; import org.onap.aai.interceptors.AAIContainerFilter; import org.onap.aai.interceptors.AAIHeaderProperties; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import java.util.Collections; import java.util.regex.Matcher; diff --git a/src/main/java/org/onap/aai/interceptors/pre/RequestModification.java b/src/main/java/org/onap/aai/interceptors/pre/RequestModification.java index 9c17ffc..ae66e5e 100644 --- a/src/main/java/org/onap/aai/interceptors/pre/RequestModification.java +++ b/src/main/java/org/onap/aai/interceptors/pre/RequestModification.java @@ -21,13 +21,13 @@ package org.onap.aai.interceptors.pre; import org.onap.aai.interceptors.AAIContainerFilter; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.ext.Provider; import java.io.IOException; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/org/onap/aai/interceptors/pre/RequestTransactionLogging.java b/src/main/java/org/onap/aai/interceptors/pre/RequestTransactionLogging.java index ecaff91..699a612 100644 --- a/src/main/java/org/onap/aai/interceptors/pre/RequestTransactionLogging.java +++ b/src/main/java/org/onap/aai/interceptors/pre/RequestTransactionLogging.java @@ -32,15 +32,15 @@ import org.onap.aai.util.AAIConstants; import org.onap.aai.util.HbaseSaltPrefixer; import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.Priority; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.Provider; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/org/onap/aai/interceptors/pre/RetiredInterceptor.java b/src/main/java/org/onap/aai/interceptors/pre/RetiredInterceptor.java index 9a33b05..9ed73c4 100644 --- a/src/main/java/org/onap/aai/interceptors/pre/RetiredInterceptor.java +++ b/src/main/java/org/onap/aai/interceptors/pre/RetiredInterceptor.java @@ -24,15 +24,14 @@ import org.onap.aai.interceptors.AAIContainerFilter; import org.onap.aai.logging.ErrorLogHelper; import org.onap.aai.service.RetiredService; import org.onap.aai.util.AAIConfig; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -53,7 +52,6 @@ public class RetiredInterceptor extends AAIContainerFilter implements ContainerR private String basePath; - @Autowired public RetiredInterceptor(RetiredService retiredService, @Value("${schema.uri.base.path}") String basePath){ this.retiredService = retiredService; this.basePath = basePath; diff --git a/src/main/java/org/onap/aai/interceptors/pre/VersionInterceptor.java b/src/main/java/org/onap/aai/interceptors/pre/VersionInterceptor.java index 5d32649..b76190f 100644 --- a/src/main/java/org/onap/aai/interceptors/pre/VersionInterceptor.java +++ b/src/main/java/org/onap/aai/interceptors/pre/VersionInterceptor.java @@ -24,13 +24,12 @@ import org.onap.aai.interceptors.AAIContainerFilter; import org.onap.aai.logging.ErrorLogHelper; import org.onap.aai.setup.SchemaVersion; import org.onap.aai.setup.SchemaVersions; -import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.Response; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; +import jakarta.ws.rs.core.Response; import java.util.ArrayList; import java.util.Set; import java.util.regex.Matcher; @@ -47,7 +46,6 @@ public class VersionInterceptor extends AAIContainerFilter implements ContainerR private final SchemaVersions schemaVersions; - @Autowired public VersionInterceptor(SchemaVersions schemaVersions){ this.schemaVersions = schemaVersions; allowedVersions = schemaVersions.getVersions() diff --git a/src/main/java/org/onap/aai/interceptors/pre/VersionLatestInterceptor.java b/src/main/java/org/onap/aai/interceptors/pre/VersionLatestInterceptor.java index 61008b6..7fc581b 100644 --- a/src/main/java/org/onap/aai/interceptors/pre/VersionLatestInterceptor.java +++ b/src/main/java/org/onap/aai/interceptors/pre/VersionLatestInterceptor.java @@ -21,12 +21,11 @@ package org.onap.aai.interceptors.pre; import org.onap.aai.interceptors.AAIContainerFilter; import org.onap.aai.setup.SchemaVersions; -import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.PreMatching; import java.net.URI; @PreMatching @@ -35,7 +34,6 @@ public class VersionLatestInterceptor extends AAIContainerFilter implements Cont private final SchemaVersions schemaVersions; - @Autowired public VersionLatestInterceptor(SchemaVersions schemaVersions){ this.schemaVersions = schemaVersions; } diff --git a/src/main/java/org/onap/aai/migration/MigrationControllerInternal.java b/src/main/java/org/onap/aai/migration/MigrationControllerInternal.java index 21879cc..d19a7f6 100644 --- a/src/main/java/org/onap/aai/migration/MigrationControllerInternal.java +++ b/src/main/java/org/onap/aai/migration/MigrationControllerInternal.java @@ -26,7 +26,7 @@ import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.commons.configuration2.PropertiesConfiguration; import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder; import org.apache.commons.configuration2.builder.fluent.Parameters; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.onap.aai.datasnapshot.DataSnapshot; import org.onap.aai.db.props.AAIProperties; import org.onap.aai.dbmap.AAIGraph; @@ -53,7 +53,6 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -132,7 +131,7 @@ public class MigrationControllerInternal { dataSnapshot.executeCommand(dataSnapShotArgs, true, false, null, "MULTITHREAD_RELOAD", snapshotFile); } } catch (ConfigurationException e) { - logAndPrint("ERROR: Could not load janusgraph configuration.\n" + ExceptionUtils.getFullStackTrace(e)); + logAndPrint("ERROR: Could not load janusgraph configuration.\n" + ExceptionUtils.getStackTrace(e)); return; } } @@ -207,7 +206,7 @@ public class MigrationControllerInternal { SchemaVersions.class ).newInstance(engine, loaderFactory, edgeIngestor, edgeSerializer,schemaVersions); } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) { - logAndPrint("EXCEPTION caught initalizing migration class " + migratorClass.getSimpleName() + ".\n" + ExceptionUtils.getFullStackTrace(e)); + logAndPrint("EXCEPTION caught initalizing migration class " + migratorClass.getSimpleName() + ".\n" + ExceptionUtils.getStackTrace(e)); engine.rollback(); continue; } @@ -360,7 +359,7 @@ public class MigrationControllerInternal { logAndPrint("Saving snapshot of graph " + phase + " migration to " + fileName); try { - Path pathToFile = Paths.get(fileName); + Path pathToFile = Path.of(fileName); if (!pathToFile.toFile().exists()) { Files.createDirectories(pathToFile.getParent()); } @@ -368,7 +367,7 @@ public class MigrationControllerInternal { DataSnapshot dataSnapshot = new DataSnapshot(); dataSnapshot.executeCommand(dataSnapshotArgs, true, false, null, "THREADED_SNAPSHOT", null); } catch (IOException e) { - logAndPrint("ERROR: Could not write in memory graph to " + phase + "Migration file. \n" + ExceptionUtils.getFullStackTrace(e)); + logAndPrint("ERROR: Could not write in memory graph to " + phase + "Migration file. \n" + ExceptionUtils.getStackTrace(e)); engine.rollback(); } diff --git a/src/main/java/org/onap/aai/migration/Migrator.java b/src/main/java/org/onap/aai/migration/Migrator.java index ca9af63..8ab0553 100644 --- a/src/main/java/org/onap/aai/migration/Migrator.java +++ b/src/main/java/org/onap/aai/migration/Migrator.java @@ -22,7 +22,7 @@ package org.onap.aai.migration; import java.io.File; import java.io.IOException; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import java.nio.file.StandardOpenOption; import java.util.Collections; import java.util.Iterator; @@ -143,7 +143,7 @@ public abstract class Migrator implements Runnable { if (dmaapMsgList.size() > 0) { try { - Files.write(Paths.get(logDirectory+"/"+fileName), (Iterable<String>)dmaapMsgList.stream()::iterator); + Files.write(Path.of(logDirectory+"/"+fileName), (Iterable<String>)dmaapMsgList.stream()::iterator); } catch (IOException e) { System.out.println("Unable to generate file with dmaap msgs for " + getMigrationName() + " Exception is: " + e.getMessage()); @@ -167,7 +167,7 @@ public abstract class Migrator implements Runnable { f.mkdirs(); try { - Files.createFile(Paths.get(logDirectory + "/" + fileName)); + Files.createFile(Path.of(logDirectory + "/" + fileName)); } catch (Exception e) { logger.error("Unable to create file", e); } @@ -180,7 +180,7 @@ public abstract class Migrator implements Runnable { try { finalStr = svIntr.getName() + "#@#" + svIntr.getURI() + "#@#" + str + "\n"; - Files.write(Paths.get(logDirectory + "/" + fileName), + Files.write(Path.of(logDirectory + "/" + fileName), finalStr.getBytes(), StandardOpenOption.APPEND); } catch (IOException e) { System.out.println("Unable to generate file with dmaap msgs for " + diff --git a/src/main/java/org/onap/aai/migration/NotificationHelper.java b/src/main/java/org/onap/aai/migration/NotificationHelper.java index de13dbb..33e4a9b 100644 --- a/src/main/java/org/onap/aai/migration/NotificationHelper.java +++ b/src/main/java/org/onap/aai/migration/NotificationHelper.java @@ -24,7 +24,7 @@ import java.net.URI; import java.util.HashMap; import java.util.List; -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.exceptions.AAIException; diff --git a/src/main/java/org/onap/aai/migration/ValueMigrator.java b/src/main/java/org/onap/aai/migration/ValueMigrator.java index 685855c..d4e7179 100644 --- a/src/main/java/org/onap/aai/migration/ValueMigrator.java +++ b/src/main/java/org/onap/aai/migration/ValueMigrator.java @@ -137,15 +137,15 @@ public abstract class ValueMigrator extends Migrator { String propertyValue = v.property(property).value().toString(); if (propertyValue.isEmpty()) { v.property(property, newValue); - logAndPrint(logger,String.format("Node Type %s: Property %s is empty, adding value %s", - nodeType, property, newValue.toString())); + logAndPrint(logger,"Node Type %s: Property %s is empty, adding value %s".formatted( + nodeType, property, newValue.toString())); this.touchVertexProperties(v, false); updateDmaapList(v); this.migrationSuccess++; this.subTotal++; } else { - logAndPrint(logger,String.format("Node Type %s: Property %s value already exists - skipping", - nodeType, property)); + logAndPrint(logger,"Node Type %s: Property %s value already exists - skipping".formatted( + nodeType, property)); } } else { logAndPrint(logger,String.format("Node Type %s: Property %s does not exist or " + diff --git a/src/main/java/org/onap/aai/migration/v12/ALTSLicenseEntitlementMigration.java b/src/main/java/org/onap/aai/migration/v12/ALTSLicenseEntitlementMigration.java index 135685c..6e47a09 100644 --- a/src/main/java/org/onap/aai/migration/v12/ALTSLicenseEntitlementMigration.java +++ b/src/main/java/org/onap/aai/migration/v12/ALTSLicenseEntitlementMigration.java @@ -150,7 +150,7 @@ public class ALTSLicenseEntitlementMigration extends Migrator{ } else if (vertices.size() == 1) { try { - logger.info(String.format("Updating %s with groupUuid %s from generic-vnf with vnfId %s with newResourceUuid %s", nodeType, groupUuid, vnfId, newResourceUuid)); + logger.info("Updating %s with groupUuid %s from generic-vnf with vnfId %s with newResourceUuid %s".formatted(nodeType, groupUuid, vnfId, newResourceUuid)); Vertex v = vertices.get(0); String resourceUuid = v.<String>property("resource-uuid").value(); logger.info("\tOriginal resource-uuid: " + resourceUuid); diff --git a/src/main/java/org/onap/aai/migration/v12/ContainmentDeleteOtherVPropertyMigration.java b/src/main/java/org/onap/aai/migration/v12/ContainmentDeleteOtherVPropertyMigration.java index 361e8bc..b9084fb 100644 --- a/src/main/java/org/onap/aai/migration/v12/ContainmentDeleteOtherVPropertyMigration.java +++ b/src/main/java/org/onap/aai/migration/v12/ContainmentDeleteOtherVPropertyMigration.java @@ -21,7 +21,7 @@ package org.onap.aai.migration.v12; import java.util.Optional; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.tinkerpop.gremlin.structure.Edge; import org.onap.aai.edges.EdgeIngestor; import org.onap.aai.edges.enums.EdgeProperty; @@ -42,22 +42,22 @@ import org.onap.aai.setup.SchemaVersions; public class ContainmentDeleteOtherVPropertyMigration extends Migrator { private boolean success = true; - + public ContainmentDeleteOtherVPropertyMigration(TransactionalGraphEngine engine, LoaderFactory loaderFactory, EdgeIngestor edgeIngestor, EdgeSerializer edgeSerializer, SchemaVersions schemaVersions) { super(engine, loaderFactory, edgeIngestor, edgeSerializer, schemaVersions); } - + //just for testing using test edge rule files public ContainmentDeleteOtherVPropertyMigration(TransactionalGraphEngine engine, LoaderFactory loaderFactory, EdgeIngestor edgeIngestor, EdgeSerializer edgeSerializer, SchemaVersions schemaVersions, String edgeRulesFile) { super(engine, loaderFactory, edgeIngestor, edgeSerializer, schemaVersions); } - + @Override public void run() { try { engine.asAdmin().getTraversalSource().E().sideEffect(t -> { Edge e = t.get(); - logger.info("out vertex: " + e.outVertex().property("aai-node-type").value() + + logger.info("out vertex: " + e.outVertex().property("aai-node-type").value() + " in vertex: " + e.inVertex().property("aai-node-type").value() + " label : " + e.label()); if (e.property(EdgeProperty.CONTAINS.toString()).isPresent() && @@ -77,11 +77,11 @@ public class ContainmentDeleteOtherVPropertyMigration extends Migrator { } }).iterate(); } catch (Exception e) { - logger.info("error encountered " + e.getClass() + " " + e.getMessage() + " " + ExceptionUtils.getFullStackTrace(e)); - logger.error("error encountered " + e.getClass() + " " + e.getMessage() + " " + ExceptionUtils.getFullStackTrace(e)); + logger.info("error encountered " + e.getClass() + " " + e.getMessage() + " " + ExceptionUtils.getStackTrace(e)); + logger.error("error encountered " + e.getClass() + " " + e.getMessage() + " " + ExceptionUtils.getStackTrace(e)); success = false; } - + } @Override diff --git a/src/main/java/org/onap/aai/migration/v12/MigrateHUBEvcInventory.java b/src/main/java/org/onap/aai/migration/v12/MigrateHUBEvcInventory.java index 97936d7..2da2703 100644 --- a/src/main/java/org/onap/aai/migration/v12/MigrateHUBEvcInventory.java +++ b/src/main/java/org/onap/aai/migration/v12/MigrateHUBEvcInventory.java @@ -42,7 +42,7 @@ package org.onap.aai.migration.v12; import java.io.FileNotFoundException; import java.io.IOException; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -113,7 +113,7 @@ public class MigrateHUBEvcInventory extends Migrator { logger.info("---------- Processing HUB Entries from file ----------"); try { String line; - List<String> lines = Files.readAllLines(Paths.get(fileName)); + List<String> lines = Files.readAllLines(Path.of(fileName)); Iterator<String> lineItr = lines.iterator(); while (lineItr.hasNext()){ line = lineItr.next(); diff --git a/src/main/java/org/onap/aai/migration/v12/MigrateINVPhysicalInventory.java b/src/main/java/org/onap/aai/migration/v12/MigrateINVPhysicalInventory.java index ade7ec3..2f86ef6 100644 --- a/src/main/java/org/onap/aai/migration/v12/MigrateINVPhysicalInventory.java +++ b/src/main/java/org/onap/aai/migration/v12/MigrateINVPhysicalInventory.java @@ -55,7 +55,7 @@ import org.onap.aai.setup.SchemaVersions; import java.io.FileNotFoundException; import java.io.IOException; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; @@ -211,7 +211,7 @@ public class MigrateINVPhysicalInventory extends Migrator { * @throws Exception */ protected Map<String,Set<String>> loadFile(String fileName) throws Exception { - List<String> lines = Files.readAllLines(Paths.get(fileName)); + List<String> lines = Files.readAllLines(Path.of(fileName)); return this.getFileContents(lines); } @@ -234,8 +234,7 @@ public class MigrateINVPhysicalInventory extends Migrator { .map(line -> Arrays.stream(line.split(",", -1)).map(String::trim).collect(Collectors.toList())) // .filter(this::verifyLine) .map(this::processLine) - .filter(Optional::isPresent) - .map(Optional::get) + .flatMap(Optional::stream) .forEach(p -> { processedRowsCount.getAndIncrement(); String pnfName = p.getValue0(); diff --git a/src/main/java/org/onap/aai/migration/v12/MigratePATHEvcInventory.java b/src/main/java/org/onap/aai/migration/v12/MigratePATHEvcInventory.java index 28b5b7b..043997f 100644 --- a/src/main/java/org/onap/aai/migration/v12/MigratePATHEvcInventory.java +++ b/src/main/java/org/onap/aai/migration/v12/MigratePATHEvcInventory.java @@ -42,7 +42,7 @@ package org.onap.aai.migration.v12; import java.io.FileNotFoundException; import java.io.IOException; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -129,7 +129,7 @@ public class MigratePATHEvcInventory extends Migrator { logger.info(fileName); logger.info("---------- Processing PATH Entries from file ----------"); try { - List<String> lines = Files.readAllLines(Paths.get(fileName)); + List<String> lines = Files.readAllLines(Path.of(fileName)); Iterator<String> lineItr = lines.iterator(); while (lineItr.hasNext()){ String line = lineItr.next().replace("\n", "").replace("\r", ""); diff --git a/src/main/java/org/onap/aai/migration/v12/MigrateSAREvcInventory.java b/src/main/java/org/onap/aai/migration/v12/MigrateSAREvcInventory.java index af7a845..0714052 100644 --- a/src/main/java/org/onap/aai/migration/v12/MigrateSAREvcInventory.java +++ b/src/main/java/org/onap/aai/migration/v12/MigrateSAREvcInventory.java @@ -42,7 +42,7 @@ package org.onap.aai.migration.v12; import java.io.FileNotFoundException; import java.io.IOException; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -127,7 +127,7 @@ public class MigrateSAREvcInventory extends Migrator { try { String line; - List<String> lines = Files.readAllLines(Paths.get(fileName)); + List<String> lines = Files.readAllLines(Path.of(fileName)); Iterator<String> lineItr = lines.iterator(); while (lineItr.hasNext()){ line = lineItr.next().replace("\n", "").replace("\r", ""); diff --git a/src/main/java/org/onap/aai/migration/v12/UriMigration.java b/src/main/java/org/onap/aai/migration/v12/UriMigration.java index 4a55f71..23a66d5 100644 --- a/src/main/java/org/onap/aai/migration/v12/UriMigration.java +++ b/src/main/java/org/onap/aai/migration/v12/UriMigration.java @@ -27,7 +27,7 @@ import java.util.Optional; import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; import org.apache.tinkerpop.gremlin.structure.Vertex; diff --git a/src/main/java/org/onap/aai/migration/v13/MigrateForwarderEvcCircuitId.java b/src/main/java/org/onap/aai/migration/v13/MigrateForwarderEvcCircuitId.java index 6c2b795..39d3883 100644 --- a/src/main/java/org/onap/aai/migration/v13/MigrateForwarderEvcCircuitId.java +++ b/src/main/java/org/onap/aai/migration/v13/MigrateForwarderEvcCircuitId.java @@ -42,7 +42,7 @@ package org.onap.aai.migration.v13; import java.io.FileNotFoundException; import java.io.IOException; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -148,7 +148,7 @@ public class MigrateForwarderEvcCircuitId extends Migrator { logger.info(fileName); logger.info("---------- Processing Entries from file ----------"); try { - List<String> lines = Files.readAllLines(Paths.get(fileName)); + List<String> lines = Files.readAllLines(Path.of(fileName)); Iterator<String> lineItr = lines.iterator(); while (lineItr.hasNext()){ String line = lineItr.next().replace("\n", "").replace("\r", ""); diff --git a/src/main/java/org/onap/aai/migration/v13/MigrateModelVer.java b/src/main/java/org/onap/aai/migration/v13/MigrateModelVer.java index 1e0ef5e..bac3e93 100644 --- a/src/main/java/org/onap/aai/migration/v13/MigrateModelVer.java +++ b/src/main/java/org/onap/aai/migration/v13/MigrateModelVer.java @@ -140,7 +140,7 @@ public class MigrateModelVer extends Migrator{ currentValueModelVersionID = getModelVersionIdNodeValue(vertex); currrentValueModelInvariantID = getModelInvariantIdNodeValue(vertex); - String uri = String.format("/service-design-and-creation/models/model/%s/model-vers/model-ver/%s", currrentValueModelInvariantID, currentValueModelVersionID); + String uri = "/service-design-and-creation/models/model/%s/model-vers/model-ver/%s".formatted(currrentValueModelInvariantID, currentValueModelVersionID); String propertyKey = NODETYPEKEYMAP.get(nodeTypeString); String propertyValue = vertex != null ? vertex.value(propertyKey).toString() : ""; logger.info("Processing "+nodeTypeString+ " vertex with key "+ propertyValue); diff --git a/src/main/java/org/onap/aai/migration/v14/MigrateSameSourcedRCTROPserverData.java b/src/main/java/org/onap/aai/migration/v14/MigrateSameSourcedRCTROPserverData.java index 85325b7..a1f899b 100644 --- a/src/main/java/org/onap/aai/migration/v14/MigrateSameSourcedRCTROPserverData.java +++ b/src/main/java/org/onap/aai/migration/v14/MigrateSameSourcedRCTROPserverData.java @@ -43,7 +43,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.P; import org.onap.aai.setup.SchemaVersions; import org.springframework.web.util.UriUtils; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.io.UnsupportedEncodingException; import java.util.*; diff --git a/src/main/java/org/onap/aai/migration/v14/MigrateSdnaIvlanData.java b/src/main/java/org/onap/aai/migration/v14/MigrateSdnaIvlanData.java index a8c2f72..5d73c3f 100644 --- a/src/main/java/org/onap/aai/migration/v14/MigrateSdnaIvlanData.java +++ b/src/main/java/org/onap/aai/migration/v14/MigrateSdnaIvlanData.java @@ -23,7 +23,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.nio.file.Files; import java.nio.file.NoSuchFileException; -import java.nio.file.Paths; +import java.nio.file.Path; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -149,7 +149,7 @@ public class MigrateSdnaIvlanData extends Migrator { try { - List<String> lines = Files.readAllLines(Paths.get(fileName)); + List<String> lines = Files.readAllLines(Path.of(fileName)); Iterator<String> lineItr = lines.iterator(); while (lineItr.hasNext()){ String line = lineItr.next().trim(); @@ -270,7 +270,7 @@ public class MigrateSdnaIvlanData extends Migrator { forwarderEvcId = forwarderEvcVtx.property("forwarder-evc-id").value().toString(); try{ forwarderEvcVtx.property("ivlan", ivlanValue); - logger.info(String.format("Updating Node Type forwarder-evc Property ivlan value %s", ivlanValue.toString())); + logger.info("Updating Node Type forwarder-evc Property ivlan value %s".formatted(ivlanValue.toString())); this.touchVertexProperties(forwarderEvcVtx, false); updateDmaapList(forwarderEvcVtx); migrationSuccess++; diff --git a/src/main/java/org/onap/aai/migration/v14/PserverDedupWithDifferentSourcesOfTruth.java b/src/main/java/org/onap/aai/migration/v14/PserverDedupWithDifferentSourcesOfTruth.java index ad3181b..74a0686 100644 --- a/src/main/java/org/onap/aai/migration/v14/PserverDedupWithDifferentSourcesOfTruth.java +++ b/src/main/java/org/onap/aai/migration/v14/PserverDedupWithDifferentSourcesOfTruth.java @@ -40,7 +40,7 @@ import org.onap.aai.migration.Status; import org.onap.aai.serialization.engines.TransactionalGraphEngine; import org.springframework.web.util.UriUtils; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.io.UnsupportedEncodingException; import java.util.*; diff --git a/src/main/java/org/onap/aai/migration/v15/MigrateCloudRegionUpgradeCycle.java b/src/main/java/org/onap/aai/migration/v15/MigrateCloudRegionUpgradeCycle.java index fd8bf5b..b0fb619 100644 --- a/src/main/java/org/onap/aai/migration/v15/MigrateCloudRegionUpgradeCycle.java +++ b/src/main/java/org/onap/aai/migration/v15/MigrateCloudRegionUpgradeCycle.java @@ -22,7 +22,7 @@ package org.onap.aai.migration.v15; import java.io.FileNotFoundException; import java.io.IOException; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -187,7 +187,7 @@ public class MigrateCloudRegionUpgradeCycle extends Migrator { * @throws Exception */ protected ArrayList loadFile(String fileName) throws Exception { - List<String> lines = Files.readAllLines(Paths.get(fileName)); + List<String> lines = Files.readAllLines(Path.of(fileName)); return this.getFileContents(lines); } @@ -209,7 +209,7 @@ public class MigrateCloudRegionUpgradeCycle extends Migrator { logger.info("Total rows count excluding header: " + lines.size()); lines.stream().filter(line -> !line.isEmpty()).map(line -> Arrays.stream(line.split(",", -1)).map(String::trim).collect(Collectors.toList())) - .map(this::processRegionUpgradeCycle).filter(Optional::isPresent).map(Optional::get).forEach(p -> { + .map(this::processRegionUpgradeCycle).flatMap(Optional::stream).forEach(p -> { processedRowsCount.getAndIncrement(); String pnfName = p.getValue0(); if (!regionMap.containsKey(pnfName)) { @@ -220,7 +220,7 @@ public class MigrateCloudRegionUpgradeCycle extends Migrator { fileContent.add(regionMap); lines.stream().filter(line -> !line.isEmpty()).map(line -> Arrays.stream(line.split(",", -1)).map(String::trim).collect(Collectors.toList())) - .map(this::processRegionAlias).filter(Optional::isPresent).map(Optional::get).forEach(p -> { + .map(this::processRegionAlias).flatMap(Optional::stream).forEach(p -> { processedRowsCount.getAndIncrement(); String pnfName = p.getValue0(); if (!aliasMap.containsKey(pnfName)) { diff --git a/src/main/java/org/onap/aai/migration/v15/MigrateRadcomChanges.java b/src/main/java/org/onap/aai/migration/v15/MigrateRadcomChanges.java index db523cd..5785381 100644 --- a/src/main/java/org/onap/aai/migration/v15/MigrateRadcomChanges.java +++ b/src/main/java/org/onap/aai/migration/v15/MigrateRadcomChanges.java @@ -42,7 +42,7 @@ package org.onap.aai.migration.v15; import java.io.FileNotFoundException; import java.io.IOException; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -176,7 +176,7 @@ public class MigrateRadcomChanges extends EdgeSwingMigrator { logger.info("---------- Reading all file types and vf-modules ----------"); ArrayList<String> fileTypeList = new ArrayList<String>(); try { - List<String> lines = Files.readAllLines(Paths.get(fileName)); + List<String> lines = Files.readAllLines(Path.of(fileName)); Iterator<String> lineItr = lines.iterator(); int typeFileLineCounter = 0; while (lineItr.hasNext()){ @@ -231,7 +231,7 @@ public class MigrateRadcomChanges extends EdgeSwingMigrator { logger.info(fileName); logger.info("---------- Processing Entries from file ----------"); try { - List<String> lines = Files.readAllLines(Paths.get(fileName)); + List<String> lines = Files.readAllLines(Path.of(fileName)); Iterator<String> lineItr = lines.iterator(); while (lineItr.hasNext()){ String line = lineItr.next().replace("\n", "").replace("\r", ""); @@ -254,7 +254,7 @@ public class MigrateRadcomChanges extends EdgeSwingMigrator { fileName = feedDir+ "INPUT-VNF.csv"; logger.info(fileName); logger.info("---------- Processing Entries from file ----------"); - lines = Files.readAllLines(Paths.get(fileName)); + lines = Files.readAllLines(Path.of(fileName)); lineItr = lines.iterator(); while (lineItr.hasNext()){ String line = lineItr.next().replace("\n", "").replace("\r", ""); diff --git a/src/main/java/org/onap/aai/rest/AuditSqlDbConsumer.java b/src/main/java/org/onap/aai/rest/AuditSqlDbConsumer.java index aec7224..61cac13 100644 --- a/src/main/java/org/onap/aai/rest/AuditSqlDbConsumer.java +++ b/src/main/java/org/onap/aai/rest/AuditSqlDbConsumer.java @@ -27,13 +27,12 @@ import org.onap.aai.restcore.RESTAPI; import org.onap.aai.util.AAIConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import javax.ws.rs.*; -import javax.ws.rs.core.*; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.*; +import jakarta.ws.rs.core.Response.Status; @Component @Path("{version: v1}/audit-sql-db") @@ -47,7 +46,6 @@ public class AuditSqlDbConsumer extends RESTAPI { private String rdbmsDbName; private AuditGraphson2Sql auditGraphson2Sql; - @Autowired public AuditSqlDbConsumer( AuditGraphson2Sql auditGraphson2Sql, @Value("${aperture.rdbmsname}") String rdbmsDbName diff --git a/src/main/java/org/onap/aai/rest/ExceptionHandler.java b/src/main/java/org/onap/aai/rest/ExceptionHandler.java index 14c45da..25be192 100644 --- a/src/main/java/org/onap/aai/rest/ExceptionHandler.java +++ b/src/main/java/org/onap/aai/rest/ExceptionHandler.java @@ -25,14 +25,14 @@ import com.sun.istack.SAXParseException2; import org.onap.aai.exceptions.AAIException; import org.onap.aai.logging.ErrorLogHelper; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; import java.util.ArrayList; import java.util.List; @@ -59,8 +59,7 @@ public class ExceptionHandler implements ExceptionMapper<Exception> { //the general case is that cxf will give us a WebApplicationException //with a linked exception - if (exception instanceof WebApplicationException) { - WebApplicationException e = (WebApplicationException) exception; + if (exception instanceof WebApplicationException e) { if (e.getCause() != null) { if (e.getCause() instanceof SAXParseException2) { templateVars.add("UnmarshalException"); @@ -93,8 +92,7 @@ public class ExceptionHandler implements ExceptionMapper<Exception> { if (response == null) { Exception actual_e = exception; - if (exception instanceof WebApplicationException) { - WebApplicationException e = (WebApplicationException) exception; + if (exception instanceof WebApplicationException e) { response = e.getResponse(); } else { templateVars.add(request.getMethod()); diff --git a/src/main/java/org/onap/aai/rest/QueryConsumer.java b/src/main/java/org/onap/aai/rest/QueryConsumer.java index a0ba61a..c77fafd 100644 --- a/src/main/java/org/onap/aai/rest/QueryConsumer.java +++ b/src/main/java/org/onap/aai/rest/QueryConsumer.java @@ -43,15 +43,14 @@ import org.onap.aai.setup.SchemaVersions; import org.onap.aai.util.AAIConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.*; -import javax.ws.rs.core.*; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.*; +import jakarta.ws.rs.core.Response.Status; import java.util.List; @Component @@ -74,7 +73,6 @@ public class QueryConsumer extends RESTAPI { private String basePath; - @Autowired public QueryConsumer( @Qualifier("traversalUriHttpEntry") HttpEntry traversalUriHttpEntry, DslQueryProcessor dslQueryProcessor, diff --git a/src/main/java/org/onap/aai/rest/SchemaJobStatusController.java b/src/main/java/org/onap/aai/rest/SchemaJobStatusController.java index 50cbddb..3004b59 100644 --- a/src/main/java/org/onap/aai/rest/SchemaJobStatusController.java +++ b/src/main/java/org/onap/aai/rest/SchemaJobStatusController.java @@ -19,9 +19,9 @@ */ package org.onap.aai.rest; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.onap.aai.exceptions.AAIException; import org.onap.aai.service.SchemaJobStatusService; diff --git a/src/main/java/org/onap/aai/rest/client/ApertureService.java b/src/main/java/org/onap/aai/rest/client/ApertureService.java index 226e681..ead12dc 100644 --- a/src/main/java/org/onap/aai/rest/client/ApertureService.java +++ b/src/main/java/org/onap/aai/rest/client/ApertureService.java @@ -21,12 +21,11 @@ package org.onap.aai.rest.client; import com.google.gson.JsonObject; -import org.apache.http.conn.ConnectTimeoutException; +import org.apache.hc.client5.http.ConnectTimeoutException; import org.onap.aai.exceptions.AAIException; import org.onap.aai.restclient.RestClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpMethod; @@ -72,7 +71,6 @@ public class ApertureService { private final String appName; - @Autowired public ApertureService( @Qualifier("apertureRestClient") RestClient apertureRestClient, @Value("${spring.application.name}") String appName diff --git a/src/main/java/org/onap/aai/rest/client/ApertureServiceNoAuthClient.java b/src/main/java/org/onap/aai/rest/client/ApertureServiceNoAuthClient.java index 703420e..8e1bd8b 100644 --- a/src/main/java/org/onap/aai/rest/client/ApertureServiceNoAuthClient.java +++ b/src/main/java/org/onap/aai/rest/client/ApertureServiceNoAuthClient.java @@ -47,6 +47,7 @@ public class ApertureServiceNoAuthClient 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/src/main/java/org/onap/aai/rest/client/ApertureServiceOneWayClient.java b/src/main/java/org/onap/aai/rest/client/ApertureServiceOneWayClient.java index 5b4fa0d..4cc72f6 100644 --- a/src/main/java/org/onap/aai/rest/client/ApertureServiceOneWayClient.java +++ b/src/main/java/org/onap/aai/rest/client/ApertureServiceOneWayClient.java @@ -54,6 +54,7 @@ public class ApertureServiceOneWayClient 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/src/main/java/org/onap/aai/rest/client/ApertureServiceRestClient.java b/src/main/java/org/onap/aai/rest/client/ApertureServiceRestClient.java index 19c32fb..095c7f9 100644 --- a/src/main/java/org/onap/aai/rest/client/ApertureServiceRestClient.java +++ b/src/main/java/org/onap/aai/rest/client/ApertureServiceRestClient.java @@ -59,6 +59,7 @@ public class ApertureServiceRestClient 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/src/main/java/org/onap/aai/rest/dsl/DslListener.java b/src/main/java/org/onap/aai/rest/dsl/DslListener.java index 70d8bf8..e806154 100644 --- a/src/main/java/org/onap/aai/rest/dsl/DslListener.java +++ b/src/main/java/org/onap/aai/rest/dsl/DslListener.java @@ -29,7 +29,6 @@ import org.onap.aai.edges.EdgeRule; import org.onap.aai.edges.EdgeRuleQuery; import org.onap.aai.edges.exceptions.AmbiguousRuleChoiceException; import org.onap.aai.edges.exceptions.EdgeRuleNotFoundException; -import org.springframework.beans.factory.annotation.Autowired; import java.util.HashMap; import java.util.List; @@ -68,7 +67,6 @@ public class DslListener extends AAIDslBaseListener { /** * Instantiates a new DslListener. */ - @Autowired public DslListener(EdgeIngestor edgeIngestor) { this.edgeRules = edgeIngestor; } diff --git a/src/main/java/org/onap/aai/rest/dsl/DslQueryProcessor.java b/src/main/java/org/onap/aai/rest/dsl/DslQueryProcessor.java index 3e77e6c..b77c9f0 100644 --- a/src/main/java/org/onap/aai/rest/dsl/DslQueryProcessor.java +++ b/src/main/java/org/onap/aai/rest/dsl/DslQueryProcessor.java @@ -27,7 +27,6 @@ import org.antlr.v4.runtime.tree.ParseTree; import org.antlr.v4.runtime.tree.ParseTreeWalker; import org.onap.aai.AAIDslLexer; import org.onap.aai.AAIDslParser; -import org.springframework.beans.factory.annotation.Autowired; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -42,7 +41,6 @@ public class DslQueryProcessor { private DslListener dslListener; - @Autowired public DslQueryProcessor(DslListener dslListener){ this.dslListener = dslListener; } diff --git a/src/main/java/org/onap/aai/rest/search/GenericQueryProcessor.java b/src/main/java/org/onap/aai/rest/search/GenericQueryProcessor.java index 85573fc..6fbf110 100644 --- a/src/main/java/org/onap/aai/rest/search/GenericQueryProcessor.java +++ b/src/main/java/org/onap/aai/rest/search/GenericQueryProcessor.java @@ -32,8 +32,8 @@ import org.onap.aai.restcore.util.URITools; import org.onap.aai.serialization.engines.TransactionalGraphEngine; import org.onap.aai.serialization.queryformats.SubGraphStyle; -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 java.io.FileNotFoundException; import java.net.URI; import java.util.*; diff --git a/src/main/java/org/onap/aai/rest/util/EchoResponse.java b/src/main/java/org/onap/aai/rest/util/EchoResponse.java index 12b62b3..2e18f38 100644 --- a/src/main/java/org/onap/aai/rest/util/EchoResponse.java +++ b/src/main/java/org/onap/aai/rest/util/EchoResponse.java @@ -20,23 +20,22 @@ package org.onap.aai.rest.util; import java.util.ArrayList; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.onap.aai.exceptions.AAIException; import org.onap.aai.logging.ErrorLogHelper; import org.onap.aai.restcore.RESTAPI; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @Component @@ -50,7 +49,6 @@ public class EchoResponse extends RESTAPI { private static final String UP_RESPONSE="{\"status\":\"UP\",\"groups\":[\"liveness\",\"readiness\"]}"; - @Autowired public EchoResponse(AaiGraphChecker aaiGraphChecker ) { this.aaiGraphChecker = aaiGraphChecker; } diff --git a/src/main/java/org/onap/aai/schema/GenTester.java b/src/main/java/org/onap/aai/schema/GenTester.java index 6443d43..cf82d19 100644 --- a/src/main/java/org/onap/aai/schema/GenTester.java +++ b/src/main/java/org/onap/aai/schema/GenTester.java @@ -197,7 +197,7 @@ public class GenTester { private static void setSchemaInitializedToFalse(JanusGraph graph, Optional<Vertex> schemaInitializedVertex) { Vertex vertex = schemaInitializedVertex.get(); Object schemaInitializedValueObj = vertex.property(SCHEMA_INITIALIZED).value(); - Boolean schemaInitializedValue = schemaInitializedValueObj instanceof Boolean ? (Boolean) schemaInitializedValueObj : Boolean.FALSE; + Boolean schemaInitializedValue = schemaInitializedValueObj instanceof Boolean b ? b : Boolean.FALSE; //Setting schema-initialized vertex to False if (Boolean.TRUE.equals(schemaInitializedValue)) { diff --git a/src/main/java/org/onap/aai/service/RetiredService.java b/src/main/java/org/onap/aai/service/RetiredService.java index 5989e31..b9d562f 100644 --- a/src/main/java/org/onap/aai/service/RetiredService.java +++ b/src/main/java/org/onap/aai/service/RetiredService.java @@ -23,7 +23,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.PropertySource; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.util.Arrays; import java.util.List; import java.util.regex.Pattern; diff --git a/src/main/java/org/onap/aai/util/ExceptionTranslator.java b/src/main/java/org/onap/aai/util/ExceptionTranslator.java index e8c9ede..bb6d867 100644 --- a/src/main/java/org/onap/aai/util/ExceptionTranslator.java +++ b/src/main/java/org/onap/aai/util/ExceptionTranslator.java @@ -38,7 +38,7 @@ public class ExceptionTranslator { aai = new AAIException("AAI_3025","Error parsing exception - Please Investigate" + LogFormatTools.getStackTop(ex)); } else { - LOGGER.info(String.format("Exception is %sRoot cause is%s", ExceptionUtils.getRootCause(ex).getMessage(), ExceptionUtils.getRootCause(ex).toString())); + LOGGER.info("Exception is %sRoot cause is%s".formatted(ExceptionUtils.getRootCause(ex).getMessage(), ExceptionUtils.getRootCause(ex).toString())); if(ExceptionUtils.getRootCause(ex).getMessage().contains("NodeIngestor")){ aai = new AAIException("AAI_3026","Error reading OXM from SchemaService - Investigate"); } diff --git a/src/main/java/org/onap/aai/util/SendDeleteMigrationNotifications.java b/src/main/java/org/onap/aai/util/SendDeleteMigrationNotifications.java index 0fd75dc..64ed39b 100644 --- a/src/main/java/org/onap/aai/util/SendDeleteMigrationNotifications.java +++ b/src/main/java/org/onap/aai/util/SendDeleteMigrationNotifications.java @@ -43,7 +43,7 @@ import org.slf4j.MDC; import java.io.IOException; import java.net.URI; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; @@ -130,7 +130,7 @@ public class SendDeleteMigrationNotifications { } private Map<Integer,String> processFile() throws IOException { - List<String> lines = Files.readAllLines(Paths.get(path)); + List<String> lines = Files.readAllLines(Path.of(path)); final Map<Integer,String> data = new LinkedHashMap<>(); AtomicInteger counter = new AtomicInteger(0); lines.stream().forEach(line -> { diff --git a/src/main/java/org/onap/aai/util/SendMigrationNotifications.java b/src/main/java/org/onap/aai/util/SendMigrationNotifications.java index a138402..0c854dc 100644 --- a/src/main/java/org/onap/aai/util/SendMigrationNotifications.java +++ b/src/main/java/org/onap/aai/util/SendMigrationNotifications.java @@ -45,7 +45,7 @@ import org.slf4j.MDC; import java.io.IOException; import java.net.URI; import java.nio.file.Files; -import java.nio.file.Paths; +import java.nio.file.Path; import java.util.*; public class SendMigrationNotifications { @@ -142,7 +142,7 @@ public class SendMigrationNotifications { } private Map<String, String> processFile() throws IOException { - List<String> lines = Files.readAllLines(Paths.get(path)); + List<String> lines = Files.readAllLines(Path.of(path)); final Map<String,String> vertexIds = new LinkedHashMap<>(); lines.stream().forEach(line -> { if (line.contains("_")) { diff --git a/src/main/java/org/onap/aai/web/JerseyConfiguration.java b/src/main/java/org/onap/aai/web/JerseyConfiguration.java index 99f304d..7c5fe6c 100644 --- a/src/main/java/org/onap/aai/web/JerseyConfiguration.java +++ b/src/main/java/org/onap/aai/web/JerseyConfiguration.java @@ -23,9 +23,9 @@ import java.util.List; import java.util.Set; import java.util.logging.Logger; import java.util.stream.Collectors; -import javax.annotation.Priority; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ContainerResponseFilter; +import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerRequestFilter; +import jakarta.ws.rs.container.ContainerResponseFilter; import org.glassfish.jersey.logging.LoggingFeature; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.servlet.ServletProperties; @@ -34,9 +34,9 @@ import org.onap.aai.rest.QueryConsumer; import org.onap.aai.rest.util.EchoResponse; import org.onap.logging.filter.base.AuditLogContainerFilter; import org.reflections8.Reflections; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Profile; import org.springframework.core.env.Environment; +import org.springframework.core.env.Profiles; import org.springframework.stereotype.Component; @Component @@ -46,7 +46,6 @@ public class JerseyConfiguration extends ResourceConfig { private Environment env; - @Autowired public JerseyConfiguration(Environment env) { this.env = env; @@ -91,7 +90,7 @@ public class JerseyConfiguration extends ResourceConfig { .stream() .filter(f -> { if (f.isAnnotationPresent(Profile.class) - && !env.acceptsProfiles(f.getAnnotation(Profile.class).value())) { + && !env.acceptsProfiles(Profiles.of(f.getAnnotation(Profile.class).value()))) { return false; } return true; diff --git a/src/main/java/org/onap/aai/web/LocalHostAccessLog.java b/src/main/java/org/onap/aai/web/LocalHostAccessLog.java deleted file mode 100644 index eaee501..0000000 --- a/src/main/java/org/onap/aai/web/LocalHostAccessLog.java +++ /dev/null @@ -1,67 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * org.onap.aai - * ================================================================================ - * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ -package org.onap.aai.web; - -import ch.qos.logback.access.jetty.RequestLogImpl; -import org.eclipse.jetty.server.handler.HandlerCollection; -import org.eclipse.jetty.server.handler.RequestLogHandler; -import org.eclipse.jetty.util.thread.QueuedThreadPool; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.web.embedded.jetty.JettyServerCustomizer; -import org.springframework.boot.web.embedded.jetty.JettyServletWebServerFactory; -import org.springframework.boot.web.servlet.server.AbstractServletWebServerFactory; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import java.util.Arrays; - -@Configuration -public class LocalHostAccessLog { - - @Bean - public AbstractServletWebServerFactory jettyConfigBean( - @Value("${jetty.threadPool.maxThreads:200}") final String maxThreads, - @Value("${jetty.threadPool.minThreads:8}") final String minThreads - ){ - JettyServletWebServerFactory jef = new JettyServletWebServerFactory(); - jef.addServerCustomizers((JettyServerCustomizer) server -> { - - HandlerCollection handlers = new HandlerCollection(); - - Arrays.stream(server.getHandlers()).forEach(handlers::addHandler); - - RequestLogHandler requestLogHandler = new RequestLogHandler(); - requestLogHandler.setServer(server); - - RequestLogImpl requestLogImpl = new RequestLogImpl(); - requestLogImpl.setResource("/localhost-access-logback.xml"); - requestLogImpl.start(); - - requestLogHandler.setRequestLog(requestLogImpl); - handlers.addHandler(requestLogHandler); - server.setHandler(handlers); - - final QueuedThreadPool threadPool = server.getBean(QueuedThreadPool.class); - threadPool.setMaxThreads(Integer.valueOf(maxThreads)); - threadPool.setMinThreads(Integer.valueOf(minThreads)); - }); - return jef; - } -} |