8000 Remove legacy Client API V2 service by mabartos · Pull Request #48091 · keycloak/keycloak · GitHub
[go: up one dir, main page]
Skip to content

Remove legacy Client API V2 service #48091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vmuzikar merged 3 commits into from
Apr 21, 2026
Merged

Remove legacy Client API V2 service #48091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c992025
Remove legacy Client API V2 service
mabartos Apr 15, 2026
a44b25d
Remove workarounds for Operator
mabartos Apr 15, 2026
0181da5
Fix compilation errors
mabartos Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
8000
Diff view
11 changes: 1 addition & 10 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1240,10 +1240,6 @@ jobs:
- build
- conditional
timeout-minutes: 20
strategy:
matrix:
service-type: [ new-service, v1-service ]
fail-fast: false
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

Expand All @@ -1252,12 +1248,7 @@ jobs:
uses: ./.github/actions/integration-test-setup

- name: Run tests
run: |
declare -A PARAMS
PARAMS["new-service"]="-Dkc.admin-v2.client-service.legacy.enabled=false"
PARAMS["v1-service"]=""

./mvnw verify -pl rest/admin-v2/tests/pom.xml ${PARAMS["${{ matrix.service-type }}"]}
run: ./mvnw verify -pl rest/admin-v2/tests/pom.xml

mixed-cluster-compatibility-tests:
name: Cluster Compatibility Tests
Expand Down
6 changes: 5 additions & 1 deletion operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,10 @@
import io.fabric8.kubernetes.api.model.SecretBuilder;
import io.fabric8.kubernetes.api.model.SecretKeySelector;
import io.fabric8.kubernetes.api.model.ServiceBuilder;
import io.quarkus.test.junit.QuarkusTest;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;

import static org.keycloak.operator.testsuite.utils.K8sUtils.deployKeycloak;
Expand All @@ -60,7 +62,9 @@
import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertNull;

public abstract class KeycloakClientTest extends BaseOperatorTest {
@Tag(BaseOperatorTest.SLOW)
@QuarkusTest
public class KeycloakClientTest extends BaseOperatorTest {

private static final String CLIENT_SECRET = "client-secret";
private static final String CLIENT_TRUSTSTORE_SECRET = "example-mtls-truststore-secret";
Expand Down
12 changes: 0 additions & 12 deletions ...est/java/org/keycloak/operator/testsuite/integration/KeycloakLegacyServiceClientTest.java
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions ...c/test/java/org/keycloak/operator/testsuite/integration/KeycloakNewServiceClientTest.java
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions .../admin-v2/services/src/main/java/org/keycloak/rest/admin/api/client/DefaultClientApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import org.keycloak.services.PatchType;
import org.keycloak.services.ServiceException;
import org.keycloak.services.client.ClientService;
import org.keycloak.services.client.ClientServiceHelper;
import org.keycloak.services.client.DefaultClientService;
import org.keycloak.services.resources.admin.RealmAdminResource;
import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator;

Expand All @@ -39,7 +39,7 @@ public DefaultClientApi(@Nonnull KeycloakSession session,
this.session = session;
this.clientId = clientId;
this.realm = realm;
this.clientService = ClientServiceHelper.getClientService(session, realm, permissions, realmAdminResource);
this.clientService = new DefaultClientService(session, realm, permissions, realmAdminResource);
}

@GET
Expand Down
4 changes: 2 additions & 2 deletions ...admin-v2/services/src/main/java/org/keycloak/rest/admin/api/client/DefaultClientsApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import org.keycloak.models.RealmModel;
import org.keycloak.representations.admin.v2.BaseClientRepresentation;
import org.keycloak.services.client.ClientService;
import org.keycloak.services.client.ClientServiceHelper;
@vmuzikar vmuzikar Apr 17, 2026
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we remove ClientServiceHelper as well?

@mabartos mabartos Apr 20, 2026
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

8BD0
import org.keycloak.services.client.DefaultClientService;
import org.keycloak.services.resources.admin.RealmAdminResource;
import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator;

Expand All @@ -38,7 +38,7 @@ public DefaultClientsApi(@Nonnull KeycloakSession session,
this.realm = realm;
this.permissions = permissions;
this.realmAdminResource = realmAdminResource;
this.clientService = ClientServiceHelper.getClientService(session, realm, permissions, realmAdminResource);
this.clientService = new DefaultClientService(session, realm, permissions, realmAdminResource);
}

@GET
Expand Down
36 changes: 0 additions & 36 deletions rest/admin-v2/services/src/main/java/org/keycloak/services/client/ClientServiceHelper.java
View file
Open in desktop

This file was deleted.

Loading
Loading
0