From 1cd99ed17a0d034ef8e54a7ac3dc059871dc7a1a Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 3 Jul 2024 09:31:01 -0400 Subject: Resolve build issues Build was failing due to issues missed in port to java 17. Updated sdnc/apps to change dependencies from javax.* to jakarta.* - required for Java 17. Also, latest version of snakeyaml cannot handle size of yaml based SDNC swagger, so replaced that with JSON based version. Issue-ID: SDNC-1843 Change-Id: I4df872481c56aea496de0d2b9cc349799ff6b60c Signed-off-by: Dan Timoney --- .../onap/sdnc/apps/pomba/networkdiscovery/service/rs/RestService.java | 4 ++-- .../sdnc/apps/pomba/networkdiscovery/service/rs/RestServiceImpl.java | 2 +- .../pomba/networkdiscovery/unittest/service/NetworkDiscoveryTest.java | 2 +- .../sdnc/apps/pomba/servicedecomposition/service/rs/RestService.java | 4 ++-- .../apps/pomba/servicedecomposition/service/rs/RestServiceImpl.java | 4 ++-- .../pomba/servicedecomposition/test/ServiceDecompositionTest.java | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'pomba') diff --git a/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/service/rs/RestService.java b/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/service/rs/RestService.java index 226f325..67ce8d3 100644 --- a/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/service/rs/RestService.java +++ b/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/service/rs/RestService.java @@ -24,7 +24,7 @@ import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; import io.swagger.annotations.Authorization; import java.util.List; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; import javax.ws.rs.GET; import javax.ws.rs.HeaderParam; @@ -93,4 +93,4 @@ public interface RestService { @ApiParam(required=true) List resourceIds) throws ApplicationException; -} \ No newline at end of file +} diff --git a/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/service/rs/RestServiceImpl.java b/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/service/rs/RestServiceImpl.java index adb5df0..6b68f22 100644 --- a/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/service/rs/RestServiceImpl.java +++ b/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/service/rs/RestServiceImpl.java @@ -25,7 +25,7 @@ import static org.onap.sdnc.apps.pomba.networkdiscovery.ApplicationException.Err import java.util.List; import java.util.UUID; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.ResponseBuilder; diff --git a/pomba/network-discovery/src/test/java/org/onap/sdnc/apps/pomba/networkdiscovery/unittest/service/NetworkDiscoveryTest.java b/pomba/network-discovery/src/test/java/org/onap/sdnc/apps/pomba/networkdiscovery/unittest/service/NetworkDiscoveryTest.java index 39239e9..bee715f 100644 --- a/pomba/network-discovery/src/test/java/org/onap/sdnc/apps/pomba/networkdiscovery/unittest/service/NetworkDiscoveryTest.java +++ b/pomba/network-discovery/src/test/java/org/onap/sdnc/apps/pomba/networkdiscovery/unittest/service/NetworkDiscoveryTest.java @@ -39,7 +39,7 @@ import java.util.Base64; import java.util.List; import java.util.UUID; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; diff --git a/pomba/service-decomposition/src/main/java/org/onap/sdnc/apps/pomba/servicedecomposition/service/rs/RestService.java b/pomba/service-decomposition/src/main/java/org/onap/sdnc/apps/pomba/servicedecomposition/service/rs/RestService.java index f887d8f..fadf222 100644 --- a/pomba/service-decomposition/src/main/java/org/onap/sdnc/apps/pomba/servicedecomposition/service/rs/RestService.java +++ b/pomba/service-decomposition/src/main/java/org/onap/sdnc/apps/pomba/servicedecomposition/service/rs/RestService.java @@ -23,7 +23,7 @@ import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; import io.swagger.annotations.Authorization; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.ws.rs.GET; import javax.ws.rs.HeaderParam; import javax.ws.rs.Path; @@ -62,4 +62,4 @@ public interface RestService { @HeaderParam(ONAPLogConstants.Headers.PARTNER_NAME) @ApiParam(required=true) String xFromAppId, @HeaderParam(ONAPLogConstants.Headers.REQUEST_ID) String xTransactionId, @QueryParam("serviceInstanceId") @ApiParam(required=true) String serviceInstanceId); -} \ No newline at end of file +} diff --git a/pomba/service-decomposition/src/main/java/org/onap/sdnc/apps/pomba/servicedecomposition/service/rs/RestServiceImpl.java b/pomba/service-decomposition/src/main/java/org/onap/sdnc/apps/pomba/servicedecomposition/service/rs/RestServiceImpl.java index 52354dd..1b321a1 100644 --- a/pomba/service-decomposition/src/main/java/org/onap/sdnc/apps/pomba/servicedecomposition/service/rs/RestServiceImpl.java +++ b/pomba/service-decomposition/src/main/java/org/onap/sdnc/apps/pomba/servicedecomposition/service/rs/RestServiceImpl.java @@ -21,7 +21,7 @@ package org.onap.sdnc.apps.pomba.servicedecomposition.service.rs; import static org.onap.sdnc.apps.pomba.servicedecomposition.exception.DiscoveryException.Error.*; import java.util.UUID; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.ResponseBuilder; @@ -105,4 +105,4 @@ public class RestServiceImpl implements RestService { adapter.exiting(); } } -} \ No newline at end of file +} diff --git a/pomba/service-decomposition/src/test/java/org/onap/sdnc/apps/pomba/servicedecomposition/test/ServiceDecompositionTest.java b/pomba/service-decomposition/src/test/java/org/onap/sdnc/apps/pomba/servicedecomposition/test/ServiceDecompositionTest.java index 9881d6b..050bc2d 100644 --- a/pomba/service-decomposition/src/test/java/org/onap/sdnc/apps/pomba/servicedecomposition/test/ServiceDecompositionTest.java +++ b/pomba/service-decomposition/src/test/java/org/onap/sdnc/apps/pomba/servicedecomposition/test/ServiceDecompositionTest.java @@ -32,7 +32,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.Base64; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; @@ -312,4 +312,4 @@ public class ServiceDecompositionTest { } return content.toString(); } -} \ No newline at end of file +} -- cgit 1.2.3-korg