From 4d47a86285e0687cf52ab23284571f5e5d4eae4f Mon Sep 17 00:00:00 2001 From: Melanie Retter Date: Wed, 24 Aug 2016 14:26:46 +0200 Subject: [PATCH] Fix typo Signed-off-by: Melanie Retter --- .../hawkbit/amqp/AmqpControllerAuthentfication.java | 8 ++++---- .../AbstractHttpControllerAuthenticationFilter.java | 4 ++-- ...ControllerPreAuthenticateAnonymousDownloadFilter.java | 2 +- ...HttpControllerPreAuthenticateSecurityTokenFilter.java | 2 +- ...rollerPreAuthenticatedGatewaySecurityTokenFilter.java | 2 +- ...tpControllerPreAuthenticatedSecurityHeaderFilter.java | 2 +- .../security/AbstractControllerAuthenticationFilter.java | 2 +- .../ControllerPreAuthenticatedAnonymousFilter.java | 2 +- ...icationFilter.java => PreAuthentificationFilter.java} | 9 +++------ 9 files changed, 15 insertions(+), 18 deletions(-) rename hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/{PreAuthenficationFilter.java => PreAuthentificationFilter.java} (95%) diff --git a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentfication.java b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentfication.java index 788d1d8d8..ccefb01a1 100644 --- a/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentfication.java +++ b/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentfication.java @@ -24,7 +24,7 @@ import org.eclipse.hawkbit.security.ControllerPreAuthenticatedGatewaySecurityTok import org.eclipse.hawkbit.security.ControllerPreAuthenticatedSecurityHeaderFilter; import org.eclipse.hawkbit.security.DdiSecurityProperties; import org.eclipse.hawkbit.security.PreAuthTokenSourceTrustAuthenticationProvider; -import org.eclipse.hawkbit.security.PreAuthenficationFilter; +import org.eclipse.hawkbit.security.PreAuthentificationFilter; import org.eclipse.hawkbit.security.SystemSecurityContext; import org.eclipse.hawkbit.tenancy.TenantAware; import org.slf4j.Logger; @@ -45,7 +45,7 @@ public class AmqpControllerAuthentfication { private final PreAuthTokenSourceTrustAuthenticationProvider preAuthenticatedAuthenticationProvider; - private final List filterChain = new ArrayList<>(); + private final List filterChain = new ArrayList<>(); @Autowired private ControllerManagement controllerManagement; @@ -107,7 +107,7 @@ public class AmqpControllerAuthentfication { */ public Authentication doAuthenticate(final TenantSecurityToken secruityToken) { PreAuthenticatedAuthenticationToken authentication = new PreAuthenticatedAuthenticationToken(null, null); - for (final PreAuthenficationFilter filter : filterChain) { + for (final PreAuthentificationFilter filter : filterChain) { final PreAuthenticatedAuthenticationToken authenticationRest = createAuthentication(filter, secruityToken); if (authenticationRest != null) { authentication = authenticationRest; @@ -119,7 +119,7 @@ public class AmqpControllerAuthentfication { } - private static PreAuthenticatedAuthenticationToken createAuthentication(final PreAuthenficationFilter filter, + private static PreAuthenticatedAuthenticationToken createAuthentication(final PreAuthentificationFilter filter, final TenantSecurityToken secruityToken) { if (!filter.isEnable(secruityToken)) { diff --git a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/AbstractHttpControllerAuthenticationFilter.java b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/AbstractHttpControllerAuthenticationFilter.java index 0a4ad0b72..70f672155 100644 --- a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/AbstractHttpControllerAuthenticationFilter.java +++ b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/AbstractHttpControllerAuthenticationFilter.java @@ -68,7 +68,7 @@ public abstract class AbstractHttpControllerAuthenticationFilter extends Abstrac private final AntPathMatcher pathExtractor; - private PreAuthenficationFilter abstractControllerAuthenticationFilter; + private PreAuthentificationFilter abstractControllerAuthenticationFilter; /** * Constructor for sub-classes. @@ -111,7 +111,7 @@ public abstract class AbstractHttpControllerAuthenticationFilter extends Abstrac } } - protected abstract PreAuthenficationFilter createControllerAuthenticationFilter(); + protected abstract PreAuthentificationFilter createControllerAuthenticationFilter(); @Override protected void successfulAuthentication(final HttpServletRequest request, final HttpServletResponse response, diff --git a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticateAnonymousDownloadFilter.java b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticateAnonymousDownloadFilter.java index 40fd1e555..7eb338e31 100644 --- a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticateAnonymousDownloadFilter.java +++ b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticateAnonymousDownloadFilter.java @@ -39,7 +39,7 @@ public class HttpControllerPreAuthenticateAnonymousDownloadFilter extends Abstra } @Override - protected PreAuthenficationFilter createControllerAuthenticationFilter() { + protected PreAuthentificationFilter createControllerAuthenticationFilter() { return new ControllerPreAuthenticatedAnonymousDownload(tenantConfigurationManagement, tenantAware, systemSecurityContext); } diff --git a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticateSecurityTokenFilter.java b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticateSecurityTokenFilter.java index 1eb155b9a..8926506e1 100644 --- a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticateSecurityTokenFilter.java +++ b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticateSecurityTokenFilter.java @@ -55,7 +55,7 @@ public class HttpControllerPreAuthenticateSecurityTokenFilter extends AbstractHt } @Override - protected PreAuthenficationFilter createControllerAuthenticationFilter() { + protected PreAuthentificationFilter createControllerAuthenticationFilter() { return new ControllerPreAuthenticateSecurityTokenFilter(tenantConfigurationManagement, controllerManagement, tenantAware, systemSecurityContext); } diff --git a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticatedGatewaySecurityTokenFilter.java b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticatedGatewaySecurityTokenFilter.java index 930c66dca..985c04f34 100644 --- a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticatedGatewaySecurityTokenFilter.java +++ b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticatedGatewaySecurityTokenFilter.java @@ -43,7 +43,7 @@ public class HttpControllerPreAuthenticatedGatewaySecurityTokenFilter } @Override - protected PreAuthenficationFilter createControllerAuthenticationFilter() { + protected PreAuthentificationFilter createControllerAuthenticationFilter() { return new ControllerPreAuthenticatedGatewaySecurityTokenFilter(tenantConfigurationManagement, tenantAware, systemSecurityContext); } diff --git a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticatedSecurityHeaderFilter.java b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticatedSecurityHeaderFilter.java index 162e2688d..d4221a2ca 100644 --- a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticatedSecurityHeaderFilter.java +++ b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticatedSecurityHeaderFilter.java @@ -54,7 +54,7 @@ public class HttpControllerPreAuthenticatedSecurityHeaderFilter extends Abstract } @Override - protected PreAuthenficationFilter createControllerAuthenticationFilter() { + protected PreAuthentificationFilter createControllerAuthenticationFilter() { return new ControllerPreAuthenticatedSecurityHeaderFilter(caCommonNameHeader, caAuthorityNameHeader, tenantConfigurationManagement, tenantAware, systemSecurityContext); } diff --git a/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/AbstractControllerAuthenticationFilter.java b/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/AbstractControllerAuthenticationFilter.java index 9a1cd2aea..edf2ef034 100644 --- a/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/AbstractControllerAuthenticationFilter.java +++ b/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/AbstractControllerAuthenticationFilter.java @@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory; * * */ -public abstract class AbstractControllerAuthenticationFilter implements PreAuthenficationFilter { +public abstract class AbstractControllerAuthenticationFilter implements PreAuthentificationFilter { private static final Logger LOGGER = LoggerFactory.getLogger(AbstractControllerAuthenticationFilter.class); diff --git a/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedAnonymousFilter.java b/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedAnonymousFilter.java index cf55c47fb..4aed42c95 100644 --- a/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedAnonymousFilter.java +++ b/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedAnonymousFilter.java @@ -16,7 +16,7 @@ import org.eclipse.hawkbit.dmf.json.model.TenantSecurityToken; * * @see DdiSecurityProperties */ -public class ControllerPreAuthenticatedAnonymousFilter implements PreAuthenficationFilter { +public class ControllerPreAuthenticatedAnonymousFilter implements PreAuthentificationFilter { private final DdiSecurityProperties ddiSecurityConfiguration; diff --git a/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/PreAuthenficationFilter.java b/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/PreAuthentificationFilter.java similarity index 95% rename from hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/PreAuthenficationFilter.java rename to hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/PreAuthentificationFilter.java index 5e4aacfa9..90f2acd50 100644 --- a/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/PreAuthenficationFilter.java +++ b/hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/PreAuthentificationFilter.java @@ -16,12 +16,9 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; /** - * Interface for Pre Authenfication. - * - * - * + * Interface for Pre Authentification. */ -public interface PreAuthenficationFilter { +public interface PreAuthentificationFilter { /** * Check if the filter is enabled. @@ -60,6 +57,6 @@ public interface PreAuthenficationFilter { */ default Collection getSuccessfulAuthenticationAuthorities() { return Collections.emptyList(); - }; + } }