libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Remove keycloak-admin-client-jee

Browse source 
Closes #32181

Signed-off-by: rmartinc <rmartinc@redhat.com>
This commit is contained in:
rmartinc 2024-08-19 10:46:01 +02:00 committed by Alexander Schwartz
parent 95e649f457
commit 3a77ac6403
84 changed files with 558 additions and 712 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -81,9 +81,6 @@ quarkus/data/*.db
# Jakarta transformed sources # # Jakarta transformed sources #
############################### ###############################
/integration/admin-client/src/
/adapters/saml/jakarta-servlet-filter/src/
/adapters/oidc/jakarta-servlet-filter/src/
/.metadata/ /.metadata/
# Git ephemeral files # Git ephemeral files

87
integration/admin-client-jee/pom.xml
View file

@ -1,87 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2016 Red Hat, Inc. and/or its affiliates
~ and other contributors as indicated by the @author tags.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>keycloak-integration-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>999.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>keycloak-admin-client-jee-tests</artifactId>
<name>Keycloak Admin REST Client JavaEE For Tests</name>
<description>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.
</description>
<properties>
<resteasy.version>${resteasy-legacy.version}</resteasy.version>
</properties>
<dependencies>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-common</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
<version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client-api</artifactId>
<version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-multipart-provider</artifactId>
<version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson2-provider</artifactId>
<version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxb-provider</artifactId>
<version>${resteasy.version}</version>
</dependency>
</dependencies>
</project>

62
integration/admin-client/pom.xml
View file

@ -32,11 +32,6 @@
For the use by 3rd party applications, please use `org.keycloak:keycloak-admin-client` module. For the use by 3rd party applications, please use `org.keycloak:keycloak-admin-client` module.
</description> </description>
<properties>
<jakarta-transformer-sources>${project.basedir}/../admin-client-jee/src</jakarta-transformer-sources>
<jakarta-transformer-target>${project.basedir}/src</jakarta-transformer-target>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
@ -80,61 +75,4 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>transform</id>
<phase>initialize</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<property name="plugin_classpath" refid="maven.plugin.classpath"/>
<delete dir="${jakarta-transformer-target}"/>
<java classname="org.eclipse.transformer.cli.JakartaTransformerCLI" fork="true">
<arg value="${jakarta-transformer-sources}"/>
<arg value="${jakarta-transformer-target}"/>
<classpath>
<pathelement path="${plugin_classpath}"/>
</classpath>
</java>
</target>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.eclipse.transformer</groupId>
<artifactId>org.eclipse.transformer.cli</artifactId>
<version>0.5.0</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.10.14</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
<fileset>
<!-- delete the files created by the transformer -->
<directory>src</directory>
<includes>
<include>**/*.java</include>
</includes>
</fileset>
</filesets>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

2
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/ClientBuilderWrapper.java → integration/admin-client/src/main/java/org/keycloak/admin/client/ClientBuilderWrapper.java
View file

