vmuzikar · Mar 27, 2026 · Mar 9, 2026 · Mar 24, 2026 · Mar 24, 2026 · Mar 24, 2026
@@ -59,6 +59,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-admin-v2-rest</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-client</artifactId>

@@ -1,13 +1,20 @@
 package org.keycloak.admin.client;
 
+import java.util.stream.Stream;
+
 import jakarta.ws.rs.core.MediaType;
 
+import org.keycloak.admin.client.deserializer.StreamDeserializer;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
 import org.jboss.resteasy.plugins.providers.jackson.ResteasyJackson2Provider;
 
 public class JacksonProvider extends ResteasyJackson2Provider {
+    private static final StreamDeserializer STREAM_DESERIALIZER = new StreamDeserializer();
+    private static final SimpleModule STREAM_MODULE = new SimpleModule().addDeserializer(Stream.class, STREAM_DESERIALIZER);
 
     @Override
     public ObjectMapper locateMapper(Class<?> type, MediaType mediaType) {
@@ -19,6 +26,7 @@ public ObjectMapper locateMapper(Class<?> type, MediaType mediaType) {
         // The client must work with the newer versions of Keycloak server, which might contain the JSON fields not yet known by the client. So unknown fields will be ignored.
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
+        objectMapper.registerModule(STREAM_MODULE);
         return objectMapper;
     }
 }
@@ -32,6 +32,7 @@
 import org.keycloak.admin.client.resource.ServerInfoResource;
 import org.keycloak.admin.client.spi.ResteasyClientProvider;
 import org.keycloak.admin.client.token.TokenManager;
+import org.keycloak.admin.client.wrapper.Clients;
 
 import static org.keycloak.OAuth2Constants.PASSWORD;
 
@@ -240,4 +241,8 @@ public void close() {
     public boolean isClosed() {
         return closed;
     }
+
+    public Clients clients(String realmName) {
+        return new Clients(CLIENT_PROVIDER, target, realmName);
+    }
 }
@@ -0,0 +1,55 @@
+package org.keycloak.admin.client.deserializer;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.stream.Stream;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
+
+public class StreamDeserializer extends JsonDeserializer<Stream<?>> implements ContextualDeserializer {
 module.addSerializer(new StreamSerializer(streamType, type)); 
 response.entity((StreamingOutput) consumer::accept); 
 module.addSerializer(new StreamSerializer(streamType, type)); 
 response.entity((StreamingOutput) consumer::accept); 
+
+  private final JavaType contentType;
+
+  public StreamDeserializer() {
+    this(null);
+  }
+
+  public StreamDeserializer(JavaType contentType) {
+    this.contentType = contentType;
+  }
+
+  @Override
+  public Stream<?> deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+    JavaType streamType = ctxt.getContextualType();
+    JavaType actualContentType = contentType;
+
+    if (actualContentType == null && streamType != null && streamType.containedTypeCount() == 1) {
+      actualContentType = streamType.containedType(0);
+    }
+
+    if (actualContentType == null) {
+      actualContentType = ctxt.getTypeFactory().constructType(Object.class);
+    }
+
+    JavaType listType = ctxt.getTypeFactory().constructCollectionType(List.class, actualContentType);
+    List<?> list = ctxt.readValue(p, listType);
+    return list.stream();
+  }
+
+  @Override
+  public JsonDeserializer<?> createContextual(DeserializationContext ctxt, BeanProperty property) {
+    JavaType contextualType = ctxt.getContextualType();
+    JavaType actualContentType = null;
+
+    if (contextualType != null && contextualType.containedTypeCount() == 1) {
+      actualContentType = contextualType.containedType(0);
+    }
+
+    return new StreamDeserializer(actualContentType);
+  }
+}
@@ -0,0 +1,24 @@
+package org.keycloak.admin.client.wrapper;
+
+import jakarta.ws.rs.client.WebTarget;
+
+import org.keycloak.admin.api.AdminRootV2;
+import org.keycloak.admin.api.client.ClientsApi;
+import org.keycloak.admin.client.spi.ResteasyClientProvider;
+
+public class Clients {
+
+  private final ResteasyClientProvider clientProvider;
+  private final WebTarget target;
+  private final String realmName;
+
+  public Clients(ResteasyClientProvider clientProvider, WebTarget target, String realmName) {
+    this.clientProvider = clientProvider;
+    this.target = target;
+    this.realmName = realmName;
+  }
+
+  public ClientsApi v2() {
+    return clientProvider.targetProxy(target, AdminRootV2.class).adminApi(realmName).clients("v2");
+  }
+}
@@ -1,48 +1,21 @@
 package org.keycloak.admin.api;
 
