Remove legacy Client API V2 service by mabartos · Pull Request #48091 · keycloak/keycloak

mabartos · 2026-04-15T10:34:31Z

Closes Remove default client v2 service #47426
Remove the legacy Client service
Remove the workarounds for Operator
Need to add the https://github.com/keycloak/keycloak/pull/48091/changes#diff-226b89fef493191617383e6a89fd93ca12854e2d5f5a52140be09e7a259c897aR338 to fulfill the requirement for PATCH and generate the client secret automatically - we had the createOrUpdate private, so for patch, it was always the legacy logic executed - so, the client secret was automatically created underhood in v1

keycloak-github-bot

Unreported flaky test detected, please review

keycloak-github-bot · 2026-04-15T11:55:53Z

Unreported flaky test detected

If the flaky tests below are affected by the changes, please review and update the changes accordingly. Otherwise, a maintainer should report the flaky tests prior to merging the PR.

org.keycloak.testsuite.model.session.UserSessionProviderModelTest#testCreateUserSessionsParallel

Keycloak CI - Store Model Tests

java.lang.AssertionError: 
threads didn't terminate in time: [main (RUNNABLE):
	at java.management@25.0.2/sun.management.ThreadImpl.dumpThreads0(Native Method)
	at java.management@25.0.2/sun.management.ThreadImpl.dumpAllThreads(ThreadImpl.java:505)
	at java.management@25.0.2/sun.management.ThreadImpl.dumpAllThreads(ThreadImpl.java:493)
...

Report flaky test

org.keycloak.testsuite.model.session.UserSessionProviderModelTest#testCreateUserSessionsParallel

Keycloak CI - Store Model Tests

java.lang.AssertionError: 
threads didn't terminate in time: [main (RUNNABLE):
	at java.management@25.0.2/sun.management.ThreadImpl.dumpThreads0(Native Method)
	at java.management@25.0.2/sun.management.ThreadImpl.dumpAllThreads(ThreadImpl.java:505)
	at java.management@25.0.2/sun.management.ThreadImpl.dumpAllThreads(ThreadImpl.java:493)
...

Report flaky test

keycloak-github-bot · 2026-04-15T14:57:41Z

Unreported flaky test detected

If the flaky tests below are affected by the changes, please review and update the changes accordingly. Otherwise, a maintainer should report the flaky tests prior to merging the PR.

org.keycloak.testsuite.model.session.UserSessionProviderModelTest#testStreamsMarshalling

Keycloak CI - Store Model Tests

java.lang.AssertionError: 
threads didn't terminate in time: [main (RUNNABLE):
	at java.management@25.0.2/sun.management.ThreadImpl.dumpThreads0(Native Method)
	at java.management@25.0.2/sun.management.ThreadImpl.dumpAllThreads(ThreadImpl.java:505)
	at java.management@25.0.2/sun.management.ThreadImpl.dumpAllThreads(ThreadImpl.java:493)
...

Report flaky test

keycloak-github-bot

Unreported flaky test detected, please review

keycloak-github-bot

Unreported flaky test detected, please review

keycloak-github-bot · 2026-04-15T15:06:24Z

Unreported flaky test detected

If the flaky tests below are affected by the changes, please review and update the changes accordingly. Otherwise, a maintainer should report the flaky tests prior to merging the PR.

org.keycloak.testsuite.model.session.UserSessionProviderModelTest#testStreamsMarshalling

Keycloak CI - Store Model Tests

java.lang.AssertionError: 
threads didn't terminate in time: [main (RUNNABLE):
	at java.management@25.0.2/sun.management.ThreadImpl.dumpThreads0(Native Method)
	at java.management@25.0.2/sun.management.ThreadImpl.dumpAllThreads(ThreadImpl.java:505)
	at java.management@25.0.2/sun.management.ThreadImpl.dumpAllThreads(ThreadImpl.java:493)
...

Report flaky test

vmuzikar · 2026-04-16T13:21:25Z

Now that #47874 was merged, can you please rebase, @mabartos?

vmuzikar · 2026-04-17T15:36:23Z

 import org.keycloak.models.RealmModel;
 import org.keycloak.representations.admin.v2.BaseClientRepresentation;
 import org.keycloak.services.client.ClientService;
-import org.keycloak.services.client.ClientServiceHelper;


Should we remove ClientServiceHelper as well?

mabartos · 2026-04-17T16:42:19Z

@vmuzikar Ooops, seems like it was caused by the rebase. I'll update it; nice catch!

shawkins

LGTM

vmuzikar

Looks good, thanks.

vmuzikar · 2026-04-21T07:55:52Z

@mabartos Can you please resolve conflicts?

Closes keycloak#47426 Signed-off-by: Martin Bartoš <mabartos@redhat.com>

Signed-off-by: Martin Bartoš <mabartos@redhat.com>

mabartos · 2026-04-21T09:22:43Z

@vmuzikar Done.

The conflicting part was this, and it's resolved:

119503e

* Remove legacy Client API V2 service Closes keycloak#47426 Signed-off-by: Martin Bartoš <mabartos@redhat.com> * Remove workarounds for Operator Signed-off-by: Martin Bartoš <mabartos@redhat.com> * Fix compilation errors Signed-off-by: Martin Bartoš <mabartos@redhat.com> --------- Signed-off-by: Martin Bartoš <mabartos@redhat.com>

