diff --git a/.gitignore b/.gitignore index 82b47094e9..5b390beb89 100644 --- a/.gitignore +++ b/.gitignore @@ -81,9 +81,6 @@ quarkus/data/*.db # Jakarta transformed sources # ############################### -/integration/admin-client/src/ -/adapters/saml/jakarta-servlet-filter/src/ -/adapters/oidc/jakarta-servlet-filter/src/ /.metadata/ # Git ephemeral files diff --git a/integration/admin-client-jee/pom.xml b/integration/admin-client-jee/pom.xml deleted file mode 100755 index 4ff6260ce4..0000000000 --- a/integration/admin-client-jee/pom.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - keycloak-integration-parent - org.keycloak - 999.0.0-SNAPSHOT - - 4.0.0 - - keycloak-admin-client-jee-tests - Keycloak Admin REST Client JavaEE For Tests - Keycloak Admin REST Client. This module is supposed to be used just in the Keycloak repository for the testsuite. It is NOT supposed to be used by the 3rd party applications. - For the use by 3rd party applications, please use `org.keycloak:keycloak-admin-client-jee` module. - - - - ${resteasy-legacy.version} - - - - - org.keycloak - keycloak-core - - - * - * - - - - - org.keycloak - keycloak-common - - - * - * - - - - - org.jboss.resteasy - resteasy-client - ${resteasy.version} - - - org.jboss.resteasy - resteasy-client-api - ${resteasy.version} - - - org.jboss.resteasy - resteasy-multipart-provider - ${resteasy.version} - - - org.jboss.resteasy - resteasy-jackson2-provider - ${resteasy.version} - - - org.jboss.resteasy - resteasy-jaxb-provider - ${resteasy.version} - - - - diff --git a/integration/admin-client/pom.xml b/integration/admin-client/pom.xml index 6e09b2312f..2d788f1f6e 100755 --- a/integration/admin-client/pom.xml +++ b/integration/admin-client/pom.xml @@ -32,11 +32,6 @@ For the use by 3rd party applications, please use `org.keycloak:keycloak-admin-client` module. - - ${project.basedir}/../admin-client-jee/src - ${project.basedir}/src - - org.keycloak @@ -80,61 +75,4 @@ - - - - maven-antrun-plugin - 3.0.0 - - - transform - initialize - - run - - - - - - - - - - - - - - - - - - - org.eclipse.transformer - org.eclipse.transformer.cli - 0.5.0 - - - org.apache.ant - ant - 1.10.14 - - - - - maven-clean-plugin - - - - - src - - **/*.java - - - - - - - - diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/ClientBuilderWrapper.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/ClientBuilderWrapper.java similarity index 96% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/ClientBuilderWrapper.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/ClientBuilderWrapper.java index 589bec338e..eb446b7d1e 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/ClientBuilderWrapper.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/ClientBuilderWrapper.java @@ -1,7 +1,7 @@ package org.keycloak.admin.client; import javax.net.ssl.SSLContext; -import javax.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.ClientBuilder; public class ClientBuilderWrapper { diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/Config.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/Config.java similarity index 100% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/Config.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/Config.java diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/CreatedResponseUtil.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/CreatedResponseUtil.java similarity index 96% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/CreatedResponseUtil.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/CreatedResponseUtil.java index 9596b225b8..1111783965 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/CreatedResponseUtil.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/CreatedResponseUtil.java @@ -16,8 +16,8 @@ */ package org.keycloak.admin.client; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; import java.net.URI; /** diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/JacksonProvider.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/JacksonProvider.java similarity index 95% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/JacksonProvider.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/JacksonProvider.java index 39785aab2b..bccb1788ef 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/JacksonProvider.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/JacksonProvider.java @@ -1,6 +1,6 @@ package org.keycloak.admin.client; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/Keycloak.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/Keycloak.java old mode 100755 new mode 100644 similarity index 99% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/Keycloak.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/Keycloak.java index d9338fb84a..3415791e8d --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/Keycloak.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/Keycloak.java @@ -16,7 +16,7 @@ */ package org.keycloak.admin.client; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.WebTarget; import org.keycloak.admin.client.resource.BearerAuthFilter; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.RealmsResource; @@ -25,7 +25,7 @@ import org.keycloak.admin.client.spi.ResteasyClientProvider; import org.keycloak.admin.client.token.TokenManager; import javax.net.ssl.SSLContext; -import javax.ws.rs.client.Client; +import jakarta.ws.rs.client.Client; import java.net.URI; import java.util.Iterator; import java.util.ServiceLoader; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/KeycloakBuilder.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/KeycloakBuilder.java similarity index 96% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/KeycloakBuilder.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/KeycloakBuilder.java index c7c3399437..ca146e1a16 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/KeycloakBuilder.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/KeycloakBuilder.java @@ -20,11 +20,11 @@ package org.keycloak.admin.client; import static org.keycloak.OAuth2Constants.CLIENT_CREDENTIALS; import static org.keycloak.OAuth2Constants.PASSWORD; -import javax.ws.rs.client.Client; +import jakarta.ws.rs.client.Client; /** * Provides a {@link Keycloak} client builder with the ability to customize the underlying - * {@link javax.ws.rs.client.Client RESTEasy client} used to communicate with the Keycloak server. + * {@link jakarta.ws.rs.client.Client RESTEasy client} used to communicate with the Keycloak server. *

*

Example usage with a connection pool size of 20:

* 
@@ -50,7 +50,7 @@ import javax.ws.rs.client.Client;
  *
* * @author Scott Rossillo - * @see javax.ws.rs.client.Client + * @see jakarta.ws.rs.client.Client */ public class KeycloakBuilder { private String serverUrl; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AggregatePoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AggregatePoliciesResource.java similarity index 82% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AggregatePoliciesResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AggregatePoliciesResource.java index 0c1f0664b1..66dd2ad8a5 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AggregatePoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AggregatePoliciesResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +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 org.keycloak.representations.idm.authorization.AggregatePolicyRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AggregatePolicyResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AggregatePolicyResource.java similarity index 89% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AggregatePolicyResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AggregatePolicyResource.java index 695afc384a..1b4a2ca92f 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AggregatePolicyResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AggregatePolicyResource.java @@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.AggregatePolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AttackDetectionResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AttackDetectionResource.java similarity index 87% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AttackDetectionResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AttackDetectionResource.java index 1168bc0f8b..1aee3f3aa2 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AttackDetectionResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AttackDetectionResource.java @@ -17,12 +17,12 @@ package org.keycloak.admin.client.resource; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import java.util.Map; /** diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AuthenticationManagementResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthenticationManagementResource.java similarity index 96% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AuthenticationManagementResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthenticationManagementResource.java index f5de2aefd1..b9cd592f18 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AuthenticationManagementResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthenticationManagementResource.java @@ -28,16 +28,16 @@ import org.keycloak.representations.idm.RequiredActionConfigRepresentation; import org.keycloak.representations.idm.RequiredActionProviderRepresentation; import org.keycloak.representations.idm.RequiredActionProviderSimpleRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -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.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +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.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; import java.util.Map; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AuthorizationResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthorizationResource.java similarity index 87% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AuthorizationResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthorizationResource.java index de8d958ab7..6085632bb1 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AuthorizationResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthorizationResource.java @@ -18,14 +18,14 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.authorization.ResourceServerRepresentation; -import javax.ws.rs.Consumes; -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.core.MediaType; +import jakarta.ws.rs.Consumes; +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.core.MediaType; /** * @author Pedro Igor diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/BasicAuthFilter.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BasicAuthFilter.java similarity index 91% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/BasicAuthFilter.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BasicAuthFilter.java index f4750b6b6c..72e9dd050d 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/BasicAuthFilter.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BasicAuthFilter.java @@ -17,9 +17,9 @@ package org.keycloak.admin.client.resource; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.core.HttpHeaders; import java.io.IOException; import org.keycloak.common.util.Base64; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/BearerAuthFilter.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BearerAuthFilter.java similarity index 91% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/BearerAuthFilter.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BearerAuthFilter.java index 0d4992fcfc..6d9527e4fb 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/BearerAuthFilter.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BearerAuthFilter.java @@ -19,11 +19,11 @@ package org.keycloak.admin.client.resource; import org.keycloak.admin.client.token.TokenManager; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.client.ClientResponseFilter; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientResponseContext; +import jakarta.ws.rs.client.ClientResponseFilter; +import jakarta.ws.rs.core.HttpHeaders; import java.io.IOException; import java.util.List; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java similarity index 94% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java index 3934975f58..02e47e6e53 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java @@ -20,12 +20,12 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.KeyStoreConfig; import org.keycloak.representations.idm.CertificateRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; /** * diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientInitialAccessResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientInitialAccessResource.java similarity index 85% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientInitialAccessResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientInitialAccessResource.java index 54dba868b1..8594d2eeba 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientInitialAccessResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientInitialAccessResource.java @@ -20,14 +20,14 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.ClientInitialAccessCreatePresentation; import org.keycloak.representations.idm.ClientInitialAccessPresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import java.util.List; /** diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesPoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesPoliciesResource.java similarity index 78% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesPoliciesResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesPoliciesResource.java index c9ae3fa3da..9acd1dba61 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesPoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesPoliciesResource.java @@ -1,11 +1,11 @@ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.ClientPoliciesRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesProfilesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesProfilesResource.java similarity index 80% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesProfilesResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesProfilesResource.java index 6c71dcecba..fe3b611926 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesProfilesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesProfilesResource.java @@ -1,11 +1,11 @@ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.ClientProfilesRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesResource.java similarity index 82% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesResource.java index 72c35c2028..d4be914c3c 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +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 org.keycloak.representations.idm.authorization.ClientPolicyRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPolicyResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPolicyResource.java similarity index 89% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPolicyResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPolicyResource.java index 5f330d3dfe..15409081b9 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPolicyResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPolicyResource.java @@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.ClientPolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientRegistrationPolicyResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientRegistrationPolicyResource.java similarity index 89% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientRegistrationPolicyResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientRegistrationPolicyResource.java index 9d6f41cae8..bff3cc100d 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientRegistrationPolicyResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientRegistrationPolicyResource.java @@ -19,10 +19,10 @@ package org.keycloak.admin.client.resource; import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.ComponentTypeRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientResource.java old mode 100755 new mode 100644 similarity index 95% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientResource.java index 4097c5ed87..7e7ce97a80 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientResource.java @@ -20,16 +20,16 @@ package org.keycloak.admin.client.resource; import java.util.List; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +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 org.keycloak.representations.adapters.action.GlobalRequestResult; import org.keycloak.representations.idm.ClientRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientScopePoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopePoliciesResource.java similarity index 83% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientScopePoliciesResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopePoliciesResource.java index 3d753c20e8..273508bfc1 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientScopePoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopePoliciesResource.java @@ -16,14 +16,14 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.ClientScopePolicyRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java old mode 100755 new mode 100644 similarity index 85% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java index 11fbf5e73f..04f7654f21 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java @@ -19,13 +19,13 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.ClientScopeRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; /** * @author rodrigo.sasaki@icarros.com.br diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientScopesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopesResource.java old mode 100755 new mode 100644 similarity index 83% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientScopesResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopesResource.java index 2df8978d43..203525b3c6 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientScopesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopesResource.java @@ -19,14 +19,14 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.ClientScopeRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientTypesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientTypesResource.java similarity index 90% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientTypesResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientTypesResource.java index 26fc7e75fe..4138c588f9 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientTypesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientTypesResource.java @@ -18,11 +18,11 @@ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.jboss.resteasy.annotations.cache.NoCache; import org.keycloak.representations.idm.ClientTypesRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java old mode 100755 new mode 100644 similarity index 88% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java index 8cec12eef5..ca9a6cad10 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java @@ -19,15 +19,15 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.ClientRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +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 java.util.List; /** diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java similarity index 87% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java index 7fc040fd27..5346e4faa8 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java @@ -21,14 +21,14 @@ import java.util.List; import org.keycloak.representations.idm.ComponentRepresentation; import org.keycloak.representations.idm.ComponentTypeRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; /** * @author Bill Burke diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java similarity index 85% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java index 235b34c845..96c630fbc6 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java @@ -18,16 +18,16 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.ComponentRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +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 java.util.List; /** diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupPoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupPoliciesResource.java similarity index 82% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupPoliciesResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupPoliciesResource.java index 071cfcf892..be10893de0 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupPoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupPoliciesResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +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 org.keycloak.representations.idm.authorization.GroupPolicyRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupPolicyResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupPolicyResource.java similarity index 89% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupPolicyResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupPolicyResource.java index 9713493804..697a35f38c 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupPolicyResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupPolicyResource.java @@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.GroupPolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupResource.java old mode 100755 new mode 100644 similarity index 95% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupResource.java index 2eeab380cd..32ea499480 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupResource.java @@ -22,16 +22,16 @@ import org.keycloak.representations.idm.ManagementPermissionReference; import org.keycloak.representations.idm.ManagementPermissionRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; /** diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupsResource.java old mode 100755 new mode 100644 similarity index 98% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupsResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupsResource.java index 511dbb9ebc..9058d8a0c4 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupsResource.java @@ -19,9 +19,9 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.GroupRepresentation; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.util.List; import java.util.Map; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/IdentityProviderResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProviderResource.java old mode 100755 new mode 100644 similarity index 87% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/IdentityProviderResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProviderResource.java index 688a2ff30a..01c1dccb72 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/IdentityProviderResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProviderResource.java @@ -21,17 +21,17 @@ import org.keycloak.representations.idm.IdentityProviderMapperRepresentation; import org.keycloak.representations.idm.IdentityProviderMapperTypeRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +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 java.util.List; import java.util.Map; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/IdentityProvidersResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProvidersResource.java old mode 100755 new mode 100644 similarity index 88% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/IdentityProvidersResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProvidersResource.java index 08eccdc2e9..4edf835a23 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/IdentityProvidersResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProvidersResource.java @@ -19,15 +19,15 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.IdentityProviderRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +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 java.util.List; import java.util.Map; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/JSPoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/JSPoliciesResource.java similarity index 82% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/JSPoliciesResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/JSPoliciesResource.java index 62daa38475..7b4780e1fe 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/JSPoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/JSPoliciesResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +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 org.keycloak.representations.idm.authorization.JSPolicyRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/JSPolicyResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/JSPolicyResource.java similarity index 89% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/JSPolicyResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/JSPolicyResource.java index 78caa39617..7059856b3f 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/JSPolicyResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/JSPolicyResource.java @@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.JSPolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/KeyResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/KeyResource.java similarity index 91% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/KeyResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/KeyResource.java index aeb1fdb5af..40b3f66879 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/KeyResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/KeyResource.java @@ -19,9 +19,9 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.KeysMetadataRepresentation; -import javax.ws.rs.GET; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import java.util.List; /** diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProviderResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProviderResource.java similarity index 86% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProviderResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProviderResource.java index 3110abc6bf..da445779fb 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProviderResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProviderResource.java @@ -17,11 +17,11 @@ package org.keycloak.admin.client.resource; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.keycloak.representations.idm.IdentityProviderRepresentation; public interface OrganizationIdentityProviderResource { diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProvidersResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProvidersResource.java similarity index 82% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProvidersResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProvidersResource.java index 0d9a99d519..7face7de2a 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProvidersResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProvidersResource.java @@ -19,14 +19,14 @@ package org.keycloak.admin.client.resource; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.keycloak.representations.idm.IdentityProviderRepresentation; public interface OrganizationIdentityProvidersResource { diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationMemberResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationMemberResource.java similarity index 86% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationMemberResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationMemberResource.java index 5c33120b6e..74c1ba61d8 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationMemberResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationMemberResource.java @@ -19,12 +19,12 @@ package org.keycloak.admin.client.resource; import java.util.List; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.keycloak.representations.idm.MemberRepresentation; import org.keycloak.representations.idm.OrganizationRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationMembersResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationMembersResource.java similarity index 90% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationMembersResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationMembersResource.java index 7f5b6f1ec1..3e65f16de8 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationMembersResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationMembersResource.java @@ -19,16 +19,16 @@ package org.keycloak.admin.client.resource; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +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 org.keycloak.representations.idm.MemberRepresentation; import org.keycloak.representations.idm.OrganizationRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationResource.java similarity index 83% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationResource.java index ec6e43b395..7c696739d0 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationResource.java @@ -17,14 +17,14 @@ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.keycloak.representations.idm.OrganizationRepresentation; public interface OrganizationResource { diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationsResource.java similarity index 93% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationsResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationsResource.java index a8aa1dca55..c42c1c1c79 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationsResource.java @@ -19,15 +19,15 @@ package org.keycloak.admin.client.resource; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +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 org.keycloak.representations.idm.OrganizationRepresentation; public interface OrganizationsResource { diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/PermissionsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PermissionsResource.java similarity index 97% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/PermissionsResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PermissionsResource.java index 679137bda9..3de81d73fd 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/PermissionsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PermissionsResource.java @@ -16,7 +16,7 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; /** * @author Pedro Igor diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/PoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PoliciesResource.java similarity index 91% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/PoliciesResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PoliciesResource.java index 9eed5e9906..b9dace649a 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/PoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PoliciesResource.java @@ -21,15 +21,15 @@ import org.keycloak.representations.idm.authorization.PolicyEvaluationResponse; import org.keycloak.representations.idm.authorization.PolicyProviderRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +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 java.util.List; /** diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/PolicyResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PolicyResource.java similarity index 89% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/PolicyResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PolicyResource.java index 00550230fb..6a8d746502 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/PolicyResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PolicyResource.java @@ -18,14 +18,14 @@ package org.keycloak.admin.client.resource; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java similarity index 87% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java index d7dd1419e0..ee7bbb0921 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java @@ -19,15 +19,15 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.ProtocolMapperRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -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.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +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.core.Response; import java.util.List; /** diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmLocalizationResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmLocalizationResource.java old mode 100755 new mode 100644 similarity index 90% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmLocalizationResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmLocalizationResource.java index 401ef71c21..38f5db2bda --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmLocalizationResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmLocalizationResource.java @@ -20,16 +20,16 @@ package org.keycloak.admin.client.resource; import java.util.List; import java.util.Map; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +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; public interface RealmLocalizationResource { diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java similarity index 95% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java index 12f3fd1ff2..157c6ae18c 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java @@ -29,19 +29,19 @@ import org.keycloak.representations.idm.RealmEventsConfigRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.TestLdapConnectionRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.DELETE; -import javax.ws.rs.FormParam; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.FormParam; +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 java.util.List; import java.util.Map; @@ -231,7 +231,7 @@ public interface RealmResource { @POST @Path("ldap-server-capabilities") @Consumes(MediaType.APPLICATION_JSON) - @Produces(javax.ws.rs.core.MediaType.APPLICATION_JSON) + @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) List ldapServerCapabilities(TestLdapConnectionRepresentation config); @Path("testSMTPConnection") diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java similarity index 85% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java index d20be9f8cc..9b0adf2d63 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java @@ -19,13 +19,13 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.RealmRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import java.util.List; /** diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RegexPoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RegexPoliciesResource.java similarity index 87% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RegexPoliciesResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RegexPoliciesResource.java index 10574e21d0..fef3c57641 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RegexPoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RegexPoliciesResource.java @@ -16,11 +16,11 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.RegexPolicyRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionResource.java similarity index 89% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionResource.java index f2bb6d8cfa..4671c8e930 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionResource.java @@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourcePermissionRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionsResource.java similarity index 82% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionsResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionsResource.java index e77377bdb7..f94d01c7f6 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionsResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +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 org.keycloak.representations.idm.authorization.ResourcePermissionRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourceResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceResource.java similarity index 86% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourceResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceResource.java index 9c3a73ea8a..49cd2e2eb9 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourceResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceResource.java @@ -21,13 +21,13 @@ import java.util.List; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; /** * @author Pedro Igor diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourceScopeResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopeResource.java similarity index 86% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourceScopeResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopeResource.java index 60efbf6ad7..276a53eb11 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourceScopeResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopeResource.java @@ -21,13 +21,13 @@ import java.util.List; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ScopeRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; /** * @author Pedro Igor diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourceScopesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopesResource.java similarity index 83% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourceScopesResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopesResource.java index 7e3f2d1179..2746e9e295 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourceScopesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopesResource.java @@ -18,15 +18,15 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.authorization.ScopeRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +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 java.util.List; /** diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourcesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcesResource.java similarity index 87% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourcesResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcesResource.java index dcf05a0c63..0be045759b 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourcesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcesResource.java @@ -18,15 +18,15 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.authorization.ResourceRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +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 java.util.List; /** diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleByIdResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleByIdResource.java old mode 100755 new mode 100644 similarity index 90% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleByIdResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleByIdResource.java index b594dbc475..0de55c0985 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleByIdResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleByIdResource.java @@ -19,16 +19,16 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.RoleRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +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 java.util.List; import java.util.Set; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java old mode 100755 new mode 100644 similarity index 86% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java index bb68f21938..e25fe13c62 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java @@ -19,12 +19,12 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.MappingsRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; /** * @author rodrigo.sasaki@icarros.com.br diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RolePoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolePoliciesResource.java similarity index 82% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RolePoliciesResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolePoliciesResource.java index be834f39f2..86c025deae 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RolePoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolePoliciesResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +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 org.keycloak.representations.idm.authorization.RolePolicyRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RolePolicyResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolePolicyResource.java similarity index 89% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RolePolicyResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolePolicyResource.java index b3be353f09..bc98fb1f72 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RolePolicyResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolePolicyResource.java @@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleResource.java old mode 100755 new mode 100644 similarity index 95% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleResource.java index 9009b47d05..f263326b04 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleResource.java @@ -23,16 +23,16 @@ import org.keycloak.representations.idm.ManagementPermissionRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +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 java.util.List; import java.util.Set; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java old mode 100755 new mode 100644 similarity index 84% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java index cfba5e76e1..3e59b386c9 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java @@ -19,15 +19,15 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.RoleRepresentation; -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.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +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.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import java.util.List; /** diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RolesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolesResource.java old mode 100755 new mode 100644 similarity index 93% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RolesResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolesResource.java index 4547a93e59..f76f9ae354 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RolesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolesResource.java @@ -19,16 +19,16 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.RoleRepresentation; -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.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +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.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import java.util.List; /** diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ScopePermissionResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ScopePermissionResource.java similarity index 90% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ScopePermissionResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ScopePermissionResource.java index 99fa30b3e7..cb0d9d3af5 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ScopePermissionResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ScopePermissionResource.java @@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ScopePermissionsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ScopePermissionsResource.java similarity index 82% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ScopePermissionsResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ScopePermissionsResource.java index e130960e50..d38df84c4d 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ScopePermissionsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ScopePermissionsResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +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 org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ServerInfoResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ServerInfoResource.java similarity index 89% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ServerInfoResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ServerInfoResource.java index 61bc6eef75..abbb4e92d5 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ServerInfoResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ServerInfoResource.java @@ -19,10 +19,10 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.info.ServerInfoRepresentation; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; /** * @author Stian Thorgersen diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/TimePoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/TimePoliciesResource.java similarity index 82% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/TimePoliciesResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/TimePoliciesResource.java index 5bc03e03fb..919c1d5280 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/TimePoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/TimePoliciesResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +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 org.keycloak.representations.idm.authorization.TimePolicyRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/TimePolicyResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/TimePolicyResource.java similarity index 89% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/TimePolicyResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/TimePolicyResource.java index acad51a686..2184c63771 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/TimePolicyResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/TimePolicyResource.java @@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserPoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserPoliciesResource.java similarity index 82% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserPoliciesResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserPoliciesResource.java index b5f7f74d25..3d019d8e25 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserPoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserPoliciesResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +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 org.keycloak.representations.idm.authorization.UserPolicyRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserPolicyResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserPolicyResource.java similarity index 89% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserPolicyResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserPolicyResource.java index 7856378642..8e33486c8b 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserPolicyResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserPolicyResource.java @@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserProfileResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserProfileResource.java similarity index 90% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserProfileResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserProfileResource.java index ba60d79287..ca7774fa51 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserProfileResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserProfileResource.java @@ -16,12 +16,12 @@ */ package org.keycloak.admin.client.resource; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.keycloak.representations.idm.UserProfileMetadata; import org.keycloak.representations.userprofile.config.UPConfig; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserResource.java old mode 100755 new mode 100644 similarity index 96% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserResource.java index f28fa1fdaf..6436869741 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserResource.java @@ -23,18 +23,18 @@ import org.keycloak.representations.idm.GroupRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.idm.UserSessionRepresentation; -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 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 java.util.List; import java.util.Map; @@ -140,7 +140,7 @@ public interface UserResource { * Update a credential label for a user */ @PUT - @Consumes(javax.ws.rs.core.MediaType.TEXT_PLAIN) + @Consumes(jakarta.ws.rs.core.MediaType.TEXT_PLAIN) @Path("credentials/{credentialId}/userLabel") void setCredentialUserLabel(final @PathParam("credentialId") String credentialId, String userLabel); diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserStorageProviderResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserStorageProviderResource.java similarity index 93% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserStorageProviderResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserStorageProviderResource.java index d382007b30..8b38dfd9d4 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserStorageProviderResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserStorageProviderResource.java @@ -18,12 +18,12 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.SynchronizationResultRepresentation; -import javax.ws.rs.POST; -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 jakarta.ws.rs.POST; +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; /** * @author Bill Burke diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UsersResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UsersResource.java old mode 100755 new mode 100644 similarity index 98% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UsersResource.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UsersResource.java index c0fb2f908b..7bb5382049 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UsersResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UsersResource.java @@ -19,16 +19,16 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.UserRepresentation; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -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 jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +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 java.util.List; public interface UsersResource { diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/spi/ResteasyClientClassicProvider.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientClassicProvider.java similarity index 93% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/spi/ResteasyClientClassicProvider.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientClassicProvider.java index f5df72ded0..7c69e2e405 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/spi/ResteasyClientClassicProvider.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientClassicProvider.java @@ -18,9 +18,9 @@ package org.keycloak.admin.client.spi; import javax.net.ssl.SSLContext; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget; import org.keycloak.admin.client.ClientBuilderWrapper; import org.keycloak.admin.client.JacksonProvider; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/spi/ResteasyClientProvider.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientProvider.java similarity index 88% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/spi/ResteasyClientProvider.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientProvider.java index ebc602034b..353928640b 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/spi/ResteasyClientProvider.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientProvider.java @@ -18,8 +18,8 @@ package org.keycloak.admin.client.spi; import javax.net.ssl.SSLContext; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.WebTarget; /** * An SPI for using the JAX-RS Client API regardless of the underlying stack. @@ -29,7 +29,7 @@ public interface ResteasyClientProvider { /** * Creates a new {@link Client}. * - * @param messageHandler a {@link javax.ws.rs.ext.MessageBodyReader} and/or {@link javax.ws.rs.ext.MessageBodyWriter} instance. + * @param messageHandler a {@link jakarta.ws.rs.ext.MessageBodyReader} and/or {@link jakarta.ws.rs.ext.MessageBodyWriter} instance. * @param sslContext an optional {@link SSLContext} * @param disableTrustManager if the client should not validate the server certificates when using TLS * @return diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/token/TokenManager.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenManager.java similarity index 97% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/token/TokenManager.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenManager.java index 38c8547034..b01c6d000b 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/token/TokenManager.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenManager.java @@ -17,7 +17,7 @@ package org.keycloak.admin.client.token; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.WebTarget; import org.jboss.resteasy.client.jaxrs.ResteasyClient; import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget; import org.keycloak.admin.client.Config; @@ -26,9 +26,9 @@ import org.keycloak.admin.client.resource.BasicAuthFilter; import org.keycloak.common.util.Time; import org.keycloak.representations.AccessTokenResponse; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.client.Client; -import javax.ws.rs.core.Form; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.core.Form; import static org.keycloak.OAuth2Constants.CLIENT_CREDENTIALS; import static org.keycloak.OAuth2Constants.CLIENT_ID; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/token/TokenService.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenService.java old mode 100755 new mode 100644 similarity index 86% rename from integration/admin-client-jee/src/main/java/org/keycloak/admin/client/token/TokenService.java rename to integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenService.java index 91a921fc87..c2f2010b75 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/token/TokenService.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenService.java @@ -19,13 +19,13 @@ package org.keycloak.admin.client.token; import org.keycloak.representations.AccessTokenResponse; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; /** * @author rodrigo.sasaki@icarros.com.br diff --git a/integration/pom.xml b/integration/pom.xml index dc6dde5da4..3881051a2f 100755 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -31,7 +31,6 @@ pom - admin-client-jee admin-client client-registration client-cli diff --git a/pom.xml b/pom.xml index a5919edbf8..7f27a33d11 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,6 @@ 2.0.1.Final 2.0.0.Final 1.2.17 - 4.7.7.Final 6.2.9.Final ${resteasy.version} 20240325.1