-import jakarta.ws.rs.NotFoundException;
 import jakarta.ws.rs.OPTIONS;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.ext.Provider;
-
-import org.keycloak.common.Profile;
-import org.keycloak.models.KeycloakSession;
-import org.keycloak.services.resources.admin.AdminCorsPreflightService;
 
 import org.eclipse.microprofile.openapi.annotations.Operation;
 
-@Provider
 @Path("admin/api")
-public class AdminRootV2 {
-
-    @Context
-    protected KeycloakSession session;
+public interface AdminRootV2 {
 
     @Path("{realmName}")
-    public AdminApi adminApi(@PathParam("realmName") String realmName) {
-        checkApiEnabled();
-        return new DefaultAdminApi(session, realmName);
-    }
+    AdminApi adminApi(@PathParam("realmName") String realmName);
 
     // TODO Fix preflights
     @Path("{realmName}/{any:.*}")
     @OPTIONS
     @Operation(hidden = true)
-    public Response preFlight() {
-        checkApiEnabled();
-        return new AdminCorsPreflightService().preflight();
-    }
-
-    private void checkApiEnabled() {
-        if (!isAdminApiV2Enabled()) {
-            throw new NotFoundException();
-        }
-    }
-
-    public static boolean isAdminApiV2Enabled() {
-        return Profile.isFeatureEnabled(Profile.Feature.CLIENT_ADMIN_API_V2); // There's currently only Client API for the new Admin API v2
-    }
+    Response preFlight();
 }
@@ -0,0 +1,39 @@
+package org.keycloak.admin.api;
+
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.Provider;
+
+import org.keycloak.common.Profile;
+import org.keycloak.models.KeycloakSession;
+import org.keycloak.services.resources.admin.AdminCorsPreflightService;
+
+@Provider
+public class DefaultAdminRootV2 implements AdminRootV2 {
+
+  @Context
+  protected KeycloakSession session;
+
+  @Override
+  public AdminApi adminApi(String realmName) {
+    checkApiEnabled();
+    return new DefaultAdminApi(session, realmName);
+  }
+
+  @Override
+  public Response preFlight() {
+    checkApiEnabled();
+    return new AdminCorsPreflightService().preflight();
+  }
+
+  private void checkApiEnabled() {
+    if (!isAdminApiV2Enabled()) {
+      throw new NotFoundException();
+    }
+  }
+
+  public static boolean isAdminApiV2Enabled() {
+    return Profile.isFeatureEnabled(Profile.Feature.CLIENT_ADMIN_API_V2); // There's currently only Client API for the new Admin API v2
+  }
+}
@@ -37,10 +37,6 @@
             <groupId>org.keycloak.testframework</groupId>
             <artifactId>keycloak-test-framework-junit5-config</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-admin-v2-rest</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.keycloak.tests</groupId>
             <artifactId>keycloak-tests-custom-providers</artifactId>

@@ -23,7 +23,6 @@ public String getRealmName() {
     public String getClientsApiUrl() {
         return "http://localhost:8080/admin/api/%s/clients/v2".formatted(getRealmName());
     }
-
     public String getClientApiUrl(String clientId) {
         return "http://localhost:8080/admin/api/%s/clients/v2/%s".formatted(getRealmName(), clientId);
     }