* Remove legacy Client API V2 service Closes keycloak#47426 Signed-off-by: Martin Bartoš <mabartos@redhat.com> * Remove workarounds for Operator Signed-off-by: Martin Bartoš <mabartos@redhat.com> * Fix compilation errors Signed-off-by: Martin Bartoš <mabartos@redhat.com> --------- Signed-off-by: Martin Bartoš <mabartos@redhat.com> Signed-off-by: vsaranchuk <vsaranchuk3@gmail.com>

mabartos self-assigned this Apr 15, 2026

mabartos force-pushed the KC-47426 branch from e2ce86b to 89ff153 Compare April 15, 2026 11:06

keycloak-github-bot Bot added the flaky-test label Apr 15, 2026

keycloak-github-bot Bot reviewed Apr 15, 2026

View reviewed changes

mabartos force-pushed the KC-47426 branch from 89ff153 to ae80cda Compare April 15, 2026 13:56

keycloak-github-bot Bot reviewed Apr 15, 2026

View reviewed changes

mabartos marked this pull request as ready for review April 15, 2026 15:33

mabartos requested review from a team as code owners April 15, 2026 15:33

keycloak-github-bot Bot added the team/cloud-native label Apr 15, 2026

mabartos force-pushed the KC-47426 branch 2 times, most recently from 5e9bd76 to 991a0b9 Compare April 17, 2026 12:34

This was referenced Apr 17, 2026

Flaky test: org.keycloak.testsuite.model.session.UserSessionProviderModelTest#testCreateUserSessionsParallel #48120

Closed

Flaky test: org.keycloak.testsuite.model.session.UserSessionProviderModelTest#testStreamsMarshalling #48121

Closed

vmuzikar requested changes Apr 17, 2026

View reviewed changes

mabartos force-pushed the KC-47426 branch from 76b3882 to c3bb520 Compare April 17, 2026 17:33

keycloak-github-bot Bot mentioned this pull request Apr 17, 2026

Flaky test: org.keycloak.testsuite.model.session.OfflineSessionPersistenceTest#testPersistenceMultipleNodesClientSessionAtSameNode #47421

Closed

mabartos requested a review from vmuzikar April 20, 2026 08:37

shawkins previously approved these changes Apr 20, 2026

View reviewed changes

vmuzikar previously approved these changes Apr 21, 2026

View reviewed changes

mabartos added 3 commits April 21, 2026 11:18

Remove legacy Client API V2 service

c992025

Closes keycloak#47426 Signed-off-by: Martin Bartoš <mabartos@redhat.com>

Remove workarounds for Operator

a44b25d

Signed-off-by: Martin Bartoš <mabartos@redhat.com>

Fix compilation errors

0181da5

Signed-off-by: Martin Bartoš <mabartos@redhat.com>

mabartos dismissed stale reviews from vmuzikar and shawkins via 0181da5 April 21, 2026 09:21

mabartos force-pushed the KC-47426 branch from c3bb520 to 0181da5 Compare April 21, 2026 09:21

This was referenced Apr 21, 2026

Flaky test: org.keycloak.testsuite.model.session.UserSessionPersisterProviderTest#testExpirationDistribution #47834

Closed

Flaky test: org.keycloak.testsuite.model.session.UserSessionInitializerTest#testUserSessionPropagationBetweenSites #47978

Closed

mabartos requested a review from vmuzikar April 21, 2026 11:15

vmuzikar approved these changes Apr 21, 2026

View reviewed changes

vmuzikar merged commit e299bb6 into keycloak:main Apr 21, 2026
90 checks passed

mabartos mentioned this pull request Apr 27, 2026

move phishing check #48495

Merged

Conversation

mabartos commented Apr 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

keycloak-github-bot Bot left a comment

Choose a reason for hiding this comment

Uh oh!

keycloak-github-bot Bot commented Apr 15, 2026

Unreported flaky test detected

org.keycloak.testsuite.model.session.UserSessionProviderModelTest#testCreateUserSessionsParallel

org.keycloak.testsuite.model.session.UserSessionProviderModelTest#testCreateUserSessionsParallel

Uh oh!

keycloak-github-bot Bot commented Apr 15, 2026

Unreported flaky test detected

org.keycloak.testsuite.model.session.UserSessionProviderModelTest#testStreamsMarshalling

Uh oh!

keycloak-github-bot Bot left a comment

Choose a reason for hiding this comment

Uh oh!

keycloak-github-bot Bot left a comment

Choose a reason for hiding this comment

Uh oh!

keycloak-github-bot Bot commented Apr 15, 2026

Unreported flaky test detected

org.keycloak.testsuite.model.session.UserSessionProviderModelTest#testStreamsMarshalling

Uh oh!

vmuzikar commented Apr 16, 2026

Uh oh!

vmuzikar Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

mabartos Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mabartos commented Apr 17, 2026

Uh oh!

shawkins left a comment

Choose a reason for hiding this comment

Uh oh!

vmuzikar left a comment

Choose a reason for hiding this comment

Uh oh!

vmuzikar commented Apr 21, 2026

Uh oh!

mabartos commented Apr 21, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mabartos commented Apr 15, 2026 •

edited

Loading