From 04cbea71d0394a5d005340c6fcf705ddf82b4bce Mon Sep 17 00:00:00 2001 From: Andrei Arlou Date: Sat, 23 Nov 2019 22:39:33 +0300 Subject: [PATCH] KEYCLOAK-12218 Remove redundant modificators from module "server-spi-private" --- .../provider/IdentityProviderMapper.java | 2 +- .../keycloak/email/EmailTemplateProvider.java | 18 ++++++++--------- .../events/EventListenerProvider.java | 4 ++-- .../java/org/keycloak/events/EventQuery.java | 20 +++++++++---------- .../keycloak/events/EventStoreProvider.java | 16 +++++++-------- .../models/dblock/DBLockProvider.java | 4 ++-- .../reflection/TypedPropertyCriteria.java | 2 +- .../org/keycloak/protocol/LoginProtocol.java | 2 +- .../ServerInfoAwareProviderFactory.java | 2 +- .../org/keycloak/timer/ScheduledTask.java | 2 +- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProviderMapper.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProviderMapper.java index 85c3497301..75a8da6b5a 100755 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProviderMapper.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProviderMapper.java @@ -30,7 +30,7 @@ import org.keycloak.provider.ProviderFactory; * @version $Revision: 1 $ */ public interface IdentityProviderMapper extends Provider, ProviderFactory,ConfiguredProvider { - public static final String ANY_PROVIDER = "*"; + String ANY_PROVIDER = "*"; String[] getCompatibleProviders(); String getDisplayCategory(); diff --git a/server-spi-private/src/main/java/org/keycloak/email/EmailTemplateProvider.java b/server-spi-private/src/main/java/org/keycloak/email/EmailTemplateProvider.java index 425ec523f9..fa8784bd6c 100755 --- a/server-spi-private/src/main/java/org/keycloak/email/EmailTemplateProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/email/EmailTemplateProvider.java @@ -33,15 +33,15 @@ public interface EmailTemplateProvider extends Provider { String IDENTITY_PROVIDER_BROKER_CONTEXT = "identityProviderBrokerCtx"; - public EmailTemplateProvider setAuthenticationSession(AuthenticationSessionModel authenticationSession); + EmailTemplateProvider setAuthenticationSession(AuthenticationSessionModel authenticationSession); - public EmailTemplateProvider setRealm(RealmModel realm); + EmailTemplateProvider setRealm(RealmModel realm); - public EmailTemplateProvider setUser(UserModel user); + EmailTemplateProvider setUser(UserModel user); - public EmailTemplateProvider setAttribute(String name, Object value); + EmailTemplateProvider setAttribute(String name, Object value); - public void sendEvent(Event event) throws EmailException; + void sendEvent(Event event) throws EmailException; /** * Reset password sent from forgot password link on login @@ -50,7 +50,7 @@ public interface EmailTemplateProvider extends Provider { * @param expirationInMinutes * @throws EmailException */ - public void sendPasswordReset(String link, long expirationInMinutes) throws EmailException; + void sendPasswordReset(String link, long expirationInMinutes) throws EmailException; /** * Test SMTP connection with current logged in user @@ -59,7 +59,7 @@ public interface EmailTemplateProvider extends Provider { * @param user SMTP recipient * @throws EmailException */ - public void sendSmtpTestEmail(Map config, UserModel user) throws EmailException; + void sendSmtpTestEmail(Map config, UserModel user) throws EmailException; /** * Send to confirm that user wants to link his account with identity broker link @@ -73,9 +73,9 @@ public interface EmailTemplateProvider extends Provider { * @param expirationInMinutes * @throws EmailException */ - public void sendExecuteActions(String link, long expirationInMinutes) throws EmailException; + void sendExecuteActions(String link, long expirationInMinutes) throws EmailException; - public void sendVerifyEmail(String link, long expirationInMinutes) throws EmailException; + void sendVerifyEmail(String link, long expirationInMinutes) throws EmailException; /** * Send formatted email diff --git a/server-spi-private/src/main/java/org/keycloak/events/EventListenerProvider.java b/server-spi-private/src/main/java/org/keycloak/events/EventListenerProvider.java index 6e12331796..a46b294dcc 100644 --- a/server-spi-private/src/main/java/org/keycloak/events/EventListenerProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/events/EventListenerProvider.java @@ -25,8 +25,8 @@ import org.keycloak.provider.Provider; */ public interface EventListenerProvider extends Provider { - public void onEvent(Event event); + void onEvent(Event event); - public void onEvent(AdminEvent event, boolean includeRepresentation); + void onEvent(AdminEvent event, boolean includeRepresentation); } diff --git a/server-spi-private/src/main/java/org/keycloak/events/EventQuery.java b/server-spi-private/src/main/java/org/keycloak/events/EventQuery.java index 6dc4802f76..dac4b251a8 100644 --- a/server-spi-private/src/main/java/org/keycloak/events/EventQuery.java +++ b/server-spi-private/src/main/java/org/keycloak/events/EventQuery.java @@ -25,24 +25,24 @@ import java.util.List; */ public interface EventQuery { - public EventQuery type(EventType... types); + EventQuery type(EventType... types); - public EventQuery realm(String realmId); + EventQuery realm(String realmId); - public EventQuery client(String clientId); + EventQuery client(String clientId); - public EventQuery user(String userId); + EventQuery user(String userId); - public EventQuery fromDate(Date fromDate); + EventQuery fromDate(Date fromDate); - public EventQuery toDate(Date toDate); + EventQuery toDate(Date toDate); - public EventQuery ipAddress(String ipAddress); + EventQuery ipAddress(String ipAddress); - public EventQuery firstResult(int result); + EventQuery firstResult(int result); - public EventQuery maxResults(int results); + EventQuery maxResults(int results); - public List getResultList(); + List getResultList(); } diff --git a/server-spi-private/src/main/java/org/keycloak/events/EventStoreProvider.java b/server-spi-private/src/main/java/org/keycloak/events/EventStoreProvider.java index be70f46b54..a596c4d8ae 100644 --- a/server-spi-private/src/main/java/org/keycloak/events/EventStoreProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/events/EventStoreProvider.java @@ -24,20 +24,20 @@ import org.keycloak.events.admin.AdminEventQuery; */ public interface EventStoreProvider extends EventListenerProvider { - public EventQuery createQuery(); + EventQuery createQuery(); - public AdminEventQuery createAdminQuery(); + AdminEventQuery createAdminQuery(); - public void clear(); + void clear(); - public void clear(String realmId); + void clear(String realmId); - public void clear(String realmId, long olderThan); + void clear(String realmId, long olderThan); - public void clearAdmin(); + void clearAdmin(); - public void clearAdmin(String realmId); + void clearAdmin(String realmId); - public void clearAdmin(String realmId, long olderThan); + void clearAdmin(String realmId, long olderThan); } diff --git a/server-spi-private/src/main/java/org/keycloak/models/dblock/DBLockProvider.java b/server-spi-private/src/main/java/org/keycloak/models/dblock/DBLockProvider.java index 2006d74dff..b0a9639430 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/dblock/DBLockProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/models/dblock/DBLockProvider.java @@ -40,7 +40,7 @@ public interface DBLockProvider extends Provider { /** * Lock namespace to have different lock types or contexts. */ - public enum Namespace { + enum Namespace { DATABASE(1), KEYCLOAK_BOOT(1000), @@ -48,7 +48,7 @@ public interface DBLockProvider extends Provider { private final int id; - private Namespace(int id) { + Namespace(int id) { this.id = id; } diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/reflection/TypedPropertyCriteria.java b/server-spi-private/src/main/java/org/keycloak/models/utils/reflection/TypedPropertyCriteria.java index 1fbafe1f3c..b9f59f5853 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/utils/reflection/TypedPropertyCriteria.java +++ b/server-spi-private/src/main/java/org/keycloak/models/utils/reflection/TypedPropertyCriteria.java @@ -34,7 +34,7 @@ public class TypedPropertyCriteria implements PropertyCriteria { * consider properties where its type is a superclass or superinterface of propertyClass. . *

*/ - public static enum MatchOption { + public enum MatchOption { SUB_TYPE, SUPER_TYPE, ALL } diff --git a/server-spi-private/src/main/java/org/keycloak/protocol/LoginProtocol.java b/server-spi-private/src/main/java/org/keycloak/protocol/LoginProtocol.java index d5c54e3e20..849859ec4b 100755 --- a/server-spi-private/src/main/java/org/keycloak/protocol/LoginProtocol.java +++ b/server-spi-private/src/main/java/org/keycloak/protocol/LoginProtocol.java @@ -37,7 +37,7 @@ import javax.ws.rs.core.UriInfo; */ public interface LoginProtocol extends Provider { - public static enum Error { + enum Error { /** * Login cancelled by the user diff --git a/server-spi-private/src/main/java/org/keycloak/provider/ServerInfoAwareProviderFactory.java b/server-spi-private/src/main/java/org/keycloak/provider/ServerInfoAwareProviderFactory.java index a4e671865a..d12332906b 100644 --- a/server-spi-private/src/main/java/org/keycloak/provider/ServerInfoAwareProviderFactory.java +++ b/server-spi-private/src/main/java/org/keycloak/provider/ServerInfoAwareProviderFactory.java @@ -32,6 +32,6 @@ public interface ServerInfoAwareProviderFactory { * * @return Map with keys describing value and relevant values itself */ - public Map getOperationalInfo(); + Map getOperationalInfo(); } diff --git a/server-spi-private/src/main/java/org/keycloak/timer/ScheduledTask.java b/server-spi-private/src/main/java/org/keycloak/timer/ScheduledTask.java index ba092ac695..8fe4721b0a 100644 --- a/server-spi-private/src/main/java/org/keycloak/timer/ScheduledTask.java +++ b/server-spi-private/src/main/java/org/keycloak/timer/ScheduledTask.java @@ -24,6 +24,6 @@ import org.keycloak.models.KeycloakSession; */ public interface ScheduledTask { - public void run(KeycloakSession session); + void run(KeycloakSession session); }