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. *