Repository: knox Updated Branches: refs/heads/master 2bdc70394 -> 521a542d2
KNOX-871 - Fix FindBugs - Malicious code vulnerability (Colm O hEigeartaigh via Sandeep More) Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/521a542d Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/521a542d Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/521a542d Branch: refs/heads/master Commit: 521a542d2a34169319ba2dccbb3f7afee8b137ca Parents: 2bdc703 Author: Sandeep More <m...@apache.org> Authored: Tue Feb 7 14:25:55 2017 -0500 Committer: Sandeep More <m...@apache.org> Committed: Tue Feb 7 14:25:55 2017 -0500 ---------------------------------------------------------------------- .../hadoop/gateway/i18n/messages/Messages.java | 6 ++--- .../gateway/i18n/messages/MessagesInvoker.java | 8 +++--- .../loggers/sout/SoutMessageLoggerFactory.java | 2 +- .../loggers/test/TestMessageLoggerFactory.java | 2 +- .../i18n/resources/ResourcesInvoker.java | 6 ++--- .../SwitchCaseIdentityAssertionFilter.java | 4 +-- .../api/UrlRewriteStreamFilterFactory.java | 4 +-- .../UrlRewriteFunctionProcessorFactory.java | 2 +- .../rewrite/impl/UrlRewriteResponseStream.java | 2 +- .../impl/UrlRewriteStepProcessorFactory.java | 2 +- .../rewrite/impl/xml/XmlFilterReader.java | 4 +-- .../pac4j/filter/Pac4jIdentityAdapter.java | 2 +- .../gateway/pac4j/session/KnoxSessionStore.java | 6 ++--- .../hadoop/gateway/pac4j/Pac4jProviderTest.java | 18 +++++++------- .../gateway/shirorealm/KnoxLdapRealm.java | 14 +++++------ .../hadoop/gateway/shirorealm/KnoxPamRealm.java | 4 +-- .../filter/XForwardedHeaderRequestWrapper.java | 26 ++++++++++---------- .../apache/hadoop/gateway/GatewayServer.java | 6 ++--- .../gateway/config/impl/GatewayConfigImpl.java | 2 +- .../gateway/deploy/DeploymentFactory.java | 2 +- .../gateway/filter/DefaultTopologyHandler.java | 2 +- .../impl/DefaultTokenAuthorityService.java | 2 +- .../hadoop/gateway/trace/TraceHandler.java | 16 ++++++------ .../apache/hadoop/gateway/trace/TraceUtil.java | 4 +-- .../org/apache/hadoop/gateway/util/KnoxCLI.java | 2 +- .../gateway/util/ServiceDefinitionsLoader.java | 6 ++--- .../websockets/GatewayWebsocketHandler.java | 8 +++--- .../websockets/ProxyWebSocketAdapter.java | 2 +- .../org/apache/hadoop/gateway/shell/KnoxSh.java | 2 +- .../org/apache/hadoop/gateway/shell/Shell.java | 2 +- .../apache/hadoop/gateway/shell/hdfs/Hdfs.java | 2 +- .../apache/hadoop/gateway/shell/job/Job.java | 2 +- .../hadoop/gateway/shell/workflow/Workflow.java | 2 +- .../apache/hadoop/gateway/shell/yarn/Yarn.java | 2 +- .../dispatch/AbstractGatewayDispatch.java | 2 +- .../gateway/filter/GatewayResponseWrapper.java | 4 +-- .../gateway/audit/api/CorrelationService.java | 2 +- .../apache/hadoop/gateway/util/HttpUtils.java | 4 +-- .../gateway/util/X500PrincipalParser.java | 20 +++++++-------- .../AbstractConfigurationAdapterDescriptor.java | 2 +- .../apache/hadoop/gateway/launcher/Command.java | 20 +++++++-------- .../apache/hadoop/gateway/launcher/Config.java | 12 ++++----- .../apache/hadoop/gateway/launcher/Invoker.java | 4 +-- .../hadoop/gateway/launcher/Launcher.java | 10 ++++---- .../hadoop/gateway/launcher/ConfigTest.java | 2 +- .../gateway/util/urltemplate/Segment.java | 4 +-- .../org/apache/hadoop/examples/WordCount.java | 2 +- 47 files changed, 132 insertions(+), 132 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/messages/Messages.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/messages/Messages.java b/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/messages/Messages.java index 210542b..68579b8 100644 --- a/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/messages/Messages.java +++ b/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/messages/Messages.java @@ -28,9 +28,9 @@ import java.lang.annotation.Target; @Retention( RetentionPolicy.RUNTIME ) @Target( ElementType.TYPE ) public @interface Messages { - final static String DEFAULT_BUNDLE = ""; - final static String DEFAULT_LOGGER = ""; - final static String DEFAULT_CODES = "{0}"; + static final String DEFAULT_BUNDLE = ""; + static final String DEFAULT_LOGGER = ""; + static final String DEFAULT_CODES = "{0}"; String bundle() default DEFAULT_BUNDLE; String logger() default DEFAULT_LOGGER; String codes() default DEFAULT_CODES; http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/messages/MessagesInvoker.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/messages/MessagesInvoker.java b/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/messages/MessagesInvoker.java index bc461a5..7fad77d 100644 --- a/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/messages/MessagesInvoker.java +++ b/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/messages/MessagesInvoker.java @@ -73,7 +73,7 @@ public class MessagesInvoker extends ResourcesInvoker implements InvocationHandl return code; } - private final static StackTrace getStackTraceAnno( final Method method, final int param ) { + private static final StackTrace getStackTraceAnno( final Method method, final int param ) { final Annotation[] annos = method.getParameterAnnotations()[ param ]; for( Annotation anno: annos ) { if( anno instanceof StackTrace ) { @@ -83,7 +83,7 @@ public class MessagesInvoker extends ResourcesInvoker implements InvocationHandl return null; } - private final static Throwable findLoggableThrowable( final MessageLogger logger, final Method method, final Object[] args ) { + private static final Throwable findLoggableThrowable( final MessageLogger logger, final Method method, final Object[] args ) { Throwable throwable = null; if( args != null ) { for( int i=0; i<args.length; i++ ) { @@ -144,7 +144,7 @@ public class MessagesInvoker extends ResourcesInvoker implements InvocationHandl return bundle; } - private final static String calcLoggerName( final Class<?> clazz, final Messages anno ) { + private static final String calcLoggerName( final Class<?> clazz, final Messages anno ) { String logger = null; if( anno != null ) { logger = anno.logger(); @@ -162,7 +162,7 @@ public class MessagesInvoker extends ResourcesInvoker implements InvocationHandl return bundle; } - private final static MessageLogger getLogger( final Class<?> clazz, final Messages anno, final MessageLoggerFactory loggers ) { + private static final MessageLogger getLogger( final Class<?> clazz, final Messages anno, final MessageLoggerFactory loggers ) { return loggers.getLogger( calcLoggerName( clazz, anno ) ); } http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/messages/loggers/sout/SoutMessageLoggerFactory.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/messages/loggers/sout/SoutMessageLoggerFactory.java b/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/messages/loggers/sout/SoutMessageLoggerFactory.java index 8652283..07c9e6c 100644 --- a/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/messages/loggers/sout/SoutMessageLoggerFactory.java +++ b/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/messages/loggers/sout/SoutMessageLoggerFactory.java @@ -30,7 +30,7 @@ import java.util.concurrent.ConcurrentHashMap; public class SoutMessageLoggerFactory implements MessageLoggerFactory { private static SoutMessageLoggerFactory INSTANCE; - private static Map<String,MessageLogger> LOGGERS = new ConcurrentHashMap<String,MessageLogger>(); + private static final Map<String,MessageLogger> LOGGERS = new ConcurrentHashMap<String,MessageLogger>(); public static SoutMessageLoggerFactory getFactory() { if( INSTANCE == null ) { http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/messages/loggers/test/TestMessageLoggerFactory.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/messages/loggers/test/TestMessageLoggerFactory.java b/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/messages/loggers/test/TestMessageLoggerFactory.java index 66a0b02..9b8b5e0 100644 --- a/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/messages/loggers/test/TestMessageLoggerFactory.java +++ b/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/messages/loggers/test/TestMessageLoggerFactory.java @@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap; public class TestMessageLoggerFactory implements MessageLoggerFactory { private static TestMessageLoggerFactory INSTANCE; - private static Map<String,MessageLogger> LOGGERS = new ConcurrentHashMap<String,MessageLogger>(); + private static final Map<String,MessageLogger> LOGGERS = new ConcurrentHashMap<String,MessageLogger>(); public static TestMessageLoggerFactory getFactory() { if( INSTANCE == null ) { http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/resources/ResourcesInvoker.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/resources/ResourcesInvoker.java b/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/resources/ResourcesInvoker.java index 049afc3..865f8db 100644 --- a/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/resources/ResourcesInvoker.java +++ b/gateway-i18n/src/main/java/org/apache/hadoop/gateway/i18n/resources/ResourcesInvoker.java @@ -88,7 +88,7 @@ public class ResourcesInvoker implements InvocationHandler { return pattern; } - protected final static String getDefaultPattern( final Method method ) { + protected static final String getDefaultPattern( final Method method ) { final String prefix = method.getName(); String suffix; final int params = method.getParameterTypes().length; @@ -109,7 +109,7 @@ public class ResourcesInvoker implements InvocationHandler { return prefix + suffix; } - private final static String createDefaultPatternSuffix( final int size ) { + private static final String createDefaultPatternSuffix( final int size ) { StringBuilder builder = new StringBuilder( 1 + size*7 ); builder.append( "(" ); for( int i=0; i<size; i++ ) { @@ -123,7 +123,7 @@ public class ResourcesInvoker implements InvocationHandler { } - private final static String calcBundleName( final Class<?> clazz ) { + private static final String calcBundleName( final Class<?> clazz ) { String bundle = null; final Resources anno = clazz.getAnnotation( Resources.class ); if( anno != null ) { http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-provider-identity-assertion-switchcase/src/main/java/org/apache/hadoop/gateway/identityasserter/switchcase/SwitchCaseIdentityAssertionFilter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-identity-assertion-switchcase/src/main/java/org/apache/hadoop/gateway/identityasserter/switchcase/SwitchCaseIdentityAssertionFilter.java b/gateway-provider-identity-assertion-switchcase/src/main/java/org/apache/hadoop/gateway/identityasserter/switchcase/SwitchCaseIdentityAssertionFilter.java index 352898b..e3a6b2c 100644 --- a/gateway-provider-identity-assertion-switchcase/src/main/java/org/apache/hadoop/gateway/identityasserter/switchcase/SwitchCaseIdentityAssertionFilter.java +++ b/gateway-provider-identity-assertion-switchcase/src/main/java/org/apache/hadoop/gateway/identityasserter/switchcase/SwitchCaseIdentityAssertionFilter.java @@ -27,8 +27,8 @@ import org.apache.hadoop.gateway.security.GroupPrincipal; public class SwitchCaseIdentityAssertionFilter extends CommonIdentityAssertionFilter { - private static String USER_INIT_PARAM = "principal.case"; - private static String GROUP_INIT_PARAM = "group.principal.case"; + private static final String USER_INIT_PARAM = "principal.case"; + private static final String GROUP_INIT_PARAM = "group.principal.case"; private enum SwitchCase { UPPER, LOWER, NONE } http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteStreamFilterFactory.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteStreamFilterFactory.java b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteStreamFilterFactory.java index fdac99f..0fa791c 100644 --- a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteStreamFilterFactory.java +++ b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/api/UrlRewriteStreamFilterFactory.java @@ -32,9 +32,9 @@ import java.util.ServiceLoader; public abstract class UrlRewriteStreamFilterFactory { - private static String DEFAULT_CHARACTER_ENCODING = "ISO-8859-1"; + private static final String DEFAULT_CHARACTER_ENCODING = "ISO-8859-1"; - private static Map<String,Map<String,UrlRewriteStreamFilter>> MAP = loadFactories(); + private static final Map<String,Map<String,UrlRewriteStreamFilter>> MAP = loadFactories(); private UrlRewriteStreamFilterFactory() { } http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteFunctionProcessorFactory.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteFunctionProcessorFactory.java b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteFunctionProcessorFactory.java index a2bf30e..56c0034 100644 --- a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteFunctionProcessorFactory.java +++ b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteFunctionProcessorFactory.java @@ -29,7 +29,7 @@ import java.util.ServiceLoader; public abstract class UrlRewriteFunctionProcessorFactory { - private static Map<Class<? extends UrlRewriteFunctionDescriptor>,Map<String,Class<? extends UrlRewriteFunctionProcessor>>> MAP + private static final Map<Class<? extends UrlRewriteFunctionDescriptor>,Map<String,Class<? extends UrlRewriteFunctionProcessor>>> MAP = loadProcessors(); private UrlRewriteFunctionProcessorFactory() { http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteResponseStream.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteResponseStream.java b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteResponseStream.java index 30d3cc4..41117bd 100644 --- a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteResponseStream.java +++ b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteResponseStream.java @@ -28,7 +28,7 @@ import java.io.InputStream; //TODO: This needs to be coded much more efficiently! public class UrlRewriteResponseStream extends SynchronousServletOutputStreamAdapter { - private static int DEFAULT_BUFFER_SIZE = 1024; + private static final int DEFAULT_BUFFER_SIZE = 1024; private GatewayResponse response; private ByteArrayOutputStream buffer; http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteStepProcessorFactory.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteStepProcessorFactory.java b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteStepProcessorFactory.java index ac0d060..88de376 100644 --- a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteStepProcessorFactory.java +++ b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/UrlRewriteStepProcessorFactory.java @@ -28,7 +28,7 @@ import java.util.ServiceLoader; public abstract class UrlRewriteStepProcessorFactory { - private static Map<Class<? extends UrlRewriteStepDescriptor>,Map<String,Class<? extends UrlRewriteStepProcessor>>> MAP + private static final Map<Class<? extends UrlRewriteStepDescriptor>,Map<String,Class<? extends UrlRewriteStepProcessor>>> MAP = loadStepProcessors(); private UrlRewriteStepProcessorFactory() { http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/xml/XmlFilterReader.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/xml/XmlFilterReader.java b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/xml/XmlFilterReader.java index e6e1797..070ccce 100644 --- a/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/xml/XmlFilterReader.java +++ b/gateway-provider-rewrite/src/main/java/org/apache/hadoop/gateway/filter/rewrite/impl/xml/XmlFilterReader.java @@ -71,9 +71,9 @@ import java.util.regex.Pattern; public abstract class XmlFilterReader extends Reader { - private static UrlRewriteResources RES = ResourcesFactory.get( UrlRewriteResources.class ); + private static final UrlRewriteResources RES = ResourcesFactory.get( UrlRewriteResources.class ); - private static String DEFAULT_XML_VERSION = "1.0"; + private static final String DEFAULT_XML_VERSION = "1.0"; private static final UrlRewriteMessages LOG = MessagesFactory.get( UrlRewriteMessages.class ); private static final UrlRewriteFilterPathDescriptor.Compiler<XPathExpression> XPATH_COMPILER = new XmlPathCompiler(); http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-provider-security-pac4j/src/main/java/org/apache/hadoop/gateway/pac4j/filter/Pac4jIdentityAdapter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-pac4j/src/main/java/org/apache/hadoop/gateway/pac4j/filter/Pac4jIdentityAdapter.java b/gateway-provider-security-pac4j/src/main/java/org/apache/hadoop/gateway/pac4j/filter/Pac4jIdentityAdapter.java index 52fad88..ec5c368 100644 --- a/gateway-provider-security-pac4j/src/main/java/org/apache/hadoop/gateway/pac4j/filter/Pac4jIdentityAdapter.java +++ b/gateway-provider-security-pac4j/src/main/java/org/apache/hadoop/gateway/pac4j/filter/Pac4jIdentityAdapter.java @@ -43,7 +43,7 @@ import java.security.PrivilegedExceptionAction; */ public class Pac4jIdentityAdapter implements Filter { - private final static Logger logger = LoggerFactory.getLogger(Pac4jIdentityAdapter.class); + private static final Logger logger = LoggerFactory.getLogger(Pac4jIdentityAdapter.class); private static AuditService auditService = AuditServiceFactory.getAuditService(); private static Auditor auditor = auditService.getAuditor( http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-provider-security-pac4j/src/main/java/org/apache/hadoop/gateway/pac4j/session/KnoxSessionStore.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-pac4j/src/main/java/org/apache/hadoop/gateway/pac4j/session/KnoxSessionStore.java b/gateway-provider-security-pac4j/src/main/java/org/apache/hadoop/gateway/pac4j/session/KnoxSessionStore.java index d1d4523..1d7c567 100644 --- a/gateway-provider-security-pac4j/src/main/java/org/apache/hadoop/gateway/pac4j/session/KnoxSessionStore.java +++ b/gateway-provider-security-pac4j/src/main/java/org/apache/hadoop/gateway/pac4j/session/KnoxSessionStore.java @@ -40,11 +40,11 @@ import java.io.Serializable; */ public class KnoxSessionStore implements SessionStore { - private final static Logger logger = LoggerFactory.getLogger(KnoxSessionStore.class); + private static final Logger logger = LoggerFactory.getLogger(KnoxSessionStore.class); - public final static String PAC4J_PASSWORD = "pac4j.password"; + public static final String PAC4J_PASSWORD = "pac4j.password"; - public final static String PAC4J_SESSION_PREFIX = "pac4j.session."; + public static final String PAC4J_SESSION_PREFIX = "pac4j.session."; private final JavaSerializationHelper javaSerializationHelper; http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-provider-security-pac4j/src/test/java/org/apache/hadoop/gateway/pac4j/Pac4jProviderTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-pac4j/src/test/java/org/apache/hadoop/gateway/pac4j/Pac4jProviderTest.java b/gateway-provider-security-pac4j/src/test/java/org/apache/hadoop/gateway/pac4j/Pac4jProviderTest.java index e0088d5..60bf6f8 100644 --- a/gateway-provider-security-pac4j/src/test/java/org/apache/hadoop/gateway/pac4j/Pac4jProviderTest.java +++ b/gateway-provider-security-pac4j/src/test/java/org/apache/hadoop/gateway/pac4j/Pac4jProviderTest.java @@ -46,15 +46,15 @@ import static org.junit.Assert.*; */ public class Pac4jProviderTest { - private final static String LOCALHOST = "127.0.0.1"; - private final static String HADOOP_SERVICE_URL = "https://"; + LOCALHOST + ":8443/gateway/sandox/webhdfs/v1/tmp?op=LISTSTATUS"; - private final static String KNOXSSO_SERVICE_URL = "https://"; + LOCALHOST + ":8443/gateway/idp/api/v1/websso"; - private final static String PAC4J_CALLBACK_URL = KNOXSSO_SERVICE_URL; - private final static String ORIGINAL_URL = "originalUrl"; - private final static String CLUSTER_NAME = "knox"; - private final static String PAC4J_PASSWORD = "pwdfortest"; - private final static String CLIENT_CLASS = IndirectBasicAuthClient.class.getSimpleName(); - private final static String USERNAME = "jleleu"; + private static final String LOCALHOST = "127.0.0.1"; + private static final String HADOOP_SERVICE_URL = "https://"; + LOCALHOST + ":8443/gateway/sandox/webhdfs/v1/tmp?op=LISTSTATUS"; + private static final String KNOXSSO_SERVICE_URL = "https://"; + LOCALHOST + ":8443/gateway/idp/api/v1/websso"; + private static final String PAC4J_CALLBACK_URL = KNOXSSO_SERVICE_URL; + private static final String ORIGINAL_URL = "originalUrl"; + private static final String CLUSTER_NAME = "knox"; + private static final String PAC4J_PASSWORD = "pwdfortest"; + private static final String CLIENT_CLASS = IndirectBasicAuthClient.class.getSimpleName(); + private static final String USERNAME = "jleleu"; @Test public void test() throws Exception { http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java b/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java index 4cfc7e9..0952870 100644 --- a/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java +++ b/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java @@ -137,16 +137,16 @@ public class KnoxLdapRealm extends JndiLdapRealm { private static String DEFAULT_PRINCIPAL_REGEX = "(.*)"; private static final String MEMBER_SUBSTITUTION_TOKEN = "{0}"; - private final static SearchControls SUBTREE_SCOPE = new SearchControls(); - private final static SearchControls ONELEVEL_SCOPE = new SearchControls(); - private final static SearchControls OBJECT_SCOPE = new SearchControls(); + private static final SearchControls SUBTREE_SCOPE = new SearchControls(); + private static final SearchControls ONELEVEL_SCOPE = new SearchControls(); + private static final SearchControls OBJECT_SCOPE = new SearchControls(); - private final static String SUBJECT_USER_ROLES = "subject.userRoles"; - private final static String SUBJECT_USER_GROUPS = "subject.userGroups"; + private static final String SUBJECT_USER_ROLES = "subject.userRoles"; + private static final String SUBJECT_USER_GROUPS = "subject.userGroups"; - private final static String MEMBER_URL = "memberUrl"; + private static final String MEMBER_URL = "memberUrl"; - private final static String POSIX_GROUP = "posixGroup"; + private static final String POSIX_GROUP = "posixGroup"; private static final String HASHING_ALGORITHM = "SHA-1"; http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxPamRealm.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxPamRealm.java b/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxPamRealm.java index e429e26..6e103ba 100644 --- a/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxPamRealm.java +++ b/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxPamRealm.java @@ -81,8 +81,8 @@ import org.jvnet.libpam.UnixUser; public class KnoxPamRealm extends AuthorizingRealm { private static final String HASHING_ALGORITHM = "SHA-1"; - private final static String SUBJECT_USER_ROLES = "subject.userRoles"; - private final static String SUBJECT_USER_GROUPS = "subject.userGroups"; + private static final String SUBJECT_USER_ROLES = "subject.userRoles"; + private static final String SUBJECT_USER_GROUPS = "subject.userGroups"; private HashService hashService = new DefaultHashService(); KnoxShiroMessages ShiroLog = MessagesFactory.get(KnoxShiroMessages.class); GatewayMessages GatewayLog = MessagesFactory.get(GatewayMessages.class); http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-server-xforwarded-filter/src/main/java/org/apache/hadoop/gateway/filter/XForwardedHeaderRequestWrapper.java ---------------------------------------------------------------------- diff --git a/gateway-server-xforwarded-filter/src/main/java/org/apache/hadoop/gateway/filter/XForwardedHeaderRequestWrapper.java b/gateway-server-xforwarded-filter/src/main/java/org/apache/hadoop/gateway/filter/XForwardedHeaderRequestWrapper.java index 230854a..787ed52 100644 --- a/gateway-server-xforwarded-filter/src/main/java/org/apache/hadoop/gateway/filter/XForwardedHeaderRequestWrapper.java +++ b/gateway-server-xforwarded-filter/src/main/java/org/apache/hadoop/gateway/filter/XForwardedHeaderRequestWrapper.java @@ -26,19 +26,19 @@ import java.util.Hashtable; public class XForwardedHeaderRequestWrapper extends GatewayRequestWrapper { - private static String X_FORWARDED_FOR = "X-Forwarded-For"; - private static String X_FORWARDED_FOR_LOWER = X_FORWARDED_FOR.toLowerCase(); - private static String X_FORWARDED_PROTO = "X-Forwarded-Proto"; - private static String X_FORWARDED_PROTO_LOWER = X_FORWARDED_PROTO.toLowerCase(); - private static String X_FORWARDED_PORT = "X-Forwarded-Port"; - private static String X_FORWARDED_PORT_LOWER = X_FORWARDED_PORT.toLowerCase(); - private static String X_FORWARDED_HOST = "X-Forwarded-Host"; - private static String X_FORWARDED_HOST_LOWER = X_FORWARDED_HOST.toLowerCase(); - private static String X_FORWARDED_SERVER = "X-Forwarded-Server"; - private static String X_FORWARDED_SERVER_LOWER = X_FORWARDED_SERVER.toLowerCase(); - private static String X_FORWARDED_CONTEXT = "X-Forwarded-Context"; - private static String X_FORWARDED_CONTEXT_LOWER = X_FORWARDED_CONTEXT.toLowerCase(); - private static ArrayList<String> headerNames = new ArrayList<>(); + private static final String X_FORWARDED_FOR = "X-Forwarded-For"; + private static final String X_FORWARDED_FOR_LOWER = X_FORWARDED_FOR.toLowerCase(); + private static final String X_FORWARDED_PROTO = "X-Forwarded-Proto"; + private static final String X_FORWARDED_PROTO_LOWER = X_FORWARDED_PROTO.toLowerCase(); + private static final String X_FORWARDED_PORT = "X-Forwarded-Port"; + private static final String X_FORWARDED_PORT_LOWER = X_FORWARDED_PORT.toLowerCase(); + private static final String X_FORWARDED_HOST = "X-Forwarded-Host"; + private static final String X_FORWARDED_HOST_LOWER = X_FORWARDED_HOST.toLowerCase(); + private static final String X_FORWARDED_SERVER = "X-Forwarded-Server"; + private static final String X_FORWARDED_SERVER_LOWER = X_FORWARDED_SERVER.toLowerCase(); + private static final String X_FORWARDED_CONTEXT = "X-Forwarded-Context"; + private static final String X_FORWARDED_CONTEXT_LOWER = X_FORWARDED_CONTEXT.toLowerCase(); + private static final ArrayList<String> headerNames = new ArrayList<>(); static { headerNames.add(X_FORWARDED_FOR); http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java index fe59bf7..559f9cc 100644 --- a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java +++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java @@ -103,9 +103,9 @@ import org.w3c.dom.NodeList; import org.xml.sax.SAXException; public class GatewayServer { - private static GatewayResources res = ResourcesFactory.get(GatewayResources.class); - private static GatewayMessages log = MessagesFactory.get(GatewayMessages.class); - private static Auditor auditor = AuditServiceFactory.getAuditService().getAuditor(AuditConstants.DEFAULT_AUDITOR_NAME, + private static final GatewayResources res = ResourcesFactory.get(GatewayResources.class); + private static final GatewayMessages log = MessagesFactory.get(GatewayMessages.class); + private static final Auditor auditor = AuditServiceFactory.getAuditService().getAuditor(AuditConstants.DEFAULT_AUDITOR_NAME, AuditConstants.KNOX_SERVICE_NAME, AuditConstants.KNOX_COMPONENT_NAME); private static GatewayServer server; private static GatewayServices services; http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-server/src/main/java/org/apache/hadoop/gateway/config/impl/GatewayConfigImpl.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/config/impl/GatewayConfigImpl.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/config/impl/GatewayConfigImpl.java index 4c94f14..0906157 100644 --- a/gateway-server/src/main/java/org/apache/hadoop/gateway/config/impl/GatewayConfigImpl.java +++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/config/impl/GatewayConfigImpl.java @@ -73,7 +73,7 @@ public class GatewayConfigImpl extends Configuration implements GatewayConfig { private static final String GATEWAY_DEFAULT_TOPOLOGY_NAME_PARAM = "default.app.topology.name"; private static final String GATEWAY_DEFAULT_TOPOLOGY_NAME = null; - private static GatewayMessages log = MessagesFactory.get( GatewayMessages.class ); + private static final GatewayMessages log = MessagesFactory.get( GatewayMessages.class ); private static final String GATEWAY_CONFIG_DIR_PREFIX = "conf"; http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/DeploymentFactory.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/DeploymentFactory.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/DeploymentFactory.java index db6476b..d834e74 100644 --- a/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/DeploymentFactory.java +++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/DeploymentFactory.java @@ -67,7 +67,7 @@ public abstract class DeploymentFactory { private static final String SERVLET_NAME_SUFFIX = "-knox-gateway-servlet"; private static final String FILTER_NAME_SUFFIX = "-knox-gateway-filter"; - private static GatewayMessages log = MessagesFactory.get( GatewayMessages.class ); + private static final GatewayMessages log = MessagesFactory.get( GatewayMessages.class ); private static GatewayServices gatewayServices = null; private static Map<String,Map<String,Map<Version, ServiceDeploymentContributor>>> SERVICE_CONTRIBUTOR_MAP; http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-server/src/main/java/org/apache/hadoop/gateway/filter/DefaultTopologyHandler.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/filter/DefaultTopologyHandler.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/filter/DefaultTopologyHandler.java index 75a2aed..707083d 100644 --- a/gateway-server/src/main/java/org/apache/hadoop/gateway/filter/DefaultTopologyHandler.java +++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/filter/DefaultTopologyHandler.java @@ -35,7 +35,7 @@ import org.eclipse.jetty.server.handler.HandlerWrapper; public class DefaultTopologyHandler extends HandlerWrapper { - private static GatewayMessages LOG = MessagesFactory.get(GatewayMessages.class); + private static final GatewayMessages LOG = MessagesFactory.get(GatewayMessages.class); private GatewayConfig config; private GatewayServices services; http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-server/src/main/java/org/apache/hadoop/gateway/services/token/impl/DefaultTokenAuthorityService.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/services/token/impl/DefaultTokenAuthorityService.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/services/token/impl/DefaultTokenAuthorityService.java index 368baff..26c83fa 100644 --- a/gateway-server/src/main/java/org/apache/hadoop/gateway/services/token/impl/DefaultTokenAuthorityService.java +++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/services/token/impl/DefaultTokenAuthorityService.java @@ -46,7 +46,7 @@ import com.nimbusds.jose.crypto.RSASSAVerifier; public class DefaultTokenAuthorityService implements JWTokenAuthority, Service { - private static String SIGNING_KEY_PASSPHRASE = "signing.key.passphrase"; + private static final String SIGNING_KEY_PASSPHRASE = "signing.key.passphrase"; private AliasService as = null; private KeystoreService ks = null; String signingKeyAlias = null; http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-server/src/main/java/org/apache/hadoop/gateway/trace/TraceHandler.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/trace/TraceHandler.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/trace/TraceHandler.java index 7f49979..62031cf 100644 --- a/gateway-server/src/main/java/org/apache/hadoop/gateway/trace/TraceHandler.java +++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/trace/TraceHandler.java @@ -28,14 +28,14 @@ import java.util.Set; public class TraceHandler extends HandlerWrapper { - static String HTTP_LOGGER = "org.apache.hadoop.gateway.http"; - static String HTTP_REQUEST_LOGGER = HTTP_LOGGER + ".request"; - static String HTTP_REQUEST_HEADER_LOGGER = HTTP_REQUEST_LOGGER + ".headers"; - static String HTTP_REQUEST_BODY_LOGGER = HTTP_REQUEST_LOGGER + ".body"; - - static String HTTP_RESPONSE_LOGGER = HTTP_LOGGER + ".response"; - static String HTTP_RESPONSE_HEADER_LOGGER = HTTP_RESPONSE_LOGGER + ".headers"; - static String HTTP_RESPONSE_BODY_LOGGER = HTTP_RESPONSE_LOGGER + ".body"; + static final String HTTP_LOGGER = "org.apache.hadoop.gateway.http"; + static final String HTTP_REQUEST_LOGGER = HTTP_LOGGER + ".request"; + static final String HTTP_REQUEST_HEADER_LOGGER = HTTP_REQUEST_LOGGER + ".headers"; + static final String HTTP_REQUEST_BODY_LOGGER = HTTP_REQUEST_LOGGER + ".body"; + + static final String HTTP_RESPONSE_LOGGER = HTTP_LOGGER + ".response"; + static final String HTTP_RESPONSE_HEADER_LOGGER = HTTP_RESPONSE_LOGGER + ".headers"; + static final String HTTP_RESPONSE_BODY_LOGGER = HTTP_RESPONSE_LOGGER + ".body"; private Set<Integer> bodyFilter; http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-server/src/main/java/org/apache/hadoop/gateway/trace/TraceUtil.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/trace/TraceUtil.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/trace/TraceUtil.java index 91babad..1379406 100644 --- a/gateway-server/src/main/java/org/apache/hadoop/gateway/trace/TraceUtil.java +++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/trace/TraceUtil.java @@ -29,7 +29,7 @@ public class TraceUtil { private static CorrelationService cs = CorrelationServiceFactory.getCorrelationService(); - final static void appendCorrelationContext( final StringBuilder sb ) { + static final void appendCorrelationContext( final StringBuilder sb ) { CorrelationContext cc = cs.getContext(); if( cc == null ) { sb.append( "||" ); @@ -48,7 +48,7 @@ public class TraceUtil { } } - final static Set<Integer> parseIntegerSet( String str ) { + static final Set<Integer> parseIntegerSet( String str ) { Set<Integer> set = new HashSet<Integer>(); if( str != null && !str.trim().isEmpty() ) { StringTokenizer parser = new StringTokenizer( str.trim(), ",", false ); http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-server/src/main/java/org/apache/hadoop/gateway/util/KnoxCLI.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/util/KnoxCLI.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/util/KnoxCLI.java index ebffc48..b3baae4 100644 --- a/gateway-server/src/main/java/org/apache/hadoop/gateway/util/KnoxCLI.java +++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/util/KnoxCLI.java @@ -88,7 +88,7 @@ import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; public class KnoxCLI extends Configured implements Tool { private static final String USAGE_PREFIX = "KnoxCLI {cmd} [options]"; - final static private String COMMANDS = + static final private String COMMANDS = " [--help]\n" + " [" + VersionCommand.USAGE + "]\n" + " [" + MasterCreateCommand.USAGE + "]\n" + http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-server/src/main/java/org/apache/hadoop/gateway/util/ServiceDefinitionsLoader.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/util/ServiceDefinitionsLoader.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/util/ServiceDefinitionsLoader.java index 737b405..e94f52e 100644 --- a/gateway-server/src/main/java/org/apache/hadoop/gateway/util/ServiceDefinitionsLoader.java +++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/util/ServiceDefinitionsLoader.java @@ -43,11 +43,11 @@ import java.util.HashSet; import java.util.Set; public class ServiceDefinitionsLoader { - private static GatewayMessages log = MessagesFactory.get(GatewayMessages.class); + private static final GatewayMessages log = MessagesFactory.get(GatewayMessages.class); - private static String SERVICE_FILE_NAME = "service"; + private static final String SERVICE_FILE_NAME = "service"; - private static String REWRITE_FILE = "rewrite.xml"; + private static final String REWRITE_FILE = "rewrite.xml"; public static Set<ServiceDeploymentContributor> loadServiceDefinitions(File servicesDir) { Set<ServiceDeploymentContributor> contributors = new HashSet<ServiceDeploymentContributor>(); http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-server/src/main/java/org/apache/hadoop/gateway/websockets/GatewayWebsocketHandler.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/websockets/GatewayWebsocketHandler.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/websockets/GatewayWebsocketHandler.java index fbae2f9..8faa4f4 100644 --- a/gateway-server/src/main/java/org/apache/hadoop/gateway/websockets/GatewayWebsocketHandler.java +++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/websockets/GatewayWebsocketHandler.java @@ -48,14 +48,14 @@ import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory; public class GatewayWebsocketHandler extends WebSocketHandler implements WebSocketCreator { - private static WebsocketLogMessages LOG = MessagesFactory + private static final WebsocketLogMessages LOG = MessagesFactory .get(WebsocketLogMessages.class); - public final static String WEBSOCKET_PROTOCOL_STRING = "ws://"; + public static final String WEBSOCKET_PROTOCOL_STRING = "ws://"; - final static String REGEX_SPLIT_CLUSTER_NAME = "^((?:[^/]*/){1}[^/]*)"; + static final String REGEX_SPLIT_CLUSTER_NAME = "^((?:[^/]*/){1}[^/]*)"; - final static String REGEX_SPLIT_CONTEXT = "^((?:[^/]*/){2}[^/]*)"; + static final String REGEX_SPLIT_CONTEXT = "^((?:[^/]*/){2}[^/]*)"; final GatewayConfig config; final GatewayServices services; http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-server/src/main/java/org/apache/hadoop/gateway/websockets/ProxyWebSocketAdapter.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/websockets/ProxyWebSocketAdapter.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/websockets/ProxyWebSocketAdapter.java index c7a7649..629f63d 100644 --- a/gateway-server/src/main/java/org/apache/hadoop/gateway/websockets/ProxyWebSocketAdapter.java +++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/websockets/ProxyWebSocketAdapter.java @@ -41,7 +41,7 @@ import org.eclipse.jetty.websocket.api.WebSocketAdapter; */ public class ProxyWebSocketAdapter extends WebSocketAdapter { - private static WebsocketLogMessages LOG = MessagesFactory + private static final WebsocketLogMessages LOG = MessagesFactory .get(WebsocketLogMessages.class); /* URI for the backend */ http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/KnoxSh.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/KnoxSh.java b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/KnoxSh.java index 68fe771..1e57d95 100644 --- a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/KnoxSh.java +++ b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/KnoxSh.java @@ -46,7 +46,7 @@ import org.apache.hadoop.gateway.util.JsonUtils; public class KnoxSh { private static final String USAGE_PREFIX = "KnoxCLI {cmd} [options]"; - final static private String COMMANDS = + static final private String COMMANDS = " [--help]\n" + " [" + KnoxInit.USAGE + "]\n" + " [" + KnoxDestroy.USAGE + "]\n" + http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/Shell.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/Shell.java b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/Shell.java index 38cbfe8..8d7ef74 100644 --- a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/Shell.java +++ b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/Shell.java @@ -34,7 +34,7 @@ import java.util.concurrent.TimeUnit; public class Shell { - private static String[] IMPORTS = new String[] { + private static final String[] IMPORTS = new String[] { Hadoop.class.getName(), HBase.class.getName(), Hdfs.class.getName(), http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/hdfs/Hdfs.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/hdfs/Hdfs.java b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/hdfs/Hdfs.java index 0984c01..7e77ac5 100644 --- a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/hdfs/Hdfs.java +++ b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/hdfs/Hdfs.java @@ -21,7 +21,7 @@ import org.apache.hadoop.gateway.shell.Hadoop; public class Hdfs { - static String SERVICE_PATH = "/webhdfs/v1"; + static final String SERVICE_PATH = "/webhdfs/v1"; public static Rename.Request rename( Hadoop session ) { return new Rename.Request( session ); http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/job/Job.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/job/Job.java b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/job/Job.java index ec49fe1..3461f9c 100644 --- a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/job/Job.java +++ b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/job/Job.java @@ -21,7 +21,7 @@ import org.apache.hadoop.gateway.shell.Hadoop; public class Job { - static String SERVICE_PATH = "/templeton/v1"; + static final String SERVICE_PATH = "/templeton/v1"; public static Java.Request submitJava( Hadoop session ) { return new Java.Request( session ); http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/workflow/Workflow.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/workflow/Workflow.java b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/workflow/Workflow.java index a132e9f..e319498 100644 --- a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/workflow/Workflow.java +++ b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/workflow/Workflow.java @@ -21,7 +21,7 @@ import org.apache.hadoop.gateway.shell.Hadoop; public class Workflow { - static String SERVICE_PATH = "/oozie/v1"; + static final String SERVICE_PATH = "/oozie/v1"; public static Submit.Request submit( Hadoop session ) { return new Submit.Request( session ); http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/yarn/Yarn.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/yarn/Yarn.java b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/yarn/Yarn.java index 3b0cfe9..215f4c2 100644 --- a/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/yarn/Yarn.java +++ b/gateway-shell/src/main/java/org/apache/hadoop/gateway/shell/yarn/Yarn.java @@ -21,7 +21,7 @@ import org.apache.hadoop.gateway.shell.Hadoop; public class Yarn { - static String SERVICE_PATH = "/resourcemanager"; + static final String SERVICE_PATH = "/resourcemanager"; public static NewApp.Request newApp(Hadoop session) { return new NewApp.Request(session); http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/AbstractGatewayDispatch.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/AbstractGatewayDispatch.java b/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/AbstractGatewayDispatch.java index ddb806b..6ba16c6 100644 --- a/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/AbstractGatewayDispatch.java +++ b/gateway-spi/src/main/java/org/apache/hadoop/gateway/dispatch/AbstractGatewayDispatch.java @@ -35,7 +35,7 @@ import java.util.Set; public abstract class AbstractGatewayDispatch implements Dispatch { - private static int STREAM_COPY_BUFFER_SIZE = 4096; + private static final int STREAM_COPY_BUFFER_SIZE = 4096; private static Set<String> REQUEST_EXCLUDE_HEADERS; protected HttpClient client; http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-spi/src/main/java/org/apache/hadoop/gateway/filter/GatewayResponseWrapper.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/main/java/org/apache/hadoop/gateway/filter/GatewayResponseWrapper.java b/gateway-spi/src/main/java/org/apache/hadoop/gateway/filter/GatewayResponseWrapper.java index d5342ed..857c37c 100644 --- a/gateway-spi/src/main/java/org/apache/hadoop/gateway/filter/GatewayResponseWrapper.java +++ b/gateway-spi/src/main/java/org/apache/hadoop/gateway/filter/GatewayResponseWrapper.java @@ -29,8 +29,8 @@ import java.io.OutputStream; public abstract class GatewayResponseWrapper extends HttpServletResponseWrapper implements GatewayResponse { - private static String DEFAULT_MIME_TYPE = "*/*"; - private static int STREAM_COPY_BUFFER_SIZE = 4096; + private static final String DEFAULT_MIME_TYPE = "*/*"; + private static final int STREAM_COPY_BUFFER_SIZE = 4096; /** * Constructs a response adaptor wrapping the given response. http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-util-common/src/main/java/org/apache/hadoop/gateway/audit/api/CorrelationService.java ---------------------------------------------------------------------- diff --git a/gateway-util-common/src/main/java/org/apache/hadoop/gateway/audit/api/CorrelationService.java b/gateway-util-common/src/main/java/org/apache/hadoop/gateway/audit/api/CorrelationService.java index 896298d..23994e5 100644 --- a/gateway-util-common/src/main/java/org/apache/hadoop/gateway/audit/api/CorrelationService.java +++ b/gateway-util-common/src/main/java/org/apache/hadoop/gateway/audit/api/CorrelationService.java @@ -27,7 +27,7 @@ public interface CorrelationService { /** * The recommended protocol header name used to transmit the correlation context over the network. */ - static String PROTOCOL_HEADER = "X-Correlation-Context"; + static final String PROTOCOL_HEADER = "X-Correlation-Context"; /** * Creates a new correlation context. The context is attached and empty. http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-util-common/src/main/java/org/apache/hadoop/gateway/util/HttpUtils.java ---------------------------------------------------------------------- diff --git a/gateway-util-common/src/main/java/org/apache/hadoop/gateway/util/HttpUtils.java b/gateway-util-common/src/main/java/org/apache/hadoop/gateway/util/HttpUtils.java index 6a80a41..357a09f 100644 --- a/gateway-util-common/src/main/java/org/apache/hadoop/gateway/util/HttpUtils.java +++ b/gateway-util-common/src/main/java/org/apache/hadoop/gateway/util/HttpUtils.java @@ -72,7 +72,7 @@ public class HttpUtils { return map; } - private final static String urlDecodeUtf8( String s ) { + private static final String urlDecodeUtf8( String s ) { if( s != null ) { try { s = URLDecoder.decode( s, "UTF-8" ); @@ -83,7 +83,7 @@ public class HttpUtils { return s; } - final static void addQueryStringParam( final Map<String,String[]> map, String name, String value ) { + static final void addQueryStringParam( final Map<String,String[]> map, String name, String value ) { name = urlDecodeUtf8( name ); value = urlDecodeUtf8( value ); String[] values = map.get( name ); http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-util-common/src/main/java/org/apache/hadoop/gateway/util/X500PrincipalParser.java ---------------------------------------------------------------------- diff --git a/gateway-util-common/src/main/java/org/apache/hadoop/gateway/util/X500PrincipalParser.java b/gateway-util-common/src/main/java/org/apache/hadoop/gateway/util/X500PrincipalParser.java index c7d65d9..848ebcf 100644 --- a/gateway-util-common/src/main/java/org/apache/hadoop/gateway/util/X500PrincipalParser.java +++ b/gateway-util-common/src/main/java/org/apache/hadoop/gateway/util/X500PrincipalParser.java @@ -28,19 +28,19 @@ public class X500PrincipalParser public static int LEASTSIGNIFICANT = 0; public static int MOSTSIGNIFICANT = 1; - public final static String attrCN = "CN"; - public final static String attrOU = "OU"; - public final static String attrO = "O"; - public final static String attrC = "C"; - public final static String attrL = "L"; - public final static String attrST = "ST"; - public final static String attrSTREET = "STREET"; - public final static String attrEMAIL = "EMAILADDRESS"; - public final static String attrUID = "UID"; + public static final String attrCN = "CN"; + public static final String attrOU = "OU"; + public static final String attrO = "O"; + public static final String attrC = "C"; + public static final String attrL = "L"; + public static final String attrST = "ST"; + public static final String attrSTREET = "STREET"; + public static final String attrEMAIL = "EMAILADDRESS"; + public static final String attrUID = "UID"; ArrayList rdnNameArray = new ArrayList(); - private final static String attrTerminator = "="; + private static final String attrTerminator = "="; public X500PrincipalParser(X500Principal principal) { http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-util-configinjector/src/main/java/org/apache/hadoop/gateway/config/spi/AbstractConfigurationAdapterDescriptor.java ---------------------------------------------------------------------- diff --git a/gateway-util-configinjector/src/main/java/org/apache/hadoop/gateway/config/spi/AbstractConfigurationAdapterDescriptor.java b/gateway-util-configinjector/src/main/java/org/apache/hadoop/gateway/config/spi/AbstractConfigurationAdapterDescriptor.java index 5372911..49fd416 100755 --- a/gateway-util-configinjector/src/main/java/org/apache/hadoop/gateway/config/spi/AbstractConfigurationAdapterDescriptor.java +++ b/gateway-util-configinjector/src/main/java/org/apache/hadoop/gateway/config/spi/AbstractConfigurationAdapterDescriptor.java @@ -24,7 +24,7 @@ import java.util.Map; public abstract class AbstractConfigurationAdapterDescriptor implements ConfigurationAdapterDescriptor { - private static Map<Class<?>, Class<? extends ConfigurationAdapter>> ADAPTERS = + private static final Map<Class<?>, Class<? extends ConfigurationAdapter>> ADAPTERS = new HashMap<Class<?>, Class<? extends ConfigurationAdapter>>(); protected AbstractConfigurationAdapterDescriptor() { http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-util-launcher/src/main/java/org/apache/hadoop/gateway/launcher/Command.java ---------------------------------------------------------------------- diff --git a/gateway-util-launcher/src/main/java/org/apache/hadoop/gateway/launcher/Command.java b/gateway-util-launcher/src/main/java/org/apache/hadoop/gateway/launcher/Command.java index 09c661e..c11eaee 100644 --- a/gateway-util-launcher/src/main/java/org/apache/hadoop/gateway/launcher/Command.java +++ b/gateway-util-launcher/src/main/java/org/apache/hadoop/gateway/launcher/Command.java @@ -32,16 +32,16 @@ import java.util.regex.Pattern; class Command { - private static String MAIN_CLASS = "main.class"; - private static String MAIN_METHOD = "main.method"; - private static String MAIN_ARGS = "main.args"; - private static String CLASS_PATH = "class.path"; - private static String CLASS_PATH_DELIM = ",;"; - private static String FORK = "fork"; - private static String REDIRECT = "redirect"; - private static String RESTREAM = "restream"; - private static String ENV_PREFIX = "env."; - private static int ENV_PREFIX_LENGTH = ENV_PREFIX.length(); + private static final String MAIN_CLASS = "main.class"; + private static final String MAIN_METHOD = "main.method"; + private static final String MAIN_ARGS = "main.args"; + private static final String CLASS_PATH = "class.path"; + private static final String CLASS_PATH_DELIM = ",;"; + private static final String FORK = "fork"; + private static final String REDIRECT = "redirect"; + private static final String RESTREAM = "restream"; + private static final String ENV_PREFIX = "env."; + private static final int ENV_PREFIX_LENGTH = ENV_PREFIX.length(); File base; String mainClass; http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-util-launcher/src/main/java/org/apache/hadoop/gateway/launcher/Config.java ---------------------------------------------------------------------- diff --git a/gateway-util-launcher/src/main/java/org/apache/hadoop/gateway/launcher/Config.java b/gateway-util-launcher/src/main/java/org/apache/hadoop/gateway/launcher/Config.java index cc74c4c..0702590 100644 --- a/gateway-util-launcher/src/main/java/org/apache/hadoop/gateway/launcher/Config.java +++ b/gateway-util-launcher/src/main/java/org/apache/hadoop/gateway/launcher/Config.java @@ -29,12 +29,12 @@ import java.util.regex.Pattern; public class Config { - static String DEFAULT_NAME = ""; - static String COMMENT_PREFIX = "#"; - static String SECTION_PREFIX = "["; - static String SECTION_SUFFIX = "]"; - static Pattern SECTION_PATTERN = Pattern.compile( "^\\[(.*?)\\]?$" ); - static Pattern PAIR_PATTERN = Pattern.compile( "^(.*?)=(.*)$" ); + static final String DEFAULT_NAME = ""; + static final String COMMENT_PREFIX = "#"; + static final String SECTION_PREFIX = "["; + static final String SECTION_SUFFIX = "]"; + static final Pattern SECTION_PATTERN = Pattern.compile( "^\\[(.*?)\\]?$" ); + static final Pattern PAIR_PATTERN = Pattern.compile( "^(.*?)=(.*)$" ); Map<String,Map<String,String>> sections; http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-util-launcher/src/main/java/org/apache/hadoop/gateway/launcher/Invoker.java ---------------------------------------------------------------------- diff --git a/gateway-util-launcher/src/main/java/org/apache/hadoop/gateway/launcher/Invoker.java b/gateway-util-launcher/src/main/java/org/apache/hadoop/gateway/launcher/Invoker.java index 472c9b2..c863f17 100644 --- a/gateway-util-launcher/src/main/java/org/apache/hadoop/gateway/launcher/Invoker.java +++ b/gateway-util-launcher/src/main/java/org/apache/hadoop/gateway/launcher/Invoker.java @@ -28,8 +28,8 @@ import java.util.regex.Pattern; class Invoker { - private static String[] STRING_ARRAY = new String[0]; - private static Class STRING_ARRAY_CLASS = STRING_ARRAY.getClass(); + private static final String[] STRING_ARRAY = new String[0]; + private static final Class STRING_ARRAY_CLASS = STRING_ARRAY.getClass(); static void invoke( Command command ) throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException { setSysProps( command.props ); http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-util-launcher/src/main/java/org/apache/hadoop/gateway/launcher/Launcher.java ---------------------------------------------------------------------- diff --git a/gateway-util-launcher/src/main/java/org/apache/hadoop/gateway/launcher/Launcher.java b/gateway-util-launcher/src/main/java/org/apache/hadoop/gateway/launcher/Launcher.java index b6e2de2..1e52ae3 100644 --- a/gateway-util-launcher/src/main/java/org/apache/hadoop/gateway/launcher/Launcher.java +++ b/gateway-util-launcher/src/main/java/org/apache/hadoop/gateway/launcher/Launcher.java @@ -25,11 +25,11 @@ import java.util.Properties; public class Launcher { - private static String LAUNCHER_PREFIX = "launcher."; - private static String CFG_EXT = "cfg"; - private static String LAUNCHER_CFG = "META-INF/" + LAUNCHER_PREFIX + CFG_EXT; - private static String EXTRACT = "extract"; - private static String OVERRIDE = "override"; + private static final String LAUNCHER_PREFIX = "launcher."; + private static final String CFG_EXT = "cfg"; + private static final String LAUNCHER_CFG = "META-INF/" + LAUNCHER_PREFIX + CFG_EXT; + private static final String EXTRACT = "extract"; + private static final String OVERRIDE = "override"; private URL launcherJarUrl; private File launcherJarDir; http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-util-launcher/src/test/java/org/apache/hadoop/gateway/launcher/ConfigTest.java ---------------------------------------------------------------------- diff --git a/gateway-util-launcher/src/test/java/org/apache/hadoop/gateway/launcher/ConfigTest.java b/gateway-util-launcher/src/test/java/org/apache/hadoop/gateway/launcher/ConfigTest.java index 3af167e..c811eaa 100644 --- a/gateway-util-launcher/src/test/java/org/apache/hadoop/gateway/launcher/ConfigTest.java +++ b/gateway-util-launcher/src/test/java/org/apache/hadoop/gateway/launcher/ConfigTest.java @@ -28,7 +28,7 @@ import static org.hamcrest.MatcherAssert.assertThat; public class ConfigTest { - private final static String NEWLINE = System.getProperty( "line.separator" ); + private static final String NEWLINE = System.getProperty( "line.separator" ); @Test public void testLoad() throws Exception { http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/gateway-util-urltemplate/src/main/java/org/apache/hadoop/gateway/util/urltemplate/Segment.java ---------------------------------------------------------------------- diff --git a/gateway-util-urltemplate/src/main/java/org/apache/hadoop/gateway/util/urltemplate/Segment.java b/gateway-util-urltemplate/src/main/java/org/apache/hadoop/gateway/util/urltemplate/Segment.java index 8f9c819..260d141 100644 --- a/gateway-util-urltemplate/src/main/java/org/apache/hadoop/gateway/util/urltemplate/Segment.java +++ b/gateway-util-urltemplate/src/main/java/org/apache/hadoop/gateway/util/urltemplate/Segment.java @@ -316,7 +316,7 @@ abstract class Segment { } // Escape .\${ and turn * into .* - final static String createRegex( final String segment ) { + static final String createRegex( final String segment ) { StringBuilder regex = new StringBuilder( segment ); int len = regex.length(); for( int i=len-1; i>=0; i-- ) { @@ -340,7 +340,7 @@ abstract class Segment { } // Creates a pattern for a simplified filesystem style wildcard '*' syntax. - final static Pattern compileRegex( String segment ) { + static final Pattern compileRegex( String segment ) { // // Turn '*' into '/' to keep it safe. // // Chose '/' because that can't exist in a segment. // segment = segment.replaceAll( "\\*", "/" ); http://git-wip-us.apache.org/repos/asf/knox/blob/521a542d/hadoop-examples/src/main/java/org/apache/hadoop/examples/WordCount.java ---------------------------------------------------------------------- diff --git a/hadoop-examples/src/main/java/org/apache/hadoop/examples/WordCount.java b/hadoop-examples/src/main/java/org/apache/hadoop/examples/WordCount.java index 5e4ac4c..7bb0626 100644 --- a/hadoop-examples/src/main/java/org/apache/hadoop/examples/WordCount.java +++ b/hadoop-examples/src/main/java/org/apache/hadoop/examples/WordCount.java @@ -34,7 +34,7 @@ public class WordCount { public static class TokenizerMapper extends Mapper<Object, Text, Text, IntWritable>{ - private final static IntWritable one = new IntWritable(1); + private static final IntWritable one = new IntWritable(1); private Text word = new Text(); public void map(Object key, Text value, Context context
