From d92b8d6b56d3cb6c94a81039d8d471cfa4f14168 Mon Sep 17 00:00:00 2001 From: lucio Date: Tue, 12 Mar 2024 17:27:07 +0100 Subject: [PATCH] moved to jakarta --- .classpath | 6 +----- .settings/org.eclipse.jdt.core.prefs | 13 ++++++++----- pom.xml | 18 +++++------------- .../clients/stubs/jaxws/ExceptionProxy.java | 11 ++++++----- .../stubs/jaxws/GCoreEndpointReference.java | 3 ++- .../common/clients/stubs/jaxws/JAXWSUtils.java | 8 ++++---- .../common/clients/stubs/jaxws/StubCache.java | 4 ++-- .../clients/stubs/jaxws/StubFactory.java | 17 +++++++++-------- .../clients/stubs/jaxws/StubFactoryDSL.java | 2 +- .../stubs/jaxws/handlers/AbstractHandler.java | 7 ++++--- .../jaxws/handlers/AuthorizationHandler.java | 5 +++-- .../stubs/jaxws/handlers/CallHandler.java | 6 +++--- .../jaxws/handlers/GCoreJAXWSHandler.java | 9 +++++---- .../handlers/LegacyWSAddressingHandler.java | 7 ++++--- .../jaxws/handlers/TargetServiceHandler.java | 5 +++-- 15 files changed, 60 insertions(+), 61 deletions(-) diff --git a/.classpath b/.classpath index a5d9509..56ef432 100644 --- a/.classpath +++ b/.classpath @@ -18,11 +18,7 @@ - - - - - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 2f5cc74..e8c450c 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,11 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/pom.xml b/pom.xml index 2a0015c..9b4364e 100644 --- a/pom.xml +++ b/pom.xml @@ -17,9 +17,6 @@ scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git https://code-repo.d4science.org/gCubeSystem/${project.artifactId} - - distro - @@ -40,19 +37,14 @@ org.gcube.common common-security + - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api - com.sun.xml.bind - jaxb-impl - runtime - - - com.sun.xml.ws - rt - 2.3.3 + jakarta.xml.ws + jakarta.xml.ws-api diff --git a/src/main/java/org/gcube/common/clients/stubs/jaxws/ExceptionProxy.java b/src/main/java/org/gcube/common/clients/stubs/jaxws/ExceptionProxy.java index a5ce0a9..1e46430 100644 --- a/src/main/java/org/gcube/common/clients/stubs/jaxws/ExceptionProxy.java +++ b/src/main/java/org/gcube/common/clients/stubs/jaxws/ExceptionProxy.java @@ -6,16 +6,17 @@ package org.gcube.common.clients.stubs.jaxws; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; import javax.xml.parsers.DocumentBuilderFactory; import org.w3c.dom.Document; import org.w3c.dom.Element; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; + /** * @author fabio * diff --git a/src/main/java/org/gcube/common/clients/stubs/jaxws/GCoreEndpointReference.java b/src/main/java/org/gcube/common/clients/stubs/jaxws/GCoreEndpointReference.java index 9f121a5..4724687 100644 --- a/src/main/java/org/gcube/common/clients/stubs/jaxws/GCoreEndpointReference.java +++ b/src/main/java/org/gcube/common/clients/stubs/jaxws/GCoreEndpointReference.java @@ -5,13 +5,14 @@ import java.io.StringWriter; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.stream.StreamResult; -import javax.xml.ws.EndpointReference; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; import org.xml.sax.InputSource; +import jakarta.xml.ws.EndpointReference; + /** * Used internally by {@link StubFactory} to bridge {@link EndpointReference}s to gCore instances which comply with the * older Member Specification of WS-Addressing (e.g. as returned by a gCore factory service) with diff --git a/src/main/java/org/gcube/common/clients/stubs/jaxws/JAXWSUtils.java b/src/main/java/org/gcube/common/clients/stubs/jaxws/JAXWSUtils.java index 6ef89ca..419ac28 100644 --- a/src/main/java/org/gcube/common/clients/stubs/jaxws/JAXWSUtils.java +++ b/src/main/java/org/gcube/common/clients/stubs/jaxws/JAXWSUtils.java @@ -2,10 +2,10 @@ package org.gcube.common.clients.stubs.jaxws; import java.util.Iterator; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.soap.DetailEntry; -import javax.xml.soap.SOAPFault; -import javax.xml.ws.soap.SOAPFaultException; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.soap.DetailEntry; +import jakarta.xml.soap.SOAPFault; +import jakarta.xml.ws.soap.SOAPFaultException; /** * Library-wide utilities. diff --git a/src/main/java/org/gcube/common/clients/stubs/jaxws/StubCache.java b/src/main/java/org/gcube/common/clients/stubs/jaxws/StubCache.java index 9bd5a1b..4f097dc 100644 --- a/src/main/java/org/gcube/common/clients/stubs/jaxws/StubCache.java +++ b/src/main/java/org/gcube/common/clients/stubs/jaxws/StubCache.java @@ -6,11 +6,11 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import javax.xml.ws.Service; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.xml.ws.Service; + /** * Privately used by a {@link StubFactory}, caches {@link Service} instances for services with given names. *