@ -1,7 +1,7 @@
package org.keycloak.admin.client; package org.keycloak.admin.client;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;
import javax.ws.rs.client.ClientBuilder; import jakarta.ws.rs.client.ClientBuilder;
public class ClientBuilderWrapper { public class ClientBuilderWrapper {

0
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/Config.java → integration/admin-client/src/main/java/org/keycloak/admin/client/Config.java
View file

4
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/CreatedResponseUtil.java → integration/admin-client/src/main/java/org/keycloak/admin/client/CreatedResponseUtil.java
View file

@ -16,8 +16,8 @@
*/ */
package org.keycloak.admin.client; package org.keycloak.admin.client;
import javax.ws.rs.WebApplicationException; import jakarta.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import java.net.URI; import java.net.URI;
/** /**

2
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/JacksonProvider.java → integration/admin-client/src/main/java/org/keycloak/admin/client/JacksonProvider.java
View file

@ -1,6 +1,6 @@
package org.keycloak.admin.client; 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.annotation.JsonInclude;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;

4
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/Keycloak.java → integration/admin-client/src/main/java/org/keycloak/admin/client/Keycloak.java Executable file → Normal file
View file

@ -16,7 +16,7 @@
*/ */
package org.keycloak.admin.client; 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.BearerAuthFilter;
import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.RealmResource;
import org.keycloak.admin.client.resource.RealmsResource; 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 org.keycloak.admin.client.token.TokenManager;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;
import javax.ws.rs.client.Client; import jakarta.ws.rs.client.Client;
import java.net.URI; import java.net.URI;
import java.util.Iterator; import java.util.Iterator;
import java.util.ServiceLoader; import java.util.ServiceLoader;

6
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/KeycloakBuilder.java → integration/admin-client/src/main/java/org/keycloak/admin/client/KeycloakBuilder.java
View file

@ -20,11 +20,11 @@ package org.keycloak.admin.client;
import static org.keycloak.OAuth2Constants.CLIENT_CREDENTIALS; import static org.keycloak.OAuth2Constants.CLIENT_CREDENTIALS;
import static org.keycloak.OAuth2Constants.PASSWORD; 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 * 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.
* <p> * <p>
* <p>Example usage with a connection pool size of 20:</p> * <p>Example usage with a connection pool size of 20:</p>
* <pre> * <pre>
@ -50,7 +50,7 @@ import javax.ws.rs.client.Client;
* </pre> * </pre>
* *
* @author Scott Rossillo * @author Scott Rossillo
* @see javax.ws.rs.client.Client * @see jakarta.ws.rs.client.Client
*/ */
public class KeycloakBuilder { public class KeycloakBuilder {
private String serverUrl; private String serverUrl;

18
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AggregatePoliciesResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AggregatePoliciesResource.java
View file

@ -16,15 +16,15 @@
*/ */
package org.keycloak.admin.client.resource; package org.keycloak.admin.client.resource;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.keycloak.representations.idm.authorization.AggregatePolicyRepresentation; import org.keycloak.representations.idm.authorization.AggregatePolicyRepresentation;

14
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AggregatePolicyResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AggregatePolicyResource.java
View file

@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource;
import java.util.List; import java.util.List;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import org.keycloak.representations.idm.authorization.AggregatePolicyRepresentation; import org.keycloak.representations.idm.authorization.AggregatePolicyRepresentation;
import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation;

12
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AttackDetectionResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AttackDetectionResource.java
View file

@ -17,12 +17,12 @@
package org.keycloak.admin.client.resource; package org.keycloak.admin.client.resource;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import java.util.Map; import java.util.Map;
/** /**

20
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AuthenticationManagementResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthenticationManagementResource.java
View file

@ -28,16 +28,16 @@ import org.keycloak.representations.idm.RequiredActionConfigRepresentation;
import org.keycloak.representations.idm.RequiredActionProviderRepresentation; import org.keycloak.representations.idm.RequiredActionProviderRepresentation;
import org.keycloak.representations.idm.RequiredActionProviderSimpleRepresentation; import org.keycloak.representations.idm.RequiredActionProviderSimpleRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

16
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AuthorizationResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthorizationResource.java
View file

@ -18,14 +18,14 @@ package org.keycloak.admin.client.resource;
import org.keycloak.representations.idm.authorization.ResourceServerRepresentation; import org.keycloak.representations.idm.authorization.ResourceServerRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
/** /**
* @author <a href="mailto:psilva@redhat.com">Pedro Igor</a> * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>

6
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/BasicAuthFilter.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BasicAuthFilter.java
View file

@ -17,9 +17,9 @@
package org.keycloak.admin.client.resource; package org.keycloak.admin.client.resource;
import javax.ws.rs.client.ClientRequestContext; import jakarta.ws.rs.client.ClientRequestContext;
import javax.ws.rs.client.ClientRequestFilter; import jakarta.ws.rs.client.ClientRequestFilter;
import javax.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.HttpHeaders;
import java.io.IOException; import java.io.IOException;
import org.keycloak.common.util.Base64; import org.keycloak.common.util.Base64;

10
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/BearerAuthFilter.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BearerAuthFilter.java
View file

@ -19,11 +19,11 @@ package org.keycloak.admin.client.resource;
import org.keycloak.admin.client.token.TokenManager; import org.keycloak.admin.client.token.TokenManager;
import javax.ws.rs.client.ClientRequestContext; import jakarta.ws.rs.client.ClientRequestContext;
import javax.ws.rs.client.ClientRequestFilter; import jakarta.ws.rs.client.ClientRequestFilter;
import javax.ws.rs.client.ClientResponseContext; import jakarta.ws.rs.client.ClientResponseContext;
import javax.ws.rs.client.ClientResponseFilter; import jakarta.ws.rs.client.ClientResponseFilter;
import javax.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.HttpHeaders;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;

12
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java
View file

@ -20,12 +20,12 @@ package org.keycloak.admin.client.resource;
import org.keycloak.representations.KeyStoreConfig; import org.keycloak.representations.KeyStoreConfig;
import org.keycloak.representations.idm.CertificateRepresentation; import org.keycloak.representations.idm.CertificateRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
/** /**
* *

16
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientInitialAccessResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientInitialAccessResource.java
View file

@ -20,14 +20,14 @@ package org.keycloak.admin.client.resource;
import org.keycloak.representations.idm.ClientInitialAccessCreatePresentation; import org.keycloak.representations.idm.ClientInitialAccessCreatePresentation;
import org.keycloak.representations.idm.ClientInitialAccessPresentation; import org.keycloak.representations.idm.ClientInitialAccessPresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import java.util.List; import java.util.List;
/** /**

12
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesPoliciesResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesPoliciesResource.java
View file

@ -1,11 +1,11 @@
package org.keycloak.admin.client.resource; package org.keycloak.admin.client.resource;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import org.keycloak.representations.idm.ClientPoliciesRepresentation; import org.keycloak.representations.idm.ClientPoliciesRepresentation;

12
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesProfilesResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesProfilesResource.java
View file

@ -1,11 +1,11 @@
package org.keycloak.admin.client.resource; package org.keycloak.admin.client.resource;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import org.keycloak.representations.idm.ClientProfilesRepresentation; import org.keycloak.representations.idm.ClientProfilesRepresentation;

18
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesResource.java
View file

@ -16,15 +16,15 @@
*/ */
package org.keycloak.admin.client.resource; package org.keycloak.admin.client.resource;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.keycloak.representations.idm.authorization.ClientPolicyRepresentation; import org.keycloak.representations.idm.authorization.ClientPolicyRepresentation;

14
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPolicyResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPolicyResource.java
View file

@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource;
import java.util.List; import java.util.List;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import org.keycloak.representations.idm.authorization.ClientPolicyRepresentation; import org.keycloak.representations.idm.authorization.ClientPolicyRepresentation;
import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation;

8
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientRegistrationPolicyResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientRegistrationPolicyResource.java
View file

@ -19,10 +19,10 @@ package org.keycloak.admin.client.resource;
import java.util.List; import java.util.List;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import org.keycloak.representations.idm.ComponentTypeRepresentation; import org.keycloak.representations.idm.ComponentTypeRepresentation;

20
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientResource.java Executable file → Normal file
View file

@ -20,16 +20,16 @@ package org.keycloak.admin.client.resource;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import org.keycloak.representations.adapters.action.GlobalRequestResult; import org.keycloak.representations.adapters.action.GlobalRequestResult;
import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.ClientRepresentation;

16
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientScopePoliciesResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopePoliciesResource.java
View file

@ -16,14 +16,14 @@
*/ */
package org.keycloak.admin.client.resource; package org.keycloak.admin.client.resource;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.keycloak.representations.idm.authorization.ClientScopePolicyRepresentation; import org.keycloak.representations.idm.authorization.ClientScopePolicyRepresentation;

14
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java Executable file → Normal file
View file

@ -19,13 +19,13 @@ package org.keycloak.admin.client.resource;
import org.keycloak.representations.idm.ClientScopeRepresentation; import org.keycloak.representations.idm.ClientScopeRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
/** /**
* @author rodrigo.sasaki@icarros.com.br * @author rodrigo.sasaki@icarros.com.br

16
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientScopesResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopesResource.java Executable file → Normal file
View file

@ -19,14 +19,14 @@ package org.keycloak.admin.client.resource;
import org.keycloak.representations.idm.ClientScopeRepresentation; import org.keycloak.representations.idm.ClientScopeRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import java.util.List; import java.util.List;
/** /**

10
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientTypesResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientTypesResource.java
View file

@ -18,11 +18,11 @@
package org.keycloak.admin.client.resource; package org.keycloak.admin.client.resource;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import org.jboss.resteasy.annotations.cache.NoCache; import org.jboss.resteasy.annotations.cache.NoCache;
import org.keycloak.representations.idm.ClientTypesRepresentation; import org.keycloak.representations.idm.ClientTypesRepresentation;

18
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java Executable file → Normal file
View file

@ -19,15 +19,15 @@ package org.keycloak.admin.client.resource;
import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.ClientRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import java.util.List; import java.util.List;
/** /**

16
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java
View file

@ -21,14 +21,14 @@ import java.util.List;
import org.keycloak.representations.idm.ComponentRepresentation; import org.keycloak.representations.idm.ComponentRepresentation;
import org.keycloak.representations.idm.ComponentTypeRepresentation; import org.keycloak.representations.idm.ComponentTypeRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
/** /**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a> * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

20
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java
View file

@ -18,16 +18,16 @@ package org.keycloak.admin.client.resource;
import org.keycloak.representations.idm.ComponentRepresentation; import org.keycloak.representations.idm.ComponentRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import java.util.List; import java.util.List;
/** /**

18
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupPoliciesResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupPoliciesResource.java
View file

@ -16,15 +16,15 @@
*/ */
package org.keycloak.admin.client.resource; package org.keycloak.admin.client.resource;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.keycloak.representations.idm.authorization.GroupPolicyRepresentation; import org.keycloak.representations.idm.authorization.GroupPolicyRepresentation;

14
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupPolicyResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupPolicyResource.java
View file

@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource;
import java.util.List; import java.util.List;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import org.keycloak.representations.idm.authorization.GroupPolicyRepresentation; import org.keycloak.representations.idm.authorization.GroupPolicyRepresentation;
import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation;

20
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupResource.java Executable file → Normal file
View file

@ -22,16 +22,16 @@ import org.keycloak.representations.idm.ManagementPermissionReference;
import org.keycloak.representations.idm.ManagementPermissionRepresentation; import org.keycloak.representations.idm.ManagementPermissionRepresentation;
import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.idm.UserRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import java.util.List; import java.util.List;
/** /**

6
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupsResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupsResource.java Executable file → Normal file
View file

@ -19,9 +19,9 @@ package org.keycloak.admin.client.resource;
import org.keycloak.representations.idm.GroupRepresentation; import org.keycloak.representations.idm.GroupRepresentation;
import javax.ws.rs.*; import jakarta.ws.rs.*;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

22
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/IdentityProviderResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProviderResource.java Executable file → Normal file
View file

@ -21,17 +21,17 @@ import org.keycloak.representations.idm.IdentityProviderMapperRepresentation;
import org.keycloak.representations.idm.IdentityProviderMapperTypeRepresentation; import org.keycloak.representations.idm.IdentityProviderMapperTypeRepresentation;
import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

18
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/IdentityProvidersResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProvidersResource.java Executable file → Normal file
View file

@ -19,15 +19,15 @@ package org.keycloak.admin.client.resource;
import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

18
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/JSPoliciesResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/JSPoliciesResource.java
View file

@ -16,15 +16,15 @@
*/ */
package org.keycloak.admin.client.resource; package org.keycloak.admin.client.resource;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.keycloak.representations.idm.authorization.JSPolicyRepresentation; import org.keycloak.representations.idm.authorization.JSPolicyRepresentation;

14
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/JSPolicyResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/JSPolicyResource.java
View file

@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource;
import java.util.List; import java.util.List;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import org.keycloak.representations.idm.authorization.JSPolicyRepresentation; import org.keycloak.representations.idm.authorization.JSPolicyRepresentation;
import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation;

6
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/KeyResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/KeyResource.java
View file

@ -19,9 +19,9 @@ package org.keycloak.admin.client.resource;
import org.keycloak.representations.idm.KeysMetadataRepresentation; import org.keycloak.representations.idm.KeysMetadataRepresentation;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import java.util.List; import java.util.List;
/** /**

10
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProviderResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProviderResource.java
View file

@ -17,11 +17,11 @@
package org.keycloak.admin.client.resource; package org.keycloak.admin.client.resource;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation;
public interface OrganizationIdentityProviderResource { public interface OrganizationIdentityProviderResource {

16
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProvidersResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProvidersResource.java
View file

@ -19,14 +19,14 @@ package org.keycloak.admin.client.resource;
import java.util.List; import java.util.List;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation;
public interface OrganizationIdentityProvidersResource { public interface OrganizationIdentityProvidersResource {

12
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationMemberResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationMemberResource.java
View file

@ -19,12 +19,12 @@ package org.keycloak.admin.client.resource;
import java.util.List; import java.util.List;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.keycloak.representations.idm.MemberRepresentation; import org.keycloak.representations.idm.MemberRepresentation;
import org.keycloak.representations.idm.OrganizationRepresentation; import org.keycloak.representations.idm.OrganizationRepresentation;

20
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationMembersResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationMembersResource.java
View file

@ -19,16 +19,16 @@ package org.keycloak.admin.client.resource;
import java.util.List; import java.util.List;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.FormParam; import jakarta.ws.rs.FormParam;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.keycloak.representations.idm.MemberRepresentation; import org.keycloak.representations.idm.MemberRepresentation;
import org.keycloak.representations.idm.OrganizationRepresentation; import org.keycloak.representations.idm.OrganizationRepresentation;

16
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationResource.java
View file

@ -17,14 +17,14 @@
package org.keycloak.admin.client.resource; package org.keycloak.admin.client.resource;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.keycloak.representations.idm.OrganizationRepresentation; import org.keycloak.representations.idm.OrganizationRepresentation;
public interface OrganizationResource { public interface OrganizationResource {

18
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/OrganizationsResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationsResource.java
View file

@ -19,15 +19,15 @@ package org.keycloak.admin.client.resource;
import java.util.List; import java.util.List;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.keycloak.representations.idm.OrganizationRepresentation; import org.keycloak.representations.idm.OrganizationRepresentation;
public interface OrganizationsResource { public interface OrganizationsResource {

2
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/PermissionsResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PermissionsResource.java
View file

@ -16,7 +16,7 @@
*/ */
package org.keycloak.admin.client.resource; package org.keycloak.admin.client.resource;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
/** /**
* @author <a href="mailto:psilva@redhat.com">Pedro Igor</a> * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>

18
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/PoliciesResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PoliciesResource.java
View file

@ -21,15 +21,15 @@ import org.keycloak.representations.idm.authorization.PolicyEvaluationResponse;
import org.keycloak.representations.idm.authorization.PolicyProviderRepresentation; import org.keycloak.representations.idm.authorization.PolicyProviderRepresentation;
import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import java.util.List; import java.util.List;
/** /**

16
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/PolicyResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PolicyResource.java
View file

@ -18,14 +18,14 @@ package org.keycloak.admin.client.resource;
import java.util.List; import java.util.List;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation;
import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation;

18
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java
View file

@ -19,15 +19,15 @@ package org.keycloak.admin.client.resource;
import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.representations.idm.ProtocolMapperRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import java.util.List; import java.util.List;
/** /**

20
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmLocalizationResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmLocalizationResource.java Executable file → Normal file
View file

@ -20,16 +20,16 @@ package org.keycloak.admin.client.resource;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
public interface RealmLocalizationResource { public interface RealmLocalizationResource {

28
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java
View file

@ -29,19 +29,19 @@ import org.keycloak.representations.idm.RealmEventsConfigRepresentation;
import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.representations.idm.TestLdapConnectionRepresentation; import org.keycloak.representations.idm.TestLdapConnectionRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DefaultValue; import jakarta.ws.rs.DefaultValue;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.FormParam; import jakarta.ws.rs.FormParam;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -231,7 +231,7 @@ public interface RealmResource {
@POST @POST
@Path("ldap-server-capabilities") @Path("ldap-server-capabilities")
@Consumes(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON)
@Produces(javax.ws.rs.core.MediaType.APPLICATION_JSON) @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON)
List<LDAPCapabilityRepresentation> ldapServerCapabilities(TestLdapConnectionRepresentation config); List<LDAPCapabilityRepresentation> ldapServerCapabilities(TestLdapConnectionRepresentation config);
@Path("testSMTPConnection") @Path("testSMTPConnection")

14
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java
View file

@ -19,13 +19,13 @@ package org.keycloak.admin.client.resource;
import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RealmRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import java.util.List; import java.util.List;
/** /**

10
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RegexPoliciesResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RegexPoliciesResource.java
View file

@ -16,11 +16,11 @@
*/ */
package org.keycloak.admin.client.resource; package org.keycloak.admin.client.resource;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.keycloak.representations.idm.authorization.RegexPolicyRepresentation; import org.keycloak.representations.idm.authorization.RegexPolicyRepresentation;

14
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionResource.java
View file

@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource;
import java.util.List; import java.util.List;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation;
import org.keycloak.representations.idm.authorization.ResourcePermissionRepresentation; import org.keycloak.representations.idm.authorization.ResourcePermissionRepresentation;

18
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionsResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionsResource.java
View file

@ -16,15 +16,15 @@
*/ */
package org.keycloak.admin.client.resource; package org.keycloak.admin.client.resource;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.keycloak.representations.idm.authorization.ResourcePermissionRepresentation; import org.keycloak.representations.idm.authorization.ResourcePermissionRepresentation;

14
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourceResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceResource.java
View file

@ -21,13 +21,13 @@ import java.util.List;
import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation;
import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
/** /**
* @author <a href="mailto:psilva@redhat.com">Pedro Igor</a> * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>

14
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourceScopeResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopeResource.java
View file

@ -21,13 +21,13 @@ import java.util.List;
import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation;
import org.keycloak.representations.idm.authorization.ScopeRepresentation; import org.keycloak.representations.idm.authorization.ScopeRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
/** /**
* @author <a href="mailto:psilva@redhat.com">Pedro Igor</a> * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a>

18
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourceScopesResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopesResource.java
View file

@ -18,15 +18,15 @@ package org.keycloak.admin.client.resource;
import org.keycloak.representations.idm.authorization.ScopeRepresentation; import org.keycloak.representations.idm.authorization.ScopeRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import java.util.List; import java.util.List;
/** /**

18
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourcesResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcesResource.java
View file

@ -18,15 +18,15 @@ package org.keycloak.admin.client.resource;
import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import java.util.List; import java.util.List;
/** /**

20
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleByIdResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleByIdResource.java Executable file → Normal file
View file

@ -19,16 +19,16 @@ package org.keycloak.admin.client.resource;
import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.RoleRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;

12
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java Executable file → Normal file
View file

@ -19,12 +19,12 @@ package org.keycloak.admin.client.resource;
import org.keycloak.representations.idm.MappingsRepresentation; import org.keycloak.representations.idm.MappingsRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
/** /**
* @author rodrigo.sasaki@icarros.com.br * @author rodrigo.sasaki@icarros.com.br

18
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RolePoliciesResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolePoliciesResource.java
View file

@ -16,15 +16,15 @@
*/ */
package org.keycloak.admin.client.resource; package org.keycloak.admin.client.resource;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.keycloak.representations.idm.authorization.RolePolicyRepresentation; import org.keycloak.representations.idm.authorization.RolePolicyRepresentation;

14
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RolePolicyResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolePolicyResource.java
View file

@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource;
import java.util.List; import java.util.List;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation;
import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation;

20
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleResource.java Executable file → Normal file
View file

@ -23,16 +23,16 @@ import org.keycloak.representations.idm.ManagementPermissionRepresentation;
import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.RoleRepresentation;
import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.idm.UserRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;

18
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java Executable file → Normal file
View file

@ -19,15 +19,15 @@ package org.keycloak.admin.client.resource;
import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.RoleRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.DefaultValue; import jakarta.ws.rs.DefaultValue;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import java.util.List; import java.util.List;
/** /**

20
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RolesResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolesResource.java Executable file → Normal file
View file

@ -19,16 +19,16 @@ package org.keycloak.admin.client.resource;
import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.RoleRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.DefaultValue; import jakarta.ws.rs.DefaultValue;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import java.util.List; import java.util.List;
/** /**

14
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ScopePermissionResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ScopePermissionResource.java
View file

@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource;
import java.util.List; import java.util.List;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation;
import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation;

18
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ScopePermissionsResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ScopePermissionsResource.java
View file

@ -16,15 +16,15 @@
*/ */
package org.keycloak.admin.client.resource; package org.keycloak.admin.client.resource;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation;

8
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ServerInfoResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ServerInfoResource.java
View file

@ -19,10 +19,10 @@ package org.keycloak.admin.client.resource;
import org.keycloak.representations.info.ServerInfoRepresentation; import org.keycloak.representations.info.ServerInfoRepresentation;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
/** /**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a> * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>

18
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/TimePoliciesResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/TimePoliciesResource.java
View file

@ -16,15 +16,15 @@
*/ */
package org.keycloak.admin.client.resource; package org.keycloak.admin.client.resource;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.keycloak.representations.idm.authorization.TimePolicyRepresentation; import org.keycloak.representations.idm.authorization.TimePolicyRepresentation;

14
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/TimePolicyResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/TimePolicyResource.java
View file

@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource;
import java.util.List; import java.util.List;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation;
import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation;

18
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserPoliciesResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserPoliciesResource.java
View file

@ -16,15 +16,15 @@
*/ */
package org.keycloak.admin.client.resource; package org.keycloak.admin.client.resource;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import org.keycloak.representations.idm.authorization.UserPolicyRepresentation; import org.keycloak.representations.idm.authorization.UserPolicyRepresentation;

14
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserPolicyResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserPolicyResource.java
View file

@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource;
import java.util.List; import java.util.List;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation;
import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation;

12
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserProfileResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserProfileResource.java
View file

@ -16,12 +16,12 @@
*/ */
package org.keycloak.admin.client.resource; package org.keycloak.admin.client.resource;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import org.keycloak.representations.idm.UserProfileMetadata; import org.keycloak.representations.idm.UserProfileMetadata;
import org.keycloak.representations.userprofile.config.UPConfig; import org.keycloak.representations.userprofile.config.UPConfig;

26
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserResource.java Executable file → Normal file
View file

@ -23,18 +23,18 @@ import org.keycloak.representations.idm.GroupRepresentation;
import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.idm.UserRepresentation;
import org.keycloak.representations.idm.UserSessionRepresentation; import org.keycloak.representations.idm.UserSessionRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.DefaultValue; import jakarta.ws.rs.DefaultValue;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -140,7 +140,7 @@ public interface UserResource {
* Update a credential label for a user * Update a credential label for a user
*/ */
@PUT @PUT
@Consumes(javax.ws.rs.core.MediaType.TEXT_PLAIN) @Consumes(jakarta.ws.rs.core.MediaType.TEXT_PLAIN)
@Path("credentials/{credentialId}/userLabel") @Path("credentials/{credentialId}/userLabel")
void setCredentialUserLabel(final @PathParam("credentialId") String credentialId, String userLabel); void setCredentialUserLabel(final @PathParam("credentialId") String credentialId, String userLabel);

12
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserStorageProviderResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserStorageProviderResource.java
View file

@ -18,12 +18,12 @@ package org.keycloak.admin.client.resource;
import org.keycloak.representations.idm.SynchronizationResultRepresentation; import org.keycloak.representations.idm.SynchronizationResultRepresentation;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
/** /**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a> * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

20
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UsersResource.java → integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UsersResource.java Executable file → Normal file
View file

@ -19,16 +19,16 @@ package org.keycloak.admin.client.resource;
import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.idm.UserRepresentation;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import java.util.List; import java.util.List;
public interface UsersResource { public interface UsersResource {

6
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/spi/ResteasyClientClassicProvider.java → integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientClassicProvider.java
View file

@ -18,9 +18,9 @@
package org.keycloak.admin.client.spi; package org.keycloak.admin.client.spi;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;
import javax.ws.rs.client.Client; import jakarta.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder; import jakarta.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.WebTarget; import jakarta.ws.rs.client.WebTarget;
import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget; import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
import org.keycloak.admin.client.ClientBuilderWrapper; import org.keycloak.admin.client.ClientBuilderWrapper;
import org.keycloak.admin.client.JacksonProvider; import org.keycloak.admin.client.JacksonProvider;

6
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/spi/ResteasyClientProvider.java → integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientProvider.java
View file

@ -18,8 +18,8 @@
package org.keycloak.admin.client.spi; package org.keycloak.admin.client.spi;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;
import javax.ws.rs.client.Client; import jakarta.ws.rs.client.Client;
import javax.ws.rs.client.WebTarget; import jakarta.ws.rs.client.WebTarget;
/** /**
* An SPI for using the JAX-RS Client API regardless of the underlying stack. * 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}. * 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 sslContext an optional {@link SSLContext}
* @param disableTrustManager if the client should not validate the server certificates when using TLS * @param disableTrustManager if the client should not validate the server certificates when using TLS
* @return * @return

8
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/token/TokenManager.java → integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenManager.java
View file

@ -17,7 +17,7 @@
package org.keycloak.admin.client.token; 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.ResteasyClient;
import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget; import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
import org.keycloak.admin.client.Config; 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.common.util.Time;
import org.keycloak.representations.AccessTokenResponse; import org.keycloak.representations.AccessTokenResponse;
import javax.ws.rs.BadRequestException; import jakarta.ws.rs.BadRequestException;
import javax.ws.rs.client.Client; import jakarta.ws.rs.client.Client;
import javax.ws.rs.core.Form; import jakarta.ws.rs.core.Form;
import static org.keycloak.OAuth2Constants.CLIENT_CREDENTIALS; import static org.keycloak.OAuth2Constants.CLIENT_CREDENTIALS;
import static org.keycloak.OAuth2Constants.CLIENT_ID; import static org.keycloak.OAuth2Constants.CLIENT_ID;

14
integration/admin-client-jee/src/main/java/org/keycloak/admin/client/token/TokenService.java → integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenService.java Executable file → Normal file
View file

@ -19,13 +19,13 @@ package org.keycloak.admin.client.token;
import org.keycloak.representations.AccessTokenResponse; import org.keycloak.representations.AccessTokenResponse;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.MultivaluedMap;
/** /**
* @author rodrigo.sasaki@icarros.com.br * @author rodrigo.sasaki@icarros.com.br

1
integration/pom.xml
View file

@ -31,7 +31,6 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
<module>admin-client-jee</module>
<module>admin-client</module> <module>admin-client</module>
<module>client-registration</module> <module>client-registration</module>
<module>client-cli</module> <module>client-cli</module>

1
pom.xml
View file

@ -110,7 +110,6 @@
<jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>2.0.1.Final</jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version> <jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>2.0.1.Final</jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec.version>
<jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>2.0.0.Final</jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version> <jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>2.0.0.Final</jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec.version>
<log4j.version>1.2.17</log4j.version> <log4j.version>1.2.17</log4j.version>
<resteasy-legacy.version>4.7.7.Final</resteasy-legacy.version>
<resteasy.version>6.2.9.Final</resteasy.version> <resteasy.version>6.2.9.Final</resteasy.version>
<resteasy.undertow.version>${resteasy.version}</resteasy.undertow.version> <resteasy.undertow.version>${resteasy.version}</resteasy.undertow.version>
<owasp.html.sanitizer.version>20240325.1</owasp.html.sanitizer.version> <owasp.html.sanitizer.version>20240325.1</owasp.html.sanitizer.version>