From b2b5b526d9f287d4e561c75b020c70e028f81667 Mon Sep 17 00:00:00 2001 From: Vincent Potucek Date: Sun, 9 Nov 2025 10:24:43 +0100 Subject: [PATCH] [rewrite] Apply `RemoveUnusedPrivateMethods` Signed-off-by: Vincent Potucek --- .../KeycloakDependencyProcessorWildFly.java | 7 --- .../common/util/reflections/Reflections.java | 4 -- .../CertificateReloadManager.java | 5 --- .../cache/infinispan/RealmCacheSession.java | 5 --- .../authorization/attribute/Attributes.java | 4 -- .../oid4vc/issuance/OID4VCIssuerEndpoint.java | 9 ---- .../EntityDescriptorDescriptionConverter.java | 16 ------- .../services/resources/RealmsResource.java | 4 -- .../policy/impl/HostsTest.java | 44 ------------------- .../keycloak/tests/admin/ConsentsTest.java | 8 ---- .../tests/admin/event/LoginEventsTest.java | 8 ---- .../partialexport/PartialExportTest.java | 6 --- .../BackwardsCompatibilityUserStorage.java | 6 --- .../keycloak/testsuite/util/ServerURLs.java | 8 ---- .../arquillian/AuthServerTestEnricher.java | 13 ------ .../InfinispanServerDeployableContainer.java | 8 ---- .../testsuite/pages/LoginTotpPage.java | 11 ----- .../admin/AggregatePolicyManagementTest.java | 22 ---------- .../ClientRegistrationPoliciesTest.java | 4 -- .../client/OIDCClientRegistrationTest.java | 4 -- .../events/EventMetricsProviderTest.java | 9 ---- .../testsuite/forms/BruteForceTest.java | 4 -- .../StandardTokenExchangeV2Test.java | 6 --- .../signing/OID4VCIssuerEndpointTest.java | 6 --- .../testsuite/oidc/AcrAuthFlowTest.java | 9 ---- .../model/parameters/RemoteInfinispan.java | 4 -- .../testsuite/model/role/RoleModelTest.java | 4 -- .../util/cli/ClusterProviderTaskCommand.java | 5 --- 28 files changed, 243 deletions(-) diff --git a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakDependencyProcessorWildFly.java b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakDependencyProcessorWildFly.java index 87d54e31f483..a21d454e37c0 100755 --- a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakDependencyProcessorWildFly.java +++ b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakDependencyProcessorWildFly.java @@ -22,7 +22,6 @@ import org.jboss.as.server.deployment.DeploymentPhaseContext; import org.jboss.as.server.deployment.module.ModuleDependency; import org.jboss.as.server.deployment.module.ModuleSpecification; -import org.jboss.modules.ModuleClassLoader; import org.jboss.modules.ModuleLoader; /** @@ -47,10 +46,4 @@ protected void addPlatformSpecificModules(DeploymentPhaseContext phaseContext, M throw new RuntimeException("Legacy WildFly security layer is no longer supported by the Keycloak WildFly adapter"); } } - - private boolean isJakarta() { - ClassLoader classLoader = getClass().getClassLoader(); - String classLoaderName = (classLoader instanceof ModuleClassLoader ? ((ModuleClassLoader) classLoader).getName() : ""); - return classLoaderName.contains("jakarta"); - } } diff --git a/common/src/main/java/org/keycloak/common/util/reflections/Reflections.java b/common/src/main/java/org/keycloak/common/util/reflections/Reflections.java index 66b9cac562dc..8220d4e6facd 100644 --- a/common/src/main/java/org/keycloak/common/util/reflections/Reflections.java +++ b/common/src/main/java/org/keycloak/common/util/reflections/Reflections.java @@ -423,10 +423,6 @@ public static A unsetAccessible(A member) { return member; } - private static String buildSetFieldValueErrorMessage(Field field, Object obj, Object value) { - return String.format("Exception setting [%s] field on object [%s] to value [%s]", field.getName(), obj, value); - } - private static String buildGetFieldValueErrorMessage(Field field, Object obj) { return String.format("Exception reading [%s] field from object [%s].", field.getName(), obj); } diff --git a/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/CertificateReloadManager.java b/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/CertificateReloadManager.java index c3f7d9c1f5c3..71c491700c7e 100644 --- a/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/CertificateReloadManager.java +++ b/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/CertificateReloadManager.java @@ -183,11 +183,6 @@ private void bootReload() { } } - private void onInvalidCertificate() { - logger.info("On certificate exception"); - blockingManager.runBlocking(this::reloadCertificate, "invalid-certificate"); - } - private void onCertificateReloadResponse(Address address, Void unused, Throwable throwable) { if (throwable != null) { logger.warnf(throwable, "Node %s failed to handle JGroups certificate reload notification.", address); diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmCacheSession.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmCacheSession.java index d5f4342cf0cb..bc36e8699180 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmCacheSession.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmCacheSession.java @@ -1092,11 +1092,6 @@ public Stream getTopLevelGroupsStream(RealmModel realm, String searc return getGroupDelegate().getTopLevelGroupsStream(realm, search, exact, first, max); } - private boolean hasInvalidation(RealmModel realm, String cacheKey) { - return invalidations.contains(cacheKey) || listInvalidations.contains(cacheKey) - || listInvalidations.contains(realm.getId()); - } - @Override public Stream searchForGroupByNameStream(RealmModel realm, String search, Integer first, Integer max) { return getGroupDelegate().searchForGroupByNameStream(realm, search, false, first, max); diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/attribute/Attributes.java b/server-spi-private/src/main/java/org/keycloak/authorization/attribute/Attributes.java index 3e86a6985c22..def1f8e84d32 100644 --- a/server-spi-private/src/main/java/org/keycloak/authorization/attribute/Attributes.java +++ b/server-spi-private/src/main/java/org/keycloak/authorization/attribute/Attributes.java @@ -99,10 +99,6 @@ public Entry(String name, Collection values) { this.values = values.toArray(new String[values.size()]); } - private String getName() { - return this.name; - } - public int size() { return values.length; } diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCIssuerEndpoint.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCIssuerEndpoint.java index 899dbc6b2ae6..3d22920b1232 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCIssuerEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCIssuerEndpoint.java @@ -990,15 +990,6 @@ private AuthenticationManager.AuthResult getAuthResult() { return authResult; } - // get the auth result from the authentication manager - private AuthenticationManager.AuthResult getAuthResult(WebApplicationException errorResponse) { - AuthenticationManager.AuthResult authResult = bearerTokenAuthenticator.authenticate(); - if (authResult == null) { - throw errorResponse; - } - return authResult; - } - /** * Get a signed credential * diff --git a/services/src/main/java/org/keycloak/protocol/saml/EntityDescriptorDescriptionConverter.java b/services/src/main/java/org/keycloak/protocol/saml/EntityDescriptorDescriptionConverter.java index 7f3ffa3db8e5..742fbbdcac6a 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/EntityDescriptorDescriptionConverter.java +++ b/services/src/main/java/org/keycloak/protocol/saml/EntityDescriptorDescriptionConverter.java @@ -108,22 +108,6 @@ public static String getServiceURL(SPSSODescriptorType sp, String bindingURI) { return null; } - /** - * Gets from a SPSSO descriptor the artifact resolution service for a given index - * @param sp an SPSSO descriptor - * @param index the index of the artifact resolution service to return - * @return the location of the artifact resolution service - */ - private static String getArtifactResolutionService(SPSSODescriptorType sp, int index) { - List endpoints = sp.getArtifactResolutionService(); - for (IndexedEndpointType endpoint : endpoints) { - if (endpoint.getIndex() == index) { - return endpoint.getLocation().toString(); - } - } - return null; - } - /** * Tries to get from a SPSSO descriptor the default artifact resolution service. Or if it doesn't * exist, the artifact resolution service with the lowest index diff --git a/services/src/main/java/org/keycloak/services/resources/RealmsResource.java b/services/src/main/java/org/keycloak/services/resources/RealmsResource.java index b4b594e2bd26..704a837a6520 100755 --- a/services/src/main/java/org/keycloak/services/resources/RealmsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/RealmsResource.java @@ -289,10 +289,6 @@ public Object resolveRealmExtension(@PathParam("realm") String realmName, @PathP throw new NotFoundException(); } - private void checkSsl(RealmModel realm) { - checkSsl(session, realm); - } - private static void checkSsl(KeycloakSession session, RealmModel realm) { if (!"https".equals(session.getContext().getUri().getBaseUri().getScheme()) && realm.getSslRequired().isRequired(session.getContext().getConnection())) { diff --git a/services/src/test/java/org/keycloak/services/clientregistration/policy/impl/HostsTest.java b/services/src/test/java/org/keycloak/services/clientregistration/policy/impl/HostsTest.java index 98699f7a3bfa..e4b677b50aa7 100644 --- a/services/src/test/java/org/keycloak/services/clientregistration/policy/impl/HostsTest.java +++ b/services/src/test/java/org/keycloak/services/clientregistration/policy/impl/HostsTest.java @@ -41,35 +41,6 @@ public static void main(String[] args) throws Exception { } } - // 2 ms - private static Foo test1() throws Exception { - Foo f = new Foo(); - InetAddress addr = InetAddress.getByName("10.40.2.225"); - f.ipAddr = addr.getHostAddress(); - f.hostname = ""; - return f; - } - - // 231 ms - increasing linearly - private static Foo test2() throws Exception { - Foo f = new Foo(); - InetAddress addr = InetAddress.getByName("10.40.2.225"); - f.ipAddr = addr.getHostAddress(); - f.hostname = addr.getHostName(); - return f; - } - - // 240 ms - increasing linearly - private static Foo test3() throws Exception { - Foo f = new Foo(); - InetAddress addr = InetAddress.getByName("10.40.2.225"); - f.ipAddr = addr.getHostAddress(); - for (int i=0 ; i<10 ; i++) { - f.hostname = addr.getHostName(); - } - return f; - } - // 27 ms (Everything at 1st call) private static Foo test4() throws Exception { Foo f = new Foo(); @@ -79,21 +50,6 @@ private static Foo test4() throws Exception { return f; } - // 257 ms - increasing - private static Foo test5() throws Exception { - Foo f = new Foo(); - InetAddress addr = InetAddress.getByName("77.75.77.53"); - f.ipAddr = addr.getHostAddress(); - f.hostname = addr.getHostName(); - return f; - } - - // Test DNS caching - private static Foo test6() throws Exception { - Thread.sleep(1000); - return test4(); - } - private static class Foo { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/ConsentsTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/ConsentsTest.java index 42579078e7b6..6b56e006f1c3 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/ConsentsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/ConsentsTest.java @@ -401,14 +401,6 @@ private static IdentityProviderRepresentation createIdentityProvider(String alia return identityProviderRepresentation; } - private boolean isUUID(String uuid) { - return 36 == uuid.length() - && uuid.charAt(8) == '-' - && uuid.charAt(13) == '-' - && uuid.charAt(18) == '-' - && uuid.charAt(23) == '-'; - } - private static class UserRealmUserConf implements UserConfig { @Override diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/event/LoginEventsTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/event/LoginEventsTest.java index a1a06294694b..435e8ece8b48 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/event/LoginEventsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/event/LoginEventsTest.java @@ -73,14 +73,6 @@ private void badLogin() { oAuthClient.doLogin("bad", "user"); } - private void pause(int seconds) { - try { - Thread.sleep(seconds * 1000L); - } catch (InterruptedException e) { - Assertions.fail(e.getMessage()); - } - } - @Test public void eventAttributesTest() { badLogin(); diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/partialexport/PartialExportTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/partialexport/PartialExportTest.java index 54d5a4618be1..5519eec76d7c 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/partialexport/PartialExportTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/partialexport/PartialExportTest.java @@ -321,12 +321,6 @@ private void compileGroups(Set found, GroupRepresentation g) { } } } - private void checkDefaultRoles(List defaultRoles) { - HashSet roles = new HashSet<>(defaultRoles); - Assert.assertTrue(roles.contains("uma_authorization"), "Default role 'uma_authorization'"); - Assert.assertTrue(roles.contains("offline_access"), "Default role 'offline_access'"); - Assert.assertTrue(roles.contains("user"), "Default role 'user'"); - } private static T loadJson(InputStream is, Class type) { try { diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/BackwardsCompatibilityUserStorage.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/BackwardsCompatibilityUserStorage.java index 84625c75a367..023fd235cee5 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/BackwardsCompatibilityUserStorage.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/BackwardsCompatibilityUserStorage.java @@ -452,10 +452,4 @@ private void assertNotNull(Object obj) { } } - private void assertEquals(Object obj1, Object obj2) { - if (!(obj1.equals(obj2))) { - throw new AssertionError("Objects not equals"); - } - } - } diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/util/ServerURLs.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/util/ServerURLs.java index 10a9ff5f9d49..99a83e875257 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/util/ServerURLs.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/util/ServerURLs.java @@ -53,12 +53,4 @@ public static String getAppServerContextRoot(int clusterPortOffset) { public static String removeDefaultPorts(String url) { return url != null ? url.replaceFirst("(.*)(:80)(\\/.*)?$", "$1$3").replaceFirst("(.*)(:443)(\\/.*)?$", "$1$3") : null; } - - private static int parsePort(String property) { - try { - return parseInt(System.getProperty(property)); - } catch (NumberFormatException ex) { - throw new RuntimeException("Failed to get " + property, ex); - } - } } diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java index a281b194a23b..ad9f17841968 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java @@ -391,19 +391,6 @@ private boolean handleManualMigration() { private static final Pattern RECOGNIZED_ERRORS = Pattern.compile("ERROR \\[|SEVERE \\[|Exception "); private static final Pattern IGNORED = Pattern.compile("Jetty ALPN support not found|org.keycloak.events"); - private static final boolean isRecognizedErrorLog(String logText) { - //There is expected string "Exception" in server log: Adding provider - //singleton org.keycloak.services.resources.ModelExceptionMapper - return RECOGNIZED_ERRORS.matcher(logText).find() && ! IGNORED.matcher(logText).find(); - } - - private static final void failOnRecognizedErrorInLog(Stream logStream) { - Optional anyRecognizedError = logStream.filter(AuthServerTestEnricher::isRecognizedErrorLog).findAny(); - if (anyRecognizedError.isPresent()) { - throw new RuntimeException(String.format("Server log file contains ERROR: '%s'", anyRecognizedError.get())); - } - } - public void checkServerLogs(@Observes(precedence = -1) BeforeSuite event) { suiteContext.setServerLogChecker(new TextFileChecker()); } diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/InfinispanServerDeployableContainer.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/InfinispanServerDeployableContainer.java index 87470c15d763..1d6ab281cc00 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/InfinispanServerDeployableContainer.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/InfinispanServerDeployableContainer.java @@ -21,7 +21,6 @@ import java.net.ConnectException; import java.net.HttpURLConnection; import java.net.URL; -import java.nio.file.Files; import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; @@ -198,13 +197,6 @@ public void stop() throws LifecycleException { log.info("Infinispan server stopped"); } - private long getPID() throws IOException { - if (pidFile == null) { - throw new IllegalStateException(String.format("Unable to find PID file '%s'", pidFile)); - } - return Long.parseLong(Files.readAllLines(pidFile.toPath()).get(0).trim()); - } - /** * Attach to a local Infinispan JVM, launch a management-agent, and return * its JMXServiceURL. diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginTotpPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginTotpPage.java index 6593ad24dcd4..349e95aff40c 100755 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginTotpPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginTotpPage.java @@ -20,7 +20,6 @@ import java.util.stream.Collectors; import org.junit.Assert; -import org.keycloak.common.util.Retry; import org.keycloak.testsuite.util.UIUtils; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; @@ -132,14 +131,4 @@ public void selectOtpCredential(String credentialName) { UIUtils.click(webElement); } - - // Workaround, but works with HtmlUnit (WaitUtils.waitForElement doesn't). Find better solution for the future... - private void waitForElement(By by) { - Retry.executeWithBackoff((currentCount) -> { - - driver.findElement(by); - - }, 10, 10); - } - } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AggregatePolicyManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AggregatePolicyManagementTest.java index 1a1163c614d4..8131ff952812 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AggregatePolicyManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AggregatePolicyManagementTest.java @@ -28,8 +28,6 @@ import org.keycloak.admin.client.resource.AggregatePoliciesResource; import org.keycloak.admin.client.resource.AggregatePolicyResource; import org.keycloak.admin.client.resource.AuthorizationResource; -import org.keycloak.admin.client.resource.UserPoliciesResource; -import org.keycloak.admin.client.resource.UserPolicyResource; import org.keycloak.admin.client.resource.UsersResource; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.idm.authorization.AggregatePolicyRepresentation; @@ -168,29 +166,9 @@ private void assertCreated(AuthorizationResource authorization, AggregatePolicyR } } - private void assertCreated(AuthorizationResource authorization, UserPolicyRepresentation representation) { - UserPoliciesResource permissions = authorization.policies().user(); - - try (Response response = permissions.create(representation)) { - UserPolicyRepresentation created = response.readEntity(UserPolicyRepresentation.class); - UserPolicyResource permission = permissions.findById(created.getId()); - assertRepresentation(representation, permission); - } - } - private void assertRepresentation(AggregatePolicyRepresentation representation, AggregatePolicyResource policy) { AggregatePolicyRepresentation actual = policy.toRepresentation(); assertRepresentation(representation, actual, () -> policy.resources(), () -> Collections.emptyList(), () -> policy.associatedPolicies()); } - private void assertRepresentation(UserPolicyRepresentation representation, UserPolicyResource permission) { - UserPolicyRepresentation actual = permission.toRepresentation(); - assertRepresentation(representation, actual, () -> permission.resources(), () -> Collections.emptyList(), () -> permission.associatedPolicies()); - assertEquals(representation.getUsers().size(), actual.getUsers().size()); - assertEquals(0, actual.getUsers().stream().filter(userId -> !representation.getUsers().stream() - .filter(userName -> getRealm().users().get(userId).toRepresentation().getUsername().equalsIgnoreCase(userName)) - .findFirst().isPresent()) - .count()); - } - } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationPoliciesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationPoliciesTest.java index da0774355411..80778f0f94dd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationPoliciesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationPoliciesTest.java @@ -127,10 +127,6 @@ public OIDCClientRepresentation create() throws ClientRegistrationException { return response; } - private void assertOidcFail(ClientRegOp operation, OIDCClientRepresentation client, int expectedStatusCode) { - assertOidcFail(operation, client, expectedStatusCode, null); - } - private void assertOidcFail(ClientRegOp operation, OIDCClientRepresentation client, int expectedStatusCode, String expectedErrorContains) { try { switch (operation) { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCClientRegistrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCClientRegistrationTest.java index 3777e8695bf5..acae99faef10 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCClientRegistrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCClientRegistrationTest.java @@ -101,10 +101,6 @@ public OIDCClientRepresentation create() throws ClientRegistrationException { return response; } - private void assertCreateFail(OIDCClientRepresentation client, int expectedStatusCode) { - assertCreateFail(client, expectedStatusCode, null); - } - private void assertCreateFail(OIDCClientRepresentation client, int expectedStatusCode, String expectedErrorContains) { try { reg.oidc().create(client); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/EventMetricsProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/EventMetricsProviderTest.java index 959114a3c7c8..e938dacb912e 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/EventMetricsProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/EventMetricsProviderTest.java @@ -78,15 +78,6 @@ private void enableEventMetricsOptions(String tags, String events) { } } - private static void setConfigProperty(String name, String value) { - if (value != null) { - System.setProperty(name, value); - } - else { - System.clearProperty(name); - } - } - @Override public void addTestRealms(List testRealms) { RealmBuilder realm = RealmBuilder.create().name(TEST); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BruteForceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BruteForceTest.java index 216f748c129a..eda3213e25cc 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BruteForceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BruteForceTest.java @@ -1264,10 +1264,6 @@ private void assertUserDisabledEvent(String error) { events.expect(EventType.LOGIN_ERROR).error(error).assertEvent(); } - private void assertUserPermanentlyDisabledEvent() { - events.expect(EventType.LOGIN_ERROR).error(Errors.USER_DISABLED).assertEvent(); - } - private void assertUserDisabledReason(String expected) { String actual = adminClient.realm("test").users() .search("test-user@localhost", 0, 1) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV2Test.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV2Test.java index 35c39f7f3cb1..29b11927deab 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV2Test.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV2Test.java @@ -1233,12 +1233,6 @@ private void isAccessTokenDisabled(String accessTokenString, String clientId, St assertFalse(rep.isActive()); } - private void isTokenEnabled(AccessTokenResponse tokenResponse, String clientId, String secret) throws IOException { - isAccessTokenEnabled(tokenResponse.getAccessToken(), clientId, secret); - AccessTokenResponse tokenRefreshResponse = oauth.doRefreshTokenRequest(tokenResponse.getRefreshToken()); - assertEquals(Response.Status.OK.getStatusCode(), tokenRefreshResponse.getStatusCode()); - } - private void isTokenDisabled(AccessTokenResponse tokenResponse, String clientId, String secret) throws IOException { isAccessTokenDisabled(tokenResponse.getAccessToken(), clientId, secret); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointTest.java index 9216b465459f..bdf78e808d02 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointTest.java @@ -37,7 +37,6 @@ import org.keycloak.TokenVerifier; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.RealmResource; -import org.keycloak.admin.client.resource.UserResource; import org.keycloak.common.VerificationException; import org.keycloak.common.crypto.CryptoIntegration; import org.keycloak.common.util.Base64Url; @@ -342,11 +341,6 @@ private void assignOptionalClientScopeToClient(String scopeId, String clientId) clientResource.addOptionalClientScope(scopeId); } - private void logoutUser(String clientId, String username) { - UserResource user = ApiUtil.findUserByUsernameId(adminClient.realm(TEST_REALM_NAME), username); - user.logout(); - } - public static JWK generateRsaJwk() throws NoSuchAlgorithmException { KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA"); keyGen.initialize(2048); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AcrAuthFlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AcrAuthFlowTest.java index 5891b2dda5e4..e66c0894fdb1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AcrAuthFlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AcrAuthFlowTest.java @@ -427,15 +427,6 @@ private void loginWithAcr(List acrValues, boolean essential){ oauth.loginForm().claims(claims).open(); } - /** - * Helper function to fetch the authentication flow ID based on the alias - * @param alias The alias to search for - * @return The flow ID - */ - private String findFlowByAlias(String alias){ - return testRealm().flows().getFlows().stream().filter(f -> f.getAlias().equals(alias)).findFirst().orElseThrow().getId(); - } - /** * Helper function to log out the specified user diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/RemoteInfinispan.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/RemoteInfinispan.java index 376563ff9ebd..b17c9d9bc448 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/RemoteInfinispan.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/RemoteInfinispan.java @@ -98,10 +98,6 @@ private static String siteName(int node) { return "site-" + (node % 2 == 0 ? 2 : 1); } - private static String mcastAddr(int node) { - return (node % 2 == 0) ? SITE_2_MCAST_ADDR : SITE_1_MCAST_ADDR; - } - @Override public Stream getParameters(Class clazz) { if (HotRodServerRule.class.isAssignableFrom(clazz)) { diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/role/RoleModelTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/role/RoleModelTest.java index 3f2a2c8fa397..59e101d8db00 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/role/RoleModelTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/role/RoleModelTest.java @@ -101,10 +101,6 @@ private List getResult(String search, Integer first, Integer max) { return withRealm(realmId, (session, realm) -> session.roles().getRolesStream(realm, rolesSubset.stream(), search, first, max).collect(Collectors.toList())); } - private RoleModel getMainRole() { - return withRealm(realmId, (session, realm) -> session.roles().getRoleById(realm, mainRoleId)); - } - private List getModelResult(String search, Integer first, Integer max) { return withRealm(realmId, ((session, realm) -> session.roles().getRoleById(realm, mainRoleId).getCompositesStream(search, first, max).collect(Collectors.toList()))); } diff --git a/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/ClusterProviderTaskCommand.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/ClusterProviderTaskCommand.java index 1b29be61407b..596e05cb4112 100644 --- a/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/ClusterProviderTaskCommand.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/ClusterProviderTaskCommand.java @@ -18,7 +18,6 @@ package org.keycloak.testsuite.util.cli; import org.keycloak.cluster.ClusterProvider; -import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.models.KeycloakSession; import java.util.concurrent.ExecutorService; @@ -58,10 +57,6 @@ protected void doRunCommand(KeycloakSession session) { }); } - private void updateConfig(MultivaluedHashMap cfg, int waitTime) { - cfg.putSingle("wait-time", String.valueOf(waitTime)); - } - @Override public String getName() {