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/22 12:49:20 UTC
[3/3] knox git commit: KNOX-1536 - Replace redundant types with the
diamond operator
KNOX-1536 - Replace redundant types with the diamond operator
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/84d794f8
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/84d794f8
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/84d794f8
Branch: refs/heads/master
Commit: 84d794f843a8f73fa089f36af0e01cf421685cf9
Parents: 76770fb
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Oct 22 13:48:55 2018 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Oct 22 13:48:55 2018 +0100
----------------------------------------------------------------------
.../provider/impl/BaseZookeeperURLManager.java | 4 +-
.../ha/provider/impl/DefaultHaDescriptor.java | 2 +-
.../ha/dispatch/DefaultHaDispatchTest.java | 2 +-
.../ha/provider/impl/DefaultHaProviderTest.java | 4 +-
.../impl/SOLRZookeeperURLManagerTest.java | 2 +-
...ctIdentityAsserterDeploymentContributor.java | 2 +-
...entityAsserterHttpServletRequestWrapper.java | 4 +-
.../function/UsernameFunctionProcessor.java | 4 +-
...yAssertionHttpServletRequestWrapperTest.java | 4 +-
.../function/UsernameFunctionProcessorTest.java | 2 +-
...adoopGroupProviderDeploymentContributor.java | 4 +-
.../JerseyServiceDeploymentContributorBase.java | 2 +-
.../hostmap/impl/HostmapFunctionProcessor.java | 2 +-
.../impl/ServiceAddressFunctionProcessor.java | 2 +-
.../impl/ServiceHostFunctionProcessor.java | 2 +-
.../ServiceMappedAddressFunctionProcessor.java | 2 +-
.../ServiceMappedHostFunctionProcessor.java | 2 +-
.../impl/ServiceMappedUrlFunctionProcessor.java | 2 +-
.../impl/ServicePathFunctionProcessor.java | 2 +-
.../impl/ServicePortFunctionProcessor.java | 2 +-
.../impl/ServiceSchemeFunctionProcessor.java | 2 +-
.../impl/ServiceUrlFunctionProcessor.java | 2 +-
.../impl/ServiceRegistryFunctionsTest.java | 2 +-
.../ext/UrlRewriteMatchProcessorExt.java | 2 +-
.../impl/UrlRewriteFilterDescriptorImpl.java | 4 +-
.../UrlRewriteFilterGroupDescriptorBase.java | 2 +-
.../impl/UrlRewriteRulesDescriptorImpl.java | 6 +-
.../impl/UrlRewriteStepProcessorHolder.java | 2 +-
.../rewrite/impl/html/HtmlFilterReaderBase.java | 2 +-
.../rewrite/impl/json/JsonFilterReader.java | 2 +-
.../rewrite/impl/xml/XmlFilterReader.java | 2 +-
.../spi/UrlRewriteFlowDescriptorBase.java | 2 +-
.../rewrite/api/UrlRewriteProcessorTest.java | 4 +-
.../UrlRewriteServletContextListenerTest.java | 2 +-
.../api/UrlRewriteServletFilterTest.java | 2 +-
.../impl/FrontendFunctionProcessorTest.java | 2 +-
.../impl/UrlRewriteStepProcessorStateTest.java | 6 +-
.../impl/AclsAuthzDeploymentContributor.java | 2 +-
.../gateway/filter/AclsAuthorizationFilter.java | 4 +-
.../jwt/deploy/JWTFederationContributor.java | 2 +-
.../deploy/SSOCookieFederationContributor.java | 2 +-
.../jwt/filter/AbstractJWTFilter.java | 2 +-
.../federation/AbstractJWTFilterTest.java | 2 +-
.../Pac4jFederationProviderContributor.java | 2 +-
.../pac4j/filter/Pac4jIdentityAdapter.java | 2 +-
.../deploy/HeaderPreAuthContributor.java | 2 +-
.../deploy/impl/ShiroDeploymentContributor.java | 2 +-
.../gateway/filter/ResponseCookieFilter.java | 2 +-
.../knox/gateway/shirorealm/KnoxLdapRealm.java | 4 +-
.../knox/gateway/shirorealm/KnoxPamRealm.java | 2 +-
.../webappsec/filter/StrictTransportFilter.java | 4 +-
.../webappsec/filter/XFrameOptionsFilter.java | 4 +-
.../filter/CompositeEnumerationTest.java | 14 +-
.../org/apache/knox/gateway/GatewayFilter.java | 4 +-
.../org/apache/knox/gateway/GatewayServer.java | 4 +-
.../knox/gateway/deploy/DeploymentFactory.java | 12 +-
.../impl/ApplicationDeploymentContributor.java | 4 +-
.../GenericProviderDeploymentContributor.java | 2 +-
.../ServiceDefinitionDeploymentContributor.java | 2 +-
.../descriptor/impl/FilterDescriptorImpl.java | 2 +-
.../descriptor/impl/GatewayDescriptorImpl.java | 4 +-
.../descriptor/impl/ResourceDescriptorImpl.java | 4 +-
.../gateway/dispatch/DispatchParamResolver.java | 2 +-
.../knox/gateway/filter/JaasLoginFilter.java | 2 +-
.../services/registry/impl/RegEntry.java | 2 +-
.../security/impl/DefaultAliasService.java | 2 +-
.../impl/DefaultTokenAuthorityService.java | 2 +-
.../topology/impl/DefaultTopologyService.java | 6 +-
.../builder/BeanPropertyTopologyBuilder.java | 6 +-
.../builder/PropertyTopologyBuilder.java | 2 +-
.../topology/validation/TopologyValidator.java | 2 +-
.../org/apache/knox/gateway/TempletonDemo.java | 2 +-
.../service/admin/TopologiesResource.java | 4 +-
.../service/knoxsso/WebSSOResourceTest.java | 2 +-
.../knoxtoken/TokenServiceResourceTest.java | 6 +-
.../service/test/ServiceTestResource.java | 2 +-
.../ServiceTestDeploymentContributor.java | 2 +-
.../hdfs/dispatch/WebHdfsHaDispatchTest.java | 2 +-
.../apache/knox/gateway/shell/Credentials.java | 2 +-
.../gateway/shell/hbase/table/CreateTable.java | 4 +-
.../knox/gateway/shell/hbase/table/Family.java | 4 +-
.../gateway/shell/hbase/table/UpdateTable.java | 2 +-
.../shell/hbase/table/row/QueryRows.java | 2 +-
.../gateway/shell/hbase/table/row/StoreRow.java | 2 +-
.../hbase/table/scanner/CreateScanner.java | 2 +-
.../org/apache/knox/gateway/shell/job/Hive.java | 2 +-
.../org/apache/knox/gateway/shell/job/Java.java | 2 +-
.../org/apache/knox/gateway/shell/job/Pig.java | 2 +-
.../apache/knox/gateway/shell/job/Sqoop.java | 2 +-
.../security/impl/CMFMasterService.java | 4 +-
.../services/security/token/impl/JWTToken.java | 2 +-
.../apache/knox/gateway/topology/Provider.java | 2 +-
.../apache/knox/gateway/topology/Service.java | 4 +-
.../apache/knox/gateway/topology/Topology.java | 6 +-
.../security/token/impl/JWTTokenTest.java | 6 +-
.../apache/knox/gateway/GatewayTestConfig.java | 4 +-
.../org/apache/knox/test/mock/MockServer.java | 2 +-
.../apache/knox/gateway/GatewayAppFuncTest.java | 2 +-
.../appender/JdbmStoreAndForwardAppender.java | 2 +-
.../knox/gateway/util/IpAddressValidator.java | 8 +-
.../org/apache/knox/gateway/util/JsonPath.java | 6 +-
.../knox/gateway/audit/JdbmQueueTest.java | 2 +-
.../knox/gateway/util/MimeTypeMapTest.java | 2 +-
.../apache/knox/gateway/launcher/Command.java | 2 +-
.../knox/gateway/util/urltemplate/Builder.java | 4 +-
.../knox/gateway/util/urltemplate/Matcher.java | 8 +-
.../gateway/util/urltemplate/MockParams.java | 2 +-
.../knox/gateway/util/urltemplate/Rewriter.java | 2 +-
.../gateway/util/urltemplate/ExpanderTest.java | 14 +-
.../gateway/util/urltemplate/FunctionTest.java | 2 +-
.../gateway/util/urltemplate/MatcherTest.java | 166 +++++++++----------
.../gateway/util/urltemplate/ParserTest.java | 2 +-
.../gateway/util/urltemplate/RewriterTest.java | 2 +-
113 files changed, 258 insertions(+), 258 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/BaseZookeeperURLManager.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/BaseZookeeperURLManager.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/BaseZookeeperURLManager.java
index a51b515..07be403 100644
--- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/BaseZookeeperURLManager.java
+++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/BaseZookeeperURLManager.java
@@ -59,7 +59,7 @@ public abstract class BaseZookeeperURLManager implements URLManager {
private String zooKeeperEnsemble;
private String zooKeeperNamespace;
- private ConcurrentLinkedQueue<String> urls = new ConcurrentLinkedQueue<String>();
+ private ConcurrentLinkedQueue<String> urls = new ConcurrentLinkedQueue<>();
// -------------------------------------------------------------------------------------
// URLManager interface methods
@@ -160,7 +160,7 @@ public abstract class BaseZookeeperURLManager implements URLManager {
* @return Hosts with successful access
*/
protected List<String> validateHosts(List<String> hosts, String suffix, String acceptHeader) {
- List<String> result = new ArrayList<String>();
+ List<String> result = new ArrayList<>();
CloseableHttpClient client = buildHttpClient();
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/DefaultHaDescriptor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/DefaultHaDescriptor.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/DefaultHaDescriptor.java
index ae74a2f..cc4d2d3 100644
--- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/DefaultHaDescriptor.java
+++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/DefaultHaDescriptor.java
@@ -58,7 +58,7 @@ public class DefaultHaDescriptor implements HaDescriptor {
@Override
public List<String> getEnabledServiceNames() {
- ArrayList<String> services = new ArrayList<String>(serviceConfigs.size());
+ ArrayList<String> services = new ArrayList<>(serviceConfigs.size());
Collection<HaServiceConfig> configs = serviceConfigs.values();
for (HaServiceConfig config : configs) {
if (config.isEnabled()) {
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/dispatch/DefaultHaDispatchTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/dispatch/DefaultHaDispatchTest.java b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/dispatch/DefaultHaDispatchTest.java
index c3c800f..85d4edd 100644
--- a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/dispatch/DefaultHaDispatchTest.java
+++ b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/dispatch/DefaultHaDispatchTest.java
@@ -52,7 +52,7 @@ public class DefaultHaDispatchTest {
HaProvider provider = new DefaultHaProvider(descriptor);
URI uri1 = new URI( "http://unreachable-host" );
URI uri2 = new URI( "http://reachable-host" );
- ArrayList<String> urlList = new ArrayList<String>();
+ ArrayList<String> urlList = new ArrayList<>();
urlList.add(uri1.toString());
urlList.add(uri2.toString());
provider.addHaService(serviceName, urlList);
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/DefaultHaProviderTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/DefaultHaProviderTest.java b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/DefaultHaProviderTest.java
index 0fb3ab0..27491c5 100644
--- a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/DefaultHaProviderTest.java
+++ b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/DefaultHaProviderTest.java
@@ -51,7 +51,7 @@ public class DefaultHaProviderTest {
public void testAddingService() {
HaDescriptor descriptor = new DefaultHaDescriptor();
HaProvider provider = new DefaultHaProvider(descriptor);
- ArrayList<String> urls = new ArrayList<String>();
+ ArrayList<String> urls = new ArrayList<>();
urls.add("http://host1");
urls.add("http://host2");
provider.addHaService("foo", urls);
@@ -65,7 +65,7 @@ public class DefaultHaProviderTest {
public void testActiveUrl() {
HaDescriptor descriptor = new DefaultHaDescriptor();
HaProvider provider = new DefaultHaProvider(descriptor);
- ArrayList<String> urls = new ArrayList<String>();
+ ArrayList<String> urls = new ArrayList<>();
String url1 = "http://host1";
urls.add(url1);
String url2 = "http://host2";
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/SOLRZookeeperURLManagerTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/SOLRZookeeperURLManagerTest.java b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/SOLRZookeeperURLManagerTest.java
index a37a138..f874cbb 100644
--- a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/SOLRZookeeperURLManagerTest.java
+++ b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/SOLRZookeeperURLManagerTest.java
@@ -85,7 +85,7 @@ public class SOLRZookeeperURLManagerTest {
// Order of URLS is not deterministic out of Zookeeper
// So we just check for expected values
- TreeSet<String> expected = new TreeSet<String>();
+ TreeSet<String> expected = new TreeSet<>();
expected.add("http://host1:8983/solr");
expected.add("http://host2:8983/solr");
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/AbstractIdentityAsserterDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/AbstractIdentityAsserterDeploymentContributor.java b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/AbstractIdentityAsserterDeploymentContributor.java
index 9e5deb1..46a5527 100644
--- a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/AbstractIdentityAsserterDeploymentContributor.java
+++ b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/filter/AbstractIdentityAsserterDeploymentContributor.java
@@ -49,7 +49,7 @@ public abstract class AbstractIdentityAsserterDeploymentContributor extends
ResourceDescriptor resource, List<FilterParamDescriptor> params) {
// blindly add all the provider params as filter init params
if (params == null) {
- params = new ArrayList<FilterParamDescriptor>();
+ params = new ArrayList<>();
}
Map<String, String> providerParams = provider.getParams();
for(Entry<String, String> entry : providerParams.entrySet()) {
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/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 e76f3dc..4031c56 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
@@ -163,7 +163,7 @@ private static SpiGatewayMessages log = MessagesFactory.get( SpiGatewayMessages.
if (params == null) {
params = new HashMap<>();
}
- ArrayList<String> al = new ArrayList<String>();
+ ArrayList<String> al = new ArrayList<>();
al.add(username);
List<String> principalParamNames = getImpersonationParamNames();
@@ -192,7 +192,7 @@ private static SpiGatewayMessages log = MessagesFactory.get( SpiGatewayMessages.
// params in a future release and get this list from a central registry.
// This will provide better coverage of protection by removing any
// prepopulated impersonation params.
- ArrayList<String> principalParamNames = new ArrayList<String>();
+ ArrayList<String> principalParamNames = new ArrayList<>();
principalParamNames.add(DOAS_PRINCIPAL_PARAM);
principalParamNames.add(PRINCIPAL_PARAM);
return principalParamNames;
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/function/UsernameFunctionProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/function/UsernameFunctionProcessor.java b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/function/UsernameFunctionProcessor.java
index 28de837..ccfee37 100644
--- a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/function/UsernameFunctionProcessor.java
+++ b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/identityasserter/common/function/UsernameFunctionProcessor.java
@@ -58,11 +58,11 @@ public class UsernameFunctionProcessor
List<String> results = null;
Subject subject = SubjectUtils.getCurrentSubject( );
if( subject != null ) {
- results = new ArrayList<String>( 1 );
+ results = new ArrayList<>( 1 );
String username = SubjectUtils.getEffectivePrincipalName(subject);
results.add( username );
} else if( parameters != null && !parameters.isEmpty() ) {
- results = new ArrayList<String>( 1 );
+ results = new ArrayList<>( 1 );
results.add( parameters.get( 0 ) );
}
return results;
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/IdentityAssertionHttpServletRequestWrapperTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/IdentityAssertionHttpServletRequestWrapperTest.java b/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/IdentityAssertionHttpServletRequestWrapperTest.java
index f8a9985..4f7d0cb 100644
--- a/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/IdentityAssertionHttpServletRequestWrapperTest.java
+++ b/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/IdentityAssertionHttpServletRequestWrapperTest.java
@@ -261,14 +261,14 @@ public class IdentityAssertionHttpServletRequestWrapperTest {
assertThat( s, is( "no-values" ) );
m = new HashMap<>();
- List<String> lst = new ArrayList<String>();
+ List<String> lst = new ArrayList<>();
lst.add("value1");
m.put( "one-value", lst);
s = IdentityAsserterHttpServletRequestWrapper.urlEncode( m, "UTF-8" );
assertThat( s, is( "one-value=value1" ) );
m = new HashMap<>();
- lst = new ArrayList<String>();
+ lst = new ArrayList<>();
String[] a = {"value1", "value2"};
lst.addAll(Arrays.asList(a));
m.put( "two-values", lst);
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java b/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java
index b433a58..68583be 100644
--- a/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java
+++ b/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java
@@ -101,7 +101,7 @@ public class UsernameFunctionProcessorTest {
}
rewriteFilter.setFilter( new UrlRewriteServletFilter() );
- interactions = new ArrayQueue<MockInteraction>();
+ interactions = new ArrayQueue<>();
ServletHolder servlet = server.addServlet( MockServlet.class, "/" );
servlet.setServlet( new MockServlet( "mock-servlet", interactions ) );
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributor.java b/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributor.java
index 53f9cc1..3bfa809 100644
--- a/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributor.java
+++ b/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributor.java
@@ -100,7 +100,7 @@ public class HadoopGroupProviderDeploymentContributor
ResourceDescriptor resource, List<FilterParamDescriptor> params) {
// blindly add all the provider params as filter init params
if (params == null) {
- params = new ArrayList<FilterParamDescriptor>();
+ params = new ArrayList<>();
}
Map<String, String> providerParams = provider.getParams();
return createParamList(resource, params, providerParams);
@@ -109,7 +109,7 @@ public class HadoopGroupProviderDeploymentContributor
private List<FilterParamDescriptor> createParamList(ResourceDescriptor resource, List<FilterParamDescriptor> params,
Map<String, String> providerParams) {
if (params == null) {
- params = new ArrayList<FilterParamDescriptor>();
+ params = new ArrayList<>();
}
for(Entry<String, String> entry : providerParams.entrySet()) {
params.add( resource.createFilterParam().name(entry.getKey().toLowerCase(Locale.ROOT)).value(entry.getValue()));
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-jersey/src/main/java/org/apache/knox/gateway/jersey/JerseyServiceDeploymentContributorBase.java
----------------------------------------------------------------------
diff --git a/gateway-provider-jersey/src/main/java/org/apache/knox/gateway/jersey/JerseyServiceDeploymentContributorBase.java b/gateway-provider-jersey/src/main/java/org/apache/knox/gateway/jersey/JerseyServiceDeploymentContributorBase.java
index da93549..d5300e7 100644
--- a/gateway-provider-jersey/src/main/java/org/apache/knox/gateway/jersey/JerseyServiceDeploymentContributorBase.java
+++ b/gateway-provider-jersey/src/main/java/org/apache/knox/gateway/jersey/JerseyServiceDeploymentContributorBase.java
@@ -49,7 +49,7 @@ public abstract class JerseyServiceDeploymentContributorBase extends ServiceDepl
addIdentityAssertionFilter( context, service, resource );
addAuthorizationFilter( context, service, resource );
// addRewriteFilter( context, service, resource, null );
- List<FilterParamDescriptor> params = new ArrayList<FilterParamDescriptor>();
+ List<FilterParamDescriptor> params = new ArrayList<>();
FilterParamDescriptor param = resource.createFilterParam();
param.name( PACKAGES_PARAM );
param.value( packages );
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/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 3439c44..fe97b57 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
@@ -70,7 +70,7 @@ public class HostmapFunctionProcessor
public List<String> resolve( UrlRewriteContext context, List<String> parameters ) throws Exception {
List<String> result = null;
if( parameters != null ) {
- result = new ArrayList<String>( parameters.size() );
+ result = new ArrayList<>( parameters.size() );
for( String parameter : parameters ) {
switch( context.getDirection() ) {
case IN:
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceAddressFunctionProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceAddressFunctionProcessor.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceAddressFunctionProcessor.java
index a16c72c..10a889c 100644
--- a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceAddressFunctionProcessor.java
+++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceAddressFunctionProcessor.java
@@ -43,7 +43,7 @@ public class ServiceAddressFunctionProcessor
List<String> results = null;
if( parameters != null ) {
UrlRewriter.Direction direction = context.getDirection();
- results = new ArrayList<String>( parameters.size() );
+ results = new ArrayList<>( parameters.size() );
for( String parameter : parameters ) {
parameter = resolve( parameter );
results.add( parameter );
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceHostFunctionProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceHostFunctionProcessor.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceHostFunctionProcessor.java
index 7a7e813..bc83eb2 100644
--- a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceHostFunctionProcessor.java
+++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceHostFunctionProcessor.java
@@ -40,7 +40,7 @@ public class ServiceHostFunctionProcessor
public List<String> resolve( UrlRewriteContext context, List<String> parameters ) throws Exception {
List<String> results = null;
if( parameters != null ) {
- results = new ArrayList<String>( parameters.size() );
+ results = new ArrayList<>( parameters.size() );
for( String parameter : parameters ) {
String url = lookupServiceUrl( parameter );
if( url != null ) {
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/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 4d2ff0b..e798301 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
@@ -58,7 +58,7 @@ public class ServiceMappedAddressFunctionProcessor
List<String> results = null;
if( parameters != null ) {
UrlRewriter.Direction direction = context.getDirection();
- results = new ArrayList<String>( parameters.size() );
+ results = new ArrayList<>( parameters.size() );
for( String parameter : parameters ) {
parameter = resolve( direction, parameter );
results.add( parameter );
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedHostFunctionProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedHostFunctionProcessor.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedHostFunctionProcessor.java
index a8d61c8..39f19bc 100644
--- a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedHostFunctionProcessor.java
+++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedHostFunctionProcessor.java
@@ -55,7 +55,7 @@ public class ServiceMappedHostFunctionProcessor
public List<String> resolve( UrlRewriteContext context, List<String> parameters ) throws Exception {
List<String> results = null;
if( parameters != null ) {
- results = new ArrayList<String>( parameters.size() );
+ results = new ArrayList<>( parameters.size() );
for( String parameter : parameters ) {
String url = lookupServiceUrl( parameter );
if( url != null ) {
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedUrlFunctionProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedUrlFunctionProcessor.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedUrlFunctionProcessor.java
index 7cb8072..37b813b 100644
--- a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedUrlFunctionProcessor.java
+++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedUrlFunctionProcessor.java
@@ -55,7 +55,7 @@ public class ServiceMappedUrlFunctionProcessor
List<String> results = null;
if( parameters != null ) {
UrlRewriter.Direction direction = context.getDirection();
- results = new ArrayList<String>( parameters.size() );
+ results = new ArrayList<>( parameters.size() );
for( String parameter : parameters ) {
parameter = resolve( direction, parameter );
results.add( parameter );
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServicePathFunctionProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServicePathFunctionProcessor.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServicePathFunctionProcessor.java
index 820aafc..24b056c 100644
--- a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServicePathFunctionProcessor.java
+++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServicePathFunctionProcessor.java
@@ -40,7 +40,7 @@ public class ServicePathFunctionProcessor
public List<String> resolve( UrlRewriteContext context, List<String> parameters ) throws Exception {
List<String> results = null;
if( parameters != null ) {
- results = new ArrayList<String>( parameters.size() );
+ results = new ArrayList<>( parameters.size() );
for( String parameter : parameters ) {
String url = lookupServiceUrl( parameter );
if( url != null ) {
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServicePortFunctionProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServicePortFunctionProcessor.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServicePortFunctionProcessor.java
index deb7751..1edcb64 100644
--- a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServicePortFunctionProcessor.java
+++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServicePortFunctionProcessor.java
@@ -40,7 +40,7 @@ public class ServicePortFunctionProcessor
public List<String> resolve( UrlRewriteContext context, List<String> parameters ) throws Exception {
List<String> results = null;
if( parameters != null ) {
- results = new ArrayList<String>( parameters.size() );
+ results = new ArrayList<>( parameters.size() );
for( String parameter : parameters ) {
String url = lookupServiceUrl( parameter );
if( url != null ) {
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceSchemeFunctionProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceSchemeFunctionProcessor.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceSchemeFunctionProcessor.java
index defe504..59da23c 100644
--- a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceSchemeFunctionProcessor.java
+++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceSchemeFunctionProcessor.java
@@ -40,7 +40,7 @@ public class ServiceSchemeFunctionProcessor
public List<String> resolve( UrlRewriteContext context, List<String> parameters ) throws Exception {
List<String> results = null;
if( parameters != null ) {
- results = new ArrayList<String>( parameters.size() );
+ results = new ArrayList<>( parameters.size() );
for( String parameter : parameters ) {
String url = lookupServiceUrl( parameter );
if( url != null && !url.equals( parameter ) ) {
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceUrlFunctionProcessor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceUrlFunctionProcessor.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceUrlFunctionProcessor.java
index 238a22e..ea229bd 100644
--- a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceUrlFunctionProcessor.java
+++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceUrlFunctionProcessor.java
@@ -40,7 +40,7 @@ public class ServiceUrlFunctionProcessor
List<String> results = null;
if( parameters != null ) {
UrlRewriter.Direction direction = context.getDirection();
- results = new ArrayList<String>( parameters.size() );
+ results = new ArrayList<>( parameters.size() );
for( String parameter : parameters ) {
parameter = resolve( parameter );
results.add( parameter );
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java
index 39cdd4a..ca50414 100644
--- a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java
+++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java
@@ -106,7 +106,7 @@ public class ServiceRegistryFunctionsTest {
}
rewriteFilter.setFilter( new UrlRewriteServletFilter() );
- interactions = new ArrayQueue<MockInteraction>();
+ interactions = new ArrayQueue<>();
ServletHolder servlet = server.addServlet( MockServlet.class, "/" );
servlet.setServlet( new MockServlet( "mock-servlet", interactions ) );
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/ext/UrlRewriteMatchProcessorExt.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/ext/UrlRewriteMatchProcessorExt.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/ext/UrlRewriteMatchProcessorExt.java
index 6ada5dc..64d1f5a 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/ext/UrlRewriteMatchProcessorExt.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/ext/UrlRewriteMatchProcessorExt.java
@@ -41,7 +41,7 @@ public class UrlRewriteMatchProcessorExt implements
if( template == null ) {
this.matcher = null;
} else {
- this.matcher = new Matcher<Void>( descriptor.template(), null );
+ this.matcher = new Matcher<>( descriptor.template(), null );
}
}
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteFilterDescriptorImpl.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteFilterDescriptorImpl.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteFilterDescriptorImpl.java
index a090c82..e4aba56 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteFilterDescriptorImpl.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteFilterDescriptorImpl.java
@@ -30,8 +30,8 @@ public class UrlRewriteFilterDescriptorImpl implements
UrlRewriteFilterDescriptor {
private String name;
- private List<UrlRewriteFilterContentDescriptor> contentList = new ArrayList<UrlRewriteFilterContentDescriptor>();
- private MimeTypeMap<UrlRewriteFilterContentDescriptor> contentMap = new MimeTypeMap<UrlRewriteFilterContentDescriptor>();
+ private List<UrlRewriteFilterContentDescriptor> contentList = new ArrayList<>();
+ private MimeTypeMap<UrlRewriteFilterContentDescriptor> contentMap = new MimeTypeMap<>();
public UrlRewriteFilterDescriptorImpl() {
}
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteFilterGroupDescriptorBase.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteFilterGroupDescriptorBase.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteFilterGroupDescriptorBase.java
index 963d4f0..3d99795 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteFilterGroupDescriptorBase.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteFilterGroupDescriptorBase.java
@@ -28,7 +28,7 @@ public class UrlRewriteFilterGroupDescriptorBase
extends UrlRewriteFilterSelectorDescriptorBase
implements UrlRewriteFilterGroupDescriptor {
- private List<UrlRewriteFilterPathDescriptor> selectors = new ArrayList<UrlRewriteFilterPathDescriptor>();
+ private List<UrlRewriteFilterPathDescriptor> selectors = new ArrayList<>();
@Override
public List<UrlRewriteFilterPathDescriptor> getSelectors() {
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRulesDescriptorImpl.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRulesDescriptorImpl.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRulesDescriptorImpl.java
index 64f6e60..c570b27 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRulesDescriptorImpl.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRulesDescriptorImpl.java
@@ -31,10 +31,10 @@ import java.util.Map;
public class UrlRewriteRulesDescriptorImpl implements UrlRewriteRulesDescriptor {
private Map<String,UrlRewriteFunctionDescriptor> funcMap = new HashMap<>();
- private List<UrlRewriteFunctionDescriptor> funcList = new ArrayList<UrlRewriteFunctionDescriptor>();
- private List<UrlRewriteRuleDescriptor> ruleList = new ArrayList<UrlRewriteRuleDescriptor>();
+ private List<UrlRewriteFunctionDescriptor> funcList = new ArrayList<>();
+ private List<UrlRewriteRuleDescriptor> ruleList = new ArrayList<>();
private Map<String,UrlRewriteRuleDescriptor> ruleMap = new HashMap<>();
- private List<UrlRewriteFilterDescriptor> filterList = new ArrayList<UrlRewriteFilterDescriptor>();
+ private List<UrlRewriteFilterDescriptor> filterList = new ArrayList<>();
private Map<String,UrlRewriteFilterDescriptor> filterMap = new HashMap<>();
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteStepProcessorHolder.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteStepProcessorHolder.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteStepProcessorHolder.java
index 57c4989..51d627f 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteStepProcessorHolder.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteStepProcessorHolder.java
@@ -67,7 +67,7 @@ public class UrlRewriteStepProcessorHolder implements UrlRewriteStepProcessor {
this.descriptor = descriptor;
this.processor = processor;
this.isCondition = descriptor instanceof UrlRewriteFlowDescriptor;
- this.childProcessors = new ArrayList<UrlRewriteStepProcessorHolder>();
+ this.childProcessors = new ArrayList<>();
if( isCondition ) {
UrlRewriteFlowDescriptor flowDescriptor = (UrlRewriteFlowDescriptor)descriptor;
List<UrlRewriteStepDescriptor> stepList = flowDescriptor.steps();
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/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 fe726a7..008a098 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
@@ -70,7 +70,7 @@ public abstract class HtmlFilterReaderBase extends Reader implements
protected HtmlFilterReaderBase( Reader reader ) throws IOException, ParserConfigurationException {
this.reader = reader;
document = XmlUtils.createDocument( false );
- stack = new Stack<Level>();
+ stack = new Stack<>();
parser = new StreamedSource( reader );
iterator = parser.iterator();
writer = new StringWriter();
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java
index b34e97d..2e47a58 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReader.java
@@ -74,7 +74,7 @@ class JsonFilterReader extends Reader {
buffer = writer.getBuffer();
offset = 0;
generator = factory.createGenerator( writer );
- stack = new Stack<Level>();
+ stack = new Stack<>();
bufferingLevel = null;
bufferingConfig = null;
this.config = config;
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReader.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReader.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReader.java
index f7808f8..34255b0 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReader.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReader.java
@@ -94,7 +94,7 @@ public abstract class XmlFilterReader extends Reader {
buffer = writer.getBuffer();
offset = 0;
document = null;
- stack = new Stack<Level>();
+ stack = new Stack<>();
isEmptyElement = false;
factory = XMLInputFactory.newFactory();
//KNOX-620 factory.setProperty( XMLConstants.ACCESS_EXTERNAL_DTD, "false" );
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/spi/UrlRewriteFlowDescriptorBase.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/spi/UrlRewriteFlowDescriptorBase.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/spi/UrlRewriteFlowDescriptorBase.java
index f28ee22..ef0044d 100644
--- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/spi/UrlRewriteFlowDescriptorBase.java
+++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/spi/UrlRewriteFlowDescriptorBase.java
@@ -30,7 +30,7 @@ public abstract class UrlRewriteFlowDescriptorBase<T> extends UrlRewriteStepDesc
UrlRewriteFlowDescriptor<T> {
private UrlRewriteStepFlow flow;
- private List<UrlRewriteStepDescriptor> steps = new ArrayList<UrlRewriteStepDescriptor>();
+ private List<UrlRewriteStepDescriptor> steps = new ArrayList<>();
public UrlRewriteFlowDescriptorBase( String type ) {
super( type );
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteProcessorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteProcessorTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteProcessorTest.java
index 6723c94..1941318 100644
--- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteProcessorTest.java
+++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteProcessorTest.java
@@ -320,7 +320,7 @@ public class UrlRewriteProcessorTest {
pattern = Parser.parseTemplate("*://*:*/**/solr/{collection=**}/{query=**}?{**}");
template = Parser.parseTemplate("http://sandbox.hortonworks.com/solr/{collection=**}/{query=**}?{**}");
- matcher = new Matcher<Void>();
+ matcher = new Matcher<>();
matcher.add(pattern, null);
match = matcher.match(input);
@@ -363,7 +363,7 @@ public class UrlRewriteProcessorTest {
pattern = Parser.parseTemplate("*://*:*/**/solr/{collection=**}/{query=**}?{**}");
template = Parser.parseTemplate("http://sandbox.hortonworks.com/solr/{collection=**}/{query=**}?{**}");
- matcher = new Matcher<Void>();
+ matcher = new Matcher<>();
matcher.add(pattern, null);
match = matcher.match(input);
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java
index 4437327..4f475b1 100644
--- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java
+++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java
@@ -58,7 +58,7 @@ public class UrlRewriteServletContextListenerTest {
FilterHolder filter = server.addFilter( UrlRewriteServletFilter.class, "/*", EnumSet.of( DispatcherType.REQUEST ) );
filter.setFilter( new UrlRewriteServletFilter() );
- interactions = new ArrayQueue<MockInteraction>();
+ interactions = new ArrayQueue<>();
ServletHolder servlet = server.addServlet( MockServlet.class, "/" );
servlet.setServlet( new MockServlet( "mock-servlet", interactions ) );
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java
index 0d5b8cc..b5251d8 100644
--- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java
+++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java
@@ -95,7 +95,7 @@ public class UrlRewriteServletFilterTest {
}
rewriteFilter.setFilter( new UrlRewriteServletFilter() );
- interactions = new ArrayQueue<MockInteraction>();
+ interactions = new ArrayQueue<>();
ServletHolder servlet = server.addServlet( MockServlet.class, "/" );
servlet.setServlet( new MockServlet( "mock-servlet", interactions ) );
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java
index 85ddb48..dea69c0 100644
--- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java
+++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java
@@ -158,7 +158,7 @@ public class FrontendFunctionProcessorTest {
}
rewriteFilter.setFilter( new UrlRewriteServletFilter() );
- interactions = new ArrayQueue<MockInteraction>();
+ interactions = new ArrayQueue<>();
ServletHolder servlet = server.addServlet( MockServlet.class, "/" );
servlet.setServlet( new MockServlet( "mock-servlet", interactions ) );
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteStepProcessorStateTest.java
----------------------------------------------------------------------
diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteStepProcessorStateTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteStepProcessorStateTest.java
index b5c2abc..aed2134 100644
--- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteStepProcessorStateTest.java
+++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteStepProcessorStateTest.java
@@ -41,7 +41,7 @@ public class UrlRewriteStepProcessorStateTest {
@Test
public void testEmpty() {
- List<UrlRewriteStepProcessorHolder> steps = new ArrayList<UrlRewriteStepProcessorHolder>();
+ List<UrlRewriteStepProcessorHolder> steps = new ArrayList<>();
UrlRewriteStepProcessorState state = new UrlRewriteStepProcessorState( steps.iterator() );
MatcherAssert
@@ -56,7 +56,7 @@ public class UrlRewriteStepProcessorStateTest {
@Test
public void testNextAction() throws Exception {
UrlRewriteStepProcessorHolder holder;
- List<UrlRewriteStepProcessorHolder> steps = new ArrayList<UrlRewriteStepProcessorHolder>();
+ List<UrlRewriteStepProcessorHolder> steps = new ArrayList<>();
holder = new UrlRewriteStepProcessorHolder();
holder.initialize( new FakeEnvironment(), new FakeActionDescriptor( "one" ), new FakeActionProcessor( "one" ) );
steps.add( holder );
@@ -90,7 +90,7 @@ public class UrlRewriteStepProcessorStateTest {
@Test
public void testNextCondition() throws Exception {
UrlRewriteStepProcessorHolder holder;
- List<UrlRewriteStepProcessorHolder> steps = new ArrayList<UrlRewriteStepProcessorHolder>();
+ List<UrlRewriteStepProcessorHolder> steps = new ArrayList<>();
holder = new UrlRewriteStepProcessorHolder();
holder.initialize( new FakeEnvironment(), new FakeConditionDescriptor( "one" ), new FakeConditionProcessor( "one" ) );
steps.add( holder );
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/deploy/impl/AclsAuthzDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/deploy/impl/AclsAuthzDeploymentContributor.java b/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/deploy/impl/AclsAuthzDeploymentContributor.java
index 764a2f6..13f9968 100644
--- a/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/deploy/impl/AclsAuthzDeploymentContributor.java
+++ b/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/deploy/impl/AclsAuthzDeploymentContributor.java
@@ -57,7 +57,7 @@ public class AclsAuthzDeploymentContributor extends ProviderDeploymentContributo
public void contributeFilter( DeploymentContext context, Provider provider, Service service,
ResourceDescriptor resource, List<FilterParamDescriptor> params ) {
if (params == null) {
- params = new ArrayList<FilterParamDescriptor>();
+ params = new ArrayList<>();
}
// add resource role to params so that we can determine the acls to enforce at runtime
params.add( resource.createFilterParam().name( "resource.role" ).value(resource.role() ) );
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/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 6a231e4..eb0a67f 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
@@ -53,8 +53,8 @@ public class AclsAuthorizationFilter implements Filter {
private String resourceRole = null;
private String aclProcessingMode = null;
private AclParser parser = new AclParser();
- private ArrayList<String> adminGroups = new ArrayList<String>();;
- private ArrayList<String> adminUsers = new ArrayList<String>();;
+ private ArrayList<String> adminGroups = new ArrayList<>();;
+ private ArrayList<String> adminUsers = new ArrayList<>();;
@Override
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/deploy/JWTFederationContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/deploy/JWTFederationContributor.java b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/deploy/JWTFederationContributor.java
index 11547e3..0977800 100644
--- a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/deploy/JWTFederationContributor.java
+++ b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/deploy/JWTFederationContributor.java
@@ -53,7 +53,7 @@ public class JWTFederationContributor extends
public void contributeFilter( DeploymentContext context, Provider provider, Service service, ResourceDescriptor resource, List<FilterParamDescriptor> params ) {
// blindly add all the provider params as filter init params
if (params == null) {
- params = new ArrayList<FilterParamDescriptor>();
+ params = new ArrayList<>();
}
Map<String, String> providerParams = provider.getParams();
for(Entry<String, String> entry : providerParams.entrySet()) {
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/deploy/SSOCookieFederationContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/deploy/SSOCookieFederationContributor.java b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/deploy/SSOCookieFederationContributor.java
index ccc5d5b..ba19d64 100644
--- a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/deploy/SSOCookieFederationContributor.java
+++ b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/deploy/SSOCookieFederationContributor.java
@@ -53,7 +53,7 @@ public class SSOCookieFederationContributor extends
public void contributeFilter( DeploymentContext context, Provider provider, Service service, ResourceDescriptor resource, List<FilterParamDescriptor> params ) {
// blindly add all the provider params as filter init params
if (params == null) {
- params = new ArrayList<FilterParamDescriptor>();
+ params = new ArrayList<>();
}
Map<String, String> providerParams = provider.getParams();
for(Entry<String, String> entry : providerParams.entrySet()) {
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/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 55be281..db93d73 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
@@ -133,7 +133,7 @@ public abstract class AbstractJWTFilter implements Filter {
if (!StringUtils.isEmpty(expectedAudiences)) {
// parse into the list
String[] audArray = expectedAudiences.split(",");
- audList = new ArrayList<String>();
+ audList = new ArrayList<>();
for (String a : audArray) {
audList.add(a.trim());
}
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/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 61068d3..6d21308 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
@@ -707,7 +707,7 @@ public abstract class AbstractJWTFilterTest {
protected SignedJWT getJWT(String issuer, String sub, String aud, Date expires, Date nbf, RSAPrivateKey privateKey,
String signatureAlgorithm)
throws Exception {
- List<String> audiences = new ArrayList<String>();
+ List<String> audiences = new ArrayList<>();
if (aud != null) {
audiences.add(aud);
}
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/deploy/Pac4jFederationProviderContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/deploy/Pac4jFederationProviderContributor.java b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/deploy/Pac4jFederationProviderContributor.java
index d9a5445..74baad3 100644
--- a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/deploy/Pac4jFederationProviderContributor.java
+++ b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/deploy/Pac4jFederationProviderContributor.java
@@ -66,7 +66,7 @@ public class Pac4jFederationProviderContributor extends
ResourceDescriptor resource, List<FilterParamDescriptor> params) {
// blindly add all the provider params as filter init params
if (params == null) {
- params = new ArrayList<FilterParamDescriptor>();
+ params = new ArrayList<>();
}
Map<String, String> providerParams = provider.getParams();
for(Entry<String, String> entry : providerParams.entrySet()) {
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jIdentityAdapter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jIdentityAdapter.java b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jIdentityAdapter.java
index 0500fbd..694d95e 100644
--- a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jIdentityAdapter.java
+++ b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jIdentityAdapter.java
@@ -83,7 +83,7 @@ public class Pac4jIdentityAdapter implements Filter {
final HttpServletResponse response = (HttpServletResponse) servletResponse;
final J2EContext context = new J2EContext(request, response,
((Config)request.getAttribute(PAC4J_CONFIG)).getSessionStore());
- final ProfileManager<CommonProfile> manager = new ProfileManager<CommonProfile>(context);
+ final ProfileManager<CommonProfile> manager = new ProfileManager<>(context);
final Optional<CommonProfile> optional = manager.get(true);
if (optional.isPresent()) {
CommonProfile profile = optional.get();
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/deploy/HeaderPreAuthContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/deploy/HeaderPreAuthContributor.java b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/deploy/HeaderPreAuthContributor.java
index 8917cc6..5b08f01 100644
--- a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/deploy/HeaderPreAuthContributor.java
+++ b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/deploy/HeaderPreAuthContributor.java
@@ -56,7 +56,7 @@ public class HeaderPreAuthContributor extends
ResourceDescriptor resource, List<FilterParamDescriptor> params) {
// blindly add all the provider params as filter init params
if (params == null) {
- params = new ArrayList<FilterParamDescriptor>();
+ params = new ArrayList<>();
}
Map<String, String> providerParams = provider.getParams();
for(Entry<String, String> entry : providerParams.entrySet()) {
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroDeploymentContributor.java b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroDeploymentContributor.java
index d912c9c..84c81d5 100644
--- a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroDeploymentContributor.java
+++ b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroDeploymentContributor.java
@@ -104,7 +104,7 @@ public class ShiroDeploymentContributor extends ProviderDeploymentContributorBas
// You may also need to do some additional processing of the response in order to not return cookies or other
// filter specifics that are not needed for integration with Knox. Below we do that in the pre-processing filter.
if (params == null) {
- params = new ArrayList<FilterParamDescriptor>();
+ params = new ArrayList<>();
}
Map<String, String> providerParams = provider.getParams();
String redirectToUrl = providerParams.get(RedirectToUrlFilter.REDIRECT_TO_URL);
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/ResponseCookieFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/ResponseCookieFilter.java b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/ResponseCookieFilter.java
index 465f77c..66eaac1 100644
--- a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/ResponseCookieFilter.java
+++ b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/ResponseCookieFilter.java
@@ -33,7 +33,7 @@ import java.util.List;
public class ResponseCookieFilter extends AbstractGatewayFilter {
public static final String RESTRICTED_COOKIES = "restrictedCookies";
- protected static List<String> restrictedCookies = new ArrayList<String>();
+ protected static List<String> restrictedCookies = new ArrayList<>();
@Override
public void init(FilterConfig filterConfig) throws ServletException {
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/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 f90d43f..0dbc4b6 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
@@ -402,7 +402,7 @@ public class KnoxLdapRealm extends JndiLdapRealm {
private Set<String> permsFor(Set<String> roleNames) {
- Set<String> perms = new LinkedHashSet<String>(); // preserve order
+ Set<String> perms = new LinkedHashSet<>(); // preserve order
for(String role: roleNames) {
List<String> permsForRole = permissionsByRole.get(role);
if(permsForRole != null) {
@@ -529,7 +529,7 @@ public class KnoxLdapRealm extends JndiLdapRealm {
String role = stEq.nextToken().trim();
String perm = stEq.nextToken().trim();
StringTokenizer stCom = new StringTokenizer(perm, ",");
- List<String> permList = new ArrayList<String>();
+ List<String> permList = new ArrayList<>();
while (stCom.hasMoreTokens()) {
permList.add(stCom.nextToken().trim());
}
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxPamRealm.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxPamRealm.java b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxPamRealm.java
index 589ecc4..93a5390 100644
--- a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxPamRealm.java
+++ b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxPamRealm.java
@@ -110,7 +110,7 @@ public class KnoxPamRealm extends AuthorizingRealm {
@Override
protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
- Set<String> roles = new LinkedHashSet<String>();
+ Set<String> roles = new LinkedHashSet<>();
UnixUserPrincipal user = principals.oneByType(UnixUserPrincipal.class);
if (user != null) {
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/StrictTransportFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/StrictTransportFilter.java b/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/StrictTransportFilter.java
index 7c10423..3fcbd3a 100644
--- a/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/StrictTransportFilter.java
+++ b/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/StrictTransportFilter.java
@@ -115,7 +115,7 @@ public class StrictTransportFilter implements Filter {
public Collection<String> getHeaderNames() {
List<String> names = (List<String>) super.getHeaderNames();
if (names == null) {
- names = new ArrayList<String>();
+ names = new ArrayList<>();
}
names.add(STRICT_TRANSPORT);
return names;
@@ -126,7 +126,7 @@ public class StrictTransportFilter implements Filter {
List<String> values = (List<String>) super.getHeaders(name);
if (name.equals(STRICT_TRANSPORT)) {
if (values == null) {
- values = new ArrayList<String>();
+ values = new ArrayList<>();
}
values.add(option);
}
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/XFrameOptionsFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/XFrameOptionsFilter.java b/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/XFrameOptionsFilter.java
index 0b46522..981cb37 100644
--- a/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/XFrameOptionsFilter.java
+++ b/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/filter/XFrameOptionsFilter.java
@@ -115,7 +115,7 @@ public class XFrameOptionsFilter implements Filter {
public Collection<String> getHeaderNames() {
List<String> names = (List<String>) super.getHeaderNames();
if (names == null) {
- names = new ArrayList<String>();
+ names = new ArrayList<>();
}
names.add(X_FRAME_OPTIONS);
return names;
@@ -126,7 +126,7 @@ public class XFrameOptionsFilter implements Filter {
List<String> values = (List<String>) super.getHeaders(name);
if (name.equals(X_FRAME_OPTIONS)) {
if (values == null) {
- values = new ArrayList<String>();
+ values = new ArrayList<>();
}
values.add(option);
}
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-server-xforwarded-filter/src/test/java/org/apache/knox/gateway/filter/CompositeEnumerationTest.java
----------------------------------------------------------------------
diff --git a/gateway-server-xforwarded-filter/src/test/java/org/apache/knox/gateway/filter/CompositeEnumerationTest.java b/gateway-server-xforwarded-filter/src/test/java/org/apache/knox/gateway/filter/CompositeEnumerationTest.java
index 7722d14..5372efb 100644
--- a/gateway-server-xforwarded-filter/src/test/java/org/apache/knox/gateway/filter/CompositeEnumerationTest.java
+++ b/gateway-server-xforwarded-filter/src/test/java/org/apache/knox/gateway/filter/CompositeEnumerationTest.java
@@ -39,7 +39,7 @@ public class CompositeEnumerationTest {
String[] b = new String[]{ "3", "4" };
Enumeration<String> eb = Collections.enumeration( Arrays.asList( b ) );
- CompositeEnumeration<String> ce = new CompositeEnumeration<String>( ea, eb );
+ CompositeEnumeration<String> ce = new CompositeEnumeration<>( ea, eb );
assertThat( ce.nextElement(), is( "1" ) );
assertThat( ce.nextElement(), is( "2" ) );
@@ -57,7 +57,7 @@ public class CompositeEnumerationTest {
String[] b = new String[]{ "2" };
Enumeration<String> eb = Collections.enumeration( Arrays.asList( b ) );
- CompositeEnumeration<String> ce = new CompositeEnumeration<String>( ea, eb );
+ CompositeEnumeration<String> ce = new CompositeEnumeration<>( ea, eb );
assertThat( ce.nextElement(), is( "1" ) );
assertThat( ce.nextElement(), is( "2" ) );
@@ -73,27 +73,27 @@ public class CompositeEnumerationTest {
Enumeration<String> e1 = Collections.enumeration( Arrays.asList( a ) );
Enumeration<String> e2 = Collections.enumeration( Arrays.asList( c ) );
- CompositeEnumeration<String> ce = new CompositeEnumeration<String>( e1, e2 );
+ CompositeEnumeration<String> ce = new CompositeEnumeration<>( e1, e2 );
assertThat( ce.nextElement(), is( "1" ) );
assertThat( ce.nextElement(), is( "2" ) );
assertThat( ce.hasMoreElements(), is( false ) );
e1 = Collections.enumeration( Arrays.asList( c ) );
e2 = Collections.enumeration( Arrays.asList( a ) );
- ce = new CompositeEnumeration<String>( e1, e2 );
+ ce = new CompositeEnumeration<>( e1, e2 );
assertThat( ce.nextElement(), is( "1" ) );
assertThat( ce.nextElement(), is( "2" ) );
assertThat( ce.hasMoreElements(), is( false ) );
e1 = Collections.enumeration( Arrays.asList( c ) );
e2 = Collections.enumeration( Arrays.asList( c ) );
- ce = new CompositeEnumeration<String>( e1, e2 );
+ ce = new CompositeEnumeration<>( e1, e2 );
assertThat( ce.hasMoreElements(), is( false ) );
}
@Test
public void testEmpty() {
- CompositeEnumeration<String> ce = new CompositeEnumeration<String>();
+ CompositeEnumeration<String> ce = new CompositeEnumeration<>();
assertThat( ce.hasMoreElements(), is( false ) );
try {
@@ -107,7 +107,7 @@ public class CompositeEnumerationTest {
@Test
public void testNulls() {
try {
- CompositeEnumeration<String> ce = new CompositeEnumeration<String>( null );
+ CompositeEnumeration<String> ce = new CompositeEnumeration<>( null );
fail( "Expected IllegalArgumentException" );
} catch( IllegalArgumentException e ) {
// Expected.
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/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 7bba402..6fc9a9e 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
@@ -81,7 +81,7 @@ public class GatewayFilter implements Filter {
public GatewayFilter() {
holders = new HashSet<>();
- chains = new Matcher<Chain>();
+ chains = new Matcher<>();
}
@Override
@@ -258,7 +258,7 @@ public class GatewayFilter implements Filter {
private String resourceRole;
private Chain() {
- this.chain = new ArrayList<Holder>();
+ this.chain = new ArrayList<>();
}
private Chain( List<Holder> chain ) {
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/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 854e816..ac5674e 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
@@ -569,7 +569,7 @@ public class GatewayServer {
final Map<String, Integer> topologyPortMap = config.getGatewayPortMappings();
// List of all the topology that are deployed
- final List<String> deployedTopologyList = new ArrayList<String>();
+ final List<String> deployedTopologyList = new ArrayList<>();
for (final Topology t : topologies) {
deployedTopologyList.add(t.getName());
@@ -841,7 +841,7 @@ public class GatewayServer {
}
// Find all the deployed contexts we need to deactivate.
- List<WebAppContext> deactivate = new ArrayList<WebAppContext>();
+ List<WebAppContext> deactivate = new ArrayList<>();
if( deployments != null ) {
for( WebAppContext app : deployments.values() ) {
String appPath = app.getContextPath();
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/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 6dbfd88..bb75e3c 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
@@ -87,7 +87,7 @@ public abstract class DeploymentFactory {
}
static List<Application> findApplicationsByUrl( Topology topology, String url ) {
- List<Application> foundApps = new ArrayList<Application>();
+ List<Application> foundApps = new ArrayList<>();
if( topology != null ) {
url = Urls.trimLeadingAndTrailingSlash( url );
Collection<Application> searchApps = topology.getApplications();
@@ -95,7 +95,7 @@ public abstract class DeploymentFactory {
for( Application searchApp : searchApps ) {
List<String> searchUrls = searchApp.getUrls();
if( searchUrls == null || searchUrls.isEmpty() ) {
- searchUrls = new ArrayList<String>(1);
+ searchUrls = new ArrayList<>(1);
searchUrls.add( searchApp.getName() );
}
for( String searchUrl : searchUrls ) {
@@ -118,7 +118,7 @@ public abstract class DeploymentFactory {
for( Application app : apps ) {
List<String> urls = app.getUrls();
if( urls == null || urls.isEmpty() ) {
- urls = new ArrayList<String>(1);
+ urls = new ArrayList<>(1);
urls.add( app.getName() );
}
for( String url : urls ) {
@@ -305,7 +305,7 @@ public abstract class DeploymentFactory {
String role = contributor.getRole();
List<ProviderDeploymentContributor> list = defaults.get( role );
if( list == null ) {
- list = new ArrayList<ProviderDeploymentContributor>();
+ list = new ArrayList<>();
defaults.put( role, list );
}
if( list.isEmpty() ) {
@@ -325,7 +325,7 @@ public abstract class DeploymentFactory {
if( contributor != null ) {
List<ServiceDeploymentContributor> list = defaults.get( role );
if( list == null ) {
- list = new ArrayList<ServiceDeploymentContributor>( 1 );
+ list = new ArrayList<>( 1 );
defaults.put( role, list );
}
if( !list.contains( contributor ) ) {
@@ -348,7 +348,7 @@ public abstract class DeploymentFactory {
ApplicationDeploymentContributor contributor = new ApplicationDeploymentContributor( config, application );
List<String> urls = application.getUrls();
if( urls == null || urls.isEmpty() ) {
- urls = new ArrayList<String>( 1 );
+ urls = new ArrayList<>( 1 );
urls.add( "/" + name );
}
for( String url : urls ) {
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/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 97e41a0..26a4690 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
@@ -72,7 +72,7 @@ public class ApplicationDeploymentContributor extends ServiceDeploymentContribut
if( !file.exists() ) {
definition = new ServiceDefinition();
definition.setName( application.getName() );
- List<Route> routes = new ArrayList<Route>(1);
+ List<Route> routes = new ArrayList<>(1);
Route route;
route = new Route();
route.setPath( "/?**" );
@@ -171,7 +171,7 @@ public class ApplicationDeploymentContributor extends ServiceDeploymentContribut
}
private void contributeResource( DeploymentContext context, Service service, Route binding, Map<String, String> filterParams) throws URISyntaxException {
- List<FilterParamDescriptor> params = new ArrayList<FilterParamDescriptor>();
+ List<FilterParamDescriptor> params = new ArrayList<>();
ResourceDescriptor resource = context.getGatewayDescriptor().addResource();
resource.role(service.getRole());
resource.pattern(binding.getPath());
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/GenericProviderDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/GenericProviderDeploymentContributor.java b/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/GenericProviderDeploymentContributor.java
index 6d0e148..9b133c9 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/GenericProviderDeploymentContributor.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/GenericProviderDeploymentContributor.java
@@ -76,7 +76,7 @@ public class GenericProviderDeploymentContributor extends
FilterDescriptor filter,
Map<String,String> providerParams,
List<FilterParamDescriptor> filterParams ) {
- List<FilterParamDescriptor> aggregateParams = new ArrayList<FilterParamDescriptor>();
+ List<FilterParamDescriptor> aggregateParams = new ArrayList<>();
if( providerParams != null ) {
for( Map.Entry<String,String> param : providerParams.entrySet() ) {
String name = param.getKey();