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/11/26 20:20:01 UTC
knox git commit: KNOX-1626 - indexOf char should use single quotes
Repository: knox
Updated Branches:
refs/heads/master 12eac267e -> 1f7e67efe
KNOX-1626 - indexOf char should use single quotes
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/1f7e67ef
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/1f7e67ef
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/1f7e67ef
Branch: refs/heads/master
Commit: 1f7e67efe7a9b7d72303b5a837a10c2232aaff8d
Parents: 12eac26
Author: Kevin Risden <kr...@apache.org>
Authored: Mon Nov 26 14:51:58 2018 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Mon Nov 26 14:52:03 2018 -0500
----------------------------------------------------------------------
.../topology/discovery/ambari/HDFSURLCreatorBase.java | 2 +-
.../gateway/ha/provider/impl/HBaseZookeeperURLManager.java | 2 +-
.../gateway/filter/rewrite/impl/UrlRewriteResponse.java | 2 +-
.../filter/rewrite/impl/html/HtmlFilterReaderBase.java | 2 +-
.../org/apache/knox/gateway/deploy/impl/ShiroConfig.java | 2 +-
.../org/apache/knox/gateway/shirorealm/KnoxLdapRealm.java | 2 +-
.../knox/gateway/filter/XForwardedHeaderRequestWrapper.java | 2 +-
.../topology/monitor/DefaultRemoteConfigurationMonitor.java | 4 ++--
.../src/main/java/org/apache/knox/gateway/util/KnoxCLI.java | 9 ++++-----
.../gateway/shell/hbase/table/scanner/CreateScanner.java | 2 +-
.../knox/gateway/shell/manager/ListResourcesRequest.java | 2 +-
.../java/org/apache/knox/gateway/util/WhitelistUtils.java | 2 +-
12 files changed, 16 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/1f7e67ef/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 14d9f72..6145632 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
@@ -83,7 +83,7 @@ public abstract class HDFSURLCreatorBase implements ServiceURLCreator {
if (coreSite != null) {
String defaultFS = coreSite.getProperties().get("fs.defaultFS");
if (defaultFS != null) {
- ns = defaultFS.substring(defaultFS.lastIndexOf("/") + 1);
+ ns = defaultFS.substring(defaultFS.lastIndexOf('/') + 1);
}
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/1f7e67ef/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HBaseZookeeperURLManager.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HBaseZookeeperURLManager.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HBaseZookeeperURLManager.java
index b0808f5..b9dd018 100644
--- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HBaseZookeeperURLManager.java
+++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/HBaseZookeeperURLManager.java
@@ -153,7 +153,7 @@ public class HBaseZookeeperURLManager extends BaseZookeeperURLManager {
buffer.append(scheme);
buffer.append("://");
// Strip off the host name
- buffer.append(serverInfo.substring(0, serverInfo.indexOf(",")));
+ buffer.append(serverInfo.substring(0, serverInfo.indexOf(',')));
buffer.append(":");
buffer.append(PORT_NUMBER);
http://git-wip-us.apache.org/repos/asf/knox/blob/1f7e67ef/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 b0b6aa4..c8516b9 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
@@ -330,7 +330,7 @@ public class UrlRewriteResponse extends GatewayResponseWrapper implements Params
xForwardedScheme = request.getScheme();
}
if ( xForwardedHostname != null ) {
- int separator = xForwardedHostname.indexOf( ":" );
+ int separator = xForwardedHostname.indexOf(':');
if ( separator > 0 ) {
//a specific port in the forwarded host wins
xForwardedPort = xForwardedHostname.substring(separator + 1, xForwardedHostname.length());
http://git-wip-us.apache.org/repos/asf/knox/blob/1f7e67ef/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 008a098..c2b4264 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
@@ -310,7 +310,7 @@ public abstract class HtmlFilterReaderBase extends Reader implements
for( Attribute attribute : tag.getAttributes() ) {
String name = attribute.getName();
if( name.toLowerCase(Locale.ROOT).startsWith( "xmlns" ) ) {
- int colon = name.indexOf( ":", 5 );
+ int colon = name.indexOf( ':', 5 );
String prefix;
if( colon <= 0 ) {
prefix = "";
http://git-wip-us.apache.org/repos/asf/knox/blob/1f7e67ef/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 d927212..98c2ebf 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
@@ -39,7 +39,7 @@ public class ShiroConfig {
name = entry.getKey().substring(sectionDot + 1);
value = entry.getValue().trim();
if (value.startsWith("${ALIAS=") && value.endsWith("}")) {
- String baseName = name.substring(0, name.lastIndexOf("."));
+ String baseName = name.substring(0, name.lastIndexOf('.'));
addNameValueToSection(baseName + ".clusterName", clusterName, sectionName);
addNameValueToSection(name, "S" + value.substring(1), sectionName);
} else {
http://git-wip-us.apache.org/repos/asf/knox/blob/1f7e67ef/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 3c06d30..4b36e56 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
@@ -554,7 +554,7 @@ public class KnoxLdapRealm extends JndiLdapRealm {
}
String searchBaseString = tokens[0]
- .substring(tokens[0].lastIndexOf("/") + 1);
+ .substring(tokens[0].lastIndexOf('/') + 1);
String searchScope = tokens[2];
String searchFilter = tokens[3];
http://git-wip-us.apache.org/repos/asf/knox/blob/1f7e67ef/gateway-server-xforwarded-filter/src/main/java/org/apache/knox/gateway/filter/XForwardedHeaderRequestWrapper.java
----------------------------------------------------------------------
diff --git a/gateway-server-xforwarded-filter/src/main/java/org/apache/knox/gateway/filter/XForwardedHeaderRequestWrapper.java b/gateway-server-xforwarded-filter/src/main/java/org/apache/knox/gateway/filter/XForwardedHeaderRequestWrapper.java
index 2207f48..c0ed341 100644
--- a/gateway-server-xforwarded-filter/src/main/java/org/apache/knox/gateway/filter/XForwardedHeaderRequestWrapper.java
+++ b/gateway-server-xforwarded-filter/src/main/java/org/apache/knox/gateway/filter/XForwardedHeaderRequestWrapper.java
@@ -120,7 +120,7 @@ public class XForwardedHeaderRequestWrapper extends GatewayRequestWrapper {
String value = request.getHeader( X_FORWARDED_PORT );
if( value == null ) {
String forwardedHost = getForwardedHost( request );
- int separator = forwardedHost.indexOf( ":" );
+ int separator = forwardedHost.indexOf(':');
if ( separator > 0 ) {
value = forwardedHost.substring(separator + 1, forwardedHost.length());
} else {
http://git-wip-us.apache.org/repos/asf/knox/blob/1f7e67ef/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 87d9373..d209d73 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
@@ -237,7 +237,7 @@ class DefaultRemoteConfigurationMonitor implements RemoteConfigurationMonitor {
@Override
public void childEvent(RemoteConfigurationRegistryClient client, Type type, String path) {
- File localFile = new File(localDir, path.substring(path.lastIndexOf("/") + 1));
+ File localFile = new File(localDir, path.substring(path.lastIndexOf('/') + 1));
switch (type) {
case REMOVED:
@@ -269,7 +269,7 @@ class DefaultRemoteConfigurationMonitor implements RemoteConfigurationMonitor {
@Override
public void entryChanged(RemoteConfigurationRegistryClient client, String path, byte[] data) {
- File localFile = new File(localDir, path.substring(path.lastIndexOf("/")));
+ File localFile = new File(localDir, path.substring(path.lastIndexOf('/')));
if (data != null) {
try {
// If there is no corresponding local file, or the content is different from the existing local
http://git-wip-us.apache.org/repos/asf/knox/blob/1f7e67ef/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 90255cd..652e90c 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
@@ -1293,18 +1293,17 @@ public class KnoxCLI extends Configured implements Tool {
String p1 = shiro.getParams().get("main.ldapRealm.userDnTemplate");
// We know everything between first "=" and "," will be part of the principal.
- int eq = userDn.indexOf("=");
- int com = userDn.indexOf(",");
+ int eq = userDn.indexOf('=');
+ int com = userDn.indexOf(',');
if(eq != -1 && com > eq && com != -1) {
result = userDn.substring(eq + 1, com);
} else {
result = "";
}
+ return result;
} catch (NoSuchTopologyException e) {
out.println(e.toString());
- result = userDn;
- } finally {
- return result;
+ return userDn;
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/1f7e67ef/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/CreateScanner.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/CreateScanner.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/CreateScanner.java
index 53afadf..d52b92e 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/CreateScanner.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/CreateScanner.java
@@ -192,7 +192,7 @@ public class CreateScanner {
Header locationHeader = response().getFirstHeader( "Location" );
if( locationHeader != null && locationHeader.getValue() != null && !locationHeader.getValue().isEmpty() ) {
String location = locationHeader.getValue();
- int position = location.lastIndexOf( "/" );
+ int position = location.lastIndexOf( '/' );
if( position != -1 ) {
return location.substring( position + 1 );
}
http://git-wip-us.apache.org/repos/asf/knox/blob/1f7e67ef/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListResourcesRequest.java
----------------------------------------------------------------------
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListResourcesRequest.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListResourcesRequest.java
index 3074b47..11bfa12 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListResourcesRequest.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListResourcesRequest.java
@@ -62,7 +62,7 @@ class ListResourcesRequest extends AbstractRequest<BasicResponse> {
JSONObject item = (JSONObject) items.get(i);
String name = (String) item.get("name");
if (name != null) {
- result.add(name.substring(0, name.lastIndexOf(".")));
+ result.add(name.substring(0, name.lastIndexOf('.')));
}
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/1f7e67ef/gateway-spi/src/main/java/org/apache/knox/gateway/util/WhitelistUtils.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/util/WhitelistUtils.java b/gateway-spi/src/main/java/org/apache/knox/gateway/util/WhitelistUtils.java
index 09eaefe..1bd43be 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/util/WhitelistUtils.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/util/WhitelistUtils.java
@@ -136,7 +136,7 @@ public class WhitelistUtils {
private static String stripPort(String hostName) {
String result = hostName;
- int portIndex = hostName.indexOf(":");
+ int portIndex = hostName.indexOf(':');
if (portIndex > 0) {
result = hostName.substring(0, portIndex);
}