From 396f60280265a37379916ad12752a94691118f65 Mon Sep 17 00:00:00 2001 From: "adheli.tavares" Date: Mon, 7 Aug 2023 16:01:21 -0400 Subject: Upgrade java-17 in drools-pdp Issue-ID: POLICY-4676 Change-Id: I85a0f6303b30cd0405d63be003c9288f59a9d6b7 Signed-off-by: adheli.tavares --- policy-management/pom.xml | 82 ++++------------------ .../policy/drools/server/restful/RestManager.java | 36 +++++----- .../server/restful/aaf/AafTelemetryAuthFilter.java | 2 +- .../policy/drools/system/PolicyController.java | 2 +- .../restful/test/TestAafTelemetryAuthFilter.java | 2 +- 5 files changed, 35 insertions(+), 89 deletions(-) (limited to 'policy-management') diff --git a/policy-management/pom.xml b/policy-management/pom.xml index 64e9f6b4..fb203580 100644 --- a/policy-management/pom.xml +++ b/policy-management/pom.xml @@ -20,13 +20,14 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.policy.drools-pdp drools-pdp - 2.0.0-SNAPSHOT + 2.0.1-SNAPSHOT policy-management @@ -74,7 +75,6 @@ false false false - javax.inject runtime @@ -175,7 +175,7 @@ PolicyTypeController=org.onap.policy.drools.lifecycle.PolicyTypeController, Properties=java.util.Properties, ProtocolCoderToolset=org.onap.policy.drools.protocol.coders.ProtocolCoderToolset, - Response=javax.ws.rs.core.Response, + Response=jakarta.ws.rs.core.Response, TopicEndpoint=org.onap.policy.common.endpoints.event.comm.TopicEndpoint, TopicSink=org.onap.policy.common.endpoints.event.comm.TopicSink, TopicSource=org.onap.policy.common.endpoints.event.comm.TopicSource, @@ -186,10 +186,11 @@ src/gen/java - java11 + java17 true true false + true @@ -199,13 +200,11 @@ - org.onap.policy.drools-pdp policy-core ${project.version} - org.onap.policy.drools-pdp policy-domains @@ -217,7 +216,11 @@ policy-endpoints ${policy.common.version} - + + org.onap.policy.common + gson + ${policy.common.version} + org.onap.policy.common utils @@ -234,34 +237,24 @@ org.eclipse.jetty jetty-server - org.eclipse.jetty jetty-servlet - - org.onap.policy.common - gson - ${policy.common.version} - - com.google.code.gson gson - com.fatboyindustrial.gson-javatime-serialisers gson-javatime-serialisers - 1.1.1 + 1.1.2 - com.jayway.jsonpath json-path - org.apache.commons commons-collections4 @@ -275,37 +268,16 @@ commons-codec commons-codec - ch.qos.logback logback-classic - - - junit - junit - test - - - - org.mockito - mockito-core - test - - org.springframework spring-test test - - org.onap.policy.common - utils-test - ${policy.common.version} - test - - - - - javax.persistence - javax.persistence-api - - - org.hibernate.common hibernate-commons-annotations - commons-io commons-io - io.prometheus simpleclient_logback - - org.assertj - assertj-core - test - - - - org.awaitility - awaitility - test - - io.swagger.core.v3 swagger-annotations - + diff --git a/policy-management/src/main/java/org/onap/policy/drools/server/restful/RestManager.java b/policy-management/src/main/java/org/onap/policy/drools/server/restful/RestManager.java index 11840a7e..b5cf319e 100644 --- a/policy-management/src/main/java/org/onap/policy/drools/server/restful/RestManager.java +++ b/policy-management/src/main/java/org/onap/policy/drools/server/restful/RestManager.java @@ -23,6 +23,19 @@ package org.onap.policy.drools.server.restful; import ch.qos.logback.classic.LoggerContext; import com.google.re2j.Pattern; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -33,24 +46,12 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Properties; import java.util.UUID; import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; @@ -145,7 +146,8 @@ public class RestManager implements SwaggerApi, DefaultApi, FeaturesApi, InputsA public Response swagger() { try (InputStream inputStream = getClass().getResourceAsStream(SWAGGER); - BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) { + BufferedReader reader = new BufferedReader( + new InputStreamReader(Objects.requireNonNull(inputStream)))) { String contents = reader.lines() .collect(Collectors.joining(System.lineSeparator())); return Response.status(Response.Status.OK) @@ -1720,12 +1722,11 @@ public class RestManager implements SwaggerApi, DefaultApi, FeaturesApi, InputsA @Path("engine/tools/loggers") public Response loggers() { final List names = new ArrayList<>(); - if (!(LoggerFactory.getILoggerFactory() instanceof LoggerContext)) { + if (!(LoggerFactory.getILoggerFactory() instanceof LoggerContext context)) { logger.warn("The SLF4J logger factory is not configured for logback"); return Response.status(Status.INTERNAL_SERVER_ERROR).entity(names).build(); } - final LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); for (final Logger lgr : context.getLoggerList()) { names.add(lgr.getName()); } @@ -1743,12 +1744,11 @@ public class RestManager implements SwaggerApi, DefaultApi, FeaturesApi, InputsA @Path("engine/tools/loggers/{logger}") @Produces(MediaType.TEXT_PLAIN) public Response loggerName1(@PathParam("logger") String loggerName) { - if (!(LoggerFactory.getILoggerFactory() instanceof LoggerContext)) { + if (!(LoggerFactory.getILoggerFactory() instanceof LoggerContext context)) { logger.warn("The SLF4J logger factory is not configured for logback"); return Response.status(Status.INTERNAL_SERVER_ERROR).build(); } - final LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); var lgr = context.getLogger(loggerName); if (lgr == null) { return Response.status(Status.NOT_FOUND).build(); diff --git a/policy-management/src/main/java/org/onap/policy/drools/server/restful/aaf/AafTelemetryAuthFilter.java b/policy-management/src/main/java/org/onap/policy/drools/server/restful/aaf/AafTelemetryAuthFilter.java index f76b3de2..1f7ef8c3 100644 --- a/policy-management/src/main/java/org/onap/policy/drools/server/restful/aaf/AafTelemetryAuthFilter.java +++ b/policy-management/src/main/java/org/onap/policy/drools/server/restful/aaf/AafTelemetryAuthFilter.java @@ -20,7 +20,7 @@ package org.onap.policy.drools.server.restful.aaf; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.onap.policy.common.utils.network.NetworkUtil; /** diff --git a/policy-management/src/main/java/org/onap/policy/drools/system/PolicyController.java b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyController.java index 7501aed5..931e8a55 100644 --- a/policy-management/src/main/java/org/onap/policy/drools/system/PolicyController.java +++ b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyController.java @@ -85,7 +85,7 @@ public interface PolicyController extends Startable, Lockable { boolean offer(T event); /** - * Attempts delivering of an String over communication infrastructure "busType". + * Attempts delivering of a String over communication infrastructure "busType". * * @param busType bus type * @param topic topic diff --git a/policy-management/src/test/java/org/onap/policy/drools/server/restful/test/TestAafTelemetryAuthFilter.java b/policy-management/src/test/java/org/onap/policy/drools/server/restful/test/TestAafTelemetryAuthFilter.java index 67e16183..6a9be8a2 100644 --- a/policy-management/src/test/java/org/onap/policy/drools/server/restful/test/TestAafTelemetryAuthFilter.java +++ b/policy-management/src/test/java/org/onap/policy/drools/server/restful/test/TestAafTelemetryAuthFilter.java @@ -20,7 +20,7 @@ package org.onap.policy.drools.server.restful.test; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.onap.policy.common.utils.network.NetworkUtil; import org.onap.policy.drools.server.restful.aaf.AafTelemetryAuthFilter; -- cgit 1.2.3-korg