knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lmc...@apache.org
Subject [1/2] knox git commit: KNOX-942 - Remove extraneous spaces around '=' (Colm O hEigeartaigh via lmccay)
Date Tue, 23 May 2017 02:23:41 GMT
Repository: knox
Updated Branches:
  refs/heads/master 111d89747 -> 6a921359d


KNOX-942 - Remove extraneous spaces around '=' (Colm O hEigeartaigh via lmccay)

Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/17f5209f
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/17f5209f
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/17f5209f

Branch: refs/heads/master
Commit: 17f5209f80efcee37e7ad28af992cc832420391c
Parents: 111d897
Author: Larry McCay <lmccay@hortonworks.com>
Authored: Mon May 22 22:16:34 2017 -0400
Committer: Larry McCay <lmccay@hortonworks.com>
Committed: Mon May 22 22:16:34 2017 -0400

----------------------------------------------------------------------
 .../provider/impl/HaDescriptorManagerTest.java  |  6 +--
 .../gateway/config/impl/GatewayConfigImpl.java  | 42 ++++++++++----------
 .../impl/DefaultServiceDefinitionRegistry.java  |  2 +-
 .../org/apache/hadoop/gateway/util/KnoxCLI.java |  6 +--
 .../service/admin/TopologyResourceTest.java     |  4 +-
 .../security/impl/BaseKeystoreService.java      |  4 +-
 .../hadoop/gateway/GatewayTestConfig.java       | 16 ++++----
 .../gateway/AmbariServiceDefinitionTest.java    | 12 +++---
 .../hadoop/gateway/GatewayAdminFuncTest.java    |  2 +-
 .../gateway/GatewayAdminTopologyFuncTest.java   | 16 ++++----
 .../hadoop/gateway/GatewayAppFuncTest.java      |  6 +--
 .../hadoop/gateway/GatewayDeployFuncTest.java   |  2 +-
 .../GatewayLdapDynamicGroupFuncTest.java        |  6 +--
 .../gateway/GatewayLdapGroupFuncTest.java       |  6 +--
 .../gateway/GatewayLocalServiceFuncTest.java    |  2 +-
 .../hadoop/gateway/GatewaySampleFuncTest.java   |  2 +-
 .../hadoop/gateway/GatewayTestConfig.java       | 18 ++++-----
 .../apache/hadoop/gateway/Knox242FuncTest.java  |  6 +--
 .../hadoop/gateway/audit/AuditServiceTest.java  |  2 +-
 .../gateway/util/urltemplate/Segment.java       |  2 +-
 .../gateway/util/urltemplate/RewriterTest.java  |  2 +-
 .../gateway/util/urltemplate/SegmentTest.java   |  2 +-
 22 files changed, 83 insertions(+), 83 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/17f5209f/gateway-provider-ha/src/test/java/org/apache/hadoop/gateway/ha/provider/impl/HaDescriptorManagerTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/test/java/org/apache/hadoop/gateway/ha/provider/impl/HaDescriptorManagerTest.java
