Repository: knox Updated Branches: refs/heads/master eb2eabce7 -> c0f52c201
KNOX-1467 - Remove explicit guava dependency from gateway-provider-security-preauth Signed-off-by: Kevin Risden <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/c0f52c20 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/c0f52c20 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/c0f52c20 Branch: refs/heads/master Commit: c0f52c201b28dd1336f0ece4764cc248e5fb0c9e Parents: eb2eabc Author: Kevin Risden <[email protected]> Authored: Thu Sep 27 12:33:08 2018 -0400 Committer: Kevin Risden <[email protected]> Committed: Thu Sep 27 13:30:27 2018 -0400 ---------------------------------------------------------------------- .../preauth/filter/AbstractPreAuthFederationFilter.java | 4 +--- .../knox/gateway/preauth/filter/PreAuthService.java | 11 +++-------- 2 files changed, 4 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/c0f52c20/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/AbstractPreAuthFederationFilter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/AbstractPreAuthFederationFilter.java b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/AbstractPreAuthFederationFilter.java index 6122c80..caacbd4 100644 --- a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/AbstractPreAuthFederationFilter.java +++ b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/AbstractPreAuthFederationFilter.java @@ -34,8 +34,6 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.google.common.annotations.VisibleForTesting; - import org.apache.knox.gateway.audit.api.Action; import org.apache.knox.gateway.audit.api.ActionOutcome; import org.apache.knox.gateway.audit.api.AuditService; @@ -71,7 +69,7 @@ public abstract class AbstractPreAuthFederationFilter implements Filter { validators = PreAuthService.getValidators(filterConfig); } - @VisibleForTesting + // VisibleForTesting public List<PreAuthValidator> getValidators() { return validators; } http://git-wip-us.apache.org/repos/asf/knox/blob/c0f52c20/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthService.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthService.java b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthService.java index d6914b7..fab1624 100644 --- a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthService.java +++ b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthService.java @@ -17,15 +17,11 @@ */ package org.apache.knox.gateway.preauth.filter; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Strings; - import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Collections; -import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; @@ -51,13 +47,12 @@ public class PreAuthService { private static void initializeValidators() { ServiceLoader<PreAuthValidator> servLoader = ServiceLoader.load(PreAuthValidator.class); validatorMap = new ConcurrentHashMap<>(); - for (Iterator<PreAuthValidator> iterator = servLoader.iterator(); iterator.hasNext(); ) { - PreAuthValidator validator = iterator.next(); + for (PreAuthValidator validator : servLoader) { validatorMap.put(validator.getName(), validator); } } - @VisibleForTesting + // VisibleForTesting public static Map<String, PreAuthValidator> getValidatorMap() { return Collections.unmodifiableMap(validatorMap); } @@ -73,7 +68,7 @@ public class PreAuthService { public static List<PreAuthValidator> getValidators(FilterConfig filterConfig) throws ServletException { String validationMethods = filterConfig.getInitParameter(VALIDATION_METHOD_PARAM); List<PreAuthValidator> vList = new ArrayList<>(); - if (Strings.isNullOrEmpty(validationMethods)) { + if (validationMethods == null || validationMethods.isEmpty()) { validationMethods = DefaultValidator.DEFAULT_VALIDATION_METHOD_VALUE; } Set<String> vMethodSet = new LinkedHashSet<>();