diff --git a/src/main/java/org/gcube/common/clients/stubs/jaxws/StubFactory.java b/src/main/java/org/gcube/common/clients/stubs/jaxws/StubFactory.java index e1b3ece..8ccee7a 100644 --- a/src/main/java/org/gcube/common/clients/stubs/jaxws/StubFactory.java +++ b/src/main/java/org/gcube/common/clients/stubs/jaxws/StubFactory.java @@ -1,6 +1,6 @@ package org.gcube.common.clients.stubs.jaxws; -import static org.gcube.common.clients.stubs.jaxws.JAXWSUtils.*; +import static org.gcube.common.clients.stubs.jaxws.JAXWSUtils.notNull; import java.net.URI; import java.net.URISyntaxException; @@ -9,13 +9,6 @@ import java.util.List; import java.util.concurrent.Callable; import javax.xml.namespace.QName; -import javax.xml.ws.Binding; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.EndpointReference; -import javax.xml.ws.Service; -import javax.xml.ws.handler.Handler; -import javax.xml.ws.soap.AddressingFeature; -import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder; import org.gcube.common.clients.stubs.jaxws.StubFactoryDSL.AtClause; import org.gcube.common.clients.stubs.jaxws.handlers.GCoreJAXWSHandler; @@ -23,6 +16,14 @@ import org.gcube.common.clients.stubs.jaxws.proxies.GenericProxyFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.xml.ws.Binding; +import jakarta.xml.ws.BindingProvider; +import jakarta.xml.ws.EndpointReference; +import jakarta.xml.ws.Service; +import jakarta.xml.ws.handler.Handler; +import jakarta.xml.ws.soap.AddressingFeature; +import jakarta.xml.ws.wsaddressing.W3CEndpointReferenceBuilder; + /** * Generates JAXWS stubs for endpoints or instances of gCore service at given addresses. * diff --git a/src/main/java/org/gcube/common/clients/stubs/jaxws/StubFactoryDSL.java b/src/main/java/org/gcube/common/clients/stubs/jaxws/StubFactoryDSL.java index 4e91c36..49287de 100644 --- a/src/main/java/org/gcube/common/clients/stubs/jaxws/StubFactoryDSL.java +++ b/src/main/java/org/gcube/common/clients/stubs/jaxws/StubFactoryDSL.java @@ -2,7 +2,7 @@ package org.gcube.common.clients.stubs.jaxws; import java.net.URI; -import javax.xml.ws.EndpointReference; +import jakarta.xml.ws.EndpointReference; /** * Simple DSL for the {@link StubFactory} diff --git a/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/AbstractHandler.java b/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/AbstractHandler.java index 1de19b4..c9b1c97 100644 --- a/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/AbstractHandler.java +++ b/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/AbstractHandler.java @@ -1,12 +1,13 @@ package org.gcube.common.clients.stubs.jaxws.handlers; import javax.xml.namespace.QName; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPHeader; -import javax.xml.ws.handler.soap.SOAPMessageContext; import org.gcube.common.clients.stubs.jaxws.GCoreService; +import jakarta.xml.soap.SOAPException; +import jakarta.xml.soap.SOAPHeader; +import jakarta.xml.ws.handler.soap.SOAPMessageContext; + /** * Adapter implementation of {@link CallHandler} for selective implementations (handle only outgoing calls, or only responses). * diff --git a/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/AuthorizationHandler.java b/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/AuthorizationHandler.java index 51b9ad4..838e670 100644 --- a/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/AuthorizationHandler.java +++ b/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/AuthorizationHandler.java @@ -1,13 +1,14 @@ package org.gcube.common.clients.stubs.jaxws.handlers; import javax.xml.namespace.QName; -import javax.xml.soap.SOAPHeader; -import javax.xml.ws.handler.soap.SOAPMessageContext; import org.gcube.common.clients.stubs.jaxws.GCoreService; import org.gcube.common.security.providers.SecretManagerProvider; import org.gcube.common.security.secrets.Secret; +import jakarta.xml.soap.SOAPHeader; +import jakarta.xml.ws.handler.soap.SOAPMessageContext; + public class AuthorizationHandler extends AbstractHandler { /** Namespace of scope-related headers */ diff --git a/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/CallHandler.java b/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/CallHandler.java index 65c493e..26f82ec 100644 --- a/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/CallHandler.java +++ b/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/CallHandler.java @@ -1,10 +1,10 @@ package org.gcube.common.clients.stubs.jaxws.handlers; -import javax.xml.soap.SOAPHeader; -import javax.xml.ws.handler.soap.SOAPMessageContext; - import org.gcube.common.clients.stubs.jaxws.GCoreService; +import jakarta.xml.soap.SOAPHeader; +import jakarta.xml.ws.handler.soap.SOAPMessageContext; + /** * Handles outgoing calls and their responses. * diff --git a/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/GCoreJAXWSHandler.java b/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/GCoreJAXWSHandler.java index 20c8b6a..b698871 100644 --- a/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/GCoreJAXWSHandler.java +++ b/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/GCoreJAXWSHandler.java @@ -3,13 +3,14 @@ package org.gcube.common.clients.stubs.jaxws.handlers; import java.util.Set; import javax.xml.namespace.QName; -import javax.xml.soap.SOAPHeader; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPHandler; -import javax.xml.ws.handler.soap.SOAPMessageContext; import org.gcube.common.clients.stubs.jaxws.GCoreService; +import jakarta.xml.soap.SOAPHeader; +import jakarta.xml.ws.handler.MessageContext; +import jakarta.xml.ws.handler.soap.SOAPHandler; +import jakarta.xml.ws.handler.soap.SOAPMessageContext; + /** * A {@link SOAPHandler} that adds gCube headers to outgoing calls. * diff --git a/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/LegacyWSAddressingHandler.java b/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/LegacyWSAddressingHandler.java index a31bc4d..ba8091e 100644 --- a/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/LegacyWSAddressingHandler.java +++ b/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/LegacyWSAddressingHandler.java @@ -3,12 +3,13 @@ package org.gcube.common.clients.stubs.jaxws.handlers; import java.util.Iterator; import javax.xml.namespace.QName; -import javax.xml.soap.SOAPHeader; -import javax.xml.soap.SOAPHeaderElement; -import javax.xml.ws.handler.soap.SOAPMessageContext; import org.gcube.common.clients.stubs.jaxws.GCoreService; +import jakarta.xml.soap.SOAPHeader; +import jakarta.xml.soap.SOAPHeaderElement; +import jakarta.xml.ws.handler.soap.SOAPMessageContext; + /** * A {@link CallHandler} that transforms WS-Addressing information in outgoing calls into MemberSubmission form. * @author Fabio Simeoni diff --git a/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/TargetServiceHandler.java b/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/TargetServiceHandler.java index 167b37d..22abdff 100644 --- a/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/TargetServiceHandler.java +++ b/src/main/java/org/gcube/common/clients/stubs/jaxws/handlers/TargetServiceHandler.java @@ -1,11 +1,12 @@ package org.gcube.common.clients.stubs.jaxws.handlers; import javax.xml.namespace.QName; -import javax.xml.soap.SOAPHeader; -import javax.xml.ws.handler.soap.SOAPMessageContext; import org.gcube.common.clients.stubs.jaxws.GCoreService; +import jakarta.xml.soap.SOAPHeader; +import jakarta.xml.ws.handler.soap.SOAPMessageContext; + /** * A {@link CallHandler} that sets the coordinates of the target service on outgoing calls. *