From f0ceeac163ed2dd09236931dfa160660cf125585 Mon Sep 17 00:00:00 2001 From: lucio Date: Tue, 12 Mar 2024 10:35:57 +0100 Subject: [PATCH] moved to jakarta --- .classpath | 35 ++++++++++--------- .project | 6 ++-- .settings/org.eclipse.jdt.core.prefs | 15 +++----- pom.xml | 21 ++++++----- .../library/AuthorizationEntry.java | 14 ++++---- .../authorization/library/CalledService.java | 6 ++-- .../library/ExternalServiceList.java | 10 +++--- .../authorization/library/Policies.java | 12 +++---- .../authorization/library/QualifiersList.java | 10 +++--- .../endpoints/AuthorizationEndpoint.java | 10 +++--- .../AuthorizationEndpointScanner.java | 11 +++--- .../library/policies/ExternalService.java | 6 ++-- .../library/policies/Policy.java | 8 ++--- .../authorization/library/policies/Role.java | 6 ++-- .../policies/Service2ServicePolicy.java | 6 ++-- .../library/policies/ServiceAccess.java | 6 ++-- .../library/policies/ServiceEntity.java | 6 ++-- .../authorization/library/policies/User.java | 6 ++-- .../library/policies/User2ServicePolicy.java | 10 +++--- .../library/policies/UserEntity.java | 8 ++--- .../library/provider/ClientInfo.java | 10 +++--- .../library/provider/ContainerInfo.java | 8 ++--- .../library/provider/ExternalServiceInfo.java | 8 ++--- .../library/provider/ServiceIdentifier.java | 6 ++-- .../library/provider/ServiceInfo.java | 8 ++--- .../library/provider/UserInfo.java | 8 ++--- .../library/utils/AuthorizationEntryList.java | 4 +-- .../library/utils/ListMapper.java | 2 +- .../library/utils/MapAdapter.java | 2 +- .../library/utils/MapElement.java | 2 +- .../utils/MultiServiceTokenRequest.java | 8 ++--- .../binder/AuthorizationEntryBinder.java | 6 ++-- .../library/binder/EndpointBinder.java | 6 ++-- .../library/policies/SerializationTest.java | 4 +-- 34 files changed, 145 insertions(+), 149 deletions(-) diff --git a/.classpath b/.classpath index e27c82a..f0e9804 100644 --- a/.classpath +++ b/.classpath @@ -1,16 +1,5 @@ - - - - - - - - - - - @@ -20,18 +9,30 @@ - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/.project b/.project index c65f3d9..97f2726 100644 --- a/.project +++ b/.project @@ -6,12 +6,12 @@ - org.eclipse.wst.common.project.facet.core.builder + org.eclipse.jdt.core.javabuilder - org.eclipse.jdt.core.javabuilder + org.eclipse.wst.common.project.facet.core.builder @@ -27,8 +27,6 @@ - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature org.eclipse.wst.common.project.facet.core.nature diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 671cad6..2af1e7b 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,15 +1,8 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 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=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.source=11 diff --git a/pom.xml b/pom.xml index 1428ab5..19f7825 100644 --- a/pom.xml +++ b/pom.xml @@ -12,10 +12,17 @@ 1.2.0 - scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git - scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git + + scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git + + scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git https://code-repo.d4science.org/gCubeSystem/common-authorization + + + 11 + 11 + @@ -43,16 +50,14 @@ slf4j-api - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api - com.sun.xml.bind - jaxb-impl - runtime + org.glassfish.jaxb + jaxb-runtime - diff --git a/src/main/java/org/gcube/common/authorization/library/AuthorizationEntry.java b/src/main/java/org/gcube/common/authorization/library/AuthorizationEntry.java index 7d4e6ca..e4e9838 100644 --- a/src/main/java/org/gcube/common/authorization/library/AuthorizationEntry.java +++ b/src/main/java/org/gcube/common/authorization/library/AuthorizationEntry.java @@ -3,13 +3,6 @@ package org.gcube.common.authorization.library; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlRootElement; - import org.gcube.common.authorization.library.policies.Policy; import org.gcube.common.authorization.library.policies.Service2ServicePolicy; import org.gcube.common.authorization.library.policies.User2ServicePolicy; @@ -19,6 +12,13 @@ import org.gcube.common.authorization.library.provider.ExternalServiceInfo; import org.gcube.common.authorization.library.provider.ServiceInfo; import org.gcube.common.authorization.library.provider.UserInfo; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlRootElement; + @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) public class AuthorizationEntry { diff --git a/src/main/java/org/gcube/common/authorization/library/CalledService.java b/src/main/java/org/gcube/common/authorization/library/CalledService.java index 2ce330c..4d5108c 100644 --- a/src/main/java/org/gcube/common/authorization/library/CalledService.java +++ b/src/main/java/org/gcube/common/authorization/library/CalledService.java @@ -1,8 +1,8 @@ package org.gcube.common.authorization.library; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/org/gcube/common/authorization/library/ExternalServiceList.java b/src/main/java/org/gcube/common/authorization/library/ExternalServiceList.java index a72e9d9..6e6596e 100644 --- a/src/main/java/org/gcube/common/authorization/library/ExternalServiceList.java +++ b/src/main/java/org/gcube/common/authorization/library/ExternalServiceList.java @@ -3,13 +3,13 @@ package org.gcube.common.authorization.library; import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - import org.gcube.common.authorization.library.utils.MapAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + @XmlRootElement diff --git a/src/main/java/org/gcube/common/authorization/library/Policies.java b/src/main/java/org/gcube/common/authorization/library/Policies.java index e79798f..fb7e073 100644 --- a/src/main/java/org/gcube/common/authorization/library/Policies.java +++ b/src/main/java/org/gcube/common/authorization/library/Policies.java @@ -3,16 +3,16 @@ package org.gcube.common.authorization.library; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlRootElement; - import org.gcube.common.authorization.library.policies.Policy; import org.gcube.common.authorization.library.policies.Service2ServicePolicy; import org.gcube.common.authorization.library.policies.User2ServicePolicy; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlRootElement; + @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) public class Policies { diff --git a/src/main/java/org/gcube/common/authorization/library/QualifiersList.java b/src/main/java/org/gcube/common/authorization/library/QualifiersList.java index e78b3f2..e54ef3e 100644 --- a/src/main/java/org/gcube/common/authorization/library/QualifiersList.java +++ b/src/main/java/org/gcube/common/authorization/library/QualifiersList.java @@ -3,13 +3,13 @@ package org.gcube.common.authorization.library; import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - import org.gcube.common.authorization.library.utils.MapAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + @XmlRootElement diff --git a/src/main/java/org/gcube/common/authorization/library/endpoints/AuthorizationEndpoint.java b/src/main/java/org/gcube/common/authorization/library/endpoints/AuthorizationEndpoint.java index 6d06bb4..b99aad3 100644 --- a/src/main/java/org/gcube/common/authorization/library/endpoints/AuthorizationEndpoint.java +++ b/src/main/java/org/gcube/common/authorization/library/endpoints/AuthorizationEndpoint.java @@ -1,10 +1,10 @@ package org.gcube.common.authorization.library.endpoints; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement(name="authorization-endpoint") @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/org/gcube/common/authorization/library/endpoints/AuthorizationEndpointScanner.java b/src/main/java/org/gcube/common/authorization/library/endpoints/AuthorizationEndpointScanner.java index 93548b3..7ee5c13 100644 --- a/src/main/java/org/gcube/common/authorization/library/endpoints/AuthorizationEndpointScanner.java +++ b/src/main/java/org/gcube/common/authorization/library/endpoints/AuthorizationEndpointScanner.java @@ -1,14 +1,10 @@ package org.gcube.common.authorization.library.endpoints; import java.net.URL; -import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.Set; -import java.util.regex.Pattern; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Unmarshaller; import org.reflections.Reflections; import org.reflections.scanners.ResourcesScanner; import org.reflections.util.ClasspathHelper; @@ -16,6 +12,9 @@ import org.reflections.util.ConfigurationBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Unmarshaller; + public class AuthorizationEndpointScanner { private static Logger log = LoggerFactory.getLogger(AuthorizationEndpointScanner.class); @@ -38,7 +37,7 @@ public class AuthorizationEndpointScanner { try { - ConfigurationBuilder reflectionConf = new ConfigurationBuilder().addUrls(ClasspathHelper.forJavaClassPath()).addClassLoader(AuthorizationEndpointScanner.class.getClassLoader()).setScanners(new ResourcesScanner()); + ConfigurationBuilder reflectionConf = new ConfigurationBuilder().addUrls(ClasspathHelper.forJavaClassPath()).addUrls(ClasspathHelper.forClassLoader()).addClassLoader(AuthorizationEndpointScanner.class.getClassLoader()).setScanners(new ResourcesScanner()); Reflections reflection = new Reflections(reflectionConf); @@ -79,7 +78,7 @@ public class AuthorizationEndpointScanner { log.trace("authorization endpoint retrieving finished"); } catch (Throwable e) { - log.error("errror scanning auth endpoints",e); + log.error("error scanning auth endpoints",e); throw new RuntimeException("could not load auth endpoints", e); } diff --git a/src/main/java/org/gcube/common/authorization/library/policies/ExternalService.java b/src/main/java/org/gcube/common/authorization/library/policies/ExternalService.java index 71ff445..d939f60 100644 --- a/src/main/java/org/gcube/common/authorization/library/policies/ExternalService.java +++ b/src/main/java/org/gcube/common/authorization/library/policies/ExternalService.java @@ -1,8 +1,8 @@ package org.gcube.common.authorization.library.policies; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/org/gcube/common/authorization/library/policies/Policy.java b/src/main/java/org/gcube/common/authorization/library/policies/Policy.java index a72330e..0794cb4 100644 --- a/src/main/java/org/gcube/common/authorization/library/policies/Policy.java +++ b/src/main/java/org/gcube/common/authorization/library/policies/Policy.java @@ -2,10 +2,10 @@ package org.gcube.common.authorization.library.policies; import java.util.Calendar; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSeeAlso; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/org/gcube/common/authorization/library/policies/Role.java b/src/main/java/org/gcube/common/authorization/library/policies/Role.java index aa612bc..f009f0d 100644 --- a/src/main/java/org/gcube/common/authorization/library/policies/Role.java +++ b/src/main/java/org/gcube/common/authorization/library/policies/Role.java @@ -2,9 +2,9 @@ package org.gcube.common.authorization.library.policies; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/org/gcube/common/authorization/library/policies/Service2ServicePolicy.java b/src/main/java/org/gcube/common/authorization/library/policies/Service2ServicePolicy.java index a9210cf..3ca5d6c 100644 --- a/src/main/java/org/gcube/common/authorization/library/policies/Service2ServicePolicy.java +++ b/src/main/java/org/gcube/common/authorization/library/policies/Service2ServicePolicy.java @@ -2,9 +2,9 @@ package org.gcube.common.authorization.library.policies; import java.util.Calendar; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/org/gcube/common/authorization/library/policies/ServiceAccess.java b/src/main/java/org/gcube/common/authorization/library/policies/ServiceAccess.java index c172946..fa3722d 100644 --- a/src/main/java/org/gcube/common/authorization/library/policies/ServiceAccess.java +++ b/src/main/java/org/gcube/common/authorization/library/policies/ServiceAccess.java @@ -3,9 +3,9 @@ package org.gcube.common.authorization.library.policies; import java.util.HashMap; import java.util.Map.Entry; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/org/gcube/common/authorization/library/policies/ServiceEntity.java b/src/main/java/org/gcube/common/authorization/library/policies/ServiceEntity.java index 9138bd4..44782e6 100644 --- a/src/main/java/org/gcube/common/authorization/library/policies/ServiceEntity.java +++ b/src/main/java/org/gcube/common/authorization/library/policies/ServiceEntity.java @@ -4,9 +4,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/org/gcube/common/authorization/library/policies/User.java b/src/main/java/org/gcube/common/authorization/library/policies/User.java index 123afa9..d8ebaaf 100644 --- a/src/main/java/org/gcube/common/authorization/library/policies/User.java +++ b/src/main/java/org/gcube/common/authorization/library/policies/User.java @@ -2,9 +2,9 @@ package org.gcube.common.authorization.library.policies; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/org/gcube/common/authorization/library/policies/User2ServicePolicy.java b/src/main/java/org/gcube/common/authorization/library/policies/User2ServicePolicy.java index 45d5d26..28893ce 100644 --- a/src/main/java/org/gcube/common/authorization/library/policies/User2ServicePolicy.java +++ b/src/main/java/org/gcube/common/authorization/library/policies/User2ServicePolicy.java @@ -2,11 +2,11 @@ package org.gcube.common.authorization.library.policies; import java.util.Calendar; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/org/gcube/common/authorization/library/policies/UserEntity.java b/src/main/java/org/gcube/common/authorization/library/policies/UserEntity.java index c923578..ae953d3 100644 --- a/src/main/java/org/gcube/common/authorization/library/policies/UserEntity.java +++ b/src/main/java/org/gcube/common/authorization/library/policies/UserEntity.java @@ -3,10 +3,10 @@ package org.gcube.common.authorization.library.policies; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSeeAlso; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSeeAlso; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/org/gcube/common/authorization/library/provider/ClientInfo.java b/src/main/java/org/gcube/common/authorization/library/provider/ClientInfo.java index f3ea523..3d7526a 100644 --- a/src/main/java/org/gcube/common/authorization/library/provider/ClientInfo.java +++ b/src/main/java/org/gcube/common/authorization/library/provider/ClientInfo.java @@ -3,13 +3,13 @@ package org.gcube.common.authorization.library.provider; import java.io.Serializable; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSeeAlso; - import org.gcube.common.authorization.library.ClientType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSeeAlso; + @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) @XmlSeeAlso(value={UserInfo.class, ServiceInfo.class, ExternalServiceInfo.class, ContainerInfo.class}) diff --git a/src/main/java/org/gcube/common/authorization/library/provider/ContainerInfo.java b/src/main/java/org/gcube/common/authorization/library/provider/ContainerInfo.java index 047f0df..61fc169 100644 --- a/src/main/java/org/gcube/common/authorization/library/provider/ContainerInfo.java +++ b/src/main/java/org/gcube/common/authorization/library/provider/ContainerInfo.java @@ -3,12 +3,12 @@ package org.gcube.common.authorization.library.provider; import java.util.Collections; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; - import org.gcube.common.authorization.library.ClientType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; + @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) public class ContainerInfo extends ClientInfo{ diff --git a/src/main/java/org/gcube/common/authorization/library/provider/ExternalServiceInfo.java b/src/main/java/org/gcube/common/authorization/library/provider/ExternalServiceInfo.java index 1377cf0..d1d8da1 100644 --- a/src/main/java/org/gcube/common/authorization/library/provider/ExternalServiceInfo.java +++ b/src/main/java/org/gcube/common/authorization/library/provider/ExternalServiceInfo.java @@ -3,12 +3,12 @@ package org.gcube.common.authorization.library.provider; import java.util.Collections; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; - import org.gcube.common.authorization.library.ClientType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; + @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) public class ExternalServiceInfo extends ClientInfo{ diff --git a/src/main/java/org/gcube/common/authorization/library/provider/ServiceIdentifier.java b/src/main/java/org/gcube/common/authorization/library/provider/ServiceIdentifier.java index 58ccd82..2c34fb4 100644 --- a/src/main/java/org/gcube/common/authorization/library/provider/ServiceIdentifier.java +++ b/src/main/java/org/gcube/common/authorization/library/provider/ServiceIdentifier.java @@ -2,9 +2,9 @@ package org.gcube.common.authorization.library.provider; import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/org/gcube/common/authorization/library/provider/ServiceInfo.java b/src/main/java/org/gcube/common/authorization/library/provider/ServiceInfo.java index d157464..0c57b6b 100644 --- a/src/main/java/org/gcube/common/authorization/library/provider/ServiceInfo.java +++ b/src/main/java/org/gcube/common/authorization/library/provider/ServiceInfo.java @@ -3,12 +3,12 @@ package org.gcube.common.authorization.library.provider; import java.util.Collections; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; - import org.gcube.common.authorization.library.ClientType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; + @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) public class ServiceInfo extends ClientInfo{ diff --git a/src/main/java/org/gcube/common/authorization/library/provider/UserInfo.java b/src/main/java/org/gcube/common/authorization/library/provider/UserInfo.java index f8946ea..a18cdc2 100644 --- a/src/main/java/org/gcube/common/authorization/library/provider/UserInfo.java +++ b/src/main/java/org/gcube/common/authorization/library/provider/UserInfo.java @@ -3,12 +3,12 @@ package org.gcube.common.authorization.library.provider; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; - import org.gcube.common.authorization.library.ClientType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; + @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/org/gcube/common/authorization/library/utils/AuthorizationEntryList.java b/src/main/java/org/gcube/common/authorization/library/utils/AuthorizationEntryList.java index 45d49e1..4b7df3b 100644 --- a/src/main/java/org/gcube/common/authorization/library/utils/AuthorizationEntryList.java +++ b/src/main/java/org/gcube/common/authorization/library/utils/AuthorizationEntryList.java @@ -3,10 +3,10 @@ package org.gcube.common.authorization.library.utils; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; - import org.gcube.common.authorization.library.AuthorizationEntry; +import jakarta.xml.bind.annotation.XmlRootElement; + @XmlRootElement public class AuthorizationEntryList { diff --git a/src/main/java/org/gcube/common/authorization/library/utils/ListMapper.java b/src/main/java/org/gcube/common/authorization/library/utils/ListMapper.java index 58fe0e3..0bb6501 100644 --- a/src/main/java/org/gcube/common/authorization/library/utils/ListMapper.java +++ b/src/main/java/org/gcube/common/authorization/library/utils/ListMapper.java @@ -3,7 +3,7 @@ package org.gcube.common.authorization.library.utils; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class ListMapper { diff --git a/src/main/java/org/gcube/common/authorization/library/utils/MapAdapter.java b/src/main/java/org/gcube/common/authorization/library/utils/MapAdapter.java index 6961374..21e21af 100644 --- a/src/main/java/org/gcube/common/authorization/library/utils/MapAdapter.java +++ b/src/main/java/org/gcube/common/authorization/library/utils/MapAdapter.java @@ -3,7 +3,7 @@ package org.gcube.common.authorization.library.utils; import java.util.HashMap; import java.util.Map; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; public class MapAdapter extends XmlAdapter> { diff --git a/src/main/java/org/gcube/common/authorization/library/utils/MapElement.java b/src/main/java/org/gcube/common/authorization/library/utils/MapElement.java index 2b66bea..1795b77 100644 --- a/src/main/java/org/gcube/common/authorization/library/utils/MapElement.java +++ b/src/main/java/org/gcube/common/authorization/library/utils/MapElement.java @@ -1,6 +1,6 @@ package org.gcube.common.authorization.library.utils; -import javax.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElement; class MapElements { diff --git a/src/main/java/org/gcube/common/authorization/library/utils/MultiServiceTokenRequest.java b/src/main/java/org/gcube/common/authorization/library/utils/MultiServiceTokenRequest.java index 5cf5704..18ba575 100644 --- a/src/main/java/org/gcube/common/authorization/library/utils/MultiServiceTokenRequest.java +++ b/src/main/java/org/gcube/common/authorization/library/utils/MultiServiceTokenRequest.java @@ -3,12 +3,12 @@ package org.gcube.common.authorization.library.utils; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; - import org.gcube.common.authorization.library.provider.ServiceInfo; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; + @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) public class MultiServiceTokenRequest { diff --git a/src/test/java/org/gcube/common/authorization/library/binder/AuthorizationEntryBinder.java b/src/test/java/org/gcube/common/authorization/library/binder/AuthorizationEntryBinder.java index f149ad5..e679567 100644 --- a/src/test/java/org/gcube/common/authorization/library/binder/AuthorizationEntryBinder.java +++ b/src/test/java/org/gcube/common/authorization/library/binder/AuthorizationEntryBinder.java @@ -7,9 +7,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; - import org.gcube.common.authorization.library.AuthorizationEntry; import org.gcube.common.authorization.library.QualifiersList; import org.gcube.common.authorization.library.policies.Policy; @@ -17,6 +14,9 @@ import org.gcube.common.authorization.library.provider.UserInfo; import org.junit.Assert; import org.junit.Test; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; + public class AuthorizationEntryBinder { public static JAXBContext getContext() throws JAXBException{ diff --git a/src/test/java/org/gcube/common/authorization/library/binder/EndpointBinder.java b/src/test/java/org/gcube/common/authorization/library/binder/EndpointBinder.java index 510a05c..f276a97 100644 --- a/src/test/java/org/gcube/common/authorization/library/binder/EndpointBinder.java +++ b/src/test/java/org/gcube/common/authorization/library/binder/EndpointBinder.java @@ -5,14 +5,14 @@ import java.io.StringWriter; import java.util.Arrays; import java.util.Map; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; - import org.gcube.common.authorization.library.endpoints.AuthorizationEndpoint; import org.gcube.common.authorization.library.endpoints.AuthorizationEndpointScanner; import org.junit.Assert; import org.junit.Test; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; + public class EndpointBinder { diff --git a/src/test/java/org/gcube/common/authorization/library/policies/SerializationTest.java b/src/test/java/org/gcube/common/authorization/library/policies/SerializationTest.java index 791a5e2..09f57cf 100644 --- a/src/test/java/org/gcube/common/authorization/library/policies/SerializationTest.java +++ b/src/test/java/org/gcube/common/authorization/library/policies/SerializationTest.java @@ -3,12 +3,12 @@ package org.gcube.common.authorization.library.policies; import java.io.StringReader; import java.io.StringWriter; -import javax.xml.bind.JAXBContext; - import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import jakarta.xml.bind.JAXBContext; + public class SerializationTest { static JAXBContext context;