b/gateway-provider-ha/src/test/java/org/apache/hadoop/gateway/ha/provider/impl/HaDescriptorManagerTest.java
index 5d2eeb0..a2f423e 100644
--- a/gateway-provider-ha/src/test/java/org/apache/hadoop/gateway/ha/provider/impl/HaDescriptorManagerTest.java
+++ b/gateway-provider-ha/src/test/java/org/apache/hadoop/gateway/ha/provider/impl/HaDescriptorManagerTest.java
@@ -39,7 +39,7 @@ public class HaDescriptorManagerTest {
       HaDescriptor descriptor = HaDescriptorManager.load(inputStream);
       assertNotNull(descriptor);
       assertEquals(1, descriptor.getEnabledServiceNames().size());
-      HaServiceConfig config =  descriptor.getServiceConfig("foo");
+      HaServiceConfig config = descriptor.getServiceConfig("foo");
       assertNotNull(config);
       assertEquals("foo", config.getServiceName());
       assertEquals(42, config.getMaxFailoverAttempts());
@@ -47,7 +47,7 @@ public class HaDescriptorManagerTest {
       assertEquals(2, config.getMaxRetryAttempts());
       assertEquals(2213, config.getRetrySleep());
       assertFalse(config.isEnabled());
-      config =  descriptor.getServiceConfig("bar");
+      config = descriptor.getServiceConfig("bar");
       assertTrue(config.isEnabled());
    }
 
@@ -58,7 +58,7 @@ public class HaDescriptorManagerTest {
       HaDescriptor descriptor = HaDescriptorManager.load(inputStream);
       assertNotNull(descriptor);
       assertEquals(1, descriptor.getEnabledServiceNames().size());
-      HaServiceConfig config =  descriptor.getServiceConfig("foo");
+      HaServiceConfig config = descriptor.getServiceConfig("foo");
       assertNotNull(config);
       assertEquals("foo", config.getServiceName());
       assertEquals(HaServiceConfigConstants.DEFAULT_MAX_FAILOVER_ATTEMPTS, config.getMaxFailoverAttempts());

http://git-wip-us.apache.org/repos/asf/knox/blob/17f5209f/gateway-server/src/main/java/org/apache/hadoop/gateway/config/impl/GatewayConfigImpl.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/config/impl/GatewayConfigImpl.java
b/gateway-server/src/main/java/org/apache/hadoop/gateway/config/impl/GatewayConfigImpl.java
index 0af105f..7089e07 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/config/impl/GatewayConfigImpl.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/config/impl/GatewayConfigImpl.java
@@ -131,8 +131,8 @@ public class GatewayConfigImpl extends Configuration implements GatewayConfig
{
   public static final String HTTP_SERVER_REQUEST_HEADER_BUFFER = GATEWAY_CONFIG_FILE_PREFIX
+ ".httpserver.requestHeaderBuffer";
   public static final String HTTP_SERVER_RESPONSE_BUFFER = GATEWAY_CONFIG_FILE_PREFIX + ".httpserver.responseBuffer";
   public static final String HTTP_SERVER_RESPONSE_HEADER_BUFFER = GATEWAY_CONFIG_FILE_PREFIX
+ ".httpserver.responseHeaderBuffer";
-  public static final String DEPLOYMENTS_BACKUP_VERSION_LIMIT =  GATEWAY_CONFIG_FILE_PREFIX
+ ".deployment.backup.versionLimit";
-  public static final String DEPLOYMENTS_BACKUP_AGE_LIMIT =  GATEWAY_CONFIG_FILE_PREFIX +
".deployment.backup.ageLimit";
+  public static final String DEPLOYMENTS_BACKUP_VERSION_LIMIT = GATEWAY_CONFIG_FILE_PREFIX
+ ".deployment.backup.versionLimit";
+  public static final String DEPLOYMENTS_BACKUP_AGE_LIMIT = GATEWAY_CONFIG_FILE_PREFIX +
".deployment.backup.ageLimit";
   public static final String METRICS_ENABLED = GATEWAY_CONFIG_FILE_PREFIX + ".metrics.enabled";
   public static final String JMX_METRICS_REPORTING_ENABLED = GATEWAY_CONFIG_FILE_PREFIX +
".jmx.metrics.reporting.enabled";
   public static final String GRAPHITE_METRICS_REPORTING_ENABLED = GATEWAY_CONFIG_FILE_PREFIX
+ ".graphite.metrics.reporting.enabled";
@@ -143,14 +143,14 @@ public class GatewayConfigImpl extends Configuration implements GatewayConfig
{
   public static final String REMOTE_IP_HEADER_NAME = GATEWAY_CONFIG_FILE_PREFIX + ".remote.ip.header.name";
 
   /* @since 0.10 Websocket config variables */
-  public static final String WEBSOCKET_FEATURE_ENABLED =  GATEWAY_CONFIG_FILE_PREFIX + ".websocket.feature.enabled";
-  public static final String WEBSOCKET_MAX_TEXT_MESSAGE_SIZE =  GATEWAY_CONFIG_FILE_PREFIX
+ ".websocket.max.text.size";
-  public static final String WEBSOCKET_MAX_BINARY_MESSAGE_SIZE =  GATEWAY_CONFIG_FILE_PREFIX
+ ".websocket.max.binary.size";
-  public static final String WEBSOCKET_MAX_TEXT_MESSAGE_BUFFER_SIZE =  GATEWAY_CONFIG_FILE_PREFIX
+ ".websocket.max.text.buffer.size";
-  public static final String WEBSOCKET_MAX_BINARY_MESSAGE_BUFFER_SIZE =  GATEWAY_CONFIG_FILE_PREFIX
+ ".websocket.max.binary.buffer.size";
-  public static final String WEBSOCKET_INPUT_BUFFER_SIZE =  GATEWAY_CONFIG_FILE_PREFIX +
".websocket.input.buffer.size";
-  public static final String WEBSOCKET_ASYNC_WRITE_TIMEOUT =  GATEWAY_CONFIG_FILE_PREFIX
+ ".websocket.async.write.timeout";
-  public static final String WEBSOCKET_IDLE_TIMEOUT =  GATEWAY_CONFIG_FILE_PREFIX + ".websocket.idle.timeout";
+  public static final String WEBSOCKET_FEATURE_ENABLED = GATEWAY_CONFIG_FILE_PREFIX + ".websocket.feature.enabled";
+  public static final String WEBSOCKET_MAX_TEXT_MESSAGE_SIZE = GATEWAY_CONFIG_FILE_PREFIX
+ ".websocket.max.text.size";
+  public static final String WEBSOCKET_MAX_BINARY_MESSAGE_SIZE = GATEWAY_CONFIG_FILE_PREFIX
+ ".websocket.max.binary.size";
+  public static final String WEBSOCKET_MAX_TEXT_MESSAGE_BUFFER_SIZE = GATEWAY_CONFIG_FILE_PREFIX
+ ".websocket.max.text.buffer.size";
+  public static final String WEBSOCKET_MAX_BINARY_MESSAGE_BUFFER_SIZE = GATEWAY_CONFIG_FILE_PREFIX
+ ".websocket.max.binary.buffer.size";
+  public static final String WEBSOCKET_INPUT_BUFFER_SIZE = GATEWAY_CONFIG_FILE_PREFIX + ".websocket.input.buffer.size";
+  public static final String WEBSOCKET_ASYNC_WRITE_TIMEOUT = GATEWAY_CONFIG_FILE_PREFIX +
".websocket.async.write.timeout";
+  public static final String WEBSOCKET_IDLE_TIMEOUT = GATEWAY_CONFIG_FILE_PREFIX + ".websocket.idle.timeout";
 
   /**
    * Properties for for gateway port mapping feature
@@ -184,16 +184,16 @@ public class GatewayConfigImpl extends Configuration implements GatewayConfig
{
   public static final String DEFAULT_DATA_DIR = "data";
 
   /* Websocket defaults */
-  public static final boolean DEFAULT_WEBSOCKET_FEATURE_ENABLED =  false;
-  public static final int DEFAULT_WEBSOCKET_MAX_TEXT_MESSAGE_SIZE =  Integer.MAX_VALUE;;
-  public static final int DEFAULT_WEBSOCKET_MAX_BINARY_MESSAGE_SIZE =  Integer.MAX_VALUE;;
-  public static final int DEFAULT_WEBSOCKET_MAX_TEXT_MESSAGE_BUFFER_SIZE =  32768;
-  public static final int DEFAULT_WEBSOCKET_MAX_BINARY_MESSAGE_BUFFER_SIZE =  32768;
-  public static final int DEFAULT_WEBSOCKET_INPUT_BUFFER_SIZE =  4096;
-  public static final int DEFAULT_WEBSOCKET_ASYNC_WRITE_TIMEOUT =  60000;
-  public static final int DEFAULT_WEBSOCKET_IDLE_TIMEOUT =  300000;
+  public static final boolean DEFAULT_WEBSOCKET_FEATURE_ENABLED = false;
+  public static final int DEFAULT_WEBSOCKET_MAX_TEXT_MESSAGE_SIZE = Integer.MAX_VALUE;;
+  public static final int DEFAULT_WEBSOCKET_MAX_BINARY_MESSAGE_SIZE = Integer.MAX_VALUE;;
+  public static final int DEFAULT_WEBSOCKET_MAX_TEXT_MESSAGE_BUFFER_SIZE = 32768;
+  public static final int DEFAULT_WEBSOCKET_MAX_BINARY_MESSAGE_BUFFER_SIZE = 32768;
+  public static final int DEFAULT_WEBSOCKET_INPUT_BUFFER_SIZE = 4096;
+  public static final int DEFAULT_WEBSOCKET_ASYNC_WRITE_TIMEOUT = 60000;
+  public static final int DEFAULT_WEBSOCKET_IDLE_TIMEOUT = 300000;
 
-  public static final boolean DEFAULT_GATEWAY_PORT_MAPPING_ENABLED =  true;
+  public static final boolean DEFAULT_GATEWAY_PORT_MAPPING_ENABLED = true;
 
   /**
    * Default list of MIME Type to be compressed.
@@ -202,8 +202,8 @@ public class GatewayConfigImpl extends Configuration implements GatewayConfig
{
   public static final String DEFAULT_MIME_TYPES_TO_COMPRESS = "text/html, text/plain, text/xml,
text/css, "
       + "application/javascript, application/x-javascript, text/javascript";
 
-  public static final String COOKIE_SCOPING_ENABLED =  GATEWAY_CONFIG_FILE_PREFIX + ".scope.cookies.feature.enabled";
-  public static final boolean DEFAULT_COOKIE_SCOPING_FEATURE_ENABLED =  false;
+  public static final String COOKIE_SCOPING_ENABLED = GATEWAY_CONFIG_FILE_PREFIX + ".scope.cookies.feature.enabled";
+  public static final boolean DEFAULT_COOKIE_SCOPING_FEATURE_ENABLED = false;
   private static final String CRYPTO_ALGORITHM = GATEWAY_CONFIG_FILE_PREFIX + ".crypto.algorithm";
   private static final String CRYPTO_PBE_ALGORITHM = GATEWAY_CONFIG_FILE_PREFIX + ".crypto.pbe.algorithm";
   private static final String CRYPTO_TRANSFORMATION = GATEWAY_CONFIG_FILE_PREFIX + ".crypto.transformation";

http://git-wip-us.apache.org/repos/asf/knox/blob/17f5209f/gateway-server/src/main/java/org/apache/hadoop/gateway/services/registry/impl/DefaultServiceDefinitionRegistry.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/services/registry/impl/DefaultServiceDefinitionRegistry.java
b/gateway-server/src/main/java/org/apache/hadoop/gateway/services/registry/impl/DefaultServiceDefinitionRegistry.java
index 8a5b113..e9e5b41 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/services/registry/impl/DefaultServiceDefinitionRegistry.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/services/registry/impl/DefaultServiceDefinitionRegistry.java
@@ -83,7 +83,7 @@ public class DefaultServiceDefinitionRegistry implements ServiceDefinitionRegist
   public ServiceDefEntry getMatchingService(String urlPattern) {
     Matcher<ServiceDefEntry>.Match match = null;
     try {
-      match =  entries.match(Parser.parseLiteral(urlPattern));
+      match = entries.match(Parser.parseLiteral(urlPattern));
     } catch ( URISyntaxException e ) {
       LOG.failedToParsePath(urlPattern, e);
     }

http://git-wip-us.apache.org/repos/asf/knox/blob/17f5209f/gateway-server/src/main/java/org/apache/hadoop/gateway/util/KnoxCLI.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/util/KnoxCLI.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/util/KnoxCLI.java
index 046b7ac..e1620d0 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/util/KnoxCLI.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/util/KnoxCLI.java
@@ -1528,7 +1528,7 @@ public class KnoxCLI extends Configured implements Tool {
     private HashSet<String> getGroups(Topology t, UsernamePasswordToken token){
       HashSet<String> groups = null;
       try {
-        Subject subject  = getSubject(getConfig(t));
+        Subject subject = getSubject(getConfig(t));
         if(!subject.isAuthenticated()) {
           subject.login(token);
         }
@@ -1598,7 +1598,7 @@ public class KnoxCLI extends Configured implements Tool {
   public class ServiceTestCommand extends Command {
     public static final String USAGE = "service-test [--u username] [--p password] [--cluster
clustername] [--hostname name] " +
         "[--port port]";
-    public static final String DESC =  "This command requires a running instance of Knox
to be present on the same " +
+    public static final String DESC = "This command requires a running instance of Knox to
be present on the same " +
         "machine. It will execute a test to make sure all services are accessible through
the gateway URLs. Errors are " +
         "reported and suggestions to resolve any problems are returned. JSON formatted.";
 
@@ -1648,7 +1648,7 @@ public class KnoxCLI extends Configured implements Tool {
       }
 
 
-      String path =  "/" + conf.getGatewayPath();
+      String path = "/" + conf.getGatewayPath();
       String topology = "/" + cluster;
       String httpServiceTestURL = http + host + ":" + gatewayPort + path + topology + "/service-test";
       String httpsServiceTestURL = https + host + ":" + gatewayPort + path + topology + "/service-test";

http://git-wip-us.apache.org/repos/asf/knox/blob/17f5209f/gateway-service-admin/src/test/java/org/apache/hadoop/gateway/service/admin/TopologyResourceTest.java
----------------------------------------------------------------------
diff --git a/gateway-service-admin/src/test/java/org/apache/hadoop/gateway/service/admin/TopologyResourceTest.java
b/gateway-service-admin/src/test/java/org/apache/hadoop/gateway/service/admin/TopologyResourceTest.java
index d4007f7..c8de5f1 100644
--- a/gateway-service-admin/src/test/java/org/apache/hadoop/gateway/service/admin/TopologyResourceTest.java
+++ b/gateway-service-admin/src/test/java/org/apache/hadoop/gateway/service/admin/TopologyResourceTest.java
@@ -46,8 +46,8 @@ public class TopologyResourceTest {
   private String fullContext = startContext + reqContext;
   private String pathInfo = "/api/version";
   private String topologyName = "topology-name";
-  private String expectedBase =  proto + "://" + server + ":" + port + "/mycontext/" + gatewayPath;
-  private String expectedURI =  expectedBase + "/" + topologyName;
+  private String expectedBase = proto + "://" + server + ":" + port + "/mycontext/" + gatewayPath;
+  private String expectedURI = expectedBase + "/" + topologyName;
   private String expectedHref = expectedBase + "/a-topology" + pathInfo + "/" + topologyName;
 
   @Test

http://git-wip-us.apache.org/repos/asf/knox/blob/17f5209f/gateway-spi/src/main/java/org/apache/hadoop/gateway/services/security/impl/BaseKeystoreService.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/hadoop/gateway/services/security/impl/BaseKeystoreService.java
b/gateway-spi/src/main/java/org/apache/hadoop/gateway/services/security/impl/BaseKeystoreService.java
index 70e5689..2f30c5b 100644
--- a/gateway-spi/src/main/java/org/apache/hadoop/gateway/services/security/impl/BaseKeystoreService.java
+++ b/gateway-spi/src/main/java/org/apache/hadoop/gateway/services/security/impl/BaseKeystoreService.java
@@ -52,7 +52,7 @@ public class BaseKeystoreService {
        final KeyStore  keyStore = KeyStore.getInstance(storeType);
        if ( keyStoreFile.exists() )
        {
-           final FileInputStream   input   = new FileInputStream( keyStoreFile );
+           final FileInputStream   input = new FileInputStream( keyStoreFile );
            try {
                keyStore.load( input, masterPassword );
            }
@@ -119,7 +119,7 @@ public class BaseKeystoreService {
       FileInputStream input = null;
       try {
         final KeyStore  keyStore = KeyStore.getInstance(storeType);
-        input   = new FileInputStream( keyStoreFile );
+        input = new FileInputStream( keyStoreFile );
         keyStore.load( input, masterService.getMasterSecret() );
         return true;
       } catch (NoSuchAlgorithmException e) {

http://git-wip-us.apache.org/repos/asf/knox/blob/17f5209f/gateway-test-release-utils/src/main/java/org/apache/hadoop/gateway/GatewayTestConfig.java
----------------------------------------------------------------------
diff --git a/gateway-test-release-utils/src/main/java/org/apache/hadoop/gateway/GatewayTestConfig.java
b/gateway-test-release-utils/src/main/java/org/apache/hadoop/gateway/GatewayTestConfig.java
index e703919..8d30231 100644
--- a/gateway-test-release-utils/src/main/java/org/apache/hadoop/gateway/GatewayTestConfig.java
+++ b/gateway-test-release-utils/src/main/java/org/apache/hadoop/gateway/GatewayTestConfig.java
@@ -31,14 +31,14 @@ import java.util.concurrent.ConcurrentHashMap;
 public class GatewayTestConfig extends Configuration implements GatewayConfig {
 
   /* Websocket defaults */
-  public static final boolean DEFAULT_WEBSOCKET_FEATURE_ENABLED =  false;
-  public static final int DEFAULT_WEBSOCKET_MAX_TEXT_MESSAGE_SIZE =  Integer.MAX_VALUE;;
-  public static final int DEFAULT_WEBSOCKET_MAX_BINARY_MESSAGE_SIZE =  Integer.MAX_VALUE;;
-  public static final int DEFAULT_WEBSOCKET_MAX_TEXT_MESSAGE_BUFFER_SIZE =  32768;
-  public static final int DEFAULT_WEBSOCKET_MAX_BINARY_MESSAGE_BUFFER_SIZE =  32768;
-  public static final int DEFAULT_WEBSOCKET_INPUT_BUFFER_SIZE =  4096;
-  public static final int DEFAULT_WEBSOCKET_ASYNC_WRITE_TIMEOUT =  60000;
-  public static final int DEFAULT_WEBSOCKET_IDLE_TIMEOUT =  300000;
+  public static final boolean DEFAULT_WEBSOCKET_FEATURE_ENABLED = false;
+  public static final int DEFAULT_WEBSOCKET_MAX_TEXT_MESSAGE_SIZE = Integer.MAX_VALUE;;
+  public static final int DEFAULT_WEBSOCKET_MAX_BINARY_MESSAGE_SIZE = Integer.MAX_VALUE;;
+  public static final int DEFAULT_WEBSOCKET_MAX_TEXT_MESSAGE_BUFFER_SIZE = 32768;
+  public static final int DEFAULT_WEBSOCKET_MAX_BINARY_MESSAGE_BUFFER_SIZE = 32768;
+  public static final int DEFAULT_WEBSOCKET_INPUT_BUFFER_SIZE = 4096;
+  public static final int DEFAULT_WEBSOCKET_ASYNC_WRITE_TIMEOUT = 60000;
+  public static final int DEFAULT_WEBSOCKET_IDLE_TIMEOUT = 300000;
 
   private String gatewayHomeDir = "gateway-home";
   private String hadoopConfDir = "hadoop";

http://git-wip-us.apache.org/repos/asf/knox/blob/17f5209f/gateway-test/src/test/java/org/apache/hadoop/gateway/AmbariServiceDefinitionTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/AmbariServiceDefinitionTest.java
b/gateway-test/src/test/java/org/apache/hadoop/gateway/AmbariServiceDefinitionTest.java
index 9c418ea..d17d0db 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/AmbariServiceDefinitionTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/AmbariServiceDefinitionTest.java
@@ -177,7 +177,7 @@ public class AmbariServiceDefinitionTest {
 
     String username = "guest";
     String password = "guest-password";
-    String serviceUrl =  clusterUrl + "/ambari/api/v1/clusters";
+    String serviceUrl = clusterUrl + "/ambari/api/v1/clusters";
 
     mockAmbari.expect()
         .method( "GET" )
@@ -213,7 +213,7 @@ public class AmbariServiceDefinitionTest {
 
     String username = "guest";
     String password = "guest-password";
-    String serviceUrl =  clusterUrl + "/ambari/api/v1/clusters/test/hosts/c6401.ambari.apache.org/host_components/HISTORYSERVER";
+    String serviceUrl = clusterUrl + "/ambari/api/v1/clusters/test/hosts/c6401.ambari.apache.org/host_components/HISTORYSERVER";
 
     mockAmbari.expect()
         .method( "GET" )
@@ -245,7 +245,7 @@ public class AmbariServiceDefinitionTest {
   public void unwiseCharacterRequest() throws Exception {
     String username = "guest";
     String password = "guest-password";
-    String serviceUrl =  clusterUrl + "/ambari/api/v1/clusters/test/components";
+    String serviceUrl = clusterUrl + "/ambari/api/v1/clusters/test/components";
 
     mockAmbari.expect()
         .method( "GET" )
@@ -274,7 +274,7 @@ public class AmbariServiceDefinitionTest {
 
     String username = "guest";
     String password = "guest-password";
-    String serviceUrl =  clusterUrl + "/ambari/api/v1/persist/CLUSTER_CURRENT_STATUS?_=1457977721091";
+    String serviceUrl = clusterUrl + "/ambari/api/v1/persist/CLUSTER_CURRENT_STATUS?_=1457977721091";
 
     mockAmbari.expect()
         .method( "GET" )
@@ -302,7 +302,7 @@ public class AmbariServiceDefinitionTest {
 
     String username = "guest";
     String password = "guest-password";
-    String serviceUrl =  clusterUrl + "/ambari/api/v1/stacks/HDP/versions/2.3/recommendations";
+    String serviceUrl = clusterUrl + "/ambari/api/v1/stacks/HDP/versions/2.3/recommendations";
 
     mockAmbari.expect()
         .method( "POST" )
@@ -332,7 +332,7 @@ public class AmbariServiceDefinitionTest {
     String username = "guest";
     String password = "guest-password";
 
-    String serviceUrl =  clusterUrl + "/ambari/api/v1/views?fields=versions/instances/ViewInstanceInfo,versions/"
+
+    String serviceUrl = clusterUrl + "/ambari/api/v1/views?fields=versions/instances/ViewInstanceInfo,versions/"
+
         "ViewVersionInfo/label&versions/ViewVersionInfo/system=false&_=1461186937589";
 
     mockAmbari.expect()

http://git-wip-us.apache.org/repos/asf/knox/blob/17f5209f/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminFuncTest.java
b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminFuncTest.java
index 5f0ad3a..45706fd 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminFuncTest.java
@@ -195,7 +195,7 @@ public class GatewayAdminFuncTest {
 
     String username = "guest";
     String password = "guest-password";
-    String serviceUrl =  clusterUrl + "/api/v1/version";
+    String serviceUrl = clusterUrl + "/api/v1/version";
     given()
         //.log().all()
         .auth().preemptive().basic( username, password )

http://git-wip-us.apache.org/repos/asf/knox/blob/17f5209f/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest.java
b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest.java
index a64b60d..082e79b 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest.java
@@ -273,7 +273,7 @@ public class GatewayAdminTopologyFuncTest {
 
     String username = "admin";
     String password = "admin-password";
-    String serviceUrl =  clusterUrl + "/api/v1/topologies";
+    String serviceUrl = clusterUrl + "/api/v1/topologies";
     String href1 = given()
         //.log().all()
         .auth().preemptive().basic(username, password)
@@ -330,7 +330,7 @@ public class GatewayAdminTopologyFuncTest {
 
     String username = "admin";
     String password = "admin-password";
-    String serviceUrl =  clusterUrl + "/api/v1/topologies";
+    String serviceUrl = clusterUrl + "/api/v1/topologies";
     String hrefJson = given()
         //.log().all()
         .auth().preemptive().basic(username, password)
@@ -392,7 +392,7 @@ public class GatewayAdminTopologyFuncTest {
 
     String adminUser = "admin";
     String adminPass = "admin-password";
-    String url =  clusterUrl + "/api/v1/topologies";
+    String url = clusterUrl + "/api/v1/topologies";
 
     given()
         //.log().all()
@@ -420,7 +420,7 @@ public class GatewayAdminTopologyFuncTest {
 
     String guestUser = "guest";
     String guestPass = "guest-password";
-    String url =  clusterUrl + "/api/v1/topologies";
+    String url = clusterUrl + "/api/v1/topologies";
 
     given()
         //.log().all()
@@ -557,7 +557,7 @@ public class GatewayAdminTopologyFuncTest {
 
     String username = "admin";
     String password = "admin-password";
-    String url =  clusterUrl + "/api/v1/topologies/" + test.getName();
+    String url = clusterUrl + "/api/v1/topologies/" + test.getName();
 
     GatewayServices gs = GatewayServer.getGatewayServices();
 
@@ -598,7 +598,7 @@ public class GatewayAdminTopologyFuncTest {
 
     String username = "admin";
     String password = "admin-password";
-    String url =  clusterUrl + "/api/v1/topologies/test-put";
+    String url = clusterUrl + "/api/v1/topologies/test-put";
 
     String JsonPut =
         given()
@@ -669,7 +669,7 @@ public class GatewayAdminTopologyFuncTest {
 
     String username = "admin";
     String password = "admin-password";
-    String url =  clusterUrl + "/api/v1/topologies";
+    String url = clusterUrl + "/api/v1/topologies";
 
 //    X-Forward header values
     String port = String.valueOf(777);
@@ -784,7 +784,7 @@ public class GatewayAdminTopologyFuncTest {
     LOG_ENTER();
     String username = "admin";
     String password = "admin-password";
-    String url =  clusterUrl + "/api/v1/topologies";
+    String url = clusterUrl + "/api/v1/topologies";
 
 //     Case 1: Normal Request (No Change in gateway.path). Ensure HTTP OK resp + valid URL.
     given()

http://git-wip-us.apache.org/repos/asf/knox/blob/17f5209f/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAppFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAppFuncTest.java
b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAppFuncTest.java
index 282182e..03f49b2 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAppFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAppFuncTest.java
@@ -187,7 +187,7 @@ public class GatewayAppFuncTest {
 
     String username = "guest";
     String password = "guest-password";
-    String serviceUrl =  clusterUrl + "/static-hello-app-path/index.html";
+    String serviceUrl = clusterUrl + "/static-hello-app-path/index.html";
     String body = given()
         //.log().all()
         .auth().preemptive().basic( username, password )
@@ -198,7 +198,7 @@ public class GatewayAppFuncTest {
         .when().get( serviceUrl ).asString();
     assertThat( the(body), hasXPath( "/html/head/title/text()", equalTo("Static Hello Application")
) );
 
-    serviceUrl =  clusterUrl + "/static-hello-app-path/";
+    serviceUrl = clusterUrl + "/static-hello-app-path/";
     body = given()
         //.log().all()
         .auth().preemptive().basic( username, password )
@@ -209,7 +209,7 @@ public class GatewayAppFuncTest {
         .when().get( serviceUrl ).asString();
     assertThat( the(body), hasXPath( "/html/head/title/text()", equalTo("Static Hello Application")
) );
 
-    serviceUrl =  clusterUrl + "/static-hello-app-path";
+    serviceUrl = clusterUrl + "/static-hello-app-path";
     body = given()
         //.log().all()
         .auth().preemptive().basic( username, password )

http://git-wip-us.apache.org/repos/asf/knox/blob/17f5209f/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayDeployFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayDeployFuncTest.java
b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayDeployFuncTest.java
index 56b749f..5a64af9 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayDeployFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayDeployFuncTest.java
@@ -211,7 +211,7 @@ public class GatewayDeployFuncTest {
     int numFilesInWebInf = 4; // # files in WEB-INF (ie gateway.xml, rewrite.xml, shiro.ini,
web.xml)
     String username = "guest";
     String password = "guest-password";
-    String serviceUrl =  clusterUrl + "/test-service-path/test-service-resource";
+    String serviceUrl = clusterUrl + "/test-service-path/test-service-resource";
     long topoTimestampBefore, topoTimestampAfter;
 
     File topoDir = new File( config.getGatewayTopologyDir() );

http://git-wip-us.apache.org/repos/asf/knox/blob/17f5209f/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLdapDynamicGroupFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLdapDynamicGroupFuncTest.java
b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLdapDynamicGroupFuncTest.java
index fcf4458..91f73fa 100755
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLdapDynamicGroupFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLdapDynamicGroupFuncTest.java
@@ -165,7 +165,7 @@ public class GatewayLdapDynamicGroupFuncTest {
 
     gatewayUrl = "http://localhost:" + gateway.getAddresses()[0].getPort() + "/" + config.getGatewayPath();
     clusterUrl = gatewayUrl + "/testdg-cluster";
-    serviceUrl =  clusterUrl + "/test-service-path/test-service-resource";
+    serviceUrl = clusterUrl + "/test-service-path/test-service-resource";
 
     ///*
     GatewayServices services = GatewayServer.getGatewayServices();
@@ -290,7 +290,7 @@ public class GatewayLdapDynamicGroupFuncTest {
     LOG_ENTER();
     String username = "bob";
     String password = "bob-password";
-    String serviceUrl =  clusterUrl + "/test-service-path/test-service-resource";
+    String serviceUrl = clusterUrl + "/test-service-path/test-service-resource";
     given()
         //.log().all()
         .auth().preemptive().basic( username, password )
@@ -308,7 +308,7 @@ public class GatewayLdapDynamicGroupFuncTest {
     LOG_ENTER();
     String username = "guest";
     String password = "guest-password";
-    String serviceUrl =  clusterUrl + "/test-service-path/test-service-resource";
+    String serviceUrl = clusterUrl + "/test-service-path/test-service-resource";
     given()
         //.log().all()
         .auth().preemptive().basic( username, password )

http://git-wip-us.apache.org/repos/asf/knox/blob/17f5209f/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLdapGroupFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLdapGroupFuncTest.java
b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLdapGroupFuncTest.java
index 06a3dbb..e0980b9 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLdapGroupFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLdapGroupFuncTest.java
@@ -166,7 +166,7 @@ public class GatewayLdapGroupFuncTest {
 
     gatewayUrl = "http://localhost:" + gateway.getAddresses()[0].getPort() + "/" + config.getGatewayPath();
     clusterUrl = gatewayUrl + "/test-cluster";
-    serviceUrl =  clusterUrl + "/test-service-path/test-service-resource";
+    serviceUrl = clusterUrl + "/test-service-path/test-service-resource";
 
     ///*
     GatewayServices services = GatewayServer.getGatewayServices();
@@ -290,7 +290,7 @@ public class GatewayLdapGroupFuncTest {
     LOG_ENTER();
     String username = "sam";
     String password = "sam-password";
-    String serviceUrl =  clusterUrl + "/test-service-path/test-service-resource";
+    String serviceUrl = clusterUrl + "/test-service-path/test-service-resource";
     given()
         //.log().all()
         .auth().preemptive().basic( username, password )
@@ -308,7 +308,7 @@ public class GatewayLdapGroupFuncTest {
     LOG_ENTER();
     String username = "guest";
     String password = "guest-password";
-    String serviceUrl =  clusterUrl + "/test-service-path/test-service-resource";
+    String serviceUrl = clusterUrl + "/test-service-path/test-service-resource";
     given()
         //.log().all()
         .auth().preemptive().basic( username, password )

http://git-wip-us.apache.org/repos/asf/knox/blob/17f5209f/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLocalServiceFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLocalServiceFuncTest.java
b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLocalServiceFuncTest.java
index 40b3bf0..5bc9b07 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLocalServiceFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayLocalServiceFuncTest.java
@@ -181,7 +181,7 @@ public class GatewayLocalServiceFuncTest {
 
     String username = "guest";
     String password = "guest-password";
-    String serviceUrl =  clusterUrl + "/test-jersey-service/test-jersey-resource-path";
+    String serviceUrl = clusterUrl + "/test-jersey-service/test-jersey-resource-path";
     given()
         //.log().all()
         .auth().preemptive().basic( username, password )

http://git-wip-us.apache.org/repos/asf/knox/blob/17f5209f/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java
b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java
index 0111265..3b18c6d 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java
@@ -197,7 +197,7 @@ public class GatewaySampleFuncTest {
     LOG_ENTER();
     String username = "guest";
     String password = "guest-password";
-    String serviceUrl =  clusterUrl + "/test-service-path/test-service-resource";
+    String serviceUrl = clusterUrl + "/test-service-path/test-service-resource";
     given()
         //.log().all()
         .auth().preemptive().basic( username, password )

http://git-wip-us.apache.org/repos/asf/knox/blob/17f5209f/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayTestConfig.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayTestConfig.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayTestConfig.java
index 2ee6f1b..5599a32 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayTestConfig.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayTestConfig.java
@@ -30,14 +30,14 @@ import java.util.concurrent.ConcurrentHashMap;
 public class GatewayTestConfig extends Configuration implements GatewayConfig {
 
   /* Websocket defaults */
-  public static final boolean DEFAULT_WEBSOCKET_FEATURE_ENABLED =  false;
-  public static final int DEFAULT_WEBSOCKET_MAX_TEXT_MESSAGE_SIZE =  Integer.MAX_VALUE;;
-  public static final int DEFAULT_WEBSOCKET_MAX_BINARY_MESSAGE_SIZE =  Integer.MAX_VALUE;;
-  public static final int DEFAULT_WEBSOCKET_MAX_TEXT_MESSAGE_BUFFER_SIZE =  32768;
-  public static final int DEFAULT_WEBSOCKET_MAX_BINARY_MESSAGE_BUFFER_SIZE =  32768;
-  public static final int DEFAULT_WEBSOCKET_INPUT_BUFFER_SIZE =  4096;
-  public static final int DEFAULT_WEBSOCKET_ASYNC_WRITE_TIMEOUT =  60000;
-  public static final int DEFAULT_WEBSOCKET_IDLE_TIMEOUT =  300000;
+  public static final boolean DEFAULT_WEBSOCKET_FEATURE_ENABLED = false;
+  public static final int DEFAULT_WEBSOCKET_MAX_TEXT_MESSAGE_SIZE = Integer.MAX_VALUE;;
+  public static final int DEFAULT_WEBSOCKET_MAX_BINARY_MESSAGE_SIZE = Integer.MAX_VALUE;;
+  public static final int DEFAULT_WEBSOCKET_MAX_TEXT_MESSAGE_BUFFER_SIZE = 32768;
+  public static final int DEFAULT_WEBSOCKET_MAX_BINARY_MESSAGE_BUFFER_SIZE = 32768;
+  public static final int DEFAULT_WEBSOCKET_INPUT_BUFFER_SIZE = 4096;
+  public static final int DEFAULT_WEBSOCKET_ASYNC_WRITE_TIMEOUT = 60000;
+  public static final int DEFAULT_WEBSOCKET_IDLE_TIMEOUT = 300000;
 
   private String gatewayHomeDir = "gateway-home";
   private String hadoopConfDir = "hadoop";
@@ -59,7 +59,7 @@ public class GatewayTestConfig extends Configuration implements GatewayConfig
{
   private String truststoreType = "jks";
   private String keystoreType = "jks";
   private boolean isTopologyPortMappingEnabled = true;
-  private ConcurrentHashMap topologyPortMapping = new ConcurrentHashMap<String, Integer>();
+  private ConcurrentHashMap<String, Integer> topologyPortMapping = new ConcurrentHashMap<>();
 
   public void setGatewayHomeDir( String gatewayHomeDir ) {
     this.gatewayHomeDir = gatewayHomeDir;

http://git-wip-us.apache.org/repos/asf/knox/blob/17f5209f/gateway-test/src/test/java/org/apache/hadoop/gateway/Knox242FuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/Knox242FuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/Knox242FuncTest.java
index a16f7c2..79c8dbb 100755
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/Knox242FuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/Knox242FuncTest.java
@@ -145,7 +145,7 @@ public class Knox242FuncTest {
 
     gatewayUrl = "http://localhost:" + gateway.getAddresses()[0].getPort() + "/" + config.getGatewayPath();
     clusterUrl = gatewayUrl + "/testdg-cluster";
-    serviceUrl =  clusterUrl + "/test-service-path/test-service-resource";
+    serviceUrl = clusterUrl + "/test-service-path/test-service-resource";
 
     GatewayServices services = GatewayServer.getGatewayServices();
     AliasService aliasService = (AliasService)services.getService(GatewayServices.ALIAS_SERVICE);
@@ -284,7 +284,7 @@ public class Knox242FuncTest {
     LOG_ENTER();
     String username = "joe";
     String password = "joe-password";
-    String serviceUrl =  clusterUrl + "/test-service-path/test-service-resource";
+    String serviceUrl = clusterUrl + "/test-service-path/test-service-resource";
     given()
         //.log().all()
         .auth().preemptive().basic( username, password )
@@ -302,7 +302,7 @@ public class Knox242FuncTest {
     LOG_ENTER();
     String username = "guest";
     String password = "guest-password";
-    String serviceUrl =  clusterUrl + "/test-service-path/test-service-resource";
+    String serviceUrl = clusterUrl + "/test-service-path/test-service-resource";
     given()
         //.log().all()
         .auth().preemptive().basic( username, password )

http://git-wip-us.apache.org/repos/asf/knox/blob/17f5209f/gateway-util-common/src/test/java/org/apache/hadoop/gateway/audit/AuditServiceTest.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/test/java/org/apache/hadoop/gateway/audit/AuditServiceTest.java
b/gateway-util-common/src/test/java/org/apache/hadoop/gateway/audit/AuditServiceTest.java
index 31d1c68..3937581 100644
--- a/gateway-util-common/src/test/java/org/apache/hadoop/gateway/audit/AuditServiceTest.java
+++ b/gateway-util-common/src/test/java/org/apache/hadoop/gateway/audit/AuditServiceTest.java
@@ -178,7 +178,7 @@ public class AuditServiceTest {
     assertThat( context.getRemoteHostname(), is( expectedAuditContext.getRemoteHostname()
) );
     assertThat( context.getTargetServiceName(), is( expectedAuditContext.getTargetServiceName()
) );
          
-    CorrelationContext correlationContext =  (CorrelationContext)event.getMDC( Log4jCorrelationService.MDC_CORRELATION_CONTEXT_KEY
);
+    CorrelationContext correlationContext = (CorrelationContext)event.getMDC( Log4jCorrelationService.MDC_CORRELATION_CONTEXT_KEY
);
     assertThat( correlationContext.getRequestId(), is( expectedCorrelationContext.getRequestId()
) );
     assertThat( correlationContext.getRootRequestId(), is( expectedCorrelationContext.getRootRequestId()
) );
     assertThat( correlationContext.getParentRequestId(), is( expectedCorrelationContext.getParentRequestId()
) );

http://git-wip-us.apache.org/repos/asf/knox/blob/17f5209f/gateway-util-urltemplate/src/main/java/org/apache/hadoop/gateway/util/urltemplate/Segment.java
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/src/main/java/org/apache/hadoop/gateway/util/urltemplate/Segment.java
b/gateway-util-urltemplate/src/main/java/org/apache/hadoop/gateway/util/urltemplate/Segment.java
index 260d141..ed95833 100644
--- a/gateway-util-urltemplate/src/main/java/org/apache/hadoop/gateway/util/urltemplate/Segment.java
+++ b/gateway-util-urltemplate/src/main/java/org/apache/hadoop/gateway/util/urltemplate/Segment.java
@@ -307,7 +307,7 @@ abstract class Segment {
 //          matches = true;
 //          break;
 //        case( REGEX ):
-//          matches =  this.pattern.equals( that.pattern );
+//          matches = this.pattern.equals( that.pattern );
 //          break;
 //      }
 //      return matches;

http://git-wip-us.apache.org/repos/asf/knox/blob/17f5209f/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/RewriterTest.java
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/RewriterTest.java
b/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/RewriterTest.java
index a4c44e2..e3903f0 100644
--- a/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/RewriterTest.java
+++ b/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/RewriterTest.java
@@ -360,7 +360,7 @@ public class RewriterTest {
     actualOutput = Rewriter.rewrite( actualInput, inputTemplate, outputTemplate, null, null
);
 
     Map<String, String> actualInputParameters = this.getParameters( actualInput.toURL());
-    Map<String, String> actualOutputParameters  = this.getParameters( actualOutput.toURL());
+    Map<String, String> actualOutputParameters = this.getParameters( actualOutput.toURL());
     assertTrue( actualInputParameters.equals(actualOutputParameters));
 
   }

http://git-wip-us.apache.org/repos/asf/knox/blob/17f5209f/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/SegmentTest.java
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/SegmentTest.java
b/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/SegmentTest.java
index b2f2881..642a51a 100644
--- a/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/SegmentTest.java
+++ b/gateway-util-urltemplate/src/test/java/org/apache/hadoop/gateway/util/urltemplate/SegmentTest.java
@@ -120,7 +120,7 @@ public class SegmentTest {
     assertThat( Segment.createRegex( "**" ), is( ".*.*" ) );
     assertThat( Segment.createRegex( "\\.${}*" ), is( "\\\\\\.\\$\\{\\}.*" ) );
 
-    String input  = "/var/lib/oozie/*.jar,/usr/lib/hadoop/client/*.jar,/usr/lib/oozie/libserver/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar";
+    String input = "/var/lib/oozie/*.jar,/usr/lib/hadoop/client/*.jar,/usr/lib/oozie/libserver/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar";
     String expect = "/var/lib/oozie/.*\\.jar,/usr/lib/hadoop/client/.*\\.jar,/usr/lib/oozie/libserver/.*\\.jar,\\$\\{catalina\\.home\\}/lib,\\$\\{catalina\\.home\\}/lib/.*\\.jar";
     String output = Segment.createRegex( input );
     assertThat( expect, is( output ) );


Mime
View raw message