You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by kr...@apache.org on 2018/12/10 18:20:20 UTC
[1/3] knox git commit: KNOX-1615 - Enable PMD for source analysis
Repository: knox
Updated Branches:
refs/heads/master f54e9d2d4 -> 6a35473a9
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/CorrelationServiceFactory.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/CorrelationServiceFactory.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/CorrelationServiceFactory.java
index 200636f..a7e5dbd 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/CorrelationServiceFactory.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/CorrelationServiceFactory.java
@@ -23,7 +23,7 @@ import org.apache.knox.gateway.audit.log4j.correlation.Log4jCorrelationService;
public abstract class CorrelationServiceFactory {
// The global correlation service instance.
- private static CorrelationService correlationService = null;
+ private static CorrelationService correlationService;
// To prevent instantiation.
private CorrelationServiceFactory() {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/appender/JdbmQueue.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/appender/JdbmQueue.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/appender/JdbmQueue.java
index f9e4f56..eb0fbd1 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/appender/JdbmQueue.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/appender/JdbmQueue.java
@@ -160,8 +160,8 @@ public class JdbmQueue<E> {
private static final class Stat implements Serializable {
private static final long serialVersionUID = 1L;
- private long lastEnqueue = 0;
- private long nextDequeue = 0;
+ private long lastEnqueue;
+ private long nextDequeue;
private long size() {
return lastEnqueue - nextDequeue;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditor.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditor.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditor.java
index a70887b..3050871 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditor.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditor.java
@@ -161,7 +161,7 @@ public class Log4jAuditor implements Auditor {
}
}
if (i < (query.length -1) ) {
- newQuery.append("&");
+ newQuery.append('&');
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonPath.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonPath.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonPath.java
index d231f34..48d2e65 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonPath.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonPath.java
@@ -312,18 +312,18 @@ public class JsonPath {
@Override
public String toString() {
- StringBuilder s = new StringBuilder();
+ StringBuilder s = new StringBuilder(32);
s.append( "JsonPath.Expression{" );
for( int i=0, n=segments.size(); i<n; i++ ) {
if( i > 0 ) {
- s.append( "," );
+ s.append(',');
}
s.append( "segment[" );
s.append( i );
s.append( "]=" );
s.append( segments.get( i ) );
}
- s.append( "]" );
+ s.append(']');
return s.toString();
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/X500PrincipalParser.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/X500PrincipalParser.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/X500PrincipalParser.java
index 7f5c52e..78199ac 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/X500PrincipalParser.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/X500PrincipalParser.java
@@ -57,7 +57,7 @@ public class X500PrincipalParser
if (namePart.startsWith(searchPart)) {
// Return the string starting after the ID string and the = sign that follows it.
- retList.add(namePart.toString().substring(searchPart.length()));
+ retList.add(namePart.substring(searchPart.length()));
}
}
@@ -128,7 +128,7 @@ public class X500PrincipalParser
if (namePart.startsWith(searchPart)) {
// Return the string starting after the ID string and the = sign that follows it.
- retNamePart = namePart.toString().substring(searchPart.length());
+ retNamePart = namePart.substring(searchPart.length());
// By definition the first one is most significant
if (significance == MOSTSIGNIFICANT)
break;
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/XmlUtils.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/XmlUtils.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/XmlUtils.java
index 15a09cc..9a15dba 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/XmlUtils.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/XmlUtils.java
@@ -17,10 +17,10 @@
package org.apache.knox.gateway.util;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.Writer;
+import java.nio.file.Files;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
@@ -40,7 +40,7 @@ import org.xml.sax.SAXException;
public class XmlUtils {
public static Document readXml( File file ) throws ParserConfigurationException, IOException, SAXException {
- return readXml( new FileInputStream( file ));
+ return readXml(Files.newInputStream(file.toPath()));
}
public static Document readXml( InputStream input ) throws ParserConfigurationException, IOException, SAXException {
@@ -84,7 +84,7 @@ public class XmlUtils {
}
if ( indent ) {
t.setOutputProperty( OutputKeys.INDENT, "yes" );
- t.setOutputProperty( "{xml.apache.org/xslt}indent-amount", "" + indentNumber );
+ t.setOutputProperty( "{xml.apache.org/xslt}indent-amount", String.valueOf(indentNumber) );
}
if ( omitXmlDeclaration ) {
t.setOutputProperty( OutputKeys.OMIT_XML_DECLARATION, "yes" );
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-util-common/src/test/java/org/apache/knox/gateway/util/IpAddressValidatorTest.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/test/java/org/apache/knox/gateway/util/IpAddressValidatorTest.java b/gateway-util-common/src/test/java/org/apache/knox/gateway/util/IpAddressValidatorTest.java
index d1d4bf5..5ca2c81 100644
--- a/gateway-util-common/src/test/java/org/apache/knox/gateway/util/IpAddressValidatorTest.java
+++ b/gateway-util-common/src/test/java/org/apache/knox/gateway/util/IpAddressValidatorTest.java
@@ -22,7 +22,7 @@ import org.junit.Test;
public class IpAddressValidatorTest extends org.junit.Assert {
String test = "127.0.0.1,193.*,192.168.1.*,0:0:0:0:0:0:0:1,0:0:0:0:0:0:*";
String testWeirdConfig = ",127.0.0.1,,193.*,192.168.1.*,29*";
- String testNullConfig = null;
+ String testNullConfig;
@Test
public void testExplicitIpAddress() throws Exception {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/ConfigurationInjectorBuilder.java
----------------------------------------------------------------------
diff --git a/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/ConfigurationInjectorBuilder.java b/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/ConfigurationInjectorBuilder.java
index a9a4db5..dcc2c10 100755
--- a/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/ConfigurationInjectorBuilder.java
+++ b/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/ConfigurationInjectorBuilder.java
@@ -29,7 +29,7 @@ import java.util.ServiceLoader;
public class ConfigurationInjectorBuilder {
private static ConfigurationBinding DEFAULT_BINDING = new DefaultConfigurationBinding();
- private static ConfigurationInjector INSTANCE = null;
+ private static ConfigurationInjector INSTANCE;
private static synchronized ConfigurationInjector getInjector() {
if( INSTANCE == null ) {
@@ -57,9 +57,9 @@ public class ConfigurationInjectorBuilder {
return injector;
}
- private Object target = null;
- private ConfigurationAdapter source = null;
- private ConfigurationBinding binding = null;
+ private Object target;
+ private ConfigurationAdapter source;
+ private ConfigurationBinding binding;
public static ConfigurationInjectorBuilder configuration() {
return new ConfigurationInjectorBuilder();
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/impl/ConfigurationAdapterFactory.java
----------------------------------------------------------------------
diff --git a/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/impl/ConfigurationAdapterFactory.java b/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/impl/ConfigurationAdapterFactory.java
index da9b78c..14c2589 100755
--- a/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/impl/ConfigurationAdapterFactory.java
+++ b/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/impl/ConfigurationAdapterFactory.java
@@ -31,7 +31,7 @@ import java.util.ServiceLoader;
public class ConfigurationAdapterFactory {
- private static Map<Class<?>, Class<? extends ConfigurationAdapter>> ADAPTERS = null;
+ private static Map<Class<?>, Class<? extends ConfigurationAdapter>> ADAPTERS;
private static synchronized Map<Class<?>, Class<? extends ConfigurationAdapter>> getAdapters() {
if( ADAPTERS == null ) {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-util-configinjector/src/test/java/org/apache/knox/gateway/config/AdapterSampleTest.java
----------------------------------------------------------------------
diff --git a/gateway-util-configinjector/src/test/java/org/apache/knox/gateway/config/AdapterSampleTest.java b/gateway-util-configinjector/src/test/java/org/apache/knox/gateway/config/AdapterSampleTest.java
index d6030dd..8d85462 100755
--- a/gateway-util-configinjector/src/test/java/org/apache/knox/gateway/config/AdapterSampleTest.java
+++ b/gateway-util-configinjector/src/test/java/org/apache/knox/gateway/config/AdapterSampleTest.java
@@ -30,7 +30,7 @@ public class AdapterSampleTest {
private static class Target {
@Configure
- private String username = null;
+ private String username;
}
private static class Adapter implements ConfigurationAdapter {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-util-configinjector/src/test/java/org/apache/knox/gateway/config/FuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-util-configinjector/src/test/java/org/apache/knox/gateway/config/FuncTest.java b/gateway-util-configinjector/src/test/java/org/apache/knox/gateway/config/FuncTest.java
index 7e40212..3452c95 100755
--- a/gateway-util-configinjector/src/test/java/org/apache/knox/gateway/config/FuncTest.java
+++ b/gateway-util-configinjector/src/test/java/org/apache/knox/gateway/config/FuncTest.java
@@ -72,7 +72,7 @@ public class FuncTest {
}
String multiArgStringField = "default";
Integer multiArgIntegerField = 0;
- int multiArgIntField = 0;
+ int multiArgIntField;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Launcher.java
----------------------------------------------------------------------
diff --git a/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Launcher.java b/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Launcher.java
index 92092dc..58700e2 100644
--- a/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Launcher.java
+++ b/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Launcher.java
@@ -18,7 +18,6 @@
package org.apache.knox.gateway.launcher;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -27,6 +26,7 @@ import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.util.Properties;
public class Launcher {
@@ -116,7 +116,7 @@ public class Launcher {
private static void createExternalConfig( File file, Properties config, URL src ) throws IOException {
try {
if( file.createNewFile() ){
- try (OutputStream output = new FileOutputStream(file)) {
+ try (OutputStream output = Files.newOutputStream(file.toPath())) {
config.store(output, "Created from " + src);
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Expander.java
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Expander.java b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Expander.java
index abf9b6b..d239b0a 100644
--- a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Expander.java
+++ b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Expander.java
@@ -70,7 +70,7 @@ public class Expander {
Segment segment = template.getScheme();
if( segment != null ) {
expandSingleValue( template.getScheme(), names, params, evaluator, builder );
- builder.append( ":" );
+ builder.append(':');
}
}
@@ -85,17 +85,17 @@ public class Expander {
Segment port = template.getPort();
expandSingleValue( username, names, params, evaluator, builder );
if( password != null ) {
- builder.append( ":" );
+ builder.append(':');
expandSingleValue( password, names, params, evaluator, builder );
}
if( username != null || password != null ) {
- builder.append( "@" );
+ builder.append('@');
}
if( host != null ) {
expandSingleValue( host, names, params, evaluator, builder );
}
if( port != null ) {
- builder.append( ":" );
+ builder.append(':');
expandSingleValue( port, names, params, evaluator, builder );
}
}
@@ -103,12 +103,12 @@ public class Expander {
private static void expandPath( Template template, Set<String> names, Params params, Evaluator evaluator, StringBuilder builder ) {
if( template.isAbsolute() ) {
- builder.append( "/" );
+ builder.append('/');
}
List<Path> path = template.getPath();
for( int i=0, n=path.size(); i<n; i++ ) {
if( i > 0 ) {
- builder.append( "/" );
+ builder.append('/');
}
Path segment = path.get( i );
String name = segment.getParamName();
@@ -130,7 +130,7 @@ public class Expander {
}
}
if( template.isDirectory() && !path.isEmpty() ) {
- builder.append( "/" );
+ builder.append('/');
}
}
@@ -141,7 +141,7 @@ public class Expander {
if( type == Segment.GLOB || type == Segment.DEFAULT ) {
for( int i=0, n=values.size(); i<n; i++ ) {
if( i > 0 ) {
- builder.append( "/" );
+ builder.append( '/' );
}
builder.append( values.get( i ) );
}
@@ -169,9 +169,9 @@ public class Expander {
for (Query query1 : query) {
int i = index.incrementAndGet();
if (i == 1) {
- builder.append("?");
+ builder.append('?');
} else {
- builder.append("&");
+ builder.append('&');
}
String queryName = query1.getQueryName();
String paramName = query1.getParamName();
@@ -183,7 +183,7 @@ public class Expander {
builder.append(queryName);
String pattern = value.getOriginalPattern();
if (pattern != null) {
- builder.append("=");
+ builder.append('=');
builder.append(pattern);
}
break;
@@ -214,13 +214,13 @@ public class Expander {
for( String value: values ) {
int i = index.incrementAndGet();
if( i == 1 ) {
- builder.append( "?" );
+ builder.append('?');
} else {
- builder.append( "&" );
+ builder.append('&');
}
appendQueryPart(name, builder);
if( value != null ) {
- builder.append( "=" );
+ builder.append('=');
appendQueryPart(value, builder);
}
}
@@ -238,12 +238,12 @@ public class Expander {
if( type == Segment.GLOB || type == Segment.DEFAULT ) {
for( int i=0, n=values.size(); i<n; i++ ) {
if( i > 0 ) {
- builder.append( "&" );
+ builder.append('&');
}
appendQueryPart(queryName, builder);
value = values.get( i );
if( value != null ) {
- builder.append( "=" );
+ builder.append('=');
appendQueryPart(value, builder);
}
}
@@ -251,7 +251,7 @@ public class Expander {
appendQueryPart(queryName, builder);
value = values.get( 0 );
if( value != null ) {
- builder.append( "=" );
+ builder.append('=');
appendQueryPart(value, builder);
}
}
@@ -268,7 +268,7 @@ public class Expander {
private static void expandFragment( Template template, Set<String> names, Params params, Evaluator evaluator, StringBuilder builder ) {
if( template.hasFragment() ) {
- builder.append( "#" );
+ builder.append('#');
}
expandSingleValue( template.getFragment(), names, params, evaluator, builder );
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Function.java
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Function.java b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Function.java
index bb13109..e11c5a3 100644
--- a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Function.java
+++ b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Function.java
@@ -25,9 +25,9 @@ class Function {
private enum State { UNKNOWN, FUNCTION, VARIABLE, LITERAL }
- private String funcName = null;
- private String paramName = null;
- private List<String> paramValue = null;
+ private String funcName;
+ private String paramName;
+ private List<String> paramValue;
static List<String> evaluate( String statement, Resolver resolver, Evaluator evaluator ) {
Function function = new Function( statement );
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Segment.java
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Segment.java b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Segment.java
index 04dd89f..67c284e 100644
--- a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Segment.java
+++ b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Segment.java
@@ -143,15 +143,15 @@ abstract class Segment {
} else if( values.isEmpty() ) {
s.append( "empty" );
} else {
- s.append( "[" );
+ s.append('[');
Iterator i = values.iterator();
while( i.hasNext() ) {
s.append( i.next() );
if( i.hasNext() ) {
- s.append( "," );
+ s.append(',');
}
}
- s.append( "]" );
+ s.append(']');
}
return s.toString();
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Template.java
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Template.java b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Template.java
index ca830f1..1293646 100644
--- a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Template.java
+++ b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Template.java
@@ -171,7 +171,7 @@ public class Template {
b.append( ':' );
buildSegmentValue( b, password, password.getFirstValue() );
}
- b.append( "@" );
+ b.append( '@' );
}
if( host != null ) {
buildSegmentValue( b, host, host.getFirstValue() );
@@ -186,7 +186,7 @@ public class Template {
private void buildSegmentValue( StringBuilder b, Segment s, Segment.Value v ) {
String paramName = s.getParamName();
if( paramName != null && !paramName.isEmpty()) {
- b.append( "{" );
+ b.append( '{' );
b.append( s.getParamName() );
String actualPattern = v.getToken().originalPattern;
if( ( actualPattern != null ) && ( v.getType() != Segment.DEFAULT ) ) {
@@ -213,7 +213,7 @@ public class Template {
String paramName = segment.getParamName();
Segment.Value firstValue = segment.getFirstValue();
if( paramName != null && !paramName.isEmpty()) {
- b.append( "{" );
+ b.append( '{' );
b.append( segment.getParamName() );
String pattern = firstValue.getOriginalPattern();
if( pattern != null && !pattern.isEmpty() ) {
@@ -284,9 +284,9 @@ public class Template {
if( paramName != null && !paramName.isEmpty()) {
if( !Segment.GLOB_PATTERN.equals( queryName ) && !Segment.STAR_PATTERN.equals( queryName ) ) {
b.append( segment.getQueryName() );
- b.append( "=" );
+ b.append( '=' );
}
- b.append( "{" );
+ b.append( '{' );
b.append( segment.getParamName() );
if( valuePattern != null ) {
b.append( '=' );
@@ -296,7 +296,7 @@ public class Template {
} else {
b.append( queryName );
if( valuePattern != null ) {
- b.append( "=" );
+ b.append( '=' );
b.append( valuePattern );
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1b8db03..3bcc455 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,6 +197,7 @@
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
+ <maven-pmd-plugin.version>3.11.0</maven-pmd-plugin.version>
<metrics.version>4.0.3</metrics.version>
<nimbus-jose-jwt.version>6.0.2</nimbus-jose-jwt.version>
<okhttp.version>2.7.5</okhttp.version>
@@ -618,6 +619,32 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>${maven-pmd-plugin.version}</version>
+ <configuration>
+ <rulesets>
+ <ruleset>build-tools/pmd/pmd-ruleset.xml</ruleset>
+ </rulesets>
+ <printFailingErrors>true</printFailingErrors>
+ <targetJdk>1.8</targetJdk>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.knox</groupId>
+ <artifactId>build-tools</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
@@ -661,6 +688,15 @@
</reportSet>
</reportSets>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <rulesets>
+ <ruleset>build-tools/pmd/pmd-ruleset.xml</ruleset>
+ </rulesets>
+ </configuration>
+ </plugin>
</plugins>
</reporting>
[3/3] knox git commit: KNOX-1615 - Enable PMD for source analysis
Posted by kr...@apache.org.
KNOX-1615 - Enable PMD for source analysis
Signed-off-by: Kevin Risden <kr...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/6a35473a
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/6a35473a
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/6a35473a
Branch: refs/heads/master
Commit: 6a35473a9ccf411e32a8681b9005a032d6473afa
Parents: f54e9d2
Author: Kevin Risden <kr...@apache.org>
Authored: Mon Dec 10 11:52:52 2018 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Mon Dec 10 11:56:40 2018 -0500
----------------------------------------------------------------------
.../resources/build-tools/pmd/pmd-ruleset.xml | 44 ++++++++++++++
.../discovery/ambari/AmbariCluster.java | 9 +--
.../ambari/AmbariConfigurationMonitor.java | 14 ++---
.../ambari/AmbariDynamicServiceURLCreator.java | 6 +-
.../ambari/AmbariServiceDiscovery.java | 7 ++-
.../discovery/ambari/HDFSURLCreatorBase.java | 2 +-
.../discovery/ambari/NameNodeUrlCreator.java | 2 +-
.../discovery/ambari/NiFiURLCreator.java | 2 +-
.../ambari/ResourceManagerURLCreatorBase.java | 2 +-
.../ambari/ServiceURLPropertyConfig.java | 4 +-
.../ambari/SparkCommonServiceURLCreator.java | 8 +--
.../ambari/AmbariConfigurationMonitorTest.java | 2 +-
.../i18n/resources/ResourcesInvoker.java | 10 +--
.../provider/impl/AtlasZookeeperURLManager.java | 6 --
.../provider/impl/KafkaZookeeperURLManager.java | 8 +--
...entityAsserterHttpServletRequestWrapper.java | 4 +-
.../CommonIdentityAssertionFilterTest.java | 6 +-
.../filter/ConcatIdentityAssertionFilter.java | 4 +-
.../filter/RegexIdentityAssertionFilter.java | 4 +-
.../hostmap/impl/HostmapFunctionProcessor.java | 2 +-
.../ServiceMappedAddressFunctionProcessor.java | 2 +-
.../SecureQueryDecryptProcessor.java | 2 +-
.../filter/rewrite/impl/UrlRewriteRequest.java | 12 ++--
.../filter/rewrite/impl/UrlRewriteResponse.java | 3 +-
.../rewrite/impl/html/HtmlFilterReaderBase.java | 2 +-
.../impl/html/HtmlImportFunctionProcessor.java | 3 +-
.../gateway/filter/AclsAuthorizationFilter.java | 4 +-
.../gateway/filter/AclsAuthzFilterTest.java | 4 +-
.../jwt/filter/AbstractJWTFilter.java | 2 +-
.../filter/JWTAccessTokenAssertionFilter.java | 2 +-
.../jwt/filter/JWTAuthCodeAssertionFilter.java | 2 +-
.../jwt/filter/SSOCookieFederationFilter.java | 4 +-
.../federation/AbstractJWTFilterTest.java | 12 ++--
.../pac4j/filter/Pac4jDispatcherFilter.java | 6 +-
.../gateway/pac4j/MockHttpServletResponse.java | 2 +-
.../filter/AbstractPreAuthFederationFilter.java | 2 +-
.../filter/HeaderPreAuthFederationFilter.java | 2 +-
.../preauth/filter/PreAuthFederationFilter.java | 2 +-
.../knox/gateway/deploy/impl/ShiroConfig.java | 4 +-
.../gateway/filter/RedirectToUrlFilter.java | 2 +-
.../knox/gateway/shirorealm/KnoxLdapRealm.java | 2 +-
.../webappsec/filter/CSRFPreventionFilter.java | 2 +-
.../webappsec/StrictTransportFilterTest.java | 8 +--
.../XContentTypeOptionsFilterTest.java | 6 +-
.../webappsec/XFrameOptionsFilterTest.java | 8 +--
.../webappsec/XSSProtectionFilterTest.java | 6 +-
.../gateway/filter/CompositeEnumeration.java | 2 +-
.../org/apache/knox/gateway/GatewayFilter.java | 5 +-
.../knox/gateway/GatewayForwardingServlet.java | 2 +-
.../org/apache/knox/gateway/GatewayServer.java | 4 +-
.../knox/gateway/deploy/DeploymentFactory.java | 2 +-
.../impl/ApplicationDeploymentContributor.java | 12 ++--
.../gateway/dispatch/UrlConnectionDispatch.java | 6 +-
.../filter/PortMappingHelperHandler.java | 2 +-
.../gateway/services/CLIGatewayServices.java | 4 +-
.../services/DefaultGatewayServices.java | 4 +-
.../impl/instr/InstrumentedGatewayFilter.java | 6 +-
.../impl/reporters/AbstractMetricsReporter.java | 2 +-
.../security/impl/DefaultCryptoService.java | 6 +-
.../security/impl/DefaultKeystoreService.java | 8 +--
.../services/security/impl/JettySSLService.java | 11 ++--
.../impl/DefaultTokenAuthorityService.java | 6 +-
...faultClusterConfigurationMonitorService.java | 2 +-
.../topology/impl/DefaultTopologyService.java | 2 +-
.../DefaultServiceDiscoveryConfig.java | 4 +-
.../DefaultRemoteConfigurationMonitor.java | 2 +-
.../RemoteConfigurationMonitorFactory.java | 2 +-
.../simple/ProviderConfigurationParser.java | 8 +--
.../simple/SimpleDescriptorHandler.java | 4 +-
.../topology/simple/SimpleDescriptorImpl.java | 2 +-
.../topology/validation/TopologyValidator.java | 7 +--
.../knox/gateway/trace/AccessHandler.java | 34 +++++------
.../apache/knox/gateway/trace/TraceRequest.java | 16 +++--
.../knox/gateway/trace/TraceResponse.java | 4 +-
.../apache/knox/gateway/trace/TraceUtil.java | 4 +-
.../org/apache/knox/gateway/util/KnoxCLI.java | 36 +++++------
.../gateway/util/ServiceDefinitionsLoader.java | 6 +-
.../websockets/GatewayWebsocketHandler.java | 4 +-
.../knox/gateway/jetty/SslSocketTest.java | 2 +-
.../services/security/CryptoServiceTest.java | 4 +-
.../simple/ProviderConfigurationParserTest.java | 2 +-
.../websockets/ProxyInboundClientTest.java | 4 +-
.../gateway/websockets/WebsocketClient.java | 8 +--
.../service/admin/TopologiesResource.java | 35 +++++------
.../service/definition/CustomDispatch.java | 2 +-
.../apache/knox/gateway/hive/HiveDispatch.java | 2 +-
.../knox/gateway/hive/HiveHaDispatch.java | 2 +-
.../gateway/service/knoxsso/WebSSOResource.java | 18 +++---
.../service/knoxsso/WebSSOutResource.java | 2 +-
.../service/knoxtoken/TokenResource.java | 6 +-
.../config/remote/zk/CuratorClientService.java | 2 +-
.../gateway/rm/dispatch/RMHaBaseDispatcher.java | 4 +-
.../service/test/ServiceTestResource.java | 64 +++++++-------------
.../knox/gateway/shell/BasicResponse.java | 2 +-
.../knox/gateway/shell/ErrorResponse.java | 2 +-
.../apache/knox/gateway/shell/KnoxSession.java | 6 +-
.../org/apache/knox/gateway/shell/KnoxSh.java | 14 +++--
.../shell/KnoxTokenCredentialCollector.java | 4 +-
.../shell/hbase/table/row/DeleteRows.java | 2 +-
.../shell/hbase/table/row/QueryRows.java | 8 +--
.../apache/knox/gateway/shell/hdfs/Mkdir.java | 4 +-
.../org/apache/knox/gateway/shell/hdfs/Put.java | 2 +-
.../gateway/dispatch/GatewayDispatchFilter.java | 2 +-
.../gateway/dispatch/HadoopAuthCookieStore.java | 7 +--
.../principal/SimplePrincipalMapper.java | 4 +-
.../security/impl/BaseKeystoreService.java | 18 +++---
.../security/impl/CMFMasterService.java | 2 +-
.../security/impl/X509CertificateUtil.java | 7 ++-
.../apache/knox/gateway/topology/Service.java | 2 +-
.../apache/knox/gateway/topology/Topology.java | 4 +-
.../dispatch/GatewayDispatchFilterTest.java | 2 +-
.../security/impl/CMFMasterServiceTest.java | 2 +-
.../apache/knox/gateway/GatewayTestConfig.java | 16 ++---
.../apache/knox/gateway/GatewayTestDriver.java | 9 +--
.../knox/test/mock/MockRequestMatcher.java | 24 ++++----
.../knox/test/mock/MockResponseProvider.java | 20 +++---
.../gateway/audit/api/AuditServiceFactory.java | 2 +-
.../audit/api/CorrelationServiceFactory.java | 2 +-
.../gateway/audit/log4j/appender/JdbmQueue.java | 4 +-
.../gateway/audit/log4j/audit/Log4jAuditor.java | 2 +-
.../org/apache/knox/gateway/util/JsonPath.java | 6 +-
.../knox/gateway/util/X500PrincipalParser.java | 4 +-
.../org/apache/knox/gateway/util/XmlUtils.java | 6 +-
.../gateway/util/IpAddressValidatorTest.java | 2 +-
.../config/ConfigurationInjectorBuilder.java | 8 +--
.../impl/ConfigurationAdapterFactory.java | 2 +-
.../knox/gateway/config/AdapterSampleTest.java | 2 +-
.../apache/knox/gateway/config/FuncTest.java | 2 +-
.../apache/knox/gateway/launcher/Launcher.java | 4 +-
.../knox/gateway/util/urltemplate/Expander.java | 36 +++++------
.../knox/gateway/util/urltemplate/Function.java | 6 +-
.../knox/gateway/util/urltemplate/Segment.java | 6 +-
.../knox/gateway/util/urltemplate/Template.java | 12 ++--
pom.xml | 36 +++++++++++
134 files changed, 488 insertions(+), 445 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/build-tools/src/main/resources/build-tools/pmd/pmd-ruleset.xml
----------------------------------------------------------------------
diff --git a/build-tools/src/main/resources/build-tools/pmd/pmd-ruleset.xml b/build-tools/src/main/resources/build-tools/pmd/pmd-ruleset.xml
new file mode 100644
index 0000000..83896f7
--- /dev/null
+++ b/build-tools/src/main/resources/build-tools/pmd/pmd-ruleset.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<ruleset xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ name="Maven PMD Plugin Ruleset"
+ xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+ <description>Ruleset</description>
+ <!--<rule ref="category/java/bestpractices.xml">-->
+ <!--<exclude name="ConstantsInInterface" />-->
+ <!--</rule>-->
+ <!--<rule ref="category/java/codestyle.xml" />-->
+ <!--<rule ref="category/java/design.xml" />-->
+ <!--<rule ref="category/java/documentation.xml" />-->
+ <!--<rule ref="category/java/errorprone.xml">-->
+ <!--<exclude name="AvoidFieldNameMatchingMethodName" />-->
+ <!--<exclude name="BeanMembersShouldSerialize" />-->
+ <!--<exclude name="DataflowAnomalyAnalysis" />-->
+ <!--<exclude name="EmptyCatchBlock" />-->
+ <!--</rule>-->
+ <!--<rule ref="category/java/multithreading.xml" />-->
+ <rule ref="category/java/performance.xml">
+ <exclude name="AvoidInstantiatingObjectsInLoops" />
+ <exclude name="InefficientEmptyStringCheck" />
+ <exclude name="SimplifyStartsWith" />
+ <exclude name="TooFewBranchesForASwitchStatement" />
+ <exclude name="UseStringBufferForStringAppends" />
+ </rule>
+ <rule ref="category/java/security.xml" />
+</ruleset>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariCluster.java
----------------------------------------------------------------------
diff --git a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariCluster.java b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariCluster.java
index f098b75..be47d63 100644
--- a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariCluster.java
+++ b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariCluster.java
@@ -20,8 +20,9 @@ import org.apache.knox.gateway.i18n.messages.MessagesFactory;
import org.apache.knox.gateway.topology.discovery.ServiceDiscovery;
import java.io.File;
-import java.io.FileInputStream;
import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -69,7 +70,7 @@ class AmbariCluster implements ServiceDiscovery.Cluster {
if (overridesPath != null) {
Properties overrides = new Properties();
- try (InputStream in = new FileInputStream(overridesPath)) {
+ try (InputStream in = Files.newInputStream(Paths.get(overridesPath))) {
overrides.load(in);
for (String name : overrides.stringPropertyNames()) {
zooKeeperHAConfigMappings.setProperty(name, overrides.getProperty(name));
@@ -260,9 +261,9 @@ class AmbariCluster implements ServiceDiscovery.Cluster {
if (portIndex > 0) {
host = host.substring(0, portIndex);
}
- updatedEnsemble.append(host).append(":").append(port);
+ updatedEnsemble.append(host).append(':').append(port);
if (++index < hosts.length) {
- updatedEnsemble.append(",");
+ updatedEnsemble.append(',');
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariConfigurationMonitor.java
----------------------------------------------------------------------
diff --git a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariConfigurationMonitor.java b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariConfigurationMonitor.java
index 141df87..3f1b035 100644
--- a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariConfigurationMonitor.java
+++ b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariConfigurationMonitor.java
@@ -24,9 +24,10 @@ import org.apache.knox.gateway.topology.discovery.ClusterConfigurationMonitor;
import org.apache.knox.gateway.topology.discovery.ServiceDiscoveryConfig;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -37,7 +38,6 @@ import java.util.Properties;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-
class AmbariConfigurationMonitor implements ClusterConfigurationMonitor {
private static final String TYPE = "Ambari";
@@ -116,7 +116,7 @@ class AmbariConfigurationMonitor implements ClusterConfigurationMonitor {
Collection<File> persistedConfigs = FileUtils.listFiles(persistenceDir, new String[]{"conf"}, false);
for (File persisted : persistedConfigs) {
Properties props = new Properties();
- try (FileInputStream in = new FileInputStream(persisted)) {
+ try (InputStream in = Files.newInputStream(persisted.toPath())) {
props.load(in);
addDiscoveryConfig(props.getProperty(PROP_CLUSTER_NAME), new ServiceDiscoveryConfig() {
@@ -152,7 +152,7 @@ class AmbariConfigurationMonitor implements ClusterConfigurationMonitor {
Collection<File> persistedConfigs = FileUtils.listFiles(persistenceDir, new String[]{"ver"}, false);
for (File persisted : persistedConfigs) {
Properties props = new Properties();
- try (FileInputStream in = new FileInputStream(persisted)) {
+ try (InputStream in = Files.newInputStream(persisted.toPath())) {
props.load(in);
String source = props.getProperty(PROP_CLUSTER_SOURCE);
@@ -210,7 +210,7 @@ class AmbariConfigurationMonitor implements ClusterConfigurationMonitor {
}
private void persist(Properties props, File dest) {
- try (FileOutputStream out = new FileOutputStream(dest)) {
+ try (OutputStream out = Files.newOutputStream(dest.toPath())) {
props.store(out, PERSISTED_FILE_COMMENT);
out.flush();
} catch (Exception e) {
@@ -472,7 +472,7 @@ class AmbariConfigurationMonitor implements ClusterConfigurationMonitor {
private AmbariConfigurationMonitor delegate;
- private boolean isActive = false;
+ private boolean isActive;
PollingConfigAnalyzer(AmbariConfigurationMonitor delegate) {
this.delegate = delegate;
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariDynamicServiceURLCreator.java
----------------------------------------------------------------------
diff --git a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariDynamicServiceURLCreator.java b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariDynamicServiceURLCreator.java
index b81a53a..1ad1830 100644
--- a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariDynamicServiceURLCreator.java
+++ b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariDynamicServiceURLCreator.java
@@ -21,10 +21,10 @@ import org.apache.knox.gateway.topology.discovery.ServiceDiscovery;
import java.io.ByteArrayInputStream;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -39,7 +39,7 @@ class AmbariDynamicServiceURLCreator implements ServiceURLCreator {
private AmbariServiceDiscoveryMessages log = MessagesFactory.get(AmbariServiceDiscoveryMessages.class);
- private AmbariCluster cluster = null;
+ private AmbariCluster cluster;
private ServiceURLPropertyConfig config;
AmbariDynamicServiceURLCreator() {
@@ -52,7 +52,7 @@ class AmbariDynamicServiceURLCreator implements ServiceURLCreator {
AmbariDynamicServiceURLCreator(AmbariCluster cluster, File mappingConfiguration) throws IOException {
this.cluster = cluster;
- try (InputStream inputStream = new FileInputStream(mappingConfiguration)) {
+ try (InputStream inputStream = Files.newInputStream(mappingConfiguration.toPath())) {
config = new ServiceURLPropertyConfig(inputStream);
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariServiceDiscovery.java
----------------------------------------------------------------------
diff --git a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariServiceDiscovery.java b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariServiceDiscovery.java
index a1ceba2..b95fe81 100644
--- a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariServiceDiscovery.java
+++ b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/AmbariServiceDiscovery.java
@@ -29,9 +29,10 @@ import org.apache.knox.gateway.topology.discovery.ServiceDiscovery;
import org.apache.knox.gateway.topology.discovery.ServiceDiscoveryConfig;
import java.io.File;
-import java.io.FileInputStream;
import java.io.InputStream;
import java.lang.reflect.Method;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -78,7 +79,7 @@ class AmbariServiceDiscovery implements ServiceDiscovery {
// This is used to update the monitor when new cluster configuration details are discovered.
private AmbariConfigurationMonitor configChangeMonitor;
- private boolean isInitialized = false;
+ private boolean isInitialized;
//
static void initializeComponentConfigMappings(){
@@ -111,7 +112,7 @@ class AmbariServiceDiscovery implements ServiceDiscovery {
// If there is an overrides configuration file specified either way, then apply it
if (overridesPath != null) {
Properties overrides = new Properties();
- try (InputStream in = new FileInputStream(overridesPath)) {
+ try (InputStream in = Files.newInputStream(Paths.get(overridesPath))) {
overrides.load(in);
for (String name : overrides.stringPropertyNames()) {
componentServiceConfigs.put(name, overrides.getProperty(name));
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/HDFSURLCreatorBase.java
----------------------------------------------------------------------
diff --git a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/HDFSURLCreatorBase.java b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/HDFSURLCreatorBase.java
index 6145632..c6f7bb0 100644
--- a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/HDFSURLCreatorBase.java
+++ b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/HDFSURLCreatorBase.java
@@ -44,7 +44,7 @@ public abstract class HDFSURLCreatorBase implements ServiceURLCreator {
protected AmbariServiceDiscoveryMessages log = MessagesFactory.get(AmbariServiceDiscoveryMessages.class);
- private AmbariCluster cluster = null;
+ private AmbariCluster cluster;
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/NameNodeUrlCreator.java
----------------------------------------------------------------------
diff --git a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/NameNodeUrlCreator.java b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/NameNodeUrlCreator.java
index 17a7517..7d39204 100644
--- a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/NameNodeUrlCreator.java
+++ b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/NameNodeUrlCreator.java
@@ -31,7 +31,7 @@ public class NameNodeUrlCreator implements ServiceURLCreator {
private AmbariServiceDiscoveryMessages log = MessagesFactory.get(AmbariServiceDiscoveryMessages.class);
- private AmbariCluster cluster = null;
+ private AmbariCluster cluster;
@Override
public void init(AmbariCluster cluster) {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/NiFiURLCreator.java
----------------------------------------------------------------------
diff --git a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/NiFiURLCreator.java b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/NiFiURLCreator.java
index ffe2922..a2d0dae 100644
--- a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/NiFiURLCreator.java
+++ b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/NiFiURLCreator.java
@@ -36,7 +36,7 @@ public class NiFiURLCreator implements ServiceURLCreator {
static final String SSL_PORT_PROPERTY = "nifi.node.ssl.port";
- private AmbariCluster cluster = null;
+ private AmbariCluster cluster;
@Override
public String getTargetService() {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/ResourceManagerURLCreatorBase.java
----------------------------------------------------------------------
diff --git a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/ResourceManagerURLCreatorBase.java b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/ResourceManagerURLCreatorBase.java
index 7081b30..a504d8a 100644
--- a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/ResourceManagerURLCreatorBase.java
+++ b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/ResourceManagerURLCreatorBase.java
@@ -35,7 +35,7 @@ public abstract class ResourceManagerURLCreatorBase implements ServiceURLCreator
protected AmbariServiceDiscoveryMessages log = MessagesFactory.get(AmbariServiceDiscoveryMessages.class);
- private AmbariCluster cluster = null;
+ private AmbariCluster cluster;
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/ServiceURLPropertyConfig.java
----------------------------------------------------------------------
diff --git a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/ServiceURLPropertyConfig.java b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/ServiceURLPropertyConfig.java
index 25eedc6..ae2db81 100644
--- a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/ServiceURLPropertyConfig.java
+++ b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/ServiceURLPropertyConfig.java
@@ -30,9 +30,9 @@ import javax.xml.xpath.XPathExpression;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -87,7 +87,7 @@ class ServiceURLPropertyConfig {
* The default service URL pattern to property mapping configuration will be used.
*/
ServiceURLPropertyConfig(File mappingConfigurationFile) throws Exception {
- this(new FileInputStream(mappingConfigurationFile));
+ this(Files.newInputStream(mappingConfigurationFile.toPath()));
}
/**
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/SparkCommonServiceURLCreator.java
----------------------------------------------------------------------
diff --git a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/SparkCommonServiceURLCreator.java b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/SparkCommonServiceURLCreator.java
index 6ff1614..ab49b45 100644
--- a/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/SparkCommonServiceURLCreator.java
+++ b/gateway-discovery-ambari/src/main/java/org/apache/knox/gateway/topology/discovery/ambari/SparkCommonServiceURLCreator.java
@@ -28,13 +28,13 @@ public abstract class SparkCommonServiceURLCreator implements ServiceURLCreator
private static final String URL_TEMPLATE = "%s://%s:%s";
- protected AmbariCluster cluster = null;
+ protected AmbariCluster cluster;
- String primaryComponentName = null;
+ String primaryComponentName;
- String secondaryComponentName = null;
+ String secondaryComponentName;
- String portConfigProperty = null;
+ String portConfigProperty;
@Override
public void init(AmbariCluster cluster) {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/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 fcdbcad..ee01e64 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
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertTrue;
public class AmbariConfigurationMonitorTest {
- private File dataDir = null;
+ private File dataDir;
@Before
public void setup() throws Exception {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/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 77bf113..02000c0 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
@@ -108,14 +108,14 @@ public class ResourcesInvoker implements InvocationHandler {
private static String createDefaultPatternSuffix( final int size ) {
StringBuilder builder = new StringBuilder( 1 + size*7 );
- builder.append( "(" );
+ builder.append('(');
for( int i=0; i<size; i++ ) {
- if( i>0 ) {
- builder.append( "," );
+ if(i > 0) {
+ builder.append(',');
}
- builder.append( "\"{" ).append( i ).append( "}\"" );
+ builder.append("\"{").append(i).append("}\"");
}
- builder.append( ")" );
+ builder.append(')');
return builder.toString();
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/AtlasZookeeperURLManager.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/AtlasZookeeperURLManager.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/AtlasZookeeperURLManager.java
index 8bca9e4..47a8641 100644
--- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/AtlasZookeeperURLManager.java
+++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/AtlasZookeeperURLManager.java
@@ -32,16 +32,13 @@ import java.util.concurrent.TimeUnit;
public class AtlasZookeeperURLManager extends DefaultURLManager {
private static final String DEFAULT_ZOOKEEPER_NAMESPACE = "/apache_atlas";
-
private static final String APACHE_ATLAS_ACTIVE_SERVER_INFO = "/active_server_info";
private static final HaMessages LOG = MessagesFactory.get(HaMessages.class);
private String zooKeeperEnsemble;
-
private String zooKeeperNamespace;
-
@Override
public boolean supportsConfig(HaServiceConfig config) {
if (!( config.getServiceName().equalsIgnoreCase("ATLAS") || config.getServiceName().equalsIgnoreCase("ATLAS-API"))) {
@@ -66,7 +63,6 @@ public class AtlasZookeeperURLManager extends DefaultURLManager {
}
public List<String> lookupURLs() {
-
List<String> serverHosts = new ArrayList<>();
try (CuratorFramework zooKeeperClient = CuratorFrameworkFactory.builder()
.connectString(zooKeeperEnsemble)
@@ -88,8 +84,6 @@ public class AtlasZookeeperURLManager extends DefaultURLManager {
return serverHosts;
}
-
-
@Override
public synchronized void markFailed(String url) {
setURLs(lookupURLs());
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/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 a94834b..debbebe 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
@@ -133,15 +133,11 @@ public class KafkaZookeeperURLManager extends BaseZookeeperURLManager {
StringBuilder buffer = new StringBuilder();
- buffer.append(scheme);
- buffer.append("://");
+ buffer.append(scheme).append("://");
JSONParser parser = new JSONParser(JSONParser.DEFAULT_PERMISSIVE_MODE);
JSONObject obj = (JSONObject) parser.parse(serverInfo);
- buffer.append(obj.get("host"));
-
- buffer.append(":");
- buffer.append(PORT_NUMBER);
+ buffer.append(obj.get("host")).append(':').append(PORT_NUMBER);
return buffer.toString();
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/IdentityAsserterHttpServletRequestWrapper.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/IdentityAsserterHttpServletRequestWrapper.java b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/IdentityAsserterHttpServletRequestWrapper.java
index 71251ca..1c8b478 100644
--- a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/IdentityAsserterHttpServletRequestWrapper.java
+++ b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/IdentityAsserterHttpServletRequestWrapper.java
@@ -266,12 +266,12 @@ private static SpiGatewayMessages log = MessagesFactory.get( SpiGatewayMessages.
} else {
for (String value : values) {
if (sb.length() > 0) {
- sb.append("&");
+ sb.append('&');
}
try {
sb.append(urlEncode(name, encoding));
if (value != null) {
- sb.append("=");
+ sb.append('=');
sb.append(urlEncode(value, encoding));
}
} catch (IllegalArgumentException e) {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/CommonIdentityAssertionFilterTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/CommonIdentityAssertionFilterTest.java b/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/CommonIdentityAssertionFilterTest.java
index 25800f5..ccc7936 100644
--- a/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/CommonIdentityAssertionFilterTest.java
+++ b/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/CommonIdentityAssertionFilterTest.java
@@ -48,9 +48,9 @@ import static org.junit.Assert.assertTrue;
*/
public class CommonIdentityAssertionFilterTest {
- private String username = null;
- private String[] mappedGroups = null;
- private Filter filter = null;
+ private String username;
+ private String[] mappedGroups;
+ private Filter filter;
@Before
public void setup() {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/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 7d72c97..655fec7 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
@@ -23,8 +23,8 @@ import javax.servlet.ServletException;
import org.apache.knox.gateway.identityasserter.common.filter.CommonIdentityAssertionFilter;
public class ConcatIdentityAssertionFilter extends CommonIdentityAssertionFilter {
- private String prefix = null;
- private String suffix = null;
+ private String prefix;
+ private String suffix;
@Override
public void init(FilterConfig filterConfig) throws ServletException {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-provider-identity-assertion-regex/src/main/java/org/apache/knox/gateway/identityasserter/regex/filter/RegexIdentityAssertionFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-regex/src/main/java/org/apache/knox/gateway/identityasserter/regex/filter/RegexIdentityAssertionFilter.java b/gateway-provider-identity-assertion-regex/src/main/java/org/apache/knox/gateway/identityasserter/regex/filter/RegexIdentityAssertionFilter.java
index cb8c222..3ddc41a 100644
--- a/gateway-provider-identity-assertion-regex/src/main/java/org/apache/knox/gateway/identityasserter/regex/filter/RegexIdentityAssertionFilter.java
+++ b/gateway-provider-identity-assertion-regex/src/main/java/org/apache/knox/gateway/identityasserter/regex/filter/RegexIdentityAssertionFilter.java
@@ -31,8 +31,8 @@ import java.util.TreeMap;
public class RegexIdentityAssertionFilter extends
CommonIdentityAssertionFilter {
- private String input = null;
- private String output = null;
+ private String input;
+ private String output;
private Map<String,String> dict;
RegexTemplate template;
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessor.java b/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessor.java
index fe97b57..885eecc 100644
--- a/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessor.java
+++ b/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessor.java
@@ -37,7 +37,7 @@ public class HostmapFunctionProcessor
public static final String DESCRIPTOR_DEFAULT_LOCATION = "/WEB-INF/" + DESCRIPTOR_DEFAULT_FILE_NAME;
private HostMapperService hostMapperService;
- private HostMapper hostMapper = null;
+ private HostMapper hostMapper;
private String clusterName;
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedAddressFunctionProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedAddressFunctionProcessor.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedAddressFunctionProcessor.java
index e798301..7dcf063 100644
--- a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedAddressFunctionProcessor.java
+++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedAddressFunctionProcessor.java
@@ -37,7 +37,7 @@ public class ServiceMappedAddressFunctionProcessor
extends ServiceRegistryFunctionProcessorBase<ServiceMappedAddressFunctionDescriptor>
implements UrlRewriteFunctionProcessor<ServiceMappedAddressFunctionDescriptor> {
- private HostMapper hostmap = null;
+ private HostMapper hostmap;
@Override
public String name() {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryDecryptProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryDecryptProcessor.java b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryDecryptProcessor.java
index df9e33e..ccd82c4 100644
--- a/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryDecryptProcessor.java
+++ b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryDecryptProcessor.java
@@ -41,7 +41,7 @@ public class SecureQueryDecryptProcessor implements
private static SecureQueryMessages log = MessagesFactory.get( SecureQueryMessages.class );
private static final String ENCRYPTED_PARAMETER_NAME = "_";
- private ConfigurableEncryptor encryptor = null;
+ private ConfigurableEncryptor encryptor;
@Override
public String getType() {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRequest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRequest.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRequest.java
index a369830..a2ad19f 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRequest.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRequest.java
@@ -92,17 +92,13 @@ public class UrlRewriteRequest extends GatewayRequestWrapper implements Resolver
//KNOX-439[
//StringBuffer urlString = super.getRequestURL();
StringBuilder urlString = new StringBuilder( 128 );
- urlString.append( getScheme() );
- urlString.append( "://" );
- urlString.append( getServerName() );
- urlString.append( ":" );
- urlString.append( getServerPort() );
- urlString.append( super.getRequestURI() );
+ urlString.append(getScheme()).append("://")
+ .append(getServerName()).append(':').append(getServerPort())
+ .append(super.getRequestURI());
//]
String queryString = super.getQueryString();
if( queryString != null ) {
- urlString.append( '?' );
- urlString.append( queryString );
+ urlString.append( '?' ).append( queryString );
}
try {
urlTemplate = Parser.parseLiteral( urlString.toString() );
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/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 783e9d5..1efcb40 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
@@ -18,6 +18,7 @@
package org.apache.knox.gateway.filter.rewrite.impl;
import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
+import org.apache.commons.lang3.StringUtils;
import org.apache.knox.gateway.filter.GatewayResponseWrapper;
import org.apache.knox.gateway.filter.ResponseStreamer;
import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteFilterContentDescriptor;
@@ -153,7 +154,7 @@ public class UrlRewriteResponse extends GatewayResponseWrapper implements Params
getRewriteFilterConfig(rewriter.getConfig(), bodyFilterName, mimeType);
if (filterContentConfig != null) {
String asType = filterContentConfig.asType();
- if ( asType != null && !asType.trim().isEmpty()) {
+ if ( asType != null && !StringUtils.isBlank(asType)) {
mimeType = MimeTypes.create(asType, getCharacterEncoding());
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlFilterReaderBase.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlFilterReaderBase.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlFilterReaderBase.java
index c2b4264..60005fe 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlFilterReaderBase.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlFilterReaderBase.java
@@ -65,7 +65,7 @@ public abstract class HtmlFilterReaderBase extends Reader implements
private int offset;
private StringWriter writer;
private StringBuffer buffer;
- private UrlRewriteFilterContentDescriptor config = null;
+ private UrlRewriteFilterContentDescriptor config;
protected HtmlFilterReaderBase( Reader reader ) throws IOException, ParserConfigurationException {
this.reader = reader;
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlImportFunctionProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlImportFunctionProcessor.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlImportFunctionProcessor.java
index 5687a40f..f3e7bb1 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlImportFunctionProcessor.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/html/HtmlImportFunctionProcessor.java
@@ -80,8 +80,7 @@ public class HtmlImportFunctionProcessor implements UrlRewriteFunctionProcessor<
}
List<String> frontendValues = frontend.resolve(context, parameters);
StringBuilder buffer = new StringBuilder(IMPORT_LITERAL);
- buffer.append(" ");
- buffer.append(prefix);
+ buffer.append(' ').append(prefix);
if ( frontendValues != null && !frontendValues.isEmpty() ) {
for ( String value : frontendValues ) {
buffer.append(value);
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclsAuthorizationFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclsAuthorizationFilter.java b/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclsAuthorizationFilter.java
index 29dc38b..d0d1629 100644
--- a/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclsAuthorizationFilter.java
+++ b/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclsAuthorizationFilter.java
@@ -50,8 +50,8 @@ public class AclsAuthorizationFilter implements Filter {
private static Auditor auditor = AuditServiceFactory.getAuditService().getAuditor( AuditConstants.DEFAULT_AUDITOR_NAME,
AuditConstants.KNOX_SERVICE_NAME, AuditConstants.KNOX_COMPONENT_NAME );
- private String resourceRole = null;
- private String aclProcessingMode = null;
+ private String resourceRole;
+ private String aclProcessingMode;
private AclParser parser = new AclParser();
private ArrayList<String> adminGroups = new ArrayList<>();
private ArrayList<String> adminUsers = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-provider-security-authz-acls/src/test/java/org/apache/knox/gateway/filter/AclsAuthzFilterTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-authz-acls/src/test/java/org/apache/knox/gateway/filter/AclsAuthzFilterTest.java b/gateway-provider-security-authz-acls/src/test/java/org/apache/knox/gateway/filter/AclsAuthzFilterTest.java
index 4d1258a..43c9bec 100644
--- a/gateway-provider-security-authz-acls/src/test/java/org/apache/knox/gateway/filter/AclsAuthzFilterTest.java
+++ b/gateway-provider-security-authz-acls/src/test/java/org/apache/knox/gateway/filter/AclsAuthzFilterTest.java
@@ -42,8 +42,8 @@ import org.junit.Before;
import org.junit.Test;
public class AclsAuthzFilterTest {
- private boolean accessGranted = false;
- private Filter filter = null;
+ private boolean accessGranted;
+ private Filter filter;
@Before
public void setup() {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/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 2ad4c1b..418e38e 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
@@ -83,7 +83,7 @@ public abstract class AbstractJWTFilter implements Filter {
protected List<String> audiences;
protected JWTokenAuthority authority;
- protected RSAPublicKey publicKey = null;
+ protected RSAPublicKey publicKey;
private String expectedIssuer;
private String expectedSigAlg;
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTAccessTokenAssertionFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTAccessTokenAssertionFilter.java b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTAccessTokenAssertionFilter.java
index c4de8ab..ac14794 100644
--- a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTAccessTokenAssertionFilter.java
+++ b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTAccessTokenAssertionFilter.java
@@ -51,7 +51,7 @@ public class JWTAccessTokenAssertionFilter extends AbstractIdentityAssertionFilt
private static final String BEARER = "Bearer ";
private static JWTMessages log = MessagesFactory.get( JWTMessages.class );
private long validity;
- private JWTokenAuthority authority = null;
+ private JWTokenAuthority authority;
private ServiceRegistry sr;
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTAuthCodeAssertionFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTAuthCodeAssertionFilter.java b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTAuthCodeAssertionFilter.java
index d7f0dcf..0602928 100644
--- a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTAuthCodeAssertionFilter.java
+++ b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTAuthCodeAssertionFilter.java
@@ -39,7 +39,7 @@ import org.apache.knox.gateway.util.JsonUtils;
public class JWTAuthCodeAssertionFilter extends AbstractIdentityAssertionFilter {
private static final String BEARER = "Bearer ";
- private JWTokenAuthority authority = null;
+ private JWTokenAuthority authority;
private ServiceRegistry sr;
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/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 bf6ad94..d5235aa 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
@@ -213,9 +213,9 @@ private String gatewayPath;
StringBuilder sb = new StringBuilder(scheme);
sb.append("://").append(host);
if (!host.contains(":")) {
- sb.append(":").append(port);
+ sb.append(':').append(port);
}
- sb.append("/").append(gatewayPath).append("/knoxsso/api/v1/websso");
+ sb.append('/').append(gatewayPath).append("/knoxsso/api/v1/websso");
return sb.toString();
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/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 9712ca8..dd9aae9 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
@@ -72,10 +72,10 @@ public abstract class AbstractJWTFilterTest {
private static final String SERVICE_URL = "https://localhost:8888/resource";
private static final String dnTemplate = "CN={0},OU=Test,O=Hadoop,L=Test,ST=Test,C=US";
- protected AbstractJWTFilter handler = null;
- protected static RSAPublicKey publicKey = null;
- protected static RSAPrivateKey privateKey = null;
- protected static String pem = null;
+ protected AbstractJWTFilter handler;
+ protected static RSAPublicKey publicKey;
+ protected static RSAPrivateKey privateKey;
+ protected static String pem;
protected abstract void setTokenOnRequest(HttpServletRequest request, SignedJWT jwt);
protected abstract void setGarbledTokenOnRequest(HttpServletRequest request, SignedJWT jwt);
@@ -819,8 +819,8 @@ public abstract class AbstractJWTFilterTest {
}
protected static class TestFilterChain implements FilterChain {
- boolean doFilterCalled = false;
- Subject subject = null;
+ boolean doFilterCalled;
+ Subject subject;
@Override
public void doFilter(ServletRequest request, ServletResponse response) {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java
index 78c2449..02e1064 100644
--- a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java
+++ b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java
@@ -85,9 +85,9 @@ public class Pac4jDispatcherFilter implements Filter {
private CallbackFilter callbackFilter;
private SecurityFilter securityFilter;
- private MasterService masterService = null;
- private KeystoreService keystoreService = null;
- private AliasService aliasService = null;
+ private MasterService masterService;
+ private KeystoreService keystoreService;
+ private AliasService aliasService;
@Override
public void init( FilterConfig filterConfig ) throws ServletException {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/MockHttpServletResponse.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/MockHttpServletResponse.java b/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/MockHttpServletResponse.java
index 8d0643d..6608e28 100644
--- a/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/MockHttpServletResponse.java
+++ b/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/MockHttpServletResponse.java
@@ -33,7 +33,7 @@ public class MockHttpServletResponse extends HttpServletResponseWrapper {
private List<Cookie> cookies = new ArrayList<>();
private String location;
- private int status = 0;
+ private int status;
private Map<String, String> headers = new HashMap<>();
public MockHttpServletResponse() {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/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 c6d1389..0b74c5e 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
@@ -46,7 +46,7 @@ import org.apache.knox.gateway.security.PrimaryPrincipal;
public abstract class AbstractPreAuthFederationFilter implements Filter {
- private List<PreAuthValidator> validators = null;
+ private List<PreAuthValidator> validators;
private FilterConfig filterConfig;
private static AuditService auditService = AuditServiceFactory.getAuditService();
private static Auditor auditor = auditService.getAuditor(
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/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 2cd6235..bf613c2 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
@@ -30,7 +30,7 @@ public class HeaderPreAuthFederationFilter extends AbstractPreAuthFederationFilt
static final String CUSTOM_HEADER_PARAM = "preauth.custom.header";
static final String CUSTOM_GROUP_HEADER_PARAM = "preauth.custom.group.header";
String headerName = "SM_USER";
- String groupHeaderName = null;
+ String groupHeaderName;
@Override
public void init(FilterConfig filterConfig) throws ServletException {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/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 d056b84..020004d 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
@@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletResponse;
public class PreAuthFederationFilter implements Filter {
private static final String CUSTOM_HEADER_PARAM = "preauth.customHeader";
- private List<PreAuthValidator> validators = null;
+ private List<PreAuthValidator> validators;
private FilterConfig filterConfig;
private String headerName = "SM_USER";
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroConfig.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroConfig.java b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroConfig.java
index f282d06..60ac744 100644
--- a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroConfig.java
+++ b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroConfig.java
@@ -62,9 +62,9 @@ public class ShiroConfig {
public String toString() {
StringBuilder sb = new StringBuilder();
for(Entry<String, Map<String, String>> section : sections.entrySet()) {
- sb.append("[").append(section.getKey()).append("]\n");
+ sb.append('[').append(section.getKey()).append("]\n");
for(Entry<String, String> entry : section.getValue().entrySet()) {
- sb.append(entry.getKey()).append("=").append(entry.getValue()).append("\n");
+ sb.append(entry.getKey()).append('=').append(entry.getValue()).append('\n');
}
}
return sb.toString();
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/RedirectToUrlFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/RedirectToUrlFilter.java b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/RedirectToUrlFilter.java
index 87f25f7..f97984f 100644
--- a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/RedirectToUrlFilter.java
+++ b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/RedirectToUrlFilter.java
@@ -28,7 +28,7 @@ import java.io.IOException;
public class RedirectToUrlFilter extends AbstractGatewayFilter {
public static final String REDIRECT_TO_URL = "redirectToUrl";
- protected String redirectUrl = null;
+ protected String redirectUrl;
@Override
public void init(FilterConfig filterConfig) throws ServletException {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealm.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealm.java b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealm.java
index 1a33d57..7aedeca 100644
--- a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealm.java
+++ b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealm.java
@@ -162,7 +162,7 @@ public class KnoxLdapRealm extends JndiLdapRealm {
private String principalRegex = DEFAULT_PRINCIPAL_REGEX;
private Pattern principalPattern = Pattern.compile( DEFAULT_PRINCIPAL_REGEX );
private String userDnTemplate = "{0}";
- private String userSearchFilter = null;
+ private String userSearchFilter;
private String userSearchAttributeTemplate = "{0}";
private String userSearchScope = "subtree";
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/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 9d0ba44..a248d5b 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
@@ -36,7 +36,7 @@ public class CSRFPreventionFilter implements Filter {
private static final String CUSTOM_METHODS_TO_IGNORE_PARAM = "csrf.methodstoignore";
private String headerName = "X-XSRF-Header";
private String mti = "GET,OPTIONS,HEAD";
- private Set<String> methodsToIgnore = null;
+ private Set<String> methodsToIgnore;
@Override
public void init( FilterConfig filterConfig ) throws ServletException {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/StrictTransportFilterTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/StrictTransportFilterTest.java b/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/StrictTransportFilterTest.java
index a4a5730..c459a1a 100644
--- a/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/StrictTransportFilterTest.java
+++ b/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/StrictTransportFilterTest.java
@@ -39,9 +39,9 @@ import org.junit.Test;
public class StrictTransportFilterTest {
private static final String STRICT_TRANSPORT = "Strict-Transport-Security";
- String options = null;
- Collection<String> headerNames = null;
- Collection<String> headers = null;
+ String options;
+ Collection<String> headerNames;
+ Collection<String> headers;
@Test
public void testDefaultOptionsValue() throws Exception {
@@ -129,7 +129,7 @@ public class StrictTransportFilterTest {
}
class TestFilterChain implements FilterChain {
- boolean doFilterCalled = false;
+ boolean doFilterCalled;
@Override
public void doFilter(ServletRequest request, ServletResponse response)
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XContentTypeOptionsFilterTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XContentTypeOptionsFilterTest.java b/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XContentTypeOptionsFilterTest.java
index 9318d38..d08642e 100644
--- a/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XContentTypeOptionsFilterTest.java
+++ b/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XContentTypeOptionsFilterTest.java
@@ -38,8 +38,8 @@ import static org.junit.Assert.fail;
public class XContentTypeOptionsFilterTest {
- private String options = null;
- private Collection<String> headers = null;
+ private String options;
+ private Collection<String> headers;
@Test
public void testDefaultOptionsValue() throws Exception {
@@ -126,7 +126,7 @@ public class XContentTypeOptionsFilterTest {
}
class TestFilterChain implements FilterChain {
- boolean doFilterCalled = false;
+ boolean doFilterCalled;
@Override
public void doFilter(ServletRequest request, ServletResponse response) {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XFrameOptionsFilterTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XFrameOptionsFilterTest.java b/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XFrameOptionsFilterTest.java
index eb085d6..6ac0525 100644
--- a/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XFrameOptionsFilterTest.java
+++ b/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XFrameOptionsFilterTest.java
@@ -39,9 +39,9 @@ import org.junit.Test;
public class XFrameOptionsFilterTest {
private static final String X_FRAME_OPTIONS = "X-Frame-Options";
- String options = null;
- Collection<String> headerNames = null;
- Collection<String> headers = null;
+ String options;
+ Collection<String> headerNames;
+ Collection<String> headers;
@Test
public void testDefaultOptionsValue() throws Exception {
@@ -158,7 +158,7 @@ public class XFrameOptionsFilterTest {
}
class TestFilterChain implements FilterChain {
- boolean doFilterCalled = false;
+ boolean doFilterCalled;
@Override
public void doFilter(ServletRequest request, ServletResponse response)
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XSSProtectionFilterTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XSSProtectionFilterTest.java b/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XSSProtectionFilterTest.java
index 8d0dbca..773384b 100644
--- a/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XSSProtectionFilterTest.java
+++ b/gateway-provider-security-webappsec/src/test/java/org/apache/knox/gateway/webappsec/XSSProtectionFilterTest.java
@@ -38,8 +38,8 @@ import static org.junit.Assert.fail;
public class XSSProtectionFilterTest {
- private String options = null;
- private Collection<String> headers = null;
+ private String options;
+ private Collection<String> headers;
@Test
public void testDefaultOptionsValue() throws Exception {
@@ -122,7 +122,7 @@ public class XSSProtectionFilterTest {
}
class TestFilterChain implements FilterChain {
- boolean doFilterCalled = false;
+ boolean doFilterCalled;
@Override
public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server-xforwarded-filter/src/main/java/org/apache/knox/gateway/filter/CompositeEnumeration.java
----------------------------------------------------------------------
diff --git a/gateway-server-xforwarded-filter/src/main/java/org/apache/knox/gateway/filter/CompositeEnumeration.java b/gateway-server-xforwarded-filter/src/main/java/org/apache/knox/gateway/filter/CompositeEnumeration.java
index 3c60e0b..96a76c6 100644
--- a/gateway-server-xforwarded-filter/src/main/java/org/apache/knox/gateway/filter/CompositeEnumeration.java
+++ b/gateway-server-xforwarded-filter/src/main/java/org/apache/knox/gateway/filter/CompositeEnumeration.java
@@ -22,7 +22,7 @@ import java.util.NoSuchElementException;
public class CompositeEnumeration<T> implements Enumeration<T> {
- private int index = 0;
+ private int index;
private Enumeration<T>[] array;
@SafeVarargs
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayFilter.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayFilter.java b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayFilter.java
index e93daee..6403a02 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayFilter.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayFilter.java
@@ -134,10 +134,9 @@ public class GatewayFilter implements Filter {
match = chains.match(Parser.parseLiteral(newPathWithQuery));
String origUrl = ((HttpServletRequest) servletRequest).getRequestURL().toString();
String url = origUrl;
- if (path.equals("/")) {
+ if (path == null || path.equals("/")) {
url += defaultServicePath;
- }
- else {
+ } else {
int index = origUrl.indexOf(path);
url = origUrl.substring(0, index) + "/" + defaultServicePath + path;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayForwardingServlet.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayForwardingServlet.java b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayForwardingServlet.java
index 6f078bd..403c5fe 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayForwardingServlet.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayForwardingServlet.java
@@ -49,7 +49,7 @@ public class GatewayForwardingServlet extends HttpServlet{
.getAuditor( AuditConstants.DEFAULT_AUDITOR_NAME,
AuditConstants.KNOX_SERVICE_NAME, AuditConstants.KNOX_COMPONENT_NAME );
- private String redirectToContext = null;
+ private String redirectToContext;
@Override
protected void doHead(HttpServletRequest req, HttpServletResponse resp)
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java
index 0a90220..2c80c81 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java
@@ -81,7 +81,6 @@ import javax.servlet.SessionCookieConfig;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
@@ -96,6 +95,7 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
@@ -734,7 +734,7 @@ public class GatewayServer {
}
}
- try (OutputStream outputStream = new FileOutputStream(webXmlFile);
+ try (OutputStream outputStream = Files.newOutputStream(webXmlFile.toPath());
OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream, StandardCharsets.UTF_8)) {
XmlUtils.writeXml(webXmlDoc, outputStreamWriter);
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/deploy/DeploymentFactory.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/deploy/DeploymentFactory.java b/gateway-server/src/main/java/org/apache/knox/gateway/deploy/DeploymentFactory.java
index 6358107..59f014f 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/deploy/DeploymentFactory.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/deploy/DeploymentFactory.java
@@ -69,7 +69,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 final GatewayMessages log = MessagesFactory.get( GatewayMessages.class );
- private static GatewayServices gatewayServices = null;
+ private static GatewayServices gatewayServices;
private static Map<String,Map<String,Map<Version, ServiceDeploymentContributor>>> SERVICE_CONTRIBUTOR_MAP;
static {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/ApplicationDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/ApplicationDeploymentContributor.java b/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/ApplicationDeploymentContributor.java
index 8cbe8bc..00574af 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/ApplicationDeploymentContributor.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/ApplicationDeploymentContributor.java
@@ -41,13 +41,14 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringReader;
import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -84,7 +85,7 @@ public class ApplicationDeploymentContributor extends ServiceDeploymentContribut
} else {
JAXBContext context = JAXBContext.newInstance( ServiceDefinition.class );
Unmarshaller unmarshaller = context.createUnmarshaller();
- try( FileInputStream inputStream = new FileInputStream( file ) ) {
+ try(InputStream inputStream = Files.newInputStream(file.toPath()) ) {
definition = (ServiceDefinition) unmarshaller.unmarshal( inputStream );
}
}
@@ -96,9 +97,10 @@ public class ApplicationDeploymentContributor extends ServiceDeploymentContribut
if( !file.exists() ) {
rules = UrlRewriteRulesDescriptorFactory.load( "xml", new StringReader( "<rules/>" ) );
} else {
- InputStreamReader reader = new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8);
- rules = UrlRewriteRulesDescriptorFactory.load( "xml", reader );
- reader.close();
+ try(InputStream inputStream = Files.newInputStream(file.toPath());
+ InputStreamReader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8)) {
+ rules = UrlRewriteRulesDescriptorFactory.load("xml", reader);
+ }
}
return rules;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/dispatch/UrlConnectionDispatch.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/dispatch/UrlConnectionDispatch.java b/gateway-server/src/main/java/org/apache/knox/gateway/dispatch/UrlConnectionDispatch.java
index 43fb579..27c83e5 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/dispatch/UrlConnectionDispatch.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/dispatch/UrlConnectionDispatch.java
@@ -113,16 +113,16 @@ public class UrlConnectionDispatch extends AbstractGatewayFilter {
StringBuilder paramStr = new StringBuilder();
Enumeration paramNames = request.getParameterNames();
if( paramNames.hasMoreElements() ) {
- paramStr.append( "?" );
+ paramStr.append('?');
}
while( paramNames.hasMoreElements() ) {
String paramName = (String)paramNames.nextElement();
String paramValue = request.getParameter( paramName );
paramStr.append( paramName );
- paramStr.append( "=" );
+ paramStr.append('=');
paramStr.append( URLEncoder.encode( paramValue, StandardCharsets.UTF_8.name() ) );
if( paramNames.hasMoreElements() ) {
- paramStr.append( "&" );
+ paramStr.append('&');
}
}
String urlStr = targetUri.toString() + paramStr.toString();
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/filter/PortMappingHelperHandler.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/filter/PortMappingHelperHandler.java b/gateway-server/src/main/java/org/apache/knox/gateway/filter/PortMappingHelperHandler.java
index a11f52a..effcd64 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/filter/PortMappingHelperHandler.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/filter/PortMappingHelperHandler.java
@@ -49,7 +49,7 @@ public class PortMappingHelperHandler extends HandlerWrapper {
final GatewayConfig config;
- private String defaultTopologyRedirectContext = null;
+ private String defaultTopologyRedirectContext;
public PortMappingHelperHandler(final GatewayConfig config) {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/services/CLIGatewayServices.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/CLIGatewayServices.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/CLIGatewayServices.java
index 919019d..5214928 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/CLIGatewayServices.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/CLIGatewayServices.java
@@ -43,8 +43,8 @@ public class CLIGatewayServices implements GatewayServices {
private static GatewayMessages log = MessagesFactory.get( GatewayMessages.class );
private Map<String,Service> services = new HashMap<>();
- private CLIMasterService ms = null;
- private DefaultKeystoreService ks = null;
+ private CLIMasterService ms;
+ private DefaultKeystoreService ks;
public CLIGatewayServices() {
super();
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/services/DefaultGatewayServices.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/DefaultGatewayServices.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/DefaultGatewayServices.java
index 98f13b2..a09f2f3 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/DefaultGatewayServices.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/DefaultGatewayServices.java
@@ -52,8 +52,8 @@ public class DefaultGatewayServices implements GatewayServices {
private static GatewayMessages log = MessagesFactory.get( GatewayMessages.class );
private Map<String,Service> services = new HashMap<>();
- private DefaultMasterService ms = null;
- private DefaultKeystoreService ks = null;
+ private DefaultMasterService ms;
+ private DefaultKeystoreService ks;
public DefaultGatewayServices() {
super();
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/services/metrics/impl/instr/InstrumentedGatewayFilter.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/metrics/impl/instr/InstrumentedGatewayFilter.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/metrics/impl/instr/InstrumentedGatewayFilter.java
index 9026598..e346bf8 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/metrics/impl/instr/InstrumentedGatewayFilter.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/metrics/impl/instr/InstrumentedGatewayFilter.java
@@ -85,12 +85,12 @@ public class InstrumentedGatewayFilter extends GatewayFilter {
private Timer timer(ServletRequest request) {
StringBuilder builder = new StringBuilder();
- builder.append("client.");
- builder.append(request.getServletContext().getContextPath());
+ builder.append("client.")
+ .append(request.getServletContext().getContextPath());
if (request instanceof HttpServletRequest) {
HttpServletRequest httpServletRequest = (HttpServletRequest) request;
builder.append(InstrUtils.getResourcePath(httpServletRequest.getPathInfo()));
- builder.append(".");
+ builder.append('.');
builder.append(httpServletRequest.getMethod());
builder.append("-requests");
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/services/metrics/impl/reporters/AbstractMetricsReporter.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/metrics/impl/reporters/AbstractMetricsReporter.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/metrics/impl/reporters/AbstractMetricsReporter.java
index 9ec3cb5..e23982d 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/metrics/impl/reporters/AbstractMetricsReporter.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/metrics/impl/reporters/AbstractMetricsReporter.java
@@ -20,7 +20,7 @@ package org.apache.knox.gateway.services.metrics.impl.reporters;
import org.apache.knox.gateway.services.metrics.MetricsReporter;
public abstract class AbstractMetricsReporter implements MetricsReporter {
- private boolean enabled = false;
+ private boolean enabled;
@Override
public boolean isEnabled() {
[2/3] knox git commit: KNOX-1615 - Enable PMD for source analysis
Posted by kr...@apache.org.
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultCryptoService.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultCryptoService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultCryptoService.java
index 7010d29..24487a0 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultCryptoService.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultCryptoService.java
@@ -41,11 +41,11 @@ import org.apache.knox.gateway.services.ServiceLifecycleException;
public class DefaultCryptoService implements CryptoService {
private static final GatewayMessages LOG = MessagesFactory.get( GatewayMessages.class );
- private AliasService as = null;
- private KeystoreService ks = null;
+ private AliasService as;
+ private KeystoreService ks;
private HashMap<String,ConfigurableEncryptor> encryptorCache =
new HashMap<>();
- private GatewayConfig config = null;
+ private GatewayConfig config;
public void setKeystoreService(KeystoreService ks) {
this.ks = ks;
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultKeystoreService.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultKeystoreService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultKeystoreService.java
index e72681f..c0c6756 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultKeystoreService.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultKeystoreService.java
@@ -62,11 +62,11 @@ public class DefaultKeystoreService extends BaseKeystoreService implements
private static GatewayMessages LOG = MessagesFactory.get( GatewayMessages.class );
private static GatewayResources RES = ResourcesFactory.get( GatewayResources.class );
- private String signingKeystoreName = null;
- private String signingKeyAlias = null;
+ private String signingKeystoreName;
+ private String signingKeyAlias;
private Map<String, Map<String, String>> cache = new ConcurrentHashMap<>();
- private Lock readLock = null;
- private Lock writeLock = null;
+ private Lock readLock;
+ private Lock writeLock;
@Override
public void init(GatewayConfig config, Map<String, String> options)
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/JettySSLService.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/JettySSLService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/JettySSLService.java
index 75613c3..b9e5c0c 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/JettySSLService.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/JettySSLService.java
@@ -17,9 +17,10 @@
*/
package org.apache.knox.gateway.services.security.impl;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
@@ -55,9 +56,9 @@ public class JettySSLService implements SSLService {
private MasterService ms;
private KeystoreService ks;
private AliasService as;
- private List<String> sslIncludeCiphers = null;
- private List<String> sslExcludeCiphers = null;
- private List<String> sslExcludeProtocols = null;
+ private List<String> sslIncludeCiphers;
+ private List<String> sslExcludeCiphers;
+ private List<String> sslExcludeProtocols;
private boolean clientAuthNeeded;
private boolean trustAllCerts;
private String truststorePath;
@@ -241,7 +242,7 @@ public class JettySSLService implements SSLService {
private static KeyStore loadKeyStore( String fileName, String storeType, char[] storePass ) throws CertificateException, NoSuchAlgorithmException, IOException, KeyStoreException {
KeyStore keystore = KeyStore.getInstance(storeType);
- try (InputStream is = new FileInputStream(fileName)) {
+ try (InputStream is = Files.newInputStream(Paths.get(fileName))) {
keystore.load(is, storePass);
}
return keystore;
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenAuthorityService.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenAuthorityService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenAuthorityService.java
index b32e914..b9e606f 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenAuthorityService.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenAuthorityService.java
@@ -51,9 +51,9 @@ public class DefaultTokenAuthorityService implements JWTokenAuthority, Service {
private static final String SIGNING_KEY_PASSPHRASE = "signing.key.passphrase";
private static final Set<String> SUPPORTED_SIG_ALGS = new HashSet<>();
- private AliasService as = null;
- private KeystoreService ks = null;
- String signingKeyAlias = null;
+ private AliasService as;
+ private KeystoreService ks;
+ String signingKeyAlias;
static {
// Only standard RSA signature algorithms are accepted
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultClusterConfigurationMonitorService.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultClusterConfigurationMonitorService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultClusterConfigurationMonitorService.java
index 60ee562..d3bd40a 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultClusterConfigurationMonitorService.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultClusterConfigurationMonitorService.java
@@ -30,7 +30,7 @@ import java.util.ServiceLoader;
public class DefaultClusterConfigurationMonitorService implements ClusterConfigurationMonitorService {
- private AliasService aliasService = null;
+ private AliasService aliasService;
private Map<String, ClusterConfigurationMonitor> monitors = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java
index cdc4907..2d501f1 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java
@@ -114,7 +114,7 @@ public class DefaultTopologyService
private volatile Map<File, Topology> topologies;
private AliasService aliasService;
- private RemoteConfigurationMonitor remoteMonitor = null;
+ private RemoteConfigurationMonitor remoteMonitor;
private GatewayConfig config;
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/topology/discovery/DefaultServiceDiscoveryConfig.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/topology/discovery/DefaultServiceDiscoveryConfig.java b/gateway-server/src/main/java/org/apache/knox/gateway/topology/discovery/DefaultServiceDiscoveryConfig.java
index d6e3d50..52913e8 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/topology/discovery/DefaultServiceDiscoveryConfig.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/topology/discovery/DefaultServiceDiscoveryConfig.java
@@ -18,8 +18,8 @@ package org.apache.knox.gateway.topology.discovery;
public class DefaultServiceDiscoveryConfig implements ServiceDiscoveryConfig {
private String address;
- private String user = null;
- private String pwdAlias = null;
+ private String user;
+ private String pwdAlias;
public DefaultServiceDiscoveryConfig(String address) {
this.address = address;
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/DefaultRemoteConfigurationMonitor.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/DefaultRemoteConfigurationMonitor.java b/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/DefaultRemoteConfigurationMonitor.java
index d209d73..82242a3 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/DefaultRemoteConfigurationMonitor.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/DefaultRemoteConfigurationMonitor.java
@@ -103,7 +103,7 @@ class DefaultRemoteConfigurationMonitor implements RemoteConfigurationMonitor {
};
}
- private RemoteConfigurationRegistryClient client = null;
+ private RemoteConfigurationRegistryClient client;
private File providersDir;
private File descriptorsDir;
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/RemoteConfigurationMonitorFactory.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/RemoteConfigurationMonitorFactory.java b/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/RemoteConfigurationMonitorFactory.java
index 07c3842..83eeed4 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/RemoteConfigurationMonitorFactory.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/RemoteConfigurationMonitorFactory.java
@@ -29,7 +29,7 @@ public class RemoteConfigurationMonitorFactory {
private static final GatewayMessages log = MessagesFactory.get(GatewayMessages.class);
- private static RemoteConfigurationRegistryClientService remoteConfigRegistryClientService = null;
+ private static RemoteConfigurationRegistryClientService remoteConfigRegistryClientService;
public static void setClientService(RemoteConfigurationRegistryClientService clientService) {
remoteConfigRegistryClientService = clientService;
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParser.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParser.java b/gateway-server/src/main/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParser.java
index 1408ca9..45d10c2 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParser.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParser.java
@@ -28,9 +28,9 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -86,7 +86,7 @@ public class ProviderConfigurationParser {
static ProviderConfiguration parseXML(File file) throws Exception {
- return parseXML(new FileInputStream(file));
+ return parseXML(Files.newInputStream(file.toPath()));
}
@@ -102,7 +102,7 @@ public class ProviderConfigurationParser {
static ProviderConfiguration parseJSON(File file) throws IOException {
- return parseJSON(new FileInputStream(file));
+ return parseJSON(Files.newInputStream(file.toPath()));
}
@@ -113,7 +113,7 @@ public class ProviderConfigurationParser {
static ProviderConfiguration parseYAML(File file) throws IOException {
- return parseYAML(new FileInputStream(file));
+ return parseYAML(Files.newInputStream(file.toPath()));
}
static ProviderConfiguration parseYAML(InputStream in) throws IOException {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorHandler.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorHandler.java b/gateway-server/src/main/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorHandler.java
index 4df2cf1..84af519 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorHandler.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorHandler.java
@@ -30,7 +30,6 @@ import org.apache.knox.gateway.topology.discovery.ServiceDiscoveryFactory;
import java.io.BufferedWriter;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
@@ -38,6 +37,7 @@ import java.io.StringWriter;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -574,7 +574,7 @@ public class SimpleDescriptorHandler {
}
topologyDescriptor = new File(destDirectory, topologyFilename + ".xml");
- try (OutputStream outputStream = new FileOutputStream(topologyDescriptor);
+ try (OutputStream outputStream = Files.newOutputStream(topologyDescriptor.toPath());
OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream, StandardCharsets.UTF_8);
BufferedWriter fw = new BufferedWriter(outputStreamWriter)) {
fw.write(sw.toString());
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorImpl.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorImpl.java b/gateway-server/src/main/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorImpl.java
index 50092cf..535e1a9 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorImpl.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorImpl.java
@@ -49,7 +49,7 @@ class SimpleDescriptorImpl implements SimpleDescriptor {
@JsonProperty("applications")
private List<ApplicationImpl> applications;
- private String name = null;
+ private String name;
void setName(String name) {
this.name = name;
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/topology/validation/TopologyValidator.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/topology/validation/TopologyValidator.java b/gateway-server/src/main/java/org/apache/knox/gateway/topology/validation/TopologyValidator.java
index 0b678a2..5561087 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/topology/validation/TopologyValidator.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/topology/validation/TopologyValidator.java
@@ -37,7 +37,7 @@ import org.xml.sax.SAXParseException;
public class TopologyValidator {
- private Collection<String> errors = null;
+ private Collection<String> errors;
private final String filePath;
public TopologyValidator(Topology t){
@@ -104,7 +104,6 @@ public class TopologyValidator {
}
public Collection<String> getTopologyErrors(){
-
if(errors != null){
return errors;
}else{
@@ -115,11 +114,9 @@ public class TopologyValidator {
public String getErrorString(){
StringBuilder out = new StringBuilder();
- out.append("");
for(String s : getTopologyErrors()){
- out.append(s).append("\n");
+ out.append(s).append('\n');
}
return out.toString();
}
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/trace/AccessHandler.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/trace/AccessHandler.java b/gateway-server/src/main/java/org/apache/knox/gateway/trace/AccessHandler.java
index 558a739..53eef68 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/trace/AccessHandler.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/trace/AccessHandler.java
@@ -24,30 +24,28 @@ import org.eclipse.jetty.server.Response;
import org.eclipse.jetty.util.component.AbstractLifeCycle;
public class AccessHandler extends AbstractLifeCycle implements RequestLog {
-
private static Logger log = Logger.getLogger( "org.apache.knox.gateway.access" );
@Override
public void log( Request request, Response response ) {
if( log.isTraceEnabled() ) {
StringBuilder sb = new StringBuilder();
- TraceUtil.appendCorrelationContext( sb );
- sb.append( "|" );
- sb.append( request.getRemoteAddr() );
- sb.append( "|" );
- sb.append( request.getMethod() );
- sb.append( "|" );
- sb.append( request.getHttpURI() );
- sb.append( "|" );
- sb.append( request.getContentLength() );
- sb.append( "|" );
- sb.append( response.getStatus() );
- sb.append( "|" );
- sb.append( response.getContentCount() );
- sb.append( "|" );
- sb.append( System.currentTimeMillis() - request.getTimeStamp() );
- log.trace( sb );
+ TraceUtil.appendCorrelationContext(sb);
+ sb.append('|')
+ .append(request.getRemoteAddr())
+ .append('|')
+ .append(request.getMethod())
+ .append('|')
+ .append(request.getHttpURI())
+ .append('|')
+ .append(request.getContentLength())
+ .append('|')
+ .append(response.getStatus())
+ .append('|')
+ .append(response.getContentCount())
+ .append('|')
+ .append(System.currentTimeMillis() - request.getTimeStamp());
+ log.trace(sb);
}
}
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceRequest.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceRequest.java b/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceRequest.java
index e40ef98..a48501e 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceRequest.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceRequest.java
@@ -55,17 +55,16 @@ class TraceRequest extends HttpServletRequestWrapper {
private void traceRequestDetails() {
StringBuilder sb = new StringBuilder();
TraceUtil.appendCorrelationContext( sb );
- sb.append( "|Request=" );
- sb.append( getMethod() );
- sb.append( " " );
- sb.append( getRequestURI() );
+ sb.append("|Request=")
+ .append(getMethod())
+ .append(' ')
+ .append(getRequestURI());
String qs = getQueryString();
if( qs != null ) {
- sb.append( "?" );
- sb.append( qs );
+ sb.append('?').append(qs);
}
- appendHeaders( sb );
- log.trace( sb.toString() );
+ appendHeaders(sb);
+ log.trace(sb.toString());
}
private void appendHeaders( StringBuilder sb ) {
@@ -81,5 +80,4 @@ class TraceRequest extends HttpServletRequestWrapper {
}
}
}
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceResponse.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceResponse.java b/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceResponse.java
index e954338..8605199 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceResponse.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceResponse.java
@@ -57,8 +57,8 @@ class TraceResponse extends HttpServletResponseWrapper {
private void traceResponseDetails() {
StringBuilder sb = new StringBuilder();
TraceUtil.appendCorrelationContext( sb );
- sb.append( "|Response=" );
- sb.append( getStatus() );
+ sb.append( "|Response=" )
+ .append( getStatus() );
appendHeaders( sb );
log.trace( sb.toString() );
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceUtil.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceUtil.java b/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceUtil.java
index c7f0c6b..d3fda4e 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceUtil.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceUtil.java
@@ -35,9 +35,9 @@ public class TraceUtil {
sb.append( "||" );
} else {
append( sb, cc.getRootRequestId() );
- sb.append( "|" );
+ sb.append('|');
append( sb, cc.getParentRequestId() );
- sb.append( "|" );
+ sb.append('|');
append( sb, cc.getRequestId() );
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/util/KnoxCLI.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/util/KnoxCLI.java b/gateway-server/src/main/java/org/apache/knox/gateway/util/KnoxCLI.java
index 2fae90e..6355d5e 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/util/KnoxCLI.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/util/KnoxCLI.java
@@ -119,24 +119,24 @@ public class KnoxCLI extends Configured implements Tool {
private static GatewayServices services = new CLIGatewayServices();
private Command command;
- private String value = null;
- private String cluster = null;
- private String path = null;
+ private String value;
+ private String cluster;
+ private String path;
private String generate = "false";
- private String hostname = null;
- private String port = null;
- private boolean force = false;
- private boolean debug = false;
- private String user = null;
- private String pass = null;
- private boolean groups = false;
+ private String hostname;
+ private String port;
+ private boolean force;
+ private boolean debug;
+ private String user;
+ private String pass;
+ private boolean groups;
- private String remoteRegistryClient = null;
- private String remoteRegistryEntryName = null;
+ private String remoteRegistryClient;
+ private String remoteRegistryEntryName;
// For testing only
- private String master = null;
- private String type = null;
+ private String master;
+ private String type;
@Override
public int run(String[] args) throws Exception {
@@ -1056,8 +1056,8 @@ public class KnoxCLI extends Configured implements Tool {
public static final String USAGE = "ldap-command";
public static final String DESC = "This is an internal command. It should not be used.";
- protected String username = null;
- protected char[] password = null;
+ protected String username;
+ protected char[] password;
protected static final String debugMessage = "For more information use --d for debug output.";
protected Topology topology;
@@ -1637,7 +1637,7 @@ public class KnoxCLI extends Configured implements Tool {
"Errors are reported and suggestions to resolve any problems are returned. JSON formatted.\n";
private boolean ssl = true;
- private int attempts = 0;
+ private int attempts;
@Override
public String getUsage() { return USAGE + ":\n\n" + DESC; }
@@ -1888,7 +1888,7 @@ public class KnoxCLI extends Configured implements Tool {
* Base class for remote config registry upload commands
*/
public abstract class RemoteRegistryUploadCommand extends RemoteRegistryCommand {
- private File sourceFile = null;
+ private File sourceFile;
protected String filename;
protected RemoteRegistryUploadCommand(String sourceFileName) {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/util/ServiceDefinitionsLoader.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/util/ServiceDefinitionsLoader.java b/gateway-server/src/main/java/org/apache/knox/gateway/util/ServiceDefinitionsLoader.java
index 63283cb..fad219b 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/util/ServiceDefinitionsLoader.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/util/ServiceDefinitionsLoader.java
@@ -32,13 +32,13 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
@@ -58,7 +58,7 @@ public class ServiceDefinitionsLoader {
Unmarshaller unmarshaller = context.createUnmarshaller();
for ( File file : getFileList(servicesDir) ) {
- try (InputStream inputStream = new FileInputStream(file)) {
+ try (InputStream inputStream = Files.newInputStream(file.toPath())) {
ServiceDefinition definition = (ServiceDefinition) unmarshaller.unmarshal(inputStream);
//look for rewrite rules as a sibling (for now)
UrlRewriteRulesDescriptor rewriteRulesDescriptor = loadRewriteRules(file.getParentFile());
@@ -119,7 +119,7 @@ public class ServiceDefinitionsLoader {
public static UrlRewriteRulesDescriptor loadRewriteRules(File servicesDir) {
File rewriteFile = new File(servicesDir, REWRITE_FILE);
if ( rewriteFile.exists() ) {
- try (InputStream stream = new FileInputStream(rewriteFile);
+ try (InputStream stream = Files.newInputStream(rewriteFile.toPath());
Reader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
return UrlRewriteRulesDescriptorFactory.load("xml", reader);
} catch ( FileNotFoundException e ) {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/main/java/org/apache/knox/gateway/websockets/GatewayWebsocketHandler.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/websockets/GatewayWebsocketHandler.java b/gateway-server/src/main/java/org/apache/knox/gateway/websockets/GatewayWebsocketHandler.java
index 1e8e8a9..ec97e5f 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/websockets/GatewayWebsocketHandler.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/websockets/GatewayWebsocketHandler.java
@@ -195,8 +195,8 @@ public class GatewayWebsocketHandler extends WebSocketHandler
|| serviceUrl.getProtocol().equals("wss")) ? serviceUrl.getProtocol()
: "ws";
backend.append(protocol).append("://");
- backend.append(serviceUrl.getHost()).append(":");
- backend.append(serviceUrl.getPort()).append("/");
+ backend.append(serviceUrl.getHost()).append(':');
+ backend.append(serviceUrl.getPort()).append('/');
backend.append(serviceUrl.getPath());
}
else {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/test/java/org/apache/knox/gateway/jetty/SslSocketTest.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/jetty/SslSocketTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/jetty/SslSocketTest.java
index a3cd6cd..e4e0d35 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/jetty/SslSocketTest.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/jetty/SslSocketTest.java
@@ -64,7 +64,7 @@ public class SslSocketTest {
public class SslServer implements Runnable {
- private boolean ready = false;
+ private boolean ready;
public boolean waitUntilReady() throws InterruptedException {
synchronized( this ) {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/test/java/org/apache/knox/gateway/services/security/CryptoServiceTest.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/services/security/CryptoServiceTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/services/security/CryptoServiceTest.java
index c28dcaa..3204630 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/services/security/CryptoServiceTest.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/services/security/CryptoServiceTest.java
@@ -38,8 +38,8 @@ import static org.junit.Assert.assertEquals;
@Category( { ManualTests.class, MediumTests.class } )
public class CryptoServiceTest {
- private static CryptoService cs = null;
- private static AliasService as = null;
+ private static CryptoService cs;
+ private static AliasService as;
@BeforeClass
public static void setupSuite() throws Exception {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParserTest.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParserTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParserTest.java
index b8c8f3c..50d2e52 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParserTest.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParserTest.java
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertTrue;
public class ProviderConfigurationParserTest {
- private static File tmpDir = null;
+ private static File tmpDir;
@BeforeClass
public static void createTempDir() {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ProxyInboundClientTest.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ProxyInboundClientTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ProxyInboundClientTest.java
index a56ea49..c445254 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ProxyInboundClientTest.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ProxyInboundClientTest.java
@@ -50,9 +50,9 @@ public class ProxyInboundClientTest {
private static URI serverUri;
private static Handler handler;
- String recievedMessage = null;
+ String recievedMessage;
- byte[] recievedBinaryMessage = null;
+ byte[] recievedBinaryMessage;
/* create an instance */
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketClient.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketClient.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketClient.java
index 08ac45f..6cb9cd1 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketClient.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketClient.java
@@ -40,14 +40,14 @@ import org.eclipse.jetty.util.BlockingArrayQueue;
@ClientEndpoint
public class WebsocketClient {
- private Session session = null;
- public CloseReason close = null;
+ private Session session;
+ public CloseReason close;
public MessageQueue messageQueue = new MessageQueue();
public LinkedList<Throwable> errors = new LinkedList<>();
public CountDownLatch closeLatch = new CountDownLatch(1);
- public boolean onError = false;
- public String errorMessage = null;
+ public boolean onError;
+ public String errorMessage;
@OnClose
public void onWebSocketClose(CloseReason reason) {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologiesResource.java
----------------------------------------------------------------------
diff --git a/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologiesResource.java b/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologiesResource.java
index b9e0e00..463b86b 100644
--- a/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologiesResource.java
+++ b/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologiesResource.java
@@ -553,10 +553,7 @@ public class TopologiesResource {
}else{
gatewayPath = "gateway";
}
- uri += "/" + gatewayPath;
-
- uri += "/" + topology.getName();
- return uri;
+ return uri + "/" + gatewayPath + "/" + topology.getName();
}
String buildHref(HttpServletRequest req) {
@@ -564,20 +561,20 @@ public class TopologiesResource {
}
String buildHref(String id, HttpServletRequest req) {
- String href = buildXForwardBaseURL(req);
+ StringBuilder href = new StringBuilder(buildXForwardBaseURL(req));
// Make sure that the pathInfo doesn't have any '/' chars at the end.
String pathInfo = req.getPathInfo();
while(pathInfo.endsWith("/")) {
pathInfo = pathInfo.substring(0, pathInfo.length() - 1);
}
- href += pathInfo;
+ href.append(pathInfo);
if (id != null) {
- href += "/" + id;
+ href.append('/').append(id);
}
- return href;
+ return href.toString();
}
String buildHref(org.apache.knox.gateway.topology.Topology t, HttpServletRequest req) {
@@ -598,43 +595,43 @@ public class TopologiesResource {
final String X_Forwarded_Port = X_Forwarded + "Port";
final String X_Forwarded_Server = X_Forwarded + "Server";
- String baseURL = "";
+ StringBuilder baseURL = new StringBuilder();
// Get Protocol
if(req.getHeader(X_Forwarded_Proto) != null){
- baseURL += req.getHeader(X_Forwarded_Proto) + "://";
+ baseURL.append(req.getHeader(X_Forwarded_Proto)).append("://");
} else {
- baseURL += req.getProtocol() + "://";
+ baseURL.append(req.getProtocol()).append("://");
}
// Handle Server/Host and Port Here
if (req.getHeader(X_Forwarded_Host) != null && req.getHeader(X_Forwarded_Port) != null){
// Double check to see if host has port
if(req.getHeader(X_Forwarded_Host).contains(req.getHeader(X_Forwarded_Port))){
- baseURL += req.getHeader(X_Forwarded_Host);
+ baseURL.append(req.getHeader(X_Forwarded_Host));
} else {
// If there's no port, add the host and port together;
- baseURL += req.getHeader(X_Forwarded_Host) + ":" + req.getHeader(X_Forwarded_Port);
+ baseURL.append(req.getHeader(X_Forwarded_Host)).append(':').append(req.getHeader(X_Forwarded_Port));
}
} else if(req.getHeader(X_Forwarded_Server) != null && req.getHeader(X_Forwarded_Port) != null){
// Tack on the server and port if they're available. Try host if server not available
- baseURL += req.getHeader(X_Forwarded_Server) + ":" + req.getHeader(X_Forwarded_Port);
+ baseURL.append(req.getHeader(X_Forwarded_Server)).append(':').append(req.getHeader(X_Forwarded_Port));
} else if(req.getHeader(X_Forwarded_Port) != null) {
// if we at least have a port, we can use it.
- baseURL += req.getServerName() + ":" + req.getHeader(X_Forwarded_Port);
+ baseURL.append(req.getServerName()).append(':').append(req.getHeader(X_Forwarded_Port));
} else {
// Resort to request members
- baseURL += req.getServerName() + ":" + req.getLocalPort();
+ baseURL.append(req.getServerName()).append(':').append(req.getLocalPort());
}
// Handle Server context
if( req.getHeader(X_Forwarded_Context) != null ) {
- baseURL += req.getHeader( X_Forwarded_Context );
+ baseURL.append(req.getHeader( X_Forwarded_Context ));
} else {
- baseURL += req.getContextPath();
+ baseURL.append(req.getContextPath());
}
- return baseURL;
+ return baseURL.toString();
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-service-definitions/src/main/java/org/apache/knox/gateway/service/definition/CustomDispatch.java
----------------------------------------------------------------------
diff --git a/gateway-service-definitions/src/main/java/org/apache/knox/gateway/service/definition/CustomDispatch.java b/gateway-service-definitions/src/main/java/org/apache/knox/gateway/service/definition/CustomDispatch.java
index 5091aed..35ed198 100644
--- a/gateway-service-definitions/src/main/java/org/apache/knox/gateway/service/definition/CustomDispatch.java
+++ b/gateway-service-definitions/src/main/java/org/apache/knox/gateway/service/definition/CustomDispatch.java
@@ -33,7 +33,7 @@ public class CustomDispatch {
private String httpClientFactory;
- private boolean useTwoWaySsl = false;
+ private boolean useTwoWaySsl;
@XmlAttribute(name = "contributor-name")
public String getContributorName() {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveDispatch.java
----------------------------------------------------------------------
diff --git a/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveDispatch.java b/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveDispatch.java
index 4ddbe46..97dc8c1 100644
--- a/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveDispatch.java
+++ b/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveDispatch.java
@@ -27,7 +27,7 @@ import org.apache.http.client.methods.HttpUriRequest;
* default HttpClientDispatch.
*/
public class HiveDispatch extends DefaultDispatch {
- private boolean basicAuthPreemptive = false;
+ private boolean basicAuthPreemptive;
@Override
public void init() {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveHaDispatch.java
----------------------------------------------------------------------
diff --git a/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveHaDispatch.java b/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveHaDispatch.java
index 9403a2c..f60b324 100644
--- a/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveHaDispatch.java
+++ b/gateway-service-hive/src/main/java/org/apache/knox/gateway/hive/HiveHaDispatch.java
@@ -25,7 +25,7 @@ import org.apache.http.client.methods.HttpUriRequest;
public class HiveHaDispatch extends DefaultHaDispatch {
- private boolean basicAuthPreemptive = false;
+ private boolean basicAuthPreemptive;
public HiveHaDispatch() {
setServiceRole("HIVE");
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-service-knoxsso/src/main/java/org/apache/knox/gateway/service/knoxsso/WebSSOResource.java
----------------------------------------------------------------------
diff --git a/gateway-service-knoxsso/src/main/java/org/apache/knox/gateway/service/knoxsso/WebSSOResource.java b/gateway-service-knoxsso/src/main/java/org/apache/knox/gateway/service/knoxsso/WebSSOResource.java
index ab3702b..04bc9bd 100644
--- a/gateway-service-knoxsso/src/main/java/org/apache/knox/gateway/service/knoxsso/WebSSOResource.java
+++ b/gateway-service-knoxsso/src/main/java/org/apache/knox/gateway/service/knoxsso/WebSSOResource.java
@@ -85,17 +85,17 @@ public class WebSSOResource {
private static final long TOKEN_TTL_DEFAULT = 30000L;
static final String RESOURCE_PATH = "/api/v1/websso";
private static KnoxSSOMessages log = MessagesFactory.get( KnoxSSOMessages.class );
- private String cookieName = null;
+ private String cookieName;
private boolean secureOnly = true;
private int maxAge = -1;
private long tokenTTL = TOKEN_TTL_DEFAULT;
- private String whitelist = null;
- private String domainSuffix = null;
+ private String whitelist;
+ private String domainSuffix;
private List<String> targetAudiences = new ArrayList<>();
- private boolean enableSession = false;
+ private boolean enableSession;
private String signatureAlgorithm = "RS256";
private List<String> ssoExpectedparams = new ArrayList<>();
- private String clusterName = null;
+ private String clusterName;
@Context
HttpServletRequest request;
@@ -300,20 +300,20 @@ public class WebSSOResource {
&& !ssoExpectedparams.contains(entry.getKey())) {
if(first) {
- buf.append("?");
+ buf.append('?');
first = false;
}
- buf.append("&").append(entry.getKey());
+ buf.append('&').append(entry.getKey());
String[] values = entry.getValue();
if (values.length > 0 && values[0] != null) {
- buf.append("=");
+ buf.append('=');
}
for (int i = 0; i < values.length; i++) {
if (values[0] != null) {
buf.append(values[i]);
if (i < values.length-1) {
- buf.append("&").append(entry.getKey()).append("=");
+ buf.append('&').append(entry.getKey()).append('=');
}
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-service-knoxssout/src/main/java/org/apache/knox/gateway/service/knoxsso/WebSSOutResource.java
----------------------------------------------------------------------
diff --git a/gateway-service-knoxssout/src/main/java/org/apache/knox/gateway/service/knoxsso/WebSSOutResource.java b/gateway-service-knoxssout/src/main/java/org/apache/knox/gateway/service/knoxsso/WebSSOutResource.java
index 4b20f9b..1520968 100644
--- a/gateway-service-knoxssout/src/main/java/org/apache/knox/gateway/service/knoxsso/WebSSOutResource.java
+++ b/gateway-service-knoxssout/src/main/java/org/apache/knox/gateway/service/knoxsso/WebSSOutResource.java
@@ -46,7 +46,7 @@ public class WebSSOutResource {
static final String RESOURCE_PATH = "/api/v1/webssout";
- private String cookieName = null;
+ private String cookieName;
@Context
HttpServletRequest request;
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java
----------------------------------------------------------------------
diff --git a/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java b/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java
index 9371c4a..1c35668 100644
--- a/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java
+++ b/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java
@@ -62,10 +62,10 @@ public class TokenResource {
private static TokenServiceMessages log = MessagesFactory.get( TokenServiceMessages.class );
private long tokenTTL = TOKEN_TTL_DEFAULT;
private List<String> targetAudiences = new ArrayList<>();
- private String tokenTargetUrl = null;
- private Map<String,Object> tokenClientDataMap = null;
+ private String tokenTargetUrl;
+ private Map<String,Object> tokenClientDataMap;
private ArrayList<String> allowedDNs = new ArrayList<>();
- private boolean clientCertRequired = false;
+ private boolean clientCertRequired;
private String signatureAlgorithm = "RS256";
@Context
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-service-remoteconfig/src/main/java/org/apache/knox/gateway/service/config/remote/zk/CuratorClientService.java
----------------------------------------------------------------------
diff --git a/gateway-service-remoteconfig/src/main/java/org/apache/knox/gateway/service/config/remote/zk/CuratorClientService.java b/gateway-service-remoteconfig/src/main/java/org/apache/knox/gateway/service/config/remote/zk/CuratorClientService.java
index b419c9c..b779e67 100644
--- a/gateway-service-remoteconfig/src/main/java/org/apache/knox/gateway/service/config/remote/zk/CuratorClientService.java
+++ b/gateway-service-remoteconfig/src/main/java/org/apache/knox/gateway/service/config/remote/zk/CuratorClientService.java
@@ -64,7 +64,7 @@ class CuratorClientService implements ZooKeeperClientService {
private Map<String, RemoteConfigurationRegistryClient> clients = new HashMap<>();
- private AliasService aliasService = null;
+ private AliasService aliasService;
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMHaBaseDispatcher.java
----------------------------------------------------------------------
diff --git a/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMHaBaseDispatcher.java b/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMHaBaseDispatcher.java
index e3770ed..caec73a 100644
--- a/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMHaBaseDispatcher.java
+++ b/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMHaBaseDispatcher.java
@@ -41,8 +41,8 @@ class RMHaBaseDispatcher extends DefaultDispatch {
private static final RMMessages LOG = MessagesFactory.get(RMMessages.class);
private int maxFailoverAttempts = HaServiceConfigConstants.DEFAULT_MAX_FAILOVER_ATTEMPTS;
private int failoverSleep = HaServiceConfigConstants.DEFAULT_FAILOVER_SLEEP;
- private String resourceRole = null;
- private HttpResponse inboundResponse = null;
+ private String resourceRole;
+ private HttpResponse inboundResponse;
/**
*
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-service-test/src/main/java/org/apache/knox/gateway/service/test/ServiceTestResource.java
----------------------------------------------------------------------
diff --git a/gateway-service-test/src/main/java/org/apache/knox/gateway/service/test/ServiceTestResource.java b/gateway-service-test/src/main/java/org/apache/knox/gateway/service/test/ServiceTestResource.java
index b169e95..5e6e0f2 100644
--- a/gateway-service-test/src/main/java/org/apache/knox/gateway/service/test/ServiceTestResource.java
+++ b/gateway-service-test/src/main/java/org/apache/knox/gateway/service/test/ServiceTestResource.java
@@ -20,10 +20,10 @@ package org.apache.knox.gateway.service.test;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.utils.URIBuilder;
-import org.apache.http.conn.ssl.SSLContexts;
import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
+import org.apache.http.ssl.SSLContexts;
import org.apache.knox.gateway.config.GatewayConfig;
import org.apache.knox.gateway.services.GatewayServices;
import org.apache.knox.gateway.services.topology.TopologyService;
@@ -218,43 +218,43 @@ public class ServiceTestResource {
final String X_Forwarded_Port = X_Forwarded + "Port";
final String X_Forwarded_Server = X_Forwarded + "Server";
- String baseURL = "";
+ StringBuilder baseURL = new StringBuilder();
// Get Protocol
if(req.getHeader(X_Forwarded_Proto) != null){
- baseURL += req.getHeader(X_Forwarded_Proto) + "://";
+ baseURL.append(req.getHeader(X_Forwarded_Proto)).append("://");
} else {
- baseURL += req.getProtocol() + "://";
+ baseURL.append(req.getProtocol()).append("://");
}
// Handle Server/Host and Port Here
if (req.getHeader(X_Forwarded_Host) != null && req.getHeader(X_Forwarded_Port) != null){
// Double check to see if host has port
if(req.getHeader(X_Forwarded_Host).contains(req.getHeader(X_Forwarded_Port))){
- baseURL += req.getHeader(X_Forwarded_Host);
+ baseURL.append(req.getHeader(X_Forwarded_Host));
} else {
// If there's no port, add the host and port together;
- baseURL += req.getHeader(X_Forwarded_Host) + ":" + req.getHeader(X_Forwarded_Port);
+ baseURL.append(req.getHeader(X_Forwarded_Host)).append(':').append(req.getHeader(X_Forwarded_Port));
}
} else if(req.getHeader(X_Forwarded_Server) != null && req.getHeader(X_Forwarded_Port) != null){
// Tack on the server and port if they're available. Try host if server not available
- baseURL += req.getHeader(X_Forwarded_Server) + ":" + req.getHeader(X_Forwarded_Port);
+ baseURL.append(req.getHeader(X_Forwarded_Server)).append(':').append(req.getHeader(X_Forwarded_Port));
} else if(req.getHeader(X_Forwarded_Port) != null) {
// if we at least have a port, we can use it.
- baseURL += req.getServerName() + ":" + req.getHeader(X_Forwarded_Port);
+ baseURL.append(req.getServerName()).append(':').append(req.getHeader(X_Forwarded_Port));
} else {
// Resort to request members
- baseURL += req.getServerName() + ":" + req.getLocalPort();
+ baseURL.append(req.getServerName()).append(':').append(req.getLocalPort());
}
// Handle Server context
if( req.getHeader(X_Forwarded_Context) != null ) {
- baseURL += req.getHeader( X_Forwarded_Context );
+ baseURL.append(req.getHeader( X_Forwarded_Context ));
} else {
- baseURL += req.getContextPath();
+ baseURL.append(req.getContextPath());
}
- return baseURL;
+ return baseURL.toString();
}
String buildURI(Topology topology, GatewayConfig config, HttpServletRequest req){
@@ -270,10 +270,7 @@ public class ServiceTestResource {
}else{
gatewayPath = "gateway";
}
- uri += "/" + gatewayPath;
-
- uri += "/" + topology.getName();
- return uri;
+ return uri + "/" + gatewayPath + "/" + topology.getName();
}
@XmlAccessorType(XmlAccessType.NONE)
@@ -340,7 +337,6 @@ public class ServiceTestResource {
}
public void setMessage(String msg) {
-
if(httpCode != -1) {
message = buildMessage(httpCode);
} else {
@@ -353,38 +349,25 @@ public class ServiceTestResource {
}
static String buildMessage(int code) {
-
- String message = "";
-
switch (code) {
-
case 200:
- message += "Request sucessful.";
- break;
+ return "Request successful.";
case 400:
- message += "Could not properly intepret HTTP request.";
- break;
+ return "Could not properly interpret HTTP request.";
case 401:
- message += "User was not authorized. Try using credentials with access to all services. " +
- "Ensure LDAP server is running.";
- break;
+ return "User was not authorized. Try using credentials with access to all services. " +
+ "Ensure LDAP server is running.";
case 403:
- message += "Access to this resource is forbidden. It seems we might have made a bad request.";
- break;
+ return "Access to this resource is forbidden. It seems we might have made a bad request.";
case 404:
- message += "The page could not be found. Are the URLs for the topology services correct?";
- break;
+ return "The page could not be found. Are the URLs for the topology services correct?";
case 500:
- message += "The server encountered an error. Are all of the cluster's services running? \n" +
+ return "The server encountered an error. Are all of the cluster's services running? \n" +
"Can a connection be established without Knox?";
- break;
-
+ default:
+ return "";
}
- return message;
-
}
-
-
}
@XmlAccessorType(XmlAccessType.FIELD)
@@ -414,8 +397,5 @@ public class ServiceTestResource {
public void setMessages(List<String> messages){
this.messages = messages;
}
-
}
-
-
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/BasicResponse.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/BasicResponse.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/BasicResponse.java
index d7e3b50..49b16ee 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/BasicResponse.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/BasicResponse.java
@@ -28,7 +28,7 @@ import java.io.InputStream;
public class BasicResponse implements Closeable {
private HttpResponse response;
- private boolean consumed = false;
+ private boolean consumed;
private String string;
private InputStream stream;
private byte[] bytes;
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/ErrorResponse.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/ErrorResponse.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/ErrorResponse.java
index 28a2e50..92661e9 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/ErrorResponse.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/ErrorResponse.java
@@ -24,7 +24,7 @@ class ErrorResponse extends RuntimeException {
HttpResponse response;
ErrorResponse( HttpResponse response ) {
- super( "" + response.getStatusLine() );
+ super(String.valueOf(response.getStatusLine()));
this.response = response;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxSession.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxSession.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxSession.java
index f475a42..e761450 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxSession.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxSession.java
@@ -56,13 +56,13 @@ import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
import java.io.Closeable;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
+import java.nio.file.Files;
import java.security.GeneralSecurityException;
import java.security.KeyStore;
import java.security.KeyStoreException;
@@ -91,7 +91,7 @@ public class KnoxSession implements Closeable {
private static final String DEFAULT_JAAS_FILE = "/jaas.conf";
public static final String JGSS_LOGIN_MOUDLE = "com.sun.security.jgss.initiate";
- private boolean isKerberos = false;
+ private boolean isKerberos;
String base;
HttpHost host;
@@ -324,7 +324,7 @@ public class KnoxSession implements Closeable {
}
if (file.exists()) {
- try (InputStream is = new FileInputStream(file)) {
+ try (InputStream is = Files.newInputStream(file.toPath())) {
ks.load(is, truststorePass.toCharArray());
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxSh.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxSh.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxSh.java
index fa8b727..07f213e 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxSh.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxSh.java
@@ -23,10 +23,10 @@ import org.apache.knox.gateway.util.JsonUtils;
import java.io.BufferedReader;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.InputStreamReader;
+import java.io.OutputStream;
import java.io.PrintStream;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
@@ -57,7 +57,7 @@ public class KnoxSh {
public PrintStream err = System.err;
private Command command;
- private String gateway = null;
+ private String gateway;
public int run(String[] args) throws Exception {
int exitCode;
@@ -184,7 +184,7 @@ public class KnoxSh {
displayTokenDetails(json);
File tokenfile = new File(System.getProperty("user.home"), ".knoxtokencache");
- try( FileOutputStream fos = new FileOutputStream(tokenfile) ) {
+ try( OutputStream fos = Files.newOutputStream(tokenfile.toPath()) ) {
fos.write(text.getBytes(StandardCharsets.UTF_8));
Set<PosixFilePermission> perms = new HashSet<>();
//add owners permission only
@@ -273,7 +273,9 @@ public class KnoxSh {
}
private String readFile(String file) throws IOException {
- try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8))) {
+ try (InputStream inputStream = Files.newInputStream(Paths.get(file));
+ InputStreamReader inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
+ BufferedReader reader = new BufferedReader(inputStreamReader)) {
String line;
StringBuilder stringBuilder = new StringBuilder();
String ls = System.getProperty("line.separator");
@@ -283,7 +285,7 @@ public class KnoxSh {
}
return stringBuilder.toString();
}
-}
+ }
/**
* @param args command line arguments
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxTokenCredentialCollector.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxTokenCredentialCollector.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxTokenCredentialCollector.java
index 71fe605..a9607dc 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxTokenCredentialCollector.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxTokenCredentialCollector.java
@@ -35,9 +35,9 @@ public class KnoxTokenCredentialCollector extends AbstractCredentialCollector {
private static final String KNOXTOKENCACHE = ".knoxtokencache";
- private String targetUrl = null;
+ private String targetUrl;
- private String tokenType = null;
+ private String tokenType;
@Override
public void collect() throws CredentialCollectionException {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/DeleteRows.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/DeleteRows.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/DeleteRows.java
index ee8d7d1..58591a5 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/DeleteRows.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/DeleteRows.java
@@ -70,7 +70,7 @@ public class DeleteRows {
if( column != null ) {
columnsURIPart.append( column.toURIPart() );
}
- columnsURIPart.append( "/" );
+ columnsURIPart.append('/');
String timeURIPart = "";
if( time != null ) {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/QueryRows.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/QueryRows.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/QueryRows.java
index 7686520..a272921 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/QueryRows.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/QueryRows.java
@@ -90,17 +90,17 @@ public class QueryRows {
int index = 0;
for( Column column : columns ) {
if( index++ > 0 ) {
- columnsURIPart.append( "," );
+ columnsURIPart.append(',');
}
columnsURIPart.append( column.toURIPart() );
}
- columnsURIPart.append( "/" );
+ columnsURIPart.append('/');
StringBuilder timesURIPart = new StringBuilder();
if( startTime != null && endTime != null ) {
- timesURIPart.append( startTime ).append( "," ).append( endTime );
+ timesURIPart.append( startTime ).append(',').append( endTime );
} else if( startTime != null ) {
- timesURIPart.append( startTime ).append( "," ).append( Long.MAX_VALUE );
+ timesURIPart.append( startTime ).append(',').append( Long.MAX_VALUE );
} else if( endTime != null ) {
timesURIPart.append( endTime );
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Mkdir.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Mkdir.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Mkdir.java
index d4aaab7..f927953 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Mkdir.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Mkdir.java
@@ -30,8 +30,8 @@ class Mkdir {
public static class Request extends AbstractRequest<Response> {
- String dir = null;
- String perm = null;
+ String dir;
+ String perm;
Request( KnoxSession session ) {
super( session );
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Put.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Put.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Put.java
index f48b40b..9d6e74e 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Put.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Put.java
@@ -41,7 +41,7 @@ class Put {
private String text;
private String file;
private String to;
- private boolean overwrite = false;
+ private boolean overwrite;
private int permission = 755;
private Integer blocksize;
private Integer buffersize;
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/GatewayDispatchFilter.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/GatewayDispatchFilter.java b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/GatewayDispatchFilter.java
index 5f6611f..79442db 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/GatewayDispatchFilter.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/GatewayDispatchFilter.java
@@ -49,7 +49,7 @@ public class GatewayDispatchFilter extends AbstractGatewayFilter {
private final Object lock = new Object();
- private String whitelist = null;
+ private String whitelist;
private Dispatch dispatch;
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/HadoopAuthCookieStore.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/HadoopAuthCookieStore.java b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/HadoopAuthCookieStore.java
index 64ca2f8..06c9967 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/HadoopAuthCookieStore.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/dispatch/HadoopAuthCookieStore.java
@@ -17,10 +17,11 @@
*/
package org.apache.knox.gateway.dispatch;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.util.Date;
import java.util.Properties;
@@ -38,7 +39,6 @@ public class HadoopAuthCookieStore extends BasicCookieStore {
private GatewayConfig gatewayConfig;
-
HadoopAuthCookieStore(GatewayConfig config) {
this.gatewayConfig = config;
}
@@ -55,7 +55,6 @@ public class HadoopAuthCookieStore extends BasicCookieStore {
}
}
-
private static boolean isKnoxCookie(GatewayConfig config, Cookie cookie) {
boolean result = false;
@@ -75,7 +74,7 @@ public class HadoopAuthCookieStore extends BasicCookieStore {
String krb5Config = config.getKerberosLoginConfig();
if (krb5Config != null && !krb5Config.isEmpty()) {
Properties p = new Properties();
- try (InputStream in = new FileInputStream(krb5Config)){
+ try (InputStream in = Files.newInputStream(Paths.get(krb5Config))){
p.load(in);
String configuredPrincipal = p.getProperty("principal");
// Strip off enclosing quotes, if present
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-spi/src/main/java/org/apache/knox/gateway/security/principal/SimplePrincipalMapper.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/security/principal/SimplePrincipalMapper.java b/gateway-spi/src/main/java/org/apache/knox/gateway/security/principal/SimplePrincipalMapper.java
index 94dcc8d..a5255a9 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/security/principal/SimplePrincipalMapper.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/security/principal/SimplePrincipalMapper.java
@@ -22,8 +22,8 @@ import java.util.HashMap;
import java.util.StringTokenizer;
public class SimplePrincipalMapper implements PrincipalMapper {
- public HashMap<String, String[]> principalMappings = null;
- public HashMap<String, String[]> groupMappings = null;
+ public HashMap<String, String[]> principalMappings;
+ public HashMap<String, String[]> groupMappings;
public SimplePrincipalMapper() {
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/BaseKeystoreService.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/BaseKeystoreService.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/BaseKeystoreService.java
index ff4b851..d69b678 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/BaseKeystoreService.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/BaseKeystoreService.java
@@ -25,11 +25,11 @@ import org.apache.knox.gateway.services.security.MasterService;
import javax.crypto.spec.SecretKeySpec;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.security.Key;
import java.security.KeyStore;
import java.security.KeyStoreException;
@@ -49,7 +49,7 @@ public class BaseKeystoreService {
throws CertificateException, IOException, KeyStoreException, NoSuchAlgorithmException {
final KeyStore keyStore = KeyStore.getInstance(storeType);
if ( keyStoreFile.exists() ) {
- try (FileInputStream input = new FileInputStream( keyStoreFile )) {
+ try (InputStream input = Files.newInputStream(keyStoreFile.toPath())) {
keyStore.load( input, masterPassword );
}
} else {
@@ -59,7 +59,7 @@ public class BaseKeystoreService {
return keyStore;
}
- private static FileOutputStream createKeyStoreFile( String fileName ) throws IOException {
+ private static OutputStream createKeyStoreFile(String fileName ) throws IOException {
File file = new File( fileName );
if( file.exists() ) {
if( file.isDirectory() ) {
@@ -75,11 +75,11 @@ public class BaseKeystoreService {
}
}
}
- return new FileOutputStream( file );
+ return Files.newOutputStream( file.toPath() );
}
protected void createKeystore(String filename, String keystoreType) throws KeystoreServiceException {
- try (FileOutputStream out = createKeyStoreFile( filename )) {
+ try (OutputStream out = createKeyStoreFile( filename )) {
KeyStore ks = KeyStore.getInstance(keystoreType);
ks.load( null, null );
ks.store( out, masterService.getMasterSecret() );
@@ -91,7 +91,7 @@ public class BaseKeystoreService {
protected boolean isKeystoreAvailable(final File keyStoreFile, String storeType) throws KeyStoreException, IOException {
if ( keyStoreFile.exists() ) {
- try (InputStream input = new FileInputStream(keyStoreFile)){
+ try (InputStream input = Files.newInputStream(keyStoreFile.toPath())){
final KeyStore keyStore = KeyStore.getInstance(storeType);
keyStore.load( input, masterService.getMasterSecret() );
return true;
@@ -157,7 +157,7 @@ public class BaseKeystoreService {
protected void writeCertificateToFile( Certificate cert, final File file ) throws CertificateEncodingException, IOException {
byte[] bytes = cert.getEncoded();
Base64 encoder = new Base64( 76, "\n".getBytes( StandardCharsets.US_ASCII ) );
- try( FileOutputStream out = new FileOutputStream( file ) ) {
+ try( OutputStream out = Files.newOutputStream( file.toPath() ) ) {
out.write( "-----BEGIN CERTIFICATE-----\n".getBytes( StandardCharsets.US_ASCII ) );
out.write( encoder.encodeToString( bytes ).getBytes( StandardCharsets.US_ASCII ) );
out.write( "-----END CERTIFICATE-----\n".getBytes( StandardCharsets.US_ASCII ) );
@@ -167,7 +167,7 @@ public class BaseKeystoreService {
protected void writeKeystoreToFile(final KeyStore keyStore, final File file)
throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException {
// TODO: backup the keystore on disk before attempting a write and restore on failure
- try( FileOutputStream out = new FileOutputStream(file) ) {
+ try( OutputStream out = Files.newOutputStream(file.toPath()) ) {
keyStore.store( out, masterService.getMasterSecret() );
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/CMFMasterService.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/CMFMasterService.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/CMFMasterService.java
index 961e7da..023583f 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/CMFMasterService.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/CMFMasterService.java
@@ -39,7 +39,7 @@ public class CMFMasterService {
private static final String MASTER_PASSPHRASE = "masterpassphrase";
private static final String MASTER_PERSISTENCE_TAG = "#1.0# " + TimeStamp.getCurrentTime().toDateString();
- protected char[] master = null;
+ protected char[] master;
protected String serviceName;
private ConfigurableEncryptor encryptor = new ConfigurableEncryptor(MASTER_PASSPHRASE);
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/X509CertificateUtil.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/X509CertificateUtil.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/X509CertificateUtil.java
index 551fb5c..8e0a370 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/X509CertificateUtil.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/X509CertificateUtil.java
@@ -18,14 +18,15 @@
package org.apache.knox.gateway.services.security.impl;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStream;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.security.KeyPair;
import java.security.KeyStore;
import java.security.KeyStoreException;
@@ -276,7 +277,7 @@ public class X509CertificateUtil {
throws CertificateEncodingException, IOException {
byte[] bytes = cert.getEncoded();
Base64 encoder = new Base64( 76, "\n".getBytes( StandardCharsets.US_ASCII ) );
- try( FileOutputStream out = new FileOutputStream( file ) ) {
+ try(OutputStream out = Files.newOutputStream(file.toPath()) ) {
out.write( "-----BEGIN CERTIFICATE-----\n".getBytes( StandardCharsets.US_ASCII ) );
out.write( encoder.encodeToString( bytes ).getBytes( StandardCharsets.US_ASCII ) );
out.write( "-----END CERTIFICATE-----\n".getBytes( StandardCharsets.US_ASCII ) );
@@ -291,7 +292,7 @@ public class X509CertificateUtil {
ks.load(null, password);
ks.setCertificateEntry("gateway-identity", cert);
/* Coverity Scan CID 1361992 */
- try (FileOutputStream fos = new FileOutputStream(file)) {
+ try (OutputStream fos = Files.newOutputStream(file.toPath())) {
ks.store(fos, password);
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Service.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Service.java b/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Service.java
index 6b0c5de..d65704c 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Service.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Service.java
@@ -34,7 +34,7 @@ public class Service {
private Version version;
private Map<String, String> params = new LinkedHashMap<>();
private List<String> urls;
- private CustomDispatch dispatch = null;
+ private CustomDispatch dispatch;
public String getRole() {
return role;
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Topology.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Topology.java b/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Topology.java
index c84673f..10f891e 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Topology.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Topology.java
@@ -32,7 +32,7 @@ public class Topology {
private URI uri;
private String name;
- private String defaultServicePath = null;
+ private String defaultServicePath;
private long timestamp;
private boolean isGenerated;
public List<Provider> providerList = new ArrayList<>();
@@ -41,7 +41,7 @@ public class Topology {
private MultiKeyMap serviceMap;
private List<Application> applications = new ArrayList<>();
private Map<String,Application> applicationMap = new HashMap<>();
- private CustomDispatch dispatch = null;
+ private CustomDispatch dispatch;
public Topology() {
serviceMap = MultiKeyMap.decorate(new HashedMap());
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/GatewayDispatchFilterTest.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/GatewayDispatchFilterTest.java b/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/GatewayDispatchFilterTest.java
index 6340182..8fc5183 100644
--- a/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/GatewayDispatchFilterTest.java
+++ b/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/GatewayDispatchFilterTest.java
@@ -270,7 +270,7 @@ public class GatewayDispatchFilterTest {
}
private static class TestHttpServletResponse extends MockHttpServletResponse {
- int status = 0;
+ int status;
@Override
public void sendError(int i) throws IOException {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFMasterServiceTest.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFMasterServiceTest.java b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFMasterServiceTest.java
index 82170ed..8c329f2 100644
--- a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFMasterServiceTest.java
+++ b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFMasterServiceTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.fail;
*/
@Category( { UnitTests.class, FastTests.class } )
public class CMFMasterServiceTest {
- TestCMFMasterService ms = null;
+ TestCMFMasterService ms;
@Before
public void setup() {
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestConfig.java
----------------------------------------------------------------------
diff --git a/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestConfig.java b/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestConfig.java
index 1fb183a..ed89a2f 100644
--- a/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestConfig.java
+++ b/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestConfig.java
@@ -47,20 +47,20 @@ public class GatewayTestConfig extends Configuration implements GatewayConfig {
private String gatewayHomeDir = "gateway-home";
private String hadoopConfDir = "hadoop";
private String gatewayHost = "localhost";
- private int gatewayPort = 0;
+ private int gatewayPort;
private String gatewayPath = "gateway";
- private boolean hadoopKerberosSecured = false;
+ private boolean hadoopKerberosSecured;
private String kerberosConfig = "/etc/knox/conf/krb5.conf";
- private boolean kerberosDebugEnabled = false;
+ private boolean kerberosDebugEnabled;
private String kerberosLoginConfig = "/etc/knox/conf/krb5JAASLogin.conf";
- private String frontendUrl = null;
+ private String frontendUrl;
private boolean xForwardedEnabled = true;
- private String gatewayApplicationsDir = null;
+ private String gatewayApplicationsDir;
private String gatewayServicesDir;
private String defaultTopologyName = "default";
- private List<String> includedSSLCiphers = null;
- private List<String> excludedSSLCiphers = null;
- private boolean sslEnabled = false;
+ private List<String> includedSSLCiphers;
+ private List<String> excludedSSLCiphers;
+ private boolean sslEnabled;
private String truststoreType = "jks";
private String keystoreType = "jks";
private boolean isTopologyPortMappingEnabled = true;
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestDriver.java
----------------------------------------------------------------------
diff --git a/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestDriver.java b/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestDriver.java
index 03bbdad..ce5f846 100644
--- a/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestDriver.java
+++ b/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestDriver.java
@@ -21,9 +21,9 @@ import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import java.net.InetAddress;
import java.net.URI;
import java.net.URISyntaxException;
@@ -31,6 +31,7 @@ import java.net.URL;
import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.nio.file.FileSystems;
+import java.nio.file.Files;
import java.nio.file.Path;
import java.util.HashMap;
import java.util.Map;
@@ -145,9 +146,9 @@ public class GatewayTestDriver {
deployDir.mkdirs();
File descriptor = new File( topoDir, cluster + ".xml" );
- FileOutputStream stream = new FileOutputStream( descriptor );
- topology.toStream( stream );
- stream.close();
+ try(OutputStream stream = Files.newOutputStream(descriptor.toPath())) {
+ topology.toStream( stream );
+ }
this.srvcs = new DefaultGatewayServices();
Map<String,String> options = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockRequestMatcher.java
----------------------------------------------------------------------
diff --git a/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockRequestMatcher.java b/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockRequestMatcher.java
index fc1246a..152e057 100644
--- a/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockRequestMatcher.java
+++ b/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockRequestMatcher.java
@@ -54,18 +54,18 @@ public class MockRequestMatcher {
private String from;
private MockResponseProvider response;
- private Set<String> methods = null;
- private String pathInfo = null;
- private String requestURL = null;
- Map<String,Matcher> headers = null;
- Set<Cookie> cookies = null;
- private Map<String,Object> attributes = null;
- private Map<String,String> queryParams = null;
- private String contentType = null;
- private String characterEncoding = null;
- private Integer contentLength = null;
- private byte[] entity = null;
- private Map<String,String[]> formParams = null;
+ private Set<String> methods;
+ private String pathInfo;
+ private String requestURL;
+ Map<String,Matcher> headers;
+ Set<Cookie> cookies;
+ private Map<String,Object> attributes;
+ private Map<String,String> queryParams;
+ private String contentType;
+ private String characterEncoding;
+ private Integer contentLength;
+ private byte[] entity;
+ private Map<String,String[]> formParams;
public MockRequestMatcher( MockResponseProvider response ) {
this.response = response;
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockResponseProvider.java
----------------------------------------------------------------------
diff --git a/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockResponseProvider.java b/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockResponseProvider.java
index 9dabded..1d5831a 100644
--- a/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockResponseProvider.java
+++ b/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockResponseProvider.java
@@ -33,16 +33,16 @@ import java.util.Set;
public class MockResponseProvider {
- Integer errorCode = null;
- String errorMsg = null;
- Integer statusCode = null;
- String redirectUrl = null;
- Map<String,String> headers = null;
- Set<Cookie> cookies = null;
- byte[] entity = null;
- String contentType = null;
- String characterEncoding = null;
- Integer contentLength = null;
+ Integer errorCode;
+ String errorMsg;
+ Integer statusCode;
+ String redirectUrl;
+ Map<String,String> headers;
+ Set<Cookie> cookies;
+ byte[] entity;
+ String contentType;
+ String characterEncoding;
+ Integer contentLength;
public MockResponseProvider status( int statusCode ) {
this.statusCode = statusCode;
http://git-wip-us.apache.org/repos/asf/knox/blob/6a35473a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/AuditServiceFactory.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/AuditServiceFactory.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/AuditServiceFactory.java
index 8f4d0a1..77e8f7b 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/AuditServiceFactory.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/api/AuditServiceFactory.java
@@ -22,7 +22,7 @@ import org.apache.knox.gateway.audit.log4j.audit.Log4jAuditService;
public abstract class AuditServiceFactory {
// The global audit service instance.
- private static AuditService auditService = null;
+ private static AuditService auditService;
// To prevent instantiation.
private AuditServiceFactory() {