From 8eda167312fa1b54f320b4b99a442c6d3794162f Mon Sep 17 00:00:00 2001 From: Stefan Guilhen Date: Wed, 12 Jun 2024 09:41:39 -0300 Subject: [PATCH] Remove jakarta imports from admin-client-jee resources Closes #30308 Signed-off-by: Stefan Guilhen --- .../client/resource/ClientTypesResource.java | 12 +++++------ .../OrganizationIdentityProviderResource.java | 10 +++++----- ...OrganizationIdentityProvidersResource.java | 16 +++++++-------- .../resource/OrganizationMemberResource.java | 10 +++++----- .../resource/OrganizationMembersResource.java | 20 +++++++++---------- .../client/resource/OrganizationResource.java | 16 +++++++-------- .../resource/OrganizationsResource.java | 18 ++++++++--------- .../admin/client/resource/RealmResource.java | 2 +- 8 files changed, 52 insertions(+), 52 deletions(-) diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientTypesResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientTypesResource.java index a8deba8d3e1..26fc7e75fe1 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientTypesResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientTypesResource.java @@ -18,11 +18,11 @@ package org.keycloak.admin.client.resource; -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 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 org.jboss.resteasy.annotations.cache.NoCache; import org.keycloak.representations.idm.ClientTypesRepresentation; @@ -46,4 +46,4 @@ public interface ClientTypesResource { @PUT @Consumes(MediaType.APPLICATION_JSON) void updateClientTypes(final ClientTypesRepresentation clientTypes); -} \ No newline at end of file +} diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProviderResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProviderResource.java index da445779fb2..3110abc6bfb 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProviderResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProviderResource.java @@ -17,11 +17,11 @@ package org.keycloak.admin.client.resource; -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 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 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-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProvidersResource.java index 7face7de2ad..0d9a99d5196 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProvidersResource.java +++ b/integration/admin-client-jee/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 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 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 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-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationMemberResource.java index f8d2d48dcae..64e96a95b40 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationMemberResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationMemberResource.java @@ -17,11 +17,11 @@ package org.keycloak.admin.client.resource; -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 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 org.keycloak.representations.idm.UserRepresentation; public interface OrganizationMemberResource { diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationMembersResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationMembersResource.java index 42b5d36ea62..fc63ba02fc4 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationMembersResource.java +++ b/integration/admin-client-jee/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 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 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 org.keycloak.representations.idm.OrganizationRepresentation; import org.keycloak.representations.idm.UserRepresentation; diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationResource.java index 7c696739d0c..ec6e43b395f 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationResource.java @@ -17,14 +17,14 @@ package org.keycloak.admin.client.resource; -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 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 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-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationsResource.java index c42c1c1c791..a8aa1dca553 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationsResource.java +++ b/integration/admin-client-jee/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 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 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 org.keycloak.representations.idm.OrganizationRepresentation; public interface OrganizationsResource { diff --git a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmResource.java index ffdb48b99bf..12f3fd1ff26 100644 --- a/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmResource.java @@ -17,7 +17,6 @@ package org.keycloak.admin.client.resource; -import jakarta.ws.rs.DefaultValue; import org.keycloak.representations.adapters.action.GlobalRequestResult; import org.keycloak.representations.idm.AdminEventRepresentation; import org.keycloak.representations.idm.ClientRepresentation; @@ -31,6 +30,7 @@ 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;