KEYCLOAK-15184: Use static inner class where possible

keycloak · Oct 9, 2020 · 269a72d · 269a72d
1 parent 6e713b5
commit 269a72d
Show file tree

Hide file tree

Showing 38 changed files with 41 additions and 41 deletions.
diff --git a/...s/oidc/adapter-core/src/main/java/org/keycloak/adapters/authorization/PolicyEnforcer.java b/...s/oidc/adapter-core/src/main/java/org/keycloak/adapters/authorization/PolicyEnforcer.java
@@ -232,7 +232,7 @@ private Map<String, PathConfig> configureAllPathsForResourceServer(ProtectedReso
         return paths;
     }
 
-    public class PathConfigMatcher extends PathMatcher<PathConfig> {
+    public static class PathConfigMatcher extends PathMatcher<PathConfig> {
 
         private final Map<String, PathConfig> paths;
         private final PathCache pathCache;

diff --git a/...re/src/main/java/org/keycloak/adapters/jetty/core/AbstractKeycloakJettyAuthenticator.java b/...re/src/main/java/org/keycloak/adapters/jetty/core/AbstractKeycloakJettyAuthenticator.java
@@ -136,7 +136,7 @@ public static UserIdentity createIdentity(KeycloakPrincipal<RefreshableKeycloakS
         return new DefaultUserIdentity(theSubject, principal, theRoles);
     }
 
-    private class DummyLoginService implements LoginService {
+    private static class DummyLoginService implements LoginService {
         @Override
         public String getName() {
             return null;

diff --git a/.../jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/AbstractSamlAuthenticator.java b/.../jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/AbstractSamlAuthenticator.java
@@ -149,7 +149,7 @@ protected void forwardToLogoutPage(Request request, HttpServletResponse response
 
     }
 
-    private class DummyLoginService implements LoginService {
+    private static class DummyLoginService implements LoginService {
         @Override
         public String getName() {
             return null;

diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPIdentityStoreRegistry.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPIdentityStoreRegistry.java
@@ -104,7 +104,7 @@ private static void checkSystemProperty(String name, String cfgValue, String def
     }
 
 
-    private class LDAPIdentityStoreContext {
+    private static class LDAPIdentityStoreContext {
 
         private LDAPIdentityStoreContext(LDAPConfig config, LDAPIdentityStore store) {
             this.config = config;

diff --git a/...src/main/java/org/keycloak/keys/infinispan/InfinispanPublicKeyStorageProviderFactory.java b/...src/main/java/org/keycloak/keys/infinispan/InfinispanPublicKeyStorageProviderFactory.java
@@ -146,7 +146,7 @@ private SessionAndKeyHolder getCacheKeyToInvalidate(ProviderEvent event) {
         }
     }
 
-    private class SessionAndKeyHolder {
+    private static class SessionAndKeyHolder {
         private final KeycloakSession session;
         private final ArrayList<String> cacheKeys;
 

diff --git a/...n/java/org/keycloak/models/sessions/infinispan/events/SessionEventsSenderTransaction.java b/...n/java/org/keycloak/models/sessions/infinispan/events/SessionEventsSenderTransaction.java
@@ -61,7 +61,7 @@ protected void rollbackImpl() {
     }
 
 
-    private class DCEventContext {
+    private static class DCEventContext {
         private final ClusterProvider.DCNotify dcNotify;
         private final SessionClusterEvent event;
 

diff --git a/...src/main/java/org/keycloak/models/sessions/infinispan/remotestore/RemoteCacheInvoker.java b/...src/main/java/org/keycloak/models/sessions/infinispan/remotestore/RemoteCacheInvoker.java
@@ -179,7 +179,7 @@ private String logTopologyData(TopologyInfo topology, int iteration) {
     }
 
 
-    private class RemoteCacheContext {
+    private static class RemoteCacheContext {
 
         private final RemoteCache remoteCache;
         private final MaxIdleTimeLoader maxIdleTimeLoader;

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AuthnContextType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AuthnContextType.java
@@ -160,7 +160,7 @@ public void removeURIType(URIType aa) {
      * ref="saml:AuthnContextDecl"/>
      * <element ref="saml:AuthnContextDeclRef"/> </choice> </sequence>
      */
-    public class AuthnContextTypeSequence implements Serializable {
+    public static class AuthnContextTypeSequence implements Serializable {
 
         private AuthnContextClassRefType classRef;
 

diff --git a/saml-core/src/main/java/org/keycloak/rotation/CompositeKeyLocator.java b/saml-core/src/main/java/org/keycloak/rotation/CompositeKeyLocator.java
@@ -110,7 +110,7 @@ private Iterable<Iterable<Key>> getKeyLocatorIterators() {
         return Collections.unmodifiableCollection(res);
     }
 
-    private class JointKeyIterator implements Iterable<Key> {
+    private static class JointKeyIterator implements Iterable<Key> {
 
         // based on http://stackoverflow.com/a/34126154/6930869
         private final Iterator<Iterable<Key>> iterablesIterator;

diff --git a/saml-core/src/main/java/org/keycloak/saml/common/util/TransformerUtil.java b/saml-core/src/main/java/org/keycloak/saml/common/util/TransformerUtil.java
@@ -435,7 +435,7 @@ private String containsBaseNamespace(StartElement startElement) {
             return null;
         }
 
-        private class CustomHolder {
+        private static class CustomHolder {
             public Document doc;
 
             public boolean encounteredTextNode = false;

diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/api/saml/v2/response/SAML2Response.java b/saml-core/src/main/java/org/keycloak/saml/processing/api/saml/v2/response/SAML2Response.java
@@ -117,7 +117,7 @@ public AuthnStatementType createAuthnStatement(String authnContextDeclRef, XMLGr
         String authContextDeclRef = JBossSAMLURIConstants.AC_PASSWORD_PROTECTED_TRANSPORT.get();
         act.addAuthenticatingAuthority(URI.create(authContextDeclRef));
 
-        AuthnContextType.AuthnContextTypeSequence sequence = act.new AuthnContextTypeSequence();
+        AuthnContextType.AuthnContextTypeSequence sequence = new AuthnContextType.AuthnContextTypeSequence();
         sequence.setClassRef(new AuthnContextClassRefType(JBossSAMLURIConstants.AC_PASSWORD.getUri()));
         act.setSequence(sequence);
 

diff --git a/...java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAuthnContextParser.java b/...java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAuthnContextParser.java
@@ -58,7 +58,7 @@ protected void processSubElement(XMLEventReader xmlEventReader, AuthnContextType
             case AUTHN_CONTEXT_DECL:
                 Element dom = StaxParserUtil.getDOMElement(xmlEventReader);
                 AuthnContextDeclType authnContextDecl = new AuthnContextDeclType(dom);
-                authnContextSequence = target.getSequence() != null ? target.getSequence() : target.new AuthnContextTypeSequence();
+                authnContextSequence = target.getSequence() != null ? target.getSequence() : new AuthnContextType.AuthnContextTypeSequence();
                 authnContextSequence.setAuthnContextDecl(authnContextDecl);
                 target.setSequence(authnContextSequence);
                 break;
@@ -75,7 +75,7 @@ protected void processSubElement(XMLEventReader xmlEventReader, AuthnContextType
                 text = StaxParserUtil.getElementText(xmlEventReader);
                 AuthnContextClassRefType authnContextClassRef = new AuthnContextClassRefType(URI.create(text));
 
-                authnContextSequence = target.getSequence() != null ? target.getSequence() : target.new AuthnContextTypeSequence();
+                authnContextSequence = target.getSequence() != null ? target.getSequence() : new AuthnContextType.AuthnContextTypeSequence();
                 authnContextSequence.setClassRef(authnContextClassRef);
 
                 target.setSequence(authnContextSequence);

diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/StatementUtil.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/StatementUtil.java
@@ -64,7 +64,7 @@ public static AuthnStatementType createAuthnStatement(XMLGregorianCalendar insta
         AuthnContextType authnContext = new AuthnContextType();
         AuthnContextClassRefType authnContextClassRef = new AuthnContextClassRefType(URI.create(authnContextClassRefValue));
 
-        AuthnContextType.AuthnContextTypeSequence sequence = (authnContext).new AuthnContextTypeSequence();
+        AuthnContextType.AuthnContextTypeSequence sequence = new AuthnContextType.AuthnContextTypeSequence();
         sequence.setClassRef(authnContextClassRef);
         authnContext.setSequence(sequence);
 

diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/TimeBasedOTP.java b/server-spi-private/src/main/java/org/keycloak/models/utils/TimeBasedOTP.java
@@ -97,7 +97,7 @@ public void setCalendar(Calendar calendar) {
         this.clock.setCalendar(calendar);
     }
 
-    private class Clock {
+    private static class Clock {
 
         private final int interval;
         private Calendar calendar;

diff --git a/services/src/main/java/org/keycloak/authorization/admin/PolicyEvaluationService.java b/services/src/main/java/org/keycloak/authorization/admin/PolicyEvaluationService.java
@@ -308,7 +308,7 @@ private CloseableKeycloakIdentity createIdentity(PolicyEvaluationRequest represe
         return new CloseableKeycloakIdentity(accessToken, keycloakSession, userSession);
     }
 
-    public class EvaluationDecisionCollector extends DecisionPermissionCollector {
+    public static class EvaluationDecisionCollector extends DecisionPermissionCollector {
 
         public EvaluationDecisionCollector(AuthorizationProvider authorizationProvider, ResourceServer resourceServer, AuthorizationRequest request) {
             super(authorizationProvider, resourceServer, request);

diff --git a/.../main/java/org/keycloak/authorization/protection/introspect/RPTIntrospectionProvider.java b/.../main/java/org/keycloak/authorization/protection/introspect/RPTIntrospectionProvider.java
@@ -102,8 +102,8 @@ public void close() {
 
     //todo: we need to avoid creating this class when processing responses. The only reason for that is that
     // UMA defines "resource_id" and "resource_scopes" claims but we use "rsid" and "scopes".
-    // To avoid breaking backward compatiblity we are just responding with all these claims.
-    public class UmaPermissionRepresentation extends Permission {
+    // To avoid breaking backward compatibility we are just responding with all these claims.
+    public static class UmaPermissionRepresentation extends Permission {
 
         public UmaPermissionRepresentation(Permission permission) {
             setResourceId(permission.getResourceId());

diff --git a/services/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProvider.java b/services/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProvider.java
@@ -270,7 +270,7 @@ protected String toCamelCase(EventType event) {
         return sb.toString();
     }
 
-    protected class EmailTemplate {
+    protected static class EmailTemplate {
 
         private String subject;
         private String textBody;

diff --git a/...c/main/java/org/keycloak/forms/account/freemarker/model/AccountFederatedIdentityBean.java b/...c/main/java/org/keycloak/forms/account/freemarker/model/AccountFederatedIdentityBean.java
@@ -93,7 +93,7 @@ public boolean isRemoveLinkPossible() {
         return removeLinkPossible;
     }
 
-    public class FederatedIdentityEntry implements OrderedModel {
+    public static class FederatedIdentityEntry implements OrderedModel {
 
         private FederatedIdentityModel federatedIdentityModel;
         private final String providerId;

diff --git a/services/src/main/java/org/keycloak/keys/DefaultKeyManager.java b/services/src/main/java/org/keycloak/keys/DefaultKeyManager.java
@@ -268,7 +268,7 @@ private List<KeyProvider> getProviders(RealmModel realm) {
         return providers;
     }
 
-    private class ProviderComparator implements Comparator<ComponentModel> {
+    private static class ProviderComparator implements Comparator<ComponentModel> {
 
         @Override
         public int compare(ComponentModel o1, ComponentModel o2) {

diff --git a/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java b/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java
@@ -1025,7 +1025,7 @@ private String generateOIDCHash(String input) {
 
     }
 
-    public class RefreshResult {
+    public static class RefreshResult {
 
         private final AccessTokenResponse response;
         private final boolean offlineToken;

diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenEndpoint.java
@@ -1351,7 +1351,7 @@ private String generateS256CodeChallenge(String codeVerifier) throws Exception {
         return codeVerifierEncoded;
     }
 
-    private class TokenExchangeSamlProtocol extends SamlProtocol {
+    private static class TokenExchangeSamlProtocol extends SamlProtocol {
         final SamlClient samlClient;
 
         TokenExchangeSamlProtocol(SamlClient samlClient) {

diff --git a/services/src/main/java/org/keycloak/services/managers/UserStorageSyncManager.java b/services/src/main/java/org/keycloak/services/managers/UserStorageSyncManager.java
@@ -75,7 +75,7 @@ public void run(KeycloakSession session) {
         });
     }
 
-    private class Holder {
+    private static class Holder {
         ExecutionResult<SynchronizationResult> result;
     }
 

diff --git a/services/src/main/java/org/keycloak/theme/FreeMarkerUtil.java b/services/src/main/java/org/keycloak/theme/FreeMarkerUtil.java
@@ -85,7 +85,7 @@ private Template getTemplate(String templateName, Theme theme) throws IOExceptio
         return cfg.getTemplate(templateName, "UTF-8");
     }
 
-    class ThemeTemplateLoader extends URLTemplateLoader {
+    static class ThemeTemplateLoader extends URLTemplateLoader {
 
         private Theme theme;
 

diff --git a/services/src/main/java/org/keycloak/truststore/FileTruststoreProviderFactory.java b/services/src/main/java/org/keycloak/truststore/FileTruststoreProviderFactory.java
@@ -127,7 +127,7 @@ public String getId() {
 
 
 
-    private class TruststoreCertificatesLoader {
+    private static class TruststoreCertificatesLoader {
 
         private Map<X500Principal, X509Certificate> trustedRootCerts = new HashMap<>();
         private Map<X500Principal, X509Certificate> intermediateCerts = new HashMap<>();

diff --git a/services/src/main/java/org/keycloak/validation/DefaultClientValidationProvider.java b/services/src/main/java/org/keycloak/validation/DefaultClientValidationProvider.java
@@ -91,7 +91,7 @@ private void basicHttpUrlCheck(String field, String url) throws ValidationExcept
         }
     }
 
-    class ValidationException extends Exception {
+    static class ValidationException extends Exception {
 
         public ValidationException(String message) {
             super(message, null, false, false);

diff --git a/...oviders/src/main/java/org/keycloak/testsuite/authorization/TestPolicyProviderFactory.java b/...oviders/src/main/java/org/keycloak/testsuite/authorization/TestPolicyProviderFactory.java
@@ -89,7 +89,7 @@ public String getId() {
         return "test";
     }
 
-    private class TestPolicyProvider implements PolicyProvider {
+    private static class TestPolicyProvider implements PolicyProvider {
 
         private final AuthorizationProvider authorization;
 

diff --git a/...rs/src/main/java/org/keycloak/testsuite/federation/BackwardsCompatibilityUserStorage.java b/...rs/src/main/java/org/keycloak/testsuite/federation/BackwardsCompatibilityUserStorage.java
@@ -378,7 +378,7 @@ public void close() {
     }
 
 
-    class MyUser {
+    static class MyUser {
 
         private String username;
         private CredentialModel hashedPassword;

diff --git a/...c/main/java/org/keycloak/testsuite/arquillian/undertow/lb/SimpleUndertowLoadBalancer.java b/...c/main/java/org/keycloak/testsuite/arquillian/undertow/lb/SimpleUndertowLoadBalancer.java
@@ -315,7 +315,7 @@ private List<String> getCurrentHostRoutes() {
     private static final AttachmentKey<Integer> REMAINING_RETRY_ATTEMPTS = AttachmentKey.create(Integer.class);
 
 
-    private class ProxyCallbackDelegate implements ProxyCallback<ProxyConnection> {
+    private static class ProxyCallbackDelegate implements ProxyCallback<ProxyConnection> {
 
         private final ProxyClient proxyClient;
         private final ProxyCallback<ProxyConnection> delegate;

diff --git a/...uillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/TestClassProvider.java b/...uillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/TestClassProvider.java
@@ -43,7 +43,7 @@ public void stop() {
         server.stop();
     }
 
-    public class ClassPathResourceManager implements ResourceManager {
+    public static class ClassPathResourceManager implements ResourceManager {
 
         @Override
         public Resource getResource(String className) {

diff --git a/...arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/LoginForm.java b/...arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/LoginForm.java
@@ -157,7 +157,7 @@ public String getRememberMeLabel() {
         return getTextFromElement(rememberMeLabel);
     }
 
-    public class TotpSetupForm extends Form {
+    public static class TotpSetupForm extends Form {
         @FindBy(id = "totp")
         private WebElement totpInputField;
 

diff --git a/...llian/tests/base/src/main/java/org/keycloak/testsuite/console/page/AdminConsoleRealm.java b/...llian/tests/base/src/main/java/org/keycloak/testsuite/console/page/AdminConsoleRealm.java
@@ -62,7 +62,7 @@ public ConfigureMenu configure() {
 //        return realmsResource().realm(getConsoleRealm());
 //    }
 
-    public class ConfigureMenu {
+    public static class ConfigureMenu {
 
         @FindBy(partialLinkText = "Realm Settings")
         private WebElement realmSettingsLink;
@@ -111,7 +111,7 @@ public ManageMenu manage() {
         return manageMenu;
     }
 
-    public class ManageMenu {
+    public static class ManageMenu {
 
         @FindBy(partialLinkText = "Users")
         private WebElement usersLink;

diff --git a/...lian/tests/base/src/main/java/org/keycloak/testsuite/console/page/events/AdminEvents.java b/...lian/tests/base/src/main/java/org/keycloak/testsuite/console/page/events/AdminEvents.java
@@ -42,7 +42,7 @@ public AdminEventsTable table() {
         return table;
     }
 
-    public class AdminEventsTable extends DataTable {
+    public static class AdminEventsTable extends DataTable {
 
         @FindBy(xpath = "//button[text()[contains(.,'Filter')]]")
         private WebElement filterButton;

diff --git a/...rquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/events/Config.java b/...rquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/events/Config.java
@@ -45,7 +45,7 @@ public ConfigForm form() {
         return form;
     }
 
-    public class ConfigForm extends Form {
+    public static class ConfigForm extends Form {
         @FindBy(id = "s2id_autogen1")
         private WebElement eventListenersInput;
 

diff --git a/...lian/tests/base/src/main/java/org/keycloak/testsuite/console/page/events/LoginEvents.java b/...lian/tests/base/src/main/java/org/keycloak/testsuite/console/page/events/LoginEvents.java
@@ -42,7 +42,7 @@ public LoginEventsTable table() {
         return table;
     }
 
-    public class LoginEventsTable extends DataTable {
+    public static class LoginEventsTable extends DataTable {
 
         @FindBy(xpath = "//button[text()[contains(.,'Filter')]]")
         private WebElement filterButton;

diff --git a/.../tests/base/src/main/java/org/keycloak/testsuite/drone/KeycloakWebDriverConfigurator.java b/.../tests/base/src/main/java/org/keycloak/testsuite/drone/KeycloakWebDriverConfigurator.java
@@ -101,7 +101,7 @@ private void updateCapabilityKeys(String browser, WebDriverConfiguration webDriv
         }
     }
 
-    public class KcBrowserCapabilities implements BrowserCapabilities {
+    public static class KcBrowserCapabilities implements BrowserCapabilities {
         private Capabilities capabilitiesToAdd;
         private BrowserCapabilities origBrowserCapabilities;
 

diff --git a/testsuite/utils/src/main/java/org/keycloak/testsuite/KerberosEmbeddedServer.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/KerberosEmbeddedServer.java
@@ -263,7 +263,7 @@ private String getHostnameForSASLPrincipal(String hostName) {
      *
      * @author Dominik Pospisil <dpospisi@redhat.com>
      */
-    class NoReplayKdcServer extends KdcServer {
+    static class NoReplayKdcServer extends KdcServer {
 
         NoReplayKdcServer(KerberosConfig kdcConfig) {
             super(kdcConfig);

diff --git a/...te/utils/src/main/java/org/keycloak/testsuite/util/cli/LoadPersistentSessionsCommand.java b/...te/utils/src/main/java/org/keycloak/testsuite/util/cli/LoadPersistentSessionsCommand.java
@@ -100,7 +100,7 @@ public String printUsage() {
     }
 
 
-    private class MyWorker implements Runnable {
+    private static class MyWorker implements Runnable {
 
         private final int workerId;
         private final int lastCreatedOn;

diff --git a/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/RangedAttributeInterceptor.java b/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/RangedAttributeInterceptor.java
@@ -50,7 +50,7 @@
  */
 public class RangedAttributeInterceptor extends BaseInterceptor {
 
-    private class RangedEntryFilteringCursor implements EntryFilteringCursor {
+    private static class RangedEntryFilteringCursor implements EntryFilteringCursor {
 
         private final EntryFilteringCursor c;
         private final String name;
-Original file line number
+Diff line change
@@ Expand Up / @@ -75,7 +75,7 @@ public void run(KeycloakSession session) { @@
             });
         }
-        private class Holder {
+        private static class Holder {
             ExecutionResult<SynchronizationResult> result;
         }
@@ Expand Down @@