WIP Signed-off-by: Kevin Risden <kris...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/488e4445 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/488e4445 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/488e4445 Branch: refs/heads/master Commit: 488e4445cf7e37c0c645b65c77c3a95c06500cfe Parents: 2868f4a Author: Kevin Risden <kris...@apache.org> Authored: Thu Nov 1 18:39:17 2018 -0400 Committer: Kevin Risden <kris...@apache.org> Committed: Fri Nov 2 13:22:42 2018 -0400 ---------------------------------------------------------------------- .../gateway/dispatch/DefaultDispatch.java | 6 - .../hadoop/gateway/dispatch/NiFiDispatch.java | 8 - .../hadoop/gateway/dispatch/NiFiHaDispatch.java | 8 - .../hdfs/dispatch/WebHdfsHaDispatch.java | 11 -- .../gateway/rm/dispatch/RMUIHaDispatch.java | 3 - .../ambari/AmbariConfigurationMonitorTest.java | 2 +- .../knox/gateway/i18n/messages/Message.java | 3 - .../gateway/i18n/messages/MessageLevel.java | 3 - .../gateway/i18n/messages/MessageLogger.java | 3 - .../i18n/messages/MessageLoggerFactory.java | 3 - .../knox/gateway/i18n/messages/Messages.java | 3 - .../gateway/i18n/messages/MessagesFactory.java | 3 - .../gateway/i18n/messages/MessagesInvoker.java | 3 - .../knox/gateway/i18n/messages/StackTrace.java | 3 - .../messages/loggers/jdk/JdkMessageLogger.java | 3 - .../loggers/jdk/JdkMessageLoggerFactory.java | 3 - .../loggers/sout/SoutMessageLogger.java | 3 - .../loggers/sout/SoutMessageLoggerFactory.java | 3 - .../loggers/test/TestMessageLogger.java | 3 - .../loggers/test/TestMessageLoggerFactory.java | 3 - .../loggers/test/TestMessageRecord.java | 3 - .../knox/gateway/i18n/resources/Resource.java | 3 - .../knox/gateway/i18n/resources/Resources.java | 3 - .../i18n/resources/ResourcesFactory.java | 3 - .../i18n/resources/ResourcesInvoker.java | 3 - .../gateway/i18n/messages/MessagesTest.java | 3 - .../i18n/messages/MessagesTestSubject.java | 3 - .../gateway/i18n/resources/ResourcesTest.java | 3 - .../ResourcesTestFormattingSubject.java | 3 - .../resources/ResourcesTestLocaleSubject.java | 3 - .../resources/ResourcesTestNamedSubject.java | 3 - .../provider/impl/KafkaZookeeperURLManager.java | 2 +- .../filter/AbstractIdentityAssertionFilter.java | 12 +- .../filter/CommonIdentityAssertionFilter.java | 19 +- .../filter/ConcatIdentityAssertionFilter.java | 11 +- .../ConcatIdentityAssertionFilterTest.java | 3 - ...adoopGroupProviderDeploymentContributor.java | 12 -- .../filter/HadoopGroupProviderFilterTest.java | 20 +-- .../IdentityAsserterDeploymentContributor.java | 3 - .../DefaultIdentityAssertionFilterTest.java | 7 - .../rewrite/api/UrlRewriteServletFilter.java | 3 - .../filter/rewrite/impl/UrlRewriteResponse.java | 3 - .../rewrite/api/UrlRewriteProcessorTest.java | 4 +- .../api/UrlRewriteServletFilterTest.java | 20 +-- .../rewrite/impl/UrlRewriteRequestTest.java | 4 +- .../apache/knox/gateway/filter/AclParser.java | 3 - .../jwt/filter/AbstractJWTFilter.java | 7 - .../jwt/filter/SSOCookieFederationFilter.java | 4 +- .../federation/AbstractJWTFilterTest.java | 51 +----- .../gateway/pac4j/session/KnoxSessionStore.java | 6 +- .../filter/AbstractPreAuthFederationFilter.java | 11 +- .../preauth/filter/DefaultValidator.java | 6 - .../filter/HeaderPreAuthFederationFilter.java | 6 - .../gateway/preauth/filter/IPValidator.java | 9 - .../preauth/filter/PreAuthFederationFilter.java | 6 - .../gateway/preauth/filter/PreAuthService.java | 3 - .../preauth/filter/PreAuthValidator.java | 9 - .../HeaderPreAuthFederationFilterTest.java | 10 -- .../webappsec/filter/CSRFPreventionFilter.java | 8 +- .../webappsec/filter/StrictTransportFilter.java | 20 +-- .../webappsec/filter/XFrameOptionsFilter.java | 20 +-- .../webappsec/filter/XSSProtectionFilter.java | 19 +- .../webappsec/StrictTransportFilterTest.java | 21 --- .../webappsec/XFrameOptionsFilterTest.java | 15 -- .../webappsec/XSSProtectionFilterTest.java | 12 -- .../org/apache/knox/gateway/GatewayFactory.java | 3 - .../org/apache/knox/gateway/GatewayFilter.java | 3 - .../apache/knox/gateway/GatewayMessages.java | 46 ----- .../apache/knox/gateway/GatewayResources.java | 3 - .../org/apache/knox/gateway/GatewayServer.java | 25 +-- .../gateway/config/impl/GatewayConfigImpl.java | 172 +++---------------- .../gateway/dispatch/UrlConnectionDispatch.java | 3 - .../filter/BasicAuthChallengeFilter.java | 3 - .../knox/gateway/filter/JaasLoginFilter.java | 3 - .../gateway/services/CLIGatewayServices.java | 13 +- .../services/DefaultGatewayServices.java | 11 +- .../services/DefaultServerInfoService.java | 15 -- .../hostmap/impl/DefaultHostMapperService.java | 22 --- .../services/metrics/impl/instr/InstrUtils.java | 4 +- .../security/impl/DefaultAliasService.java | 15 -- .../security/impl/DefaultKeystoreService.java | 8 - .../security/impl/RemoteAliasService.java | 30 ---- .../impl/DefaultTokenAuthorityService.java | 13 +- .../simple/SimpleDescriptorFactory.java | 2 +- .../org/apache/knox/gateway/util/KnoxCLI.java | 93 +--------- .../websockets/GatewayWebsocketHandler.java | 25 --- .../websockets/MessageEventCallback.java | 8 - .../apache/knox/gateway/GatewayFilterTest.java | 3 - .../gateway/GatewayPortMappingConfigTest.java | 4 +- .../knox/gateway/jetty/JettyPathMapTest.java | 3 - .../knox/gateway/mock/MockConsoleFactory.java | 3 - .../knox/gateway/websockets/BadBackendTest.java | 4 +- .../knox/gateway/websockets/BadUrlTest.java | 26 +-- .../websockets/ConnectionDroppedTest.java | 7 +- .../gateway/websockets/MessageFailureTest.java | 9 - .../websockets/ProxyInboundClientTest.java | 99 ----------- .../gateway/websockets/WebsocketClient.java | 5 - .../gateway/websockets/WebsocketEchoTest.java | 27 +-- .../WebsocketMultipleConnectionTest.java | 18 -- .../gateway/service/admin/VersionResource.java | 3 - .../AdminServiceDeploymentContributor.java | 16 -- .../HealthServiceDeploymentContributor.java | 12 -- .../KnoxSSOServiceDeploymentContributor.java | 12 -- .../KnoxSSOutServiceDeploymentContributor.java | 12 -- .../service/knoxsso/WebSSOutResourceTest.java | 3 - .../TokenServiceDeploymentContributor.java | 12 -- .../remote/RemoteConfigurationMessages.java | 3 - .../gateway/rm/dispatch/RMUIHaDispatch.java | 3 - .../ServiceTestDeploymentContributor.java | 19 -- .../service/vault/CredentialResource.java | 7 - .../VaultServiceDeploymentContributor.java | 15 -- .../gateway/hdfs/dispatch/HdfsUIHaDispatch.java | 3 - .../hdfs/dispatch/WebHdfsHaDispatch.java | 3 - .../AbstractJavaConsoleCredentialCollector.java | 3 - .../knox/gateway/shell/AbstractRequest.java | 6 +- .../shell/ClearInputCredentialCollector.java | 8 +- .../shell/HiddenInputCredentialCollector.java | 8 +- .../org/apache/knox/gateway/shell/KnoxSh.java | 17 +- .../shell/KnoxTokenCredentialCollector.java | 6 - .../apache/knox/gateway/SpiGatewayMessages.java | 4 +- .../knox/gateway/SpiGatewayResources.java | 3 - .../knox/gateway/config/GatewayConfig.java | 47 +++-- .../knox/gateway/dispatch/DefaultDispatch.java | 6 +- .../gateway/filter/AbstractGatewayFilter.java | 3 - .../security/AbstractIdentityAssertionBase.java | 2 +- .../AbstractIdentityAssertionFilter.java | 3 - .../security/principal/PrincipalMapper.java | 3 - .../principal/SimplePrincipalMapper.java | 22 +-- .../services/hostmap/FileBasedHostMapper.java | 6 - .../gateway/services/hostmap/HostMapper.java | 12 -- .../services/hostmap/HostMapperService.java | 11 -- .../token/impl/JWTProviderMessages.java | 3 - .../services/security/token/impl/JWTToken.java | 45 +---- .../apache/knox/gateway/topology/Service.java | 2 +- .../dispatch/URLDecodingDispatchTest.java | 4 +- .../apache/knox/gateway/GatewayTestConfig.java | 110 ------------ .../GatewayPortMappingDisableFeatureTest.java | 9 +- .../gateway/GatewayPortMappingFailTest.java | 6 +- .../gateway/GatewayPortMappingFuncTest.java | 18 +- .../apache/knox/gateway/WebHdfsHaFuncTest.java | 2 +- .../deploy/DeploymentFactoryFuncTest.java | 8 +- .../gateway/audit/log4j/audit/Log4jAuditor.java | 2 +- .../knox/gateway/util/CertificateUtils.java | 1 + .../knox/gateway/util/IpAddressValidator.java | 12 +- .../java/org/apache/knox/gateway/util/Urls.java | 5 +- .../org/apache/knox/gateway/util/UrlsTest.java | 3 +- .../gateway/util/urltemplate/ParserTest.java | 2 +- 147 files changed, 139 insertions(+), 1596 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/DefaultDispatch.java ---------------------------------------------------------------------- diff --git a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/DefaultDispatch.java b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/DefaultDispatch.java index 0be40ad..540f782 100644 --- a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/DefaultDispatch.java +++ b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/DefaultDispatch.java @@ -87,12 +87,6 @@ public class DefaultDispatch extends org.apache.knox.gateway.dispatch.DefaultDis super.closeInboundResponse(response, stream); } - /** - * This method provides a hook for specialized credential propagation - * in subclasses. - * - * @param outboundRequest - */ @Override protected void addCredentialsToRequest(HttpUriRequest outboundRequest) { super.addCredentialsToRequest(outboundRequest); http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/NiFiDispatch.java ---------------------------------------------------------------------- diff --git a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/NiFiDispatch.java b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/NiFiDispatch.java index 815da74..989278f 100644 --- a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/NiFiDispatch.java +++ b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/NiFiDispatch.java @@ -32,14 +32,6 @@ public class NiFiDispatch extends org.apache.knox.gateway.dispatch.NiFiDispatch super.executeRequest(outboundRequest, inboundRequest, outboundResponse); } - /** - * Overridden to provide a spot to modify the outbound response before its stream is closed. - * - * @param outboundRequest - * @param inboundRequest - * @param outboundResponse - * @param inboundResponse - */ @Override protected void writeOutboundResponse(HttpUriRequest outboundRequest, HttpServletRequest inboundRequest, HttpServletResponse outboundResponse, http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/NiFiHaDispatch.java ---------------------------------------------------------------------- diff --git a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/NiFiHaDispatch.java b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/NiFiHaDispatch.java index 88cb841..e95b08b 100644 --- a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/NiFiHaDispatch.java +++ b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/NiFiHaDispatch.java @@ -36,14 +36,6 @@ public class NiFiHaDispatch extends org.apache.knox.gateway.dispatch.NiFiHaDispa super.executeRequest(outboundRequest, inboundRequest, outboundResponse); } - /** - * Overridden to provide a spot to modify the outbound response before its stream is closed. - * - * @param outboundRequest - * @param inboundRequest - * @param outboundResponse - * @param inboundResponse - */ @Override protected void writeOutboundResponse(HttpUriRequest outboundRequest, HttpServletRequest inboundRequest, HttpServletResponse outboundResponse, http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hdfs/dispatch/WebHdfsHaDispatch.java ---------------------------------------------------------------------- diff --git a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hdfs/dispatch/WebHdfsHaDispatch.java b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hdfs/dispatch/WebHdfsHaDispatch.java index bcc0db9..753ace3 100644 --- a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hdfs/dispatch/WebHdfsHaDispatch.java +++ b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hdfs/dispatch/WebHdfsHaDispatch.java @@ -28,9 +28,6 @@ import java.io.IOException; @Deprecated public class WebHdfsHaDispatch extends org.apache.knox.gateway.hdfs.dispatch.WebHdfsHaDispatch { - /** - * @throws ServletException - */ public WebHdfsHaDispatch() throws ServletException { super(); } @@ -57,14 +54,6 @@ public class WebHdfsHaDispatch extends org.apache.knox.gateway.hdfs.dispatch.Web super.executeRequest(outboundRequest, inboundRequest, outboundResponse); } - /** - * Checks for specific outbound response codes/content to trigger a retry or failover - * - * @param outboundRequest - * @param inboundRequest - * @param outboundResponse - * @param inboundResponse - */ @Override protected void writeOutboundResponse(HttpUriRequest outboundRequest, HttpServletRequest inboundRequest, HttpServletResponse outboundResponse, http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-adapter/src/main/java/org/apache/hadoop/gateway/rm/dispatch/RMUIHaDispatch.java ---------------------------------------------------------------------- diff --git a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/rm/dispatch/RMUIHaDispatch.java b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/rm/dispatch/RMUIHaDispatch.java index 472fab0..d1c3085 100644 --- a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/rm/dispatch/RMUIHaDispatch.java +++ b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/rm/dispatch/RMUIHaDispatch.java @@ -22,9 +22,6 @@ import javax.servlet.ServletException; @Deprecated public class RMUIHaDispatch extends org.apache.knox.gateway.rm.dispatch.RMUIHaDispatch { - /** - * @throws ServletException - */ public RMUIHaDispatch() throws ServletException { super(); } http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-discovery-ambari/src/test/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariConfigurationMonitorTest.java ---------------------------------------------------------------------- diff --git a/gateway-discovery-ambari/src/test/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariConfigurationMonitorTest.java b/gateway-discovery-ambari/src/test/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariConfigurationMonitorTest.java index 324d08e..449a2a5 100644 --- a/gateway-discovery-ambari/src/test/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariConfigurationMonitorTest.java +++ b/gateway-discovery-ambari/src/test/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariConfigurationMonitorTest.java @@ -244,7 +244,7 @@ public class AmbariConfigurationMonitorTest { * @param name The cluster name * @param serviceConfigs A map of service configurations (keyed by service name) * - * @return + * @return a mocked AmbariCluster */ private AmbariCluster createTestCluster(String name, Map<String, Map<String, AmbariCluster.ServiceConfiguration>> serviceConfigs) { http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/Message.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/Message.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/Message.java index 2703bc0..89e4662 100644 --- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/Message.java +++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/Message.java @@ -22,9 +22,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - * - */ @Retention( RetentionPolicy.RUNTIME ) @Target( ElementType.METHOD ) public @interface Message { http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessageLevel.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessageLevel.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessageLevel.java index 135ce5a..f1c0b91 100644 --- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessageLevel.java +++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessageLevel.java @@ -17,9 +17,6 @@ */ package org.apache.knox.gateway.i18n.messages; -/** - * - */ public enum MessageLevel { FATAL, ERROR, WARN, INFO, DEBUG, TRACE } http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessageLogger.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessageLogger.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessageLogger.java index 8fe33e8..e6f6468 100644 --- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessageLogger.java +++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessageLogger.java @@ -17,9 +17,6 @@ */ package org.apache.knox.gateway.i18n.messages; -/** - * - */ public interface MessageLogger { boolean isLoggable( MessageLevel level ); http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessageLoggerFactory.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessageLoggerFactory.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessageLoggerFactory.java index 775573e..b0ff0ae 100644 --- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessageLoggerFactory.java +++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessageLoggerFactory.java @@ -17,9 +17,6 @@ */ package org.apache.knox.gateway.i18n.messages; -/** - * - */ public interface MessageLoggerFactory { MessageLogger getLogger( String name ); http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/Messages.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/Messages.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/Messages.java index 237a7f6..6908146 100644 --- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/Messages.java +++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/Messages.java @@ -22,9 +22,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - * - */ @Retention( RetentionPolicy.RUNTIME ) @Target( ElementType.TYPE ) public @interface Messages { http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessagesFactory.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessagesFactory.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessagesFactory.java index ff9e95c..751febd 100644 --- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessagesFactory.java +++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessagesFactory.java @@ -25,9 +25,6 @@ import java.util.Map; import java.util.ServiceLoader; import java.util.concurrent.ConcurrentHashMap; -/** - * - */ public class MessagesFactory { private static MessageLoggerFactory loggers = getMessageLoggerFactory(); http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessagesInvoker.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessagesInvoker.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessagesInvoker.java index 6d46cfb..edfeae3 100644 --- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessagesInvoker.java +++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessagesInvoker.java @@ -25,9 +25,6 @@ import java.lang.reflect.Method; import java.text.MessageFormat; import java.util.Locale; -/** - * - */ public class MessagesInvoker extends ResourcesInvoker implements InvocationHandler { private String codes; http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/StackTrace.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/StackTrace.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/StackTrace.java index 2026c32..dd342d1 100644 --- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/StackTrace.java +++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/StackTrace.java @@ -22,9 +22,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - * - */ @Retention( RetentionPolicy.RUNTIME ) @Target( ElementType.PARAMETER ) public @interface StackTrace { http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/jdk/JdkMessageLogger.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/jdk/JdkMessageLogger.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/jdk/JdkMessageLogger.java index 8223fac..c8d63fe 100644 --- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/jdk/JdkMessageLogger.java +++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/jdk/JdkMessageLogger.java @@ -24,9 +24,6 @@ import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; -/** - * - */ final class JdkMessageLogger implements MessageLogger { private final Logger logger; http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/jdk/JdkMessageLoggerFactory.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/jdk/JdkMessageLoggerFactory.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/jdk/JdkMessageLoggerFactory.java index 9263474..965d28f 100644 --- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/jdk/JdkMessageLoggerFactory.java +++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/jdk/JdkMessageLoggerFactory.java @@ -22,9 +22,6 @@ import org.apache.knox.gateway.i18n.messages.MessageLoggerFactory; import java.util.logging.Logger; -/** - * - */ public class JdkMessageLoggerFactory implements MessageLoggerFactory { @Override http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/sout/SoutMessageLogger.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/sout/SoutMessageLogger.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/sout/SoutMessageLogger.java index 273917c..b214ae4 100644 --- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/sout/SoutMessageLogger.java +++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/sout/SoutMessageLogger.java @@ -23,9 +23,6 @@ import org.apache.knox.gateway.i18n.messages.MessageLogger; import java.text.MessageFormat; import java.util.Locale; -/** - * - */ public class SoutMessageLogger implements MessageLogger { private static final String FORMAT_WITHOUT_ID = "{0}: {2}"; http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/sout/SoutMessageLoggerFactory.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/sout/SoutMessageLoggerFactory.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/sout/SoutMessageLoggerFactory.java index 04a7d84..74ab6f6 100644 --- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/sout/SoutMessageLoggerFactory.java +++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/sout/SoutMessageLoggerFactory.java @@ -23,9 +23,6 @@ import org.apache.knox.gateway.i18n.messages.MessageLoggerFactory; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -/** - * - */ public class SoutMessageLoggerFactory implements MessageLoggerFactory { private static SoutMessageLoggerFactory INSTANCE; http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageLogger.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageLogger.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageLogger.java index 67a2966..1c31444 100644 --- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageLogger.java +++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageLogger.java @@ -24,9 +24,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -/** - * - */ public class TestMessageLogger implements MessageLogger { public final List<TestMessageRecord> records = Collections.synchronizedList( new ArrayList<TestMessageRecord>() ); http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageLoggerFactory.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageLoggerFactory.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageLoggerFactory.java index e398365..6f23de6 100644 --- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageLoggerFactory.java +++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageLoggerFactory.java @@ -23,9 +23,6 @@ import org.apache.knox.gateway.i18n.messages.MessageLoggerFactory; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -/** - * - */ public class TestMessageLoggerFactory implements MessageLoggerFactory { private static TestMessageLoggerFactory INSTANCE; http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageRecord.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageRecord.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageRecord.java index 2779775..786cfff 100644 --- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageRecord.java +++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageRecord.java @@ -19,9 +19,6 @@ package org.apache.knox.gateway.i18n.messages.loggers.test; import org.apache.knox.gateway.i18n.messages.MessageLevel; -/** - * - */ public class TestMessageRecord { private final TestMessageLogger logger; http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/Resource.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/Resource.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/Resource.java index 251ea8a..021f81b 100644 --- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/Resource.java +++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/Resource.java @@ -22,9 +22,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - * - */ @Retention( RetentionPolicy.RUNTIME ) @Target( ElementType.METHOD ) public @interface Resource { http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/Resources.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/Resources.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/Resources.java index 6df03be..cba4a9d 100644 --- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/Resources.java +++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/Resources.java @@ -22,9 +22,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -/** - * - */ @Retention( RetentionPolicy.RUNTIME ) @Target( ElementType.TYPE ) public @interface Resources { http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/ResourcesFactory.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/ResourcesFactory.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/ResourcesFactory.java index de835a5..44f1a5a 100644 --- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/ResourcesFactory.java +++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/ResourcesFactory.java @@ -21,9 +21,6 @@ import java.lang.reflect.Proxy; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -/** - * - */ public class ResourcesFactory { private static Map<Class<?>, Object> proxies = new ConcurrentHashMap<>(); http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/ResourcesInvoker.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/ResourcesInvoker.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/ResourcesInvoker.java index d041cbb..d1a3926 100644 --- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/ResourcesInvoker.java +++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/ResourcesInvoker.java @@ -26,9 +26,6 @@ import java.util.MissingResourceException; import java.util.ResourceBundle; import java.util.concurrent.ConcurrentHashMap; -/** - * - */ public class ResourcesInvoker implements InvocationHandler { private static ResourceBundle MISSING_BUNDLE = new ListResourceBundle() { http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/messages/MessagesTest.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/messages/MessagesTest.java b/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/messages/MessagesTest.java index 7b94c67..873a666 100644 --- a/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/messages/MessagesTest.java +++ b/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/messages/MessagesTest.java @@ -29,9 +29,6 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -/** - * - */ @Category( { UnitTests.class, FastTests.class } ) public class MessagesTest { http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/messages/MessagesTestSubject.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/messages/MessagesTestSubject.java b/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/messages/MessagesTestSubject.java index a2b746c..8bb985f 100644 --- a/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/messages/MessagesTestSubject.java +++ b/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/messages/MessagesTestSubject.java @@ -17,9 +17,6 @@ */ package org.apache.knox.gateway.i18n.messages; -/** - * - */ @Messages( bundle="some.bundle.name", logger="some.logger.name", codes="ID:{0}" ) public interface MessagesTestSubject { http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTest.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTest.java b/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTest.java index 66b33fc..7696266 100644 --- a/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTest.java +++ b/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTest.java @@ -29,9 +29,6 @@ import java.util.Locale; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; -/** - * - */ @Category( { UnitTests.class, FastTests.class } ) public class ResourcesTest { http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTestFormattingSubject.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTestFormattingSubject.java b/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTestFormattingSubject.java index 30f9db6..655d847 100644 --- a/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTestFormattingSubject.java +++ b/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTestFormattingSubject.java @@ -17,9 +17,6 @@ */ package org.apache.knox.gateway.i18n.resources; -/** - * - */ @Resources( bundle="some.bundle.name" ) public interface ResourcesTestFormattingSubject { http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTestLocaleSubject.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTestLocaleSubject.java b/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTestLocaleSubject.java index 45fc01d..60ed856 100644 --- a/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTestLocaleSubject.java +++ b/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTestLocaleSubject.java @@ -17,9 +17,6 @@ */ package org.apache.knox.gateway.i18n.resources; -/** - * - */ @Resources public interface ResourcesTestLocaleSubject { http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTestNamedSubject.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTestNamedSubject.java b/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTestNamedSubject.java index 6ce8db4..c6062c3 100644 --- a/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTestNamedSubject.java +++ b/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTestNamedSubject.java @@ -17,9 +17,6 @@ */ package org.apache.knox.gateway.i18n.resources; -/** - * - */ @Resources( bundle="org.apache.knox.gateway.i18n.resources.NamedBundle" ) public interface ResourcesTestNamedSubject { http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/KafkaZookeeperURLManager.java ---------------------------------------------------------------------- diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/KafkaZookeeperURLManager.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/KafkaZookeeperURLManager.java index f14c385..3472d78 100644 --- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/KafkaZookeeperURLManager.java +++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/KafkaZookeeperURLManager.java @@ -125,7 +125,7 @@ public class KafkaZookeeperURLManager extends BaseZookeeperURLManager { * @param serverInfo Server Info in JSON Format from Zookeeper (required) * * @return URL to Kafka - * @throws ParseException + * @throws ParseException failure parsing json from string */ private String constructURL(String serverInfo) throws ParseException { String scheme = "http"; http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/AbstractIdentityAssertionFilter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/AbstractIdentityAssertionFilter.java b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/AbstractIdentityAssertionFilter.java index b2c1c07..18ce1be 100644 --- a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/AbstractIdentityAssertionFilter.java +++ b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/AbstractIdentityAssertionFilter.java @@ -50,9 +50,6 @@ import org.apache.knox.gateway.security.GroupPrincipal; import org.apache.knox.gateway.security.ImpersonatedPrincipal; import org.apache.knox.gateway.security.PrimaryPrincipal; -/** - * - */ public abstract class AbstractIdentityAssertionFilter extends AbstractIdentityAssertionBase implements Filter { @@ -86,18 +83,11 @@ public abstract class AbstractIdentityAssertionFilter extends * This method is used to map the username of the authenticated identity to some other * principal name based on an implementation specific mechanism. It will either return * a new principal name or the provided principal name if there is no mapping required. - * @param principalName + * @param principalName principal to try to map * @return new username or the provided principalName */ public abstract String mapUserPrincipal(String principalName); - /** - * @param request - * @param response - * @param chain - * @param mappedPrincipalName - * @param groups - */ protected void continueChainAsPrincipal(HttpServletRequestWrapper request, ServletResponse response, FilterChain chain, String mappedPrincipalName, String[] groups) throws IOException, ServletException { http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/CommonIdentityAssertionFilter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/CommonIdentityAssertionFilter.java b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/CommonIdentityAssertionFilter.java index a143f27..2076e0a 100644 --- a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/CommonIdentityAssertionFilter.java +++ b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/CommonIdentityAssertionFilter.java @@ -41,10 +41,7 @@ public class CommonIdentityAssertionFilter extends AbstractIdentityAssertionFilt private static final String GROUP_PRINCIPAL_MAPPING = "group.principal.mapping"; private static final String PRINCIPAL_MAPPING = "principal.mapping"; private SimplePrincipalMapper mapper = new SimplePrincipalMapper(); - - /* (non-Javadoc) - * @see javax.servlet.Filter#init(javax.servlet.FilterConfig) - */ + @Override public void init(FilterConfig filterConfig) throws ServletException { String principalMapping = filterConfig.getInitParameter(PRINCIPAL_MAPPING); @@ -64,9 +61,6 @@ public class CommonIdentityAssertionFilter extends AbstractIdentityAssertionFilt } } - /* (non-Javadoc) - * @see javax.servlet.Filter#destroy() - */ @Override public void destroy() { } @@ -99,11 +93,6 @@ public class CommonIdentityAssertionFilter extends AbstractIdentityAssertionFilt continueChainAsPrincipal(wrapper, response, chain, mappedPrincipalName, groups); } - /** - * @param mappedGroups - * @param groups - * @return - */ private String[] combineGroupMappings(String[] mappedGroups, String[] groups) { if (mappedGroups != null && groups != null) { return (String[])ArrayUtils.addAll(mappedGroups, groups); @@ -132,18 +121,12 @@ public class CommonIdentityAssertionFilter extends AbstractIdentityAssertionFilt return mapper.mapUserPrincipal(principalName); } - /* (non-Javadoc) - * @see AbstractIdentityAssertionFilter#mapGroupPrincipals(java.lang.String, javax.security.auth.Subject) - */ @Override public String[] mapGroupPrincipals(String mappedPrincipalName, Subject subject) { // NOP return null; } - /* (non-Javadoc) - * @see AbstractIdentityAssertionFilter#mapUserPrincipal(java.lang.String) - */ @Override public String mapUserPrincipal(String principalName) { // NOP http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-identity-assertion-concat/src/main/java/org/apache/knox/gateway/identityasserter/concat/filter/ConcatIdentityAssertionFilter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-identity-assertion-concat/src/main/java/org/apache/knox/gateway/identityasserter/concat/filter/ConcatIdentityAssertionFilter.java b/gateway-provider-identity-assertion-concat/src/main/java/org/apache/knox/gateway/identityasserter/concat/filter/ConcatIdentityAssertionFilter.java index c1ea3a3..7d72c97 100644 --- a/gateway-provider-identity-assertion-concat/src/main/java/org/apache/knox/gateway/identityasserter/concat/filter/ConcatIdentityAssertionFilter.java +++ b/gateway-provider-identity-assertion-concat/src/main/java/org/apache/knox/gateway/identityasserter/concat/filter/ConcatIdentityAssertionFilter.java @@ -25,10 +25,7 @@ import org.apache.knox.gateway.identityasserter.common.filter.CommonIdentityAsse public class ConcatIdentityAssertionFilter extends CommonIdentityAssertionFilter { private String prefix = null; private String suffix = null; - - /* (non-Javadoc) - * @see javax.servlet.Filter#init(javax.servlet.FilterConfig) - */ + @Override public void init(FilterConfig filterConfig) throws ServletException { super.init(filterConfig); @@ -43,17 +40,11 @@ public class ConcatIdentityAssertionFilter extends CommonIdentityAssertionFilter } } - /* (non-Javadoc) - * @see AbstractIdentityAssertionFilter#mapGroupPrincipals(java.lang.String, javax.security.auth.Subject) - */ @Override public String[] mapGroupPrincipals(String mappedPrincipalName, Subject subject) { return null; } - /* (non-Javadoc) - * @see AbstractIdentityAssertionFilter#mapUserPrincipal(java.lang.String) - */ @Override public String mapUserPrincipal(String principalName) { return prefix + principalName + suffix; http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-identity-assertion-concat/src/test/java/org/apache/knox/gateway/identityasserter/concat/filter/ConcatIdentityAssertionFilterTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-identity-assertion-concat/src/test/java/org/apache/knox/gateway/identityasserter/concat/filter/ConcatIdentityAssertionFilterTest.java b/gateway-provider-identity-assertion-concat/src/test/java/org/apache/knox/gateway/identityasserter/concat/filter/ConcatIdentityAssertionFilterTest.java index e465da8..e960c0a 100644 --- a/gateway-provider-identity-assertion-concat/src/test/java/org/apache/knox/gateway/identityasserter/concat/filter/ConcatIdentityAssertionFilterTest.java +++ b/gateway-provider-identity-assertion-concat/src/test/java/org/apache/knox/gateway/identityasserter/concat/filter/ConcatIdentityAssertionFilterTest.java @@ -31,9 +31,6 @@ import org.apache.knox.gateway.security.PrimaryPrincipal; import org.easymock.EasyMock; import org.junit.Test; -/** - * - */ public class ConcatIdentityAssertionFilterTest { @Test http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributor.java ---------------------------------------------------------------------- diff --git a/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributor.java b/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributor.java index 3bfa809..f41f793 100644 --- a/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributor.java +++ b/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributor.java @@ -51,23 +51,11 @@ public class HadoopGroupProviderDeploymentContributor super(); } - /* - * (non-Javadoc) - * - * @see - * ProviderDeploymentContributor#getName() - */ @Override public String getName() { return HADOOP_GROUP_PROVIDER; } - /* - * (non-Javadoc) - * - * @see org.apache.knox.gateway.identityasserter.common.filter. - * AbstractIdentityAsserterDeploymentContributor#getFilterClassname() - */ @Override protected String getFilterClassname() { return HadoopGroupProviderFilter.class.getName(); http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-identity-assertion-hadoop-groups/src/test/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderFilterTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-identity-assertion-hadoop-groups/src/test/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderFilterTest.java b/gateway-provider-identity-assertion-hadoop-groups/src/test/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderFilterTest.java index 953f371..ee59411 100644 --- a/gateway-provider-identity-assertion-hadoop-groups/src/test/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderFilterTest.java +++ b/gateway-provider-identity-assertion-hadoop-groups/src/test/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderFilterTest.java @@ -31,8 +31,6 @@ import javax.servlet.ServletContext; import javax.servlet.ServletException; import org.apache.knox.gateway.security.PrimaryPrincipal; -import org.apache.hadoop.security.LdapGroupsMapping; -import org.apache.hadoop.security.ShellBasedUnixGroupsMapping; import org.easymock.EasyMock; import org.junit.Test; @@ -54,22 +52,14 @@ public class HadoopGroupProviderFilterTest { private static final String username = System.getProperty("user.name"); /** - * Configuration object needed by for hadoop classes - */ - - /** * Hadoop Groups implementation. */ - - /* create an instance */ public HadoopGroupProviderFilterTest() { super(); } - /** + /* * Test that valid groups are retrieved for a legitimate user. - * - * @throws ServletException */ @Test public void testGroups() throws ServletException { @@ -100,10 +90,8 @@ public class HadoopGroupProviderFilterTest { } - /** + /* * Test that no groups are retrieved for a dummy user. - * - * @throws ServletException */ @Test public void testUnknownUser() throws ServletException { @@ -134,13 +122,11 @@ public class HadoopGroupProviderFilterTest { } - /** + /* * Test for a bad config (nonexistent). This test proves, we are not falling * back on {@link ShellBasedUnixGroupsMapping} because we explicitly use * {@link LdapGroupsMapping} and in case of bad config we get empty groups * (Hadoop way). - * - * @throws ServletException */ @SuppressWarnings({ "unchecked", "rawtypes" }) @Test http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-identity-assertion-pseudo/src/main/java/org/apache/knox/gateway/identityasserter/filter/IdentityAsserterDeploymentContributor.java ---------------------------------------------------------------------- diff --git a/gateway-provider-identity-assertion-pseudo/src/main/java/org/apache/knox/gateway/identityasserter/filter/IdentityAsserterDeploymentContributor.java b/gateway-provider-identity-assertion-pseudo/src/main/java/org/apache/knox/gateway/identityasserter/filter/IdentityAsserterDeploymentContributor.java index e23bccf..f6356df 100644 --- a/gateway-provider-identity-assertion-pseudo/src/main/java/org/apache/knox/gateway/identityasserter/filter/IdentityAsserterDeploymentContributor.java +++ b/gateway-provider-identity-assertion-pseudo/src/main/java/org/apache/knox/gateway/identityasserter/filter/IdentityAsserterDeploymentContributor.java @@ -42,9 +42,6 @@ public class IdentityAsserterDeploymentContributor extends AbstractIdentityAsser context.getWebAppDescriptor().createContextParam().paramName(GROUP_PRINCIPAL_MAPPING_PARAM_NAME).paramValue(groupMappings); } - /* (non-Javadoc) - * @see AbstractIdentityAsserterDeploymentContributor#getFilterClassname() - */ @Override protected String getFilterClassname() { return FILTER_CLASSNAME; http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-identity-assertion-pseudo/src/test/java/org/apache/knox/gateway/identityasserter/filter/DefaultIdentityAssertionFilterTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-identity-assertion-pseudo/src/test/java/org/apache/knox/gateway/identityasserter/filter/DefaultIdentityAssertionFilterTest.java b/gateway-provider-identity-assertion-pseudo/src/test/java/org/apache/knox/gateway/identityasserter/filter/DefaultIdentityAssertionFilterTest.java index ea2aa70..b66dbb1 100644 --- a/gateway-provider-identity-assertion-pseudo/src/test/java/org/apache/knox/gateway/identityasserter/filter/DefaultIdentityAssertionFilterTest.java +++ b/gateway-provider-identity-assertion-pseudo/src/test/java/org/apache/knox/gateway/identityasserter/filter/DefaultIdentityAssertionFilterTest.java @@ -33,9 +33,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -/** - * - */ public class DefaultIdentityAssertionFilterTest { @Test @@ -94,10 +91,6 @@ public class DefaultIdentityAssertionFilterTest { assertTrue("group1 not found in groups: " + Arrays.toString(mappedGroups), groupFoundIn("group1", mappedGroups)); } - /** - * @param string - * @return - */ private boolean groupFoundIn(String expected, String[] mappedGroups) { if (mappedGroups == null) return false; for(int i = 0; i < mappedGroups.length; i++) { http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilter.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilter.java index 1a3fa98..eea17a5 100644 --- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilter.java +++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilter.java @@ -30,9 +30,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -/** - * - */ public class UrlRewriteServletFilter extends AbstractGatewayFilter { public static final String REQUEST_URL_RULE_PARAM = "request.url"; http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteResponse.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteResponse.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteResponse.java index 93e9f07..7712986 100644 --- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteResponse.java +++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteResponse.java @@ -59,9 +59,6 @@ import java.util.zip.GZIPOutputStream; import static org.apache.knox.gateway.filter.rewrite.impl.UrlRewriteUtil.getRewriteFilterConfig; import static org.apache.knox.gateway.filter.rewrite.impl.UrlRewriteUtil.pickFirstRuleWithEqualsIgnoreCasePathMatch; -/** - * - */ public class UrlRewriteResponse extends GatewayResponseWrapper implements Params, ResponseStreamer { http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteProcessorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteProcessorTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteProcessorTest.java index 7ffbfeb..b7f56fa 100644 --- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteProcessorTest.java +++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteProcessorTest.java @@ -302,10 +302,8 @@ public class UrlRewriteProcessorTest { processor.destroy(); } - /** + /* * Tests the rewrite pattern used for re-writing Solr urls passed through Knox. - * - * @throws Exception */ @Test public void testSolrRewrite() throws Exception { http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java index ddf14b6..f857dcf 100644 --- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java +++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java @@ -25,7 +25,6 @@ import org.apache.knox.test.log.NoOpAppender; import org.apache.knox.test.mock.MockInteraction; import org.apache.knox.test.mock.MockServlet; import org.apache.log4j.Appender; -import org.apache.log4j.Logger; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpTester; import org.eclipse.jetty.servlet.FilterHolder; @@ -61,8 +60,6 @@ import static org.xmlmatchers.transform.XmlConverters.the; public class UrlRewriteServletFilterTest { - Logger LOG = Logger.getLogger(UrlRewriteServletFilterTest.class); - private ServletTester server; private HttpTester.Request request; private HttpTester.Response response; @@ -71,8 +68,7 @@ public class UrlRewriteServletFilterTest { private static URL getTestResource( String name ) { name = UrlRewriteServletFilterTest.class.getName().replaceAll( "\\.", "/" ) + "/" + name; - URL url = ClassLoader.getSystemResource( name ); - return url; + return ClassLoader.getSystemResource( name ); } public void setUp( Map<String,String> initParams ) throws Exception { @@ -805,7 +801,7 @@ public class UrlRewriteServletFilterTest { assertThat(content, anyOf( is(responseHtmlOne), is(responseHtmlTwo))); } - /** + /* * Test the prefix function * @see KNOX-994 * @since 0.14.0 @@ -843,7 +839,7 @@ public class UrlRewriteServletFilterTest { } - /** + /* * Test the postfix function * @since 1.1.0 * KNOX-1305 @@ -883,7 +879,7 @@ public class UrlRewriteServletFilterTest { assertThat(content, is(expectedLocationHeader)); } - /** + /* * Test the infix function * @since 1.1.0 * KNOX-1305 @@ -922,13 +918,9 @@ public class UrlRewriteServletFilterTest { assertThat(content, is(expectedCustomHeader)); } - - - - /** + + /* * See KNOX-791 - * @since 0.11.0 - * @throws Exception */ @Test public void testResponseHtmlAttributeEscaping() throws Exception { http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRequestTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRequestTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRequestTest.java index c37f887..2b408e2 100644 --- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRequestTest.java +++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRequestTest.java @@ -100,11 +100,9 @@ public class UrlRewriteRequestTest { assertEquals(hostHeader, "targethost.com"); } - /** + /* * Test the case where a request has * Content-Type:text/xml and Content-Encoding:gzip - * @since 1.1.0 - * @throws Exception */ @Test public void testContentEncoding() throws Exception { http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclParser.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclParser.java b/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclParser.java index a988ff5..d82f88d 100644 --- a/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclParser.java +++ b/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclParser.java @@ -23,9 +23,6 @@ import java.util.Collections; import org.apache.knox.gateway.i18n.messages.MessagesFactory; import org.apache.knox.gateway.util.IpAddressValidator; -/** - * - */ public class AclParser { private static AclsAuthorizationMessages log = MessagesFactory.get( AclsAuthorizationMessages.class ); http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java index db93d73..e28a0f3 100644 --- a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java +++ b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java @@ -60,9 +60,6 @@ import org.apache.knox.gateway.services.security.token.impl.JWT; import com.nimbusds.jose.JWSHeader; -/** - * - */ public abstract class AbstractJWTFilter implements Filter { /** * If specified, this configuration property refers to a value which the issuer of a received @@ -123,10 +120,6 @@ public abstract class AbstractJWTFilter implements Filter { } } - /** - * @param expectedAudiences - * @return - */ protected List<String> parseExpectedAudiences(String expectedAudiences) { List<String> audList = null; // setup the list of valid audiences for token validation http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/SSOCookieFederationFilter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/SSOCookieFederationFilter.java b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/SSOCookieFederationFilter.java index 68104a1..7ab5bf3 100644 --- a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/SSOCookieFederationFilter.java +++ b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/SSOCookieFederationFilter.java @@ -192,8 +192,8 @@ private String gatewayPath; /** * Derive a provider URL from the request assuming that the * KnoxSSO endpoint is local to the endpoint serving this request. - * @param request - * @return + * @param request origin request + * @return url that is based on KnoxSSO endpoint */ public String deriveDefaultAuthenticationProviderUrl(HttpServletRequest request) { String scheme = null; http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-security-jwt/src/test/java/org/apache/knox/gateway/provider/federation/AbstractJWTFilterTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-jwt/src/test/java/org/apache/knox/gateway/provider/federation/AbstractJWTFilterTest.java b/gateway-provider-security-jwt/src/test/java/org/apache/knox/gateway/provider/federation/AbstractJWTFilterTest.java index 1ef2c1b..7e98ee6 100644 --- a/gateway-provider-security-jwt/src/test/java/org/apache/knox/gateway/provider/federation/AbstractJWTFilterTest.java +++ b/gateway-provider-security-jwt/src/test/java/org/apache/knox/gateway/provider/federation/AbstractJWTFilterTest.java @@ -89,8 +89,7 @@ public abstract class AbstractJWTFilterTest { MessageFormat headerFormatter = new MessageFormat(dnTemplate, Locale.ROOT); String[] paramArray = new String[1]; paramArray[0] = hostname; - String dn = headerFormatter.format(paramArray); - return dn; + return headerFormatter.format(paramArray); } @BeforeClass @@ -202,7 +201,7 @@ public abstract class AbstractJWTFilterTest { TestFilterChain chain = new TestFilterChain(); handler.doFilter(request, response, chain); Assert.assertTrue("doFilterCalled should not be true.", !chain.doFilterCalled); - Assert.assertTrue("No Subject should be returned.", chain.subject == null); + Assert.assertNull("No Subject should be returned.", chain.subject); } catch (ServletException se) { fail("Should NOT have thrown a ServletException."); } @@ -264,7 +263,7 @@ public abstract class AbstractJWTFilterTest { TestFilterChain chain = new TestFilterChain(); handler.doFilter(request, response, chain); Assert.assertTrue("doFilterCalled should not be true.", !chain.doFilterCalled); - Assert.assertTrue("No Subject should be returned.", chain.subject == null); + Assert.assertNull("No Subject should be returned.", chain.subject); } catch (ServletException se) { fail("Should NOT have thrown a ServletException."); } @@ -338,8 +337,6 @@ public abstract class AbstractJWTFilterTest { try { Properties props = getProperties(); -// System.out.println("+" + pem + "+"); - props.put(getAudienceProperty(), "bar"); props.put("sso.authentication.provider.url", "https://localhost:8443/gateway/knoxsso/api/v1/websso";); props.put(getVerificationPemProperty(), pem); @@ -393,7 +390,7 @@ public abstract class AbstractJWTFilterTest { TestFilterChain chain = new TestFilterChain(); handler.doFilter(request, response, chain); Assert.assertTrue("doFilterCalled should not be false.", !chain.doFilterCalled); - Assert.assertTrue("No Subject should be returned.", chain.subject == null); + Assert.assertNull("No Subject should be returned.", chain.subject); } catch (ServletException se) { fail("Should NOT have thrown a ServletException."); } @@ -452,7 +449,7 @@ public abstract class AbstractJWTFilterTest { TestFilterChain chain = new TestFilterChain(); handler.doFilter(request, response, chain); Assert.assertTrue("doFilterCalled should not be true.", !chain.doFilterCalled); - Assert.assertTrue("No Subject should be returned.", chain.subject == null); + Assert.assertNull("No Subject should be returned.", chain.subject); } catch (ServletException se) { fail("Should NOT have thrown a ServletException."); } @@ -487,7 +484,7 @@ public abstract class AbstractJWTFilterTest { TestFilterChain chain = new TestFilterChain(); handler.doFilter(request, response, chain); Assert.assertTrue("doFilterCalled should not be true.", !chain.doFilterCalled); - Assert.assertTrue("No Subject should be returned.", chain.subject == null); + Assert.assertNull("No Subject should be returned.", chain.subject); } catch (ServletException se) { fail("Should NOT have thrown a ServletException."); } @@ -556,7 +553,7 @@ public abstract class AbstractJWTFilterTest { TestFilterChain chain = new TestFilterChain(); handler.doFilter(request, response, chain); Assert.assertTrue("doFilterCalled should not be true.", !chain.doFilterCalled); - Assert.assertTrue("No Subject should be returned.", chain.subject == null); + Assert.assertNull("No Subject should be returned.", chain.subject); } catch (ServletException se) { fail("Should NOT have thrown a ServletException."); } @@ -648,7 +645,7 @@ public abstract class AbstractJWTFilterTest { TestFilterChain chain = new TestFilterChain(); handler.doFilter(request, response, chain); Assert.assertTrue("doFilterCalled should not be false.", !chain.doFilterCalled ); - Assert.assertTrue("No Subject should be returned.", chain.subject == null); + Assert.assertNull("No Subject should be returned.", chain.subject); } catch (ServletException se) { fail("Should NOT have thrown a ServletException."); } @@ -743,9 +740,6 @@ public abstract class AbstractJWTFilterTest { return null; } - /* (non-Javadoc) - * @see javax.servlet.FilterConfig#getServletContext() - */ @Override public ServletContext getServletContext() { // JWTokenAuthority authority = EasyMock.createNiceMock(JWTokenAuthority.class); @@ -756,17 +750,11 @@ public abstract class AbstractJWTFilterTest { return null; } - /* (non-Javadoc) - * @see javax.servlet.FilterConfig#getInitParameter(java.lang.String) - */ @Override public String getInitParameter(String name) { return props.getProperty(name, null); } - /* (non-Javadoc) - * @see javax.servlet.FilterConfig#getInitParameterNames() - */ @Override public Enumeration<String> getInitParameterNames() { return null; @@ -782,43 +770,28 @@ public abstract class AbstractJWTFilterTest { this.verifyingKey = verifyingKey; } - /* (non-Javadoc) - * @see JWTokenAuthority#issueToken(javax.security.auth.Subject, java.lang.String) - */ @Override public JWT issueToken(Subject subject, String algorithm) throws TokenServiceException { return null; } - /* (non-Javadoc) - * @see JWTokenAuthority#issueToken(java.security.Principal, java.lang.String) - */ @Override public JWT issueToken(Principal p, String algorithm) throws TokenServiceException { return null; } - /* (non-Javadoc) - * @see JWTokenAuthority#issueToken(java.security.Principal, java.lang.String, java.lang.String) - */ @Override public JWT issueToken(Principal p, String audience, String algorithm) throws TokenServiceException { return null; } - /* (non-Javadoc) - * @see org.apache.knox.gateway.services.security.token.JWTokenAuthority#verifyToken(org.apache.knox.gateway.services.security.token.impl.JWT) - */ @Override public boolean verifyToken(JWT token) throws TokenServiceException { JWSVerifier verifier = new RSASSAVerifier((RSAPublicKey) verifyingKey); return token.verify(verifier); } - /* (non-Javadoc) - * @see JWTokenAuthority#issueToken(java.security.Principal, java.lang.String, java.lang.String, long) - */ @Override public JWT issueToken(Principal p, String audience, String algorithm, long expires) throws TokenServiceException { @@ -831,9 +804,6 @@ public abstract class AbstractJWTFilterTest { return null; } - /* (non-Javadoc) - * @see JWTokenAuthority#issueToken(java.security.Principal, java.lang.String, long) - */ @Override public JWT issueToken(Principal p, String algorithm, long expires) throws TokenServiceException { return null; @@ -844,16 +814,12 @@ public abstract class AbstractJWTFilterTest { JWSVerifier verifier = new RSASSAVerifier(publicKey); return token.verify(verifier); } - } protected static class TestFilterChain implements FilterChain { boolean doFilterCalled = false; Subject subject = null; - /* (non-Javadoc) - * @see javax.servlet.FilterChain#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse) - */ @Override public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { @@ -861,6 +827,5 @@ public abstract class AbstractJWTFilterTest { subject = Subject.getSubject( AccessController.getContext() ); } - } } http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/session/KnoxSessionStore.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/session/KnoxSessionStore.java b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/session/KnoxSessionStore.java index fc02277..3ffbee6 100644 --- a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/session/KnoxSessionStore.java +++ b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/session/KnoxSessionStore.java @@ -145,7 +145,7 @@ public class KnoxSessionStore implements SessionStore { /** * A function used to compress the data using GZIP - * @param data + * @param data data to be compressed * @return gziped data * @since 1.1.0 */ @@ -163,9 +163,9 @@ public class KnoxSessionStore implements SessionStore { /** * Decompress the data compressed using gzip * - * @param data + * @param data data to be decompressed * @return uncompressed data - * @throws IOException + * @throws IOException exception if can't decompress * @since 1.1.0 */ private static byte[] unCompress(final byte[] data) throws IOException { http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/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 caacbd4..e4f7685 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 @@ -44,9 +44,6 @@ import org.apache.knox.gateway.audit.log4j.audit.AuditConstants; import org.apache.knox.gateway.filter.AbstractGatewayFilter; import org.apache.knox.gateway.security.PrimaryPrincipal; -/** - * - */ public abstract class AbstractPreAuthFederationFilter implements Filter { private List<PreAuthValidator> validators = null; @@ -129,14 +126,8 @@ public abstract class AbstractPreAuthFederationFilter implements Filter { } } } - - /** - * @param httpRequest - */ + abstract protected String getPrimaryPrincipal(HttpServletRequest httpRequest); - /** - * @param principals - */ abstract protected void addGroupPrincipals(HttpServletRequest request, Set<Principal> principals); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/DefaultValidator.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/DefaultValidator.java b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/DefaultValidator.java index f85070c..6566503 100644 --- a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/DefaultValidator.java +++ b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/DefaultValidator.java @@ -33,12 +33,6 @@ public class DefaultValidator implements PreAuthValidator { public DefaultValidator() { } - /** - * @param httpRequest - * @param filterConfig - * @return true if validated, otherwise false - * @throws PreAuthValidationException - */ @Override public boolean validate(HttpServletRequest httpRequest, FilterConfig filterConfig) throws PreAuthValidationException { return true; http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/HeaderPreAuthFederationFilter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/HeaderPreAuthFederationFilter.java b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/HeaderPreAuthFederationFilter.java index 2106dae..2d92192 100644 --- a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/HeaderPreAuthFederationFilter.java +++ b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/HeaderPreAuthFederationFilter.java @@ -45,17 +45,11 @@ public class HeaderPreAuthFederationFilter extends AbstractPreAuthFederationFilt } } - /** - * @param httpRequest - */ @Override protected String getPrimaryPrincipal(HttpServletRequest httpRequest) { return httpRequest.getHeader(headerName); } - /** - * @param principals - */ @Override protected void addGroupPrincipals(HttpServletRequest request, Set<Principal> principals) { if (groupHeaderName != null) { http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/IPValidator.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/IPValidator.java b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/IPValidator.java index 0e763c1..5086189 100644 --- a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/IPValidator.java +++ b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/IPValidator.java @@ -22,9 +22,6 @@ import javax.servlet.http.HttpServletRequest; import org.apache.knox.gateway.util.IpAddressValidator; -/** - * - */ public class IPValidator implements PreAuthValidator { public static final String IP_ADDRESSES_PARAM = "preauth.ip.addresses"; public static final String IP_VALIDATION_METHOD_VALUE = "preauth.ip.validation"; @@ -32,12 +29,6 @@ public class IPValidator implements PreAuthValidator { public IPValidator() { } - /** - * @param httpRequest - * @param filterConfig - * @return true if validated, otherwise false - * @throws PreAuthValidationException - */ @Override public boolean validate(HttpServletRequest httpRequest, FilterConfig filterConfig) throws PreAuthValidationException { http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthFederationFilter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthFederationFilter.java b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthFederationFilter.java index 841d11a..eefbc26 100644 --- a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthFederationFilter.java +++ b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthFederationFilter.java @@ -69,9 +69,6 @@ public class PreAuthFederationFilter implements Filter { } } - /* (non-Javadoc) - * @see javax.servlet.Filter#destroy() - */ @Override public void destroy() { @@ -81,9 +78,6 @@ public class PreAuthFederationFilter implements Filter { * Recreate the current Subject based upon the provided mappedPrincipal * and look for the groups that should be associated with the new Subject. * Upon finding groups mapped to the principal - add them to the new Subject. - * @param principal - * @throws ServletException - * @throws IOException */ protected void continueChainAsPrincipal(final ServletRequest request, final ServletResponse response, final FilterChain chain, String principal) throws IOException, ServletException { http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/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 fab1624..59100b5 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 @@ -43,7 +43,6 @@ public class PreAuthService { initializeValidators(); } - private static void initializeValidators() { ServiceLoader<PreAuthValidator> servLoader = ServiceLoader.load(PreAuthValidator.class); validatorMap = new ConcurrentHashMap<>(); @@ -61,9 +60,7 @@ public class PreAuthService { * This method returns appropriate pre-auth Validator as defined in config * * @since 0.12 - * @param filterConfig * @return a list of PreAuthValidator instances as defined in config - * @throws ServletException */ public static List<PreAuthValidator> getValidators(FilterConfig filterConfig) throws ServletException { String validationMethods = filterConfig.getInitParameter(VALIDATION_METHOD_PARAM); http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthValidator.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthValidator.java b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthValidator.java index ca40ff7..6900d12 100644 --- a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthValidator.java +++ b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/filter/PreAuthValidator.java @@ -20,16 +20,7 @@ package org.apache.knox.gateway.preauth.filter; import javax.servlet.FilterConfig; import javax.servlet.http.HttpServletRequest; -/** - * - */ public interface PreAuthValidator { - /** - * @param httpRequest - * @param filterConfig - * @return true if validated, otherwise false - * @throws PreAuthValidationException - */ public abstract boolean validate(HttpServletRequest httpRequest, FilterConfig filterConfig) throws PreAuthValidationException; http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/HeaderPreAuthFederationFilterTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/HeaderPreAuthFederationFilterTest.java b/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/HeaderPreAuthFederationFilterTest.java index 1751509..86516fe 100644 --- a/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/HeaderPreAuthFederationFilterTest.java +++ b/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/HeaderPreAuthFederationFilterTest.java @@ -130,22 +130,12 @@ public class HeaderPreAuthFederationFilterTest extends org.junit.Assert { } - /** - * @param httpRequest - * @param filterConfig - * @return true if validated, otherwise false - */ @Override public boolean validate(HttpServletRequest httpRequest, FilterConfig filterConfig) { String token = httpRequest.getHeader("CUSTOM_TOKEN"); return token.equalsIgnoreCase("HelloWorld"); } - /** - * Return unique validator name - * - * @return name of validator - */ @Override public String getName() { return NAME; http://git-wip-us.apache.org/repos/asf/knox/blob/488e4445/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/CSRFPreventionFilter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/CSRFPreventionFilter.java b/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/CSRFPreventionFilter.java index c03798f..befa540 100644 --- a/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/CSRFPreventionFilter.java +++ b/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/CSRFPreventionFilter.java @@ -18,6 +18,7 @@ package org.apache.knox.gateway.webappsec.filter; import java.io.IOException; +import java.util.Arrays; import java.util.HashSet; import java.util.Set; @@ -49,9 +50,7 @@ public class CSRFPreventionFilter implements Filter { } String[] methods = mti.split(","); methodsToIgnore = new HashSet<>(); - for (int i = 0; i < methods.length; i++) { - methodsToIgnore.add(methods[i]); - } + methodsToIgnore.addAll(Arrays.asList(methods)); } @Override @@ -65,9 +64,6 @@ public class CSRFPreventionFilter implements Filter { } } - /* (non-Javadoc) - * @see javax.servlet.Filter#destroy() - */ @Override public void destroy() {
