You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by co...@apache.org on 2018/10/25 09:35:35 UTC
knox git commit: KNOX-1536 - Final merge
Repository: knox
Updated Branches:
refs/heads/master 4961cd139 -> e08d54530
KNOX-1536 - Final merge
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/e08d5453
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/e08d5453
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/e08d5453
Branch: refs/heads/master
Commit: e08d5453084adcc65c81eb0ab2f5ba28ce013676
Parents: 4961cd1
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Oct 25 10:35:11 2018 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Oct 25 10:35:11 2018 +0100
----------------------------------------------------------------------
.../org/apache/knox/gateway/i18n/resources/ResourcesInvoker.java | 2 +-
.../filter/rewrite/api/UrlRewriteRulesDescriptorFactory.java | 4 ++--
.../java/org/apache/knox/gateway/deploy/impl/ShiroConfig.java | 4 ++--
.../java/org/apache/knox/gateway/shirorealm/KnoxLdapRealm.java | 4 ++--
.../knox/gateway/filter/XForwardedHeaderRequestWrapper.java | 2 +-
.../org/apache/knox/gateway/config/impl/GatewayConfigImpl.java | 2 +-
.../java/org/apache/knox/gateway/deploy/DeploymentFactory.java | 2 +-
.../apache/knox/gateway/descriptor/GatewayDescriptorFactory.java | 4 ++--
.../gateway/services/hostmap/impl/DefaultHostMapperService.java | 2 +-
.../gateway/services/security/impl/DefaultKeystoreService.java | 4 ++--
.../org/apache/knox/gateway/GatewayPortMappingConfigTest.java | 2 +-
.../src/main/java/org/apache/knox/gateway/topology/Provider.java | 2 +-
.../src/main/java/org/apache/knox/gateway/topology/Service.java | 2 +-
.../test/java/org/apache/knox/gateway/GatewayHealthFuncTest.java | 2 +-
.../knox/gateway/GatewayPortMappingDisableFeatureTest.java | 2 +-
.../java/org/apache/knox/gateway/GatewayPortMappingFailTest.java | 2 +-
.../java/org/apache/knox/gateway/GatewayPortMappingFuncTest.java | 2 +-
.../apache/knox/gateway/audit/log4j/audit/Log4jAuditService.java | 2 +-
.../knox/gateway/config/impl/MappedConfigurationBinding.java | 2 +-
.../src/main/java/org/apache/knox/gateway/launcher/Config.java | 2 +-
.../java/org/apache/knox/gateway/util/urltemplate/Builder.java | 2 +-
.../org/apache/knox/gateway/util/urltemplate/RewriterTest.java | 2 +-
22 files changed, 27 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/e08d5453/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 c7c30e0..d041cbb 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
@@ -45,7 +45,7 @@ public class ResourcesInvoker implements InvocationHandler {
public ResourcesInvoker( Class<?> bundleClass ) {
this.bundleClass = bundleClass;
this.bundleName = calcBundleName( bundleClass );
- this.bundles = new ConcurrentHashMap<Locale, ResourceBundle>();
+ this.bundles = new ConcurrentHashMap<>();
}
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/e08d5453/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteRulesDescriptorFactory.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteRulesDescriptorFactory.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteRulesDescriptorFactory.java
index fcf0445..4ecf57f 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteRulesDescriptorFactory.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteRulesDescriptorFactory.java
@@ -62,13 +62,13 @@ public abstract class UrlRewriteRulesDescriptorFactory {
}
private static Map<String, UrlRewriteRulesImporter> loadImporters() {
- Map<String, UrlRewriteRulesImporter> map = new ConcurrentHashMap<String, UrlRewriteRulesImporter>();
+ Map<String, UrlRewriteRulesImporter> map = new ConcurrentHashMap<>();
map.put( "xml", new XmlUrlRewriteRulesImporter() );
return map;
}
private static Map<String, UrlRewriteRulesExporter> loadExporters() {
- Map<String, UrlRewriteRulesExporter> map = new ConcurrentHashMap<String, UrlRewriteRulesExporter>();
+ Map<String, UrlRewriteRulesExporter> map = new ConcurrentHashMap<>();
map.put( "xml", new XmlUrlRewriteRulesExporter() );
return map;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/e08d5453/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 5bb4686..2c171e1 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
@@ -25,7 +25,7 @@ import java.util.Map.Entry;
public class ShiroConfig {
- private Map<String, Map<String, String>> sections = new LinkedHashMap<String, Map<String, String>>();
+ private Map<String, Map<String, String>> sections = new LinkedHashMap<>();
public ShiroConfig(Provider provider, String clusterName) {
Map<String, String> params = provider.getParams();
@@ -52,7 +52,7 @@ public class ShiroConfig {
private void addNameValueToSection(String name, String value, String sectionName) {
Map<String, String> section = sections.get(sectionName);
if (section == null) {
- section = new LinkedHashMap<String, String>();
+ section = new LinkedHashMap<>();
sections.put(sectionName, section);
}
section.put(name, value);
http://git-wip-us.apache.org/repos/asf/knox/blob/e08d5453/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 0dbc4b6..615bb9e 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
@@ -179,8 +179,8 @@ public class KnoxLdapRealm extends JndiLdapRealm {
private String memberAttributeValuePrefix = "uid={0}";
private String memberAttributeValueSuffix = "";
- private final Map<String,String> rolesByGroup = new LinkedHashMap<String, String>();
- private final Map<String,List<String>> permissionsByRole = new LinkedHashMap<String, List<String>>();
+ private final Map<String,String> rolesByGroup = new LinkedHashMap<>();
+ private final Map<String,List<String>> permissionsByRole = new LinkedHashMap<>();
private boolean authorizationEnabled;
http://git-wip-us.apache.org/repos/asf/knox/blob/e08d5453/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 00497ec..2207f48 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
@@ -50,7 +50,7 @@ public class XForwardedHeaderRequestWrapper extends GatewayRequestWrapper {
headerNames.add(X_FORWARDED_CONTEXT);
}
- Hashtable<String,String> proxyHeaders = new Hashtable<String, String>();
+ Hashtable<String,String> proxyHeaders = new Hashtable<>();
public XForwardedHeaderRequestWrapper(HttpServletRequest request) {
super( request );
http://git-wip-us.apache.org/repos/asf/knox/blob/e08d5453/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java b/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java
index e14c9db..f2b0af6 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java
@@ -892,7 +892,7 @@ public class GatewayConfigImpl extends Configuration implements GatewayConfig {
@Override
public Map<String, Integer> getGatewayPortMappings() {
- final Map<String, Integer> result = new ConcurrentHashMap<String, Integer>();
+ final Map<String, Integer> result = new ConcurrentHashMap<>();
final Map<String, String> properties = getValByRegex(GATEWAY_PORT_MAPPING_REGEX);
// Convert port no. from string to int
http://git-wip-us.apache.org/repos/asf/knox/blob/e08d5453/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 bb75e3c..ca497a3 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
@@ -240,7 +240,7 @@ public abstract class DeploymentFactory {
// Scan through all of the loaded providers. For each that doesn't have an existing provider in the role
// list add it.
private static Map<String,List<ProviderDeploymentContributor>> selectContextProviders( Topology topology ) {
- Map<String,List<ProviderDeploymentContributor>> providers = new LinkedHashMap<String, List<ProviderDeploymentContributor>>();
+ Map<String,List<ProviderDeploymentContributor>> providers = new LinkedHashMap<>();
addMissingDefaultProviders(topology);
collectTopologyProviders( topology, providers );
collectDefaultProviders( providers );
http://git-wip-us.apache.org/repos/asf/knox/blob/e08d5453/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/GatewayDescriptorFactory.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/GatewayDescriptorFactory.java b/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/GatewayDescriptorFactory.java
index 06b81a7..01c85d3 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/GatewayDescriptorFactory.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/GatewayDescriptorFactory.java
@@ -53,13 +53,13 @@ public abstract class GatewayDescriptorFactory {
}
private static Map<String, GatewayDescriptorImporter> loadImporters() {
- Map<String, GatewayDescriptorImporter> map = new ConcurrentHashMap<String, GatewayDescriptorImporter>();
+ Map<String, GatewayDescriptorImporter> map = new ConcurrentHashMap<>();
map.put( "xml", new XmlGatewayDescriptorImporter() );
return map;
}
private static Map<String, GatewayDescriptorExporter> loadExporters() {
- Map<String, GatewayDescriptorExporter> map = new ConcurrentHashMap<String, GatewayDescriptorExporter>();
+ Map<String, GatewayDescriptorExporter> map = new ConcurrentHashMap<>();
map.put( "xml", new XmlGatewayDescriptorExporter() );
return map;
}
http://git-wip-us.apache.org/repos/asf/knox/blob/e08d5453/gateway-server/src/main/java/org/apache/knox/gateway/services/hostmap/impl/DefaultHostMapperService.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/hostmap/impl/DefaultHostMapperService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/hostmap/impl/DefaultHostMapperService.java
index 2fdd4c6..acffae2 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/hostmap/impl/DefaultHostMapperService.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/hostmap/impl/DefaultHostMapperService.java
@@ -31,7 +31,7 @@ import java.util.concurrent.ConcurrentHashMap;
*/
public class DefaultHostMapperService implements HostMapperService {
- private ConcurrentHashMap<String, HostMapper> map = new ConcurrentHashMap<String, HostMapper>();
+ private ConcurrentHashMap<String, HostMapper> map = new ConcurrentHashMap<>();
/* (non-Javadoc)
* @see Service#init(GatewayConfig, java.util.Map)
http://git-wip-us.apache.org/repos/asf/knox/blob/e08d5453/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 977e6fb..f3997d9 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
@@ -64,7 +64,7 @@ public class DefaultKeystoreService extends BaseKeystoreService implements
private String signingKeystoreName = null;
private String signingKeyAlias = null;
- private Map<String, Map<String, String>> cache = new ConcurrentHashMap<String,Map<String, String>>();
+ private Map<String, Map<String, String>> cache = new ConcurrentHashMap<>();
private Lock readLock = null;
private Lock writeLock = null;
@@ -463,7 +463,7 @@ public class DefaultKeystoreService extends BaseKeystoreService implements
private void addToCache(String clusterName, String alias, String credentialString) {
HashMap<String, String> clusterCache = (HashMap<String, String>) cache.get(clusterName);
if (clusterCache == null) {
- clusterCache = new HashMap<String, String>();
+ clusterCache = new HashMap<>();
}
clusterCache.put(alias, credentialString);
}
http://git-wip-us.apache.org/repos/asf/knox/blob/e08d5453/gateway-server/src/test/java/org/apache/knox/gateway/GatewayPortMappingConfigTest.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayPortMappingConfigTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayPortMappingConfigTest.java
index ae9c98f..59738de 100644
--- a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayPortMappingConfigTest.java
+++ b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayPortMappingConfigTest.java
@@ -79,7 +79,7 @@ public class GatewayPortMappingConfigTest {
@BeforeClass
public static void init() throws Exception {
- Map<String, Integer> topologyPortMapping = new ConcurrentHashMap<String, Integer>();
+ Map<String, Integer> topologyPortMapping = new ConcurrentHashMap<>();
// get unique ports
eeriePort = getAvailablePort(1240, 49151);
http://git-wip-us.apache.org/repos/asf/knox/blob/e08d5453/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Provider.java
----------------------------------------------------------------------
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Provider.java b/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Provider.java
index 01de44d..a031bec 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Provider.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Provider.java
@@ -27,7 +27,7 @@ public class Provider {
private String role;
private String name;
private boolean enabled;
- private Map<String, String> params = new LinkedHashMap<String, String>();
+ private Map<String, String> params = new LinkedHashMap<>();
public Provider() {
}
http://git-wip-us.apache.org/repos/asf/knox/blob/e08d5453/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 c5e2585..b651bec 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
@@ -32,7 +32,7 @@ public class Service {
private String role;
private String name;
private Version version;
- private Map<String, String> params = new LinkedHashMap<String, String>();
+ private Map<String, String> params = new LinkedHashMap<>();
private List<String> urls;
private CustomDispatch dispatch = null;
http://git-wip-us.apache.org/repos/asf/knox/blob/e08d5453/gateway-test/src/test/java/org/apache/knox/gateway/GatewayHealthFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayHealthFuncTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayHealthFuncTest.java
index 2717f47..e309f0c 100644
--- a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayHealthFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayHealthFuncTest.java
@@ -113,7 +113,7 @@ public class GatewayHealthFuncTest {
stream.close();
DefaultGatewayServices srvcs = new DefaultGatewayServices();
- Map<String, String> options = new HashMap<String, String>();
+ Map<String, String> options = new HashMap<>();
options.put("persist-master", "false");
options.put("master", "password");
try {
http://git-wip-us.apache.org/repos/asf/knox/blob/e08d5453/gateway-test/src/test/java/org/apache/knox/gateway/GatewayPortMappingDisableFeatureTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayPortMappingDisableFeatureTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayPortMappingDisableFeatureTest.java
index a4ff451..33c4114 100644
--- a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayPortMappingDisableFeatureTest.java
+++ b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayPortMappingDisableFeatureTest.java
@@ -84,7 +84,7 @@ public class GatewayPortMappingDisableFeatureTest {
eeriePort = getAvailablePort(1240, 49151);
- ConcurrentHashMap<String, Integer> topologyPortMapping = new ConcurrentHashMap<String, Integer>();
+ ConcurrentHashMap<String, Integer> topologyPortMapping = new ConcurrentHashMap<>();
topologyPortMapping.put("eerie", eeriePort);
masterServer = new MockServer("master", true);
http://git-wip-us.apache.org/repos/asf/knox/blob/e08d5453/gateway-test/src/test/java/org/apache/knox/gateway/GatewayPortMappingFailTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayPortMappingFailTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayPortMappingFailTest.java
index 0b1e052..3ae2aa5 100644
--- a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayPortMappingFailTest.java
+++ b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayPortMappingFailTest.java
@@ -76,7 +76,7 @@ public class GatewayPortMappingFailTest {
eeriePort = GatewayPortMappingFuncTest.getAvailablePort(1240, 49151);
- ConcurrentHashMap<String, Integer> topologyPortMapping = new ConcurrentHashMap<String, Integer>();
+ ConcurrentHashMap<String, Integer> topologyPortMapping = new ConcurrentHashMap<>();
topologyPortMapping.put("eerie", eeriePort);
masterServer = new MockServer("master", true);
http://git-wip-us.apache.org/repos/asf/knox/blob/e08d5453/gateway-test/src/test/java/org/apache/knox/gateway/GatewayPortMappingFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayPortMappingFuncTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayPortMappingFuncTest.java
index e4a03e3..c0a2e0c 100644
--- a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayPortMappingFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayPortMappingFuncTest.java
@@ -77,7 +77,7 @@ public class GatewayPortMappingFuncTest {
eeriePort = getAvailablePort(1240, 49151);
- ConcurrentHashMap<String, Integer> topologyPortMapping = new ConcurrentHashMap<String, Integer>();
+ ConcurrentHashMap<String, Integer> topologyPortMapping = new ConcurrentHashMap<>();
topologyPortMapping.put("eerie", eeriePort);
masterServer = new MockServer("master", true);
http://git-wip-us.apache.org/repos/asf/knox/blob/e08d5453/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditService.java
----------------------------------------------------------------------
diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditService.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditService.java
index 0bdbb82..5032099 100644
--- a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditService.java
+++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/audit/Log4jAuditService.java
@@ -29,7 +29,7 @@ import org.apache.log4j.MDC;
public class Log4jAuditService implements AuditService {
public static final String MDC_AUDIT_CONTEXT_KEY = "audit_context";
- private Map<String, Auditor> auditors = new ConcurrentHashMap<String, Auditor>();
+ private Map<String, Auditor> auditors = new ConcurrentHashMap<>();
@Override
public AuditContext createContext() {
http://git-wip-us.apache.org/repos/asf/knox/blob/e08d5453/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/impl/MappedConfigurationBinding.java
----------------------------------------------------------------------
diff --git a/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/impl/MappedConfigurationBinding.java b/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/impl/MappedConfigurationBinding.java
index 02f64ac..a6c6d71 100755
--- a/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/impl/MappedConfigurationBinding.java
+++ b/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/impl/MappedConfigurationBinding.java
@@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentHashMap;
public class MappedConfigurationBinding implements ConfigurationBinding {
- private Map<String,String> map = new ConcurrentHashMap<String, String>();
+ private Map<String,String> map = new ConcurrentHashMap<>();
public void bind( String targetName, String sourceName ) {
map.put( targetName, sourceName );
http://git-wip-us.apache.org/repos/asf/knox/blob/e08d5453/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Config.java
----------------------------------------------------------------------
diff --git a/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Config.java b/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Config.java
index ce62750..8e932f8 100644
--- a/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Config.java
+++ b/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Config.java
@@ -136,7 +136,7 @@ public class Config {
name = fixName( name );
Map<String,String> map = sections.get( section );
if( map == null ) {
- map = new LinkedHashMap<String, String>();
+ map = new LinkedHashMap<>();
sections.put( section, map );
}
map.put( name, value );
http://git-wip-us.apache.org/repos/asf/knox/blob/e08d5453/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Builder.java
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Builder.java b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Builder.java
index 533dc54..ec8ce55 100644
--- a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Builder.java
+++ b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Builder.java
@@ -154,7 +154,7 @@ public class Builder {
}
private LinkedHashMap<String, Query> copyQuery( Map<String, Query> orig ) {
- LinkedHashMap<String,Query> copy = new LinkedHashMap<String, Query>();
+ LinkedHashMap<String,Query> copy = new LinkedHashMap<>();
if( orig != null ) {
for( Map.Entry<String,Query> entry : orig.entrySet() ) {
copy.put( entry.getKey(), new Query( entry.getValue() ) );
http://git-wip-us.apache.org/repos/asf/knox/blob/e08d5453/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/RewriterTest.java
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/RewriterTest.java b/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/RewriterTest.java
index 7ded0a6..068493c 100644
--- a/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/RewriterTest.java
+++ b/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/RewriterTest.java
@@ -366,7 +366,7 @@ public class RewriterTest {
}
private Map<String, String> getParameters(URL url) throws UnsupportedEncodingException {
- final Map<String, String> parameter_pairs = new LinkedHashMap<String, String>();
+ final Map<String, String> parameter_pairs = new LinkedHashMap<>();
final String[] pairs = url.getQuery().split("&");
for (String pair : pairs) {
final int idx = pair.indexOf("=");