http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/ServiceDefinitionDeploymentContributor.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/ServiceDefinitionDeploymentContributor.java b/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/ServiceDefinitionDeploymentContributor.java index 9174eec..3d35e29 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/ServiceDefinitionDeploymentContributor.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/ServiceDefinitionDeploymentContributor.java @@ -121,7 +121,7 @@ public class ServiceDefinitionDeploymentContributor extends ServiceDeploymentCon } 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/descriptor/impl/FilterDescriptorImpl.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/impl/FilterDescriptorImpl.java b/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/impl/FilterDescriptorImpl.java index 3fb8ef2..18ba3b6 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/impl/FilterDescriptorImpl.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/impl/FilterDescriptorImpl.java @@ -35,7 +35,7 @@ public class FilterDescriptorImpl implements FilterDescriptor { FilterDescriptorImpl( ResourceDescriptor parent ) { this.parent = parent; - this.params = new ArrayList<FilterParamDescriptor>(); + this.params = new ArrayList<>(); } @Override http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/impl/GatewayDescriptorImpl.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/impl/GatewayDescriptorImpl.java b/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/impl/GatewayDescriptorImpl.java index 13378bb..27dc240 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/impl/GatewayDescriptorImpl.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/impl/GatewayDescriptorImpl.java @@ -30,8 +30,8 @@ public class GatewayDescriptorImpl implements GatewayDescriptor { private List<ResourceDescriptor> resources; public GatewayDescriptorImpl() { - this.params = new ArrayList<GatewayParamDescriptor>(); - this.resources = new ArrayList<ResourceDescriptor>(); + this.params = new ArrayList<>(); + this.resources = new ArrayList<>(); } @Override http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/impl/ResourceDescriptorImpl.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/impl/ResourceDescriptorImpl.java b/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/impl/ResourceDescriptorImpl.java index cce94ab..994c294 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/impl/ResourceDescriptorImpl.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/descriptor/impl/ResourceDescriptorImpl.java @@ -36,8 +36,8 @@ public class ResourceDescriptorImpl implements ResourceDescriptor { ResourceDescriptorImpl( GatewayDescriptor parent ) { this.parent = parent; - this.params = new ArrayList<ResourceParamDescriptor>(); - this.filters = new ArrayList<FilterDescriptor>(); + this.params = new ArrayList<>(); + this.filters = new ArrayList<>(); } @Override http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-server/src/main/java/org/apache/knox/gateway/dispatch/DispatchParamResolver.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/dispatch/DispatchParamResolver.java b/gateway-server/src/main/java/org/apache/knox/gateway/dispatch/DispatchParamResolver.java index e814848..979f80f 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/dispatch/DispatchParamResolver.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/dispatch/DispatchParamResolver.java @@ -57,7 +57,7 @@ class DispatchParamResolver implements Params { if( config != null ) { String value = config.getInitParameter( name ); if( value != null ) { - values = new ArrayList<String>( 1 ); + values = new ArrayList<>( 1 ); values.add( value ); return values; } http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-server/src/main/java/org/apache/knox/gateway/filter/JaasLoginFilter.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/filter/JaasLoginFilter.java b/gateway-server/src/main/java/org/apache/knox/gateway/filter/JaasLoginFilter.java index 79127b9..71ce479 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/filter/JaasLoginFilter.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/filter/JaasLoginFilter.java @@ -48,7 +48,7 @@ public class JaasLoginFilter extends AbstractGatewayFilter { // subject.getPublicCredentials().add( new PrincipalCredentials( credentials.getUserPrincipal() ) ); // //System.out.println( "Subject=" + subject ); // -// PrivilegedExceptionAction<Void> action = new PrivilegedExceptionAction<Void>() { +// PrivilegedExceptionAction<Void> action = new PrivilegedExceptionAction<>() { // @Override // public Void run() throws Exception { // chain.doFilter( request, response ); http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-server/src/main/java/org/apache/knox/gateway/services/registry/impl/RegEntry.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/registry/impl/RegEntry.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/registry/impl/RegEntry.java index 10019c6..5547eeb 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/services/registry/impl/RegEntry.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/registry/impl/RegEntry.java @@ -47,7 +47,7 @@ public class RegEntry { public List<String> getUrls() { if (urls == null && url != null && !"null".equals(url)) { - urls = new ArrayList<String>(); + urls = new ArrayList<>(); urls.add(url); } return urls; http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultAliasService.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultAliasService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultAliasService.java index abad387..7d71a8d 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultAliasService.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultAliasService.java @@ -190,7 +190,7 @@ public class DefaultAliasService implements AliasService { */ @Override public List<String> getAliasesForCluster(String clusterName) { - ArrayList<String> list = new ArrayList<String>(); + ArrayList<String> list = new ArrayList<>(); KeyStore keyStore; try { keyStore = keystoreService.getCredentialStoreForCluster(clusterName); http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenAuthorityService.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenAuthorityService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenAuthorityService.java index 28c2baa..e5ed23f 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenAuthorityService.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenAuthorityService.java @@ -112,7 +112,7 @@ public class DefaultTokenAuthorityService implements JWTokenAuthority, Service { throws TokenServiceException { List<String> audiences = null; if (audience != null) { - audiences = new ArrayList<String>(); + audiences = new ArrayList<>(); audiences.add(audience); } return issueToken(p, audiences, algorithm, expires); http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java index 50b01fc..6f5d73d 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java @@ -95,7 +95,7 @@ public class DefaultTopologyService AuditConstants.DEFAULT_AUDITOR_NAME, AuditConstants.KNOX_SERVICE_NAME, AuditConstants.KNOX_COMPONENT_NAME); - private static final List<String> SUPPORTED_TOPOLOGY_FILE_EXTENSIONS = new ArrayList<String>(); + private static final List<String> SUPPORTED_TOPOLOGY_FILE_EXTENSIONS = new ArrayList<>(); static { SUPPORTED_TOPOLOGY_FILE_EXTENSIONS.add("xml"); SUPPORTED_TOPOLOGY_FILE_EXTENSIONS.add("conf"); @@ -214,7 +214,7 @@ public class DefaultTopologyService private List<TopologyEvent> createChangeEvents( Map<File, Topology> oldTopologies, Map<File, Topology> newTopologies) { - ArrayList<TopologyEvent> events = new ArrayList<TopologyEvent>(); + ArrayList<TopologyEvent> events = new ArrayList<>(); // Go through the old topologies and find anything that was deleted. for (Entry<File, Topology> oldTopology : oldTopologies.entrySet()) { if (!newTopologies.containsKey(oldTopology.getKey())) { @@ -794,7 +794,7 @@ public class DefaultTopologyService public static class DescriptorsMonitor extends FileAlterationListenerAdaptor implements FileFilter { - static final List<String> SUPPORTED_EXTENSIONS = new ArrayList<String>(); + static final List<String> SUPPORTED_EXTENSIONS = new ArrayList<>(); static { SUPPORTED_EXTENSIONS.add("json"); SUPPORTED_EXTENSIONS.add("yml"); http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/BeanPropertyTopologyBuilder.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/BeanPropertyTopologyBuilder.java b/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/BeanPropertyTopologyBuilder.java index 75e2b4c..2b4f6ac 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/BeanPropertyTopologyBuilder.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/BeanPropertyTopologyBuilder.java @@ -34,9 +34,9 @@ public class BeanPropertyTopologyBuilder implements TopologyBuilder { private List<Application> applications; public BeanPropertyTopologyBuilder() { - providers = new ArrayList<Provider>(); - services = new ArrayList<Service>(); - applications = new ArrayList<Application>(); + providers = new ArrayList<>(); + services = new ArrayList<>(); + applications = new ArrayList<>(); } public BeanPropertyTopologyBuilder name(String name) { http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/PropertyTopologyBuilder.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/PropertyTopologyBuilder.java b/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/PropertyTopologyBuilder.java index 9c589a1..6a19786 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/PropertyTopologyBuilder.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/PropertyTopologyBuilder.java @@ -36,7 +36,7 @@ public class PropertyTopologyBuilder implements TopologyBuilder { private List<Property> properties; public PropertyTopologyBuilder() { - properties = new ArrayList<Property>(); + properties = new ArrayList<>(); } public PropertyTopologyBuilder addProperty(Property property) { http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-server/src/main/java/org/apache/knox/gateway/topology/validation/TopologyValidator.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/topology/validation/TopologyValidator.java b/gateway-server/src/main/java/org/apache/knox/gateway/topology/validation/TopologyValidator.java index b6e4b10..090bffc 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/topology/validation/TopologyValidator.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/topology/validation/TopologyValidator.java @@ -53,7 +53,7 @@ public class TopologyValidator { } public boolean validateTopology() { - errors = new LinkedList<String>(); + errors = new LinkedList<>(); try { SchemaFactory fact = SchemaFactory .newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-server/src/test/java/org/apache/knox/gateway/TempletonDemo.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/TempletonDemo.java b/gateway-server/src/test/java/org/apache/knox/gateway/TempletonDemo.java index 6be9084..d39a4c1 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/TempletonDemo.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/TempletonDemo.java @@ -53,7 +53,7 @@ public class TempletonDemo { } private void demo( String url ) throws IOException { - List<NameValuePair> parameters = new ArrayList<NameValuePair>(); + List<NameValuePair> parameters = new ArrayList<>(); parameters.add( new BasicNameValuePair( "user.name", "hdfs" ) ); parameters.add( new BasicNameValuePair( "jar", "wordcount/org.apache.hadoop-examples.jar" ) ); parameters.add( new BasicNameValuePair( "class", "org.apache.org.apache.hadoop.examples.WordCount" ) ); http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologiesResource.java ---------------------------------------------------------------------- diff --git a/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologiesResource.java b/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologiesResource.java index 1902200..328adaf 100644 --- a/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologiesResource.java +++ b/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologiesResource.java @@ -141,7 +141,7 @@ public class TopologiesResource { TopologyService ts = services.getService(GatewayServices.TOPOLOGY_SERVICE); - ArrayList<SimpleTopology> st = new ArrayList<SimpleTopology>(); + ArrayList<SimpleTopology> st = new ArrayList<>(); for (org.apache.knox.gateway.topology.Topology t : ts.getTopologies()) { st.add(getSimpleTopology(t, config)); } @@ -764,7 +764,7 @@ public class TopologiesResource { @XmlElement(name="topology") @XmlElementWrapper(name="topologies") - private List<SimpleTopology> topologies = new ArrayList<SimpleTopology>(); + private List<SimpleTopology> topologies = new ArrayList<>(); public List<SimpleTopology> getTopologies(){ return topologies; http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-service-knoxsso/src/test/java/org/apache/knox/gateway/service/knoxsso/WebSSOResourceTest.java ---------------------------------------------------------------------- diff --git a/gateway-service-knoxsso/src/test/java/org/apache/knox/gateway/service/knoxsso/WebSSOResourceTest.java b/gateway-service-knoxsso/src/test/java/org/apache/knox/gateway/service/knoxsso/WebSSOResourceTest.java index a0b3744..48d69d4 100644 --- a/gateway-service-knoxsso/src/test/java/org/apache/knox/gateway/service/knoxsso/WebSSOResourceTest.java +++ b/gateway-service-knoxsso/src/test/java/org/apache/knox/gateway/service/knoxsso/WebSSOResourceTest.java @@ -863,7 +863,7 @@ public class WebSSOResourceTest { long expires) throws TokenServiceException { List<String> audiences = null; if (audience != null) { - audiences = new ArrayList<String>(); + audiences = new ArrayList<>(); audiences.add(audience); } return issueToken(p, audiences, algorithm, expires); http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-service-knoxtoken/src/test/java/org/apache/knox/gateway/service/knoxtoken/TokenServiceResourceTest.java ---------------------------------------------------------------------- diff --git a/gateway-service-knoxtoken/src/test/java/org/apache/knox/gateway/service/knoxtoken/TokenServiceResourceTest.java b/gateway-service-knoxtoken/src/test/java/org/apache/knox/gateway/service/knoxtoken/TokenServiceResourceTest.java index 7aef9ef..ffea408 100644 --- a/gateway-service-knoxtoken/src/test/java/org/apache/knox/gateway/service/knoxtoken/TokenServiceResourceTest.java +++ b/gateway-service-knoxtoken/src/test/java/org/apache/knox/gateway/service/knoxtoken/TokenServiceResourceTest.java @@ -271,7 +271,7 @@ public class TokenServiceResourceTest { EasyMock.expect(request.getServletContext()).andReturn(context).anyTimes(); X509Certificate trustedCertMock = EasyMock.createMock(X509Certificate.class); EasyMock.expect(trustedCertMock.getSubjectDN()).andReturn(new PrimaryPrincipal("CN=localhost,OU=Test, O=Hadoop, L=Test, ST=Test, C=US")).anyTimes(); - ArrayList<X509Certificate> certArrayList = new ArrayList<X509Certificate>(); + ArrayList<X509Certificate> certArrayList = new ArrayList<>(); certArrayList.add(trustedCertMock); X509Certificate[] certs = {}; EasyMock.expect(request.getAttribute("javax.servlet.request.X509Certificate")).andReturn(certArrayList.toArray(certs)).anyTimes(); @@ -328,7 +328,7 @@ public class TokenServiceResourceTest { EasyMock.expect(request.getServletContext()).andReturn(context).anyTimes(); X509Certificate trustedCertMock = EasyMock.createMock(X509Certificate.class); EasyMock.expect(trustedCertMock.getSubjectDN()).andReturn(new PrimaryPrincipal("CN=localhost, OU=Test, O=Hadoop, L=Test, ST=Test, C=US")).anyTimes(); - ArrayList<X509Certificate> certArrayList = new ArrayList<X509Certificate>(); + ArrayList<X509Certificate> certArrayList = new ArrayList<>(); certArrayList.add(trustedCertMock); X509Certificate[] certs = {}; EasyMock.expect(request.getAttribute("javax.servlet.request.X509Certificate")).andReturn(certArrayList.toArray(certs)).anyTimes(); @@ -735,7 +735,7 @@ public class TokenServiceResourceTest { long expires) throws TokenServiceException { ArrayList<String> audiences = null; if (audience != null) { - audiences = new ArrayList<String>(); + audiences = new ArrayList<>(); audiences.add(audience); } return issueToken(p, audiences, algorithm, expires); http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-service-test/src/main/java/org/apache/knox/gateway/service/test/ServiceTestResource.java ---------------------------------------------------------------------- diff --git a/gateway-service-test/src/main/java/org/apache/knox/gateway/service/test/ServiceTestResource.java b/gateway-service-test/src/main/java/org/apache/knox/gateway/service/test/ServiceTestResource.java index e82d62a..2ab6a14 100644 --- a/gateway-service-test/src/main/java/org/apache/knox/gateway/service/test/ServiceTestResource.java +++ b/gateway-service-test/src/main/java/org/apache/knox/gateway/service/test/ServiceTestResource.java @@ -390,7 +390,7 @@ public class ServiceTestResource { @XmlElement(name="ServiceTest") @XmlElementWrapper(name="Tests") - private List<ServiceTest> tests = new ArrayList<ServiceTest>(); + private List<ServiceTest> tests = new ArrayList<>(); @XmlElement(name="message") @XmlElementWrapper(name="messages") http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-service-test/src/main/java/org/apache/knox/gateway/service/test/deploy/ServiceTestDeploymentContributor.java ---------------------------------------------------------------------- diff --git a/gateway-service-test/src/main/java/org/apache/knox/gateway/service/test/deploy/ServiceTestDeploymentContributor.java b/gateway-service-test/src/main/java/org/apache/knox/gateway/service/test/deploy/ServiceTestDeploymentContributor.java index 7173b6d..ba5c19f 100644 --- a/gateway-service-test/src/main/java/org/apache/knox/gateway/service/test/deploy/ServiceTestDeploymentContributor.java +++ b/gateway-service-test/src/main/java/org/apache/knox/gateway/service/test/deploy/ServiceTestDeploymentContributor.java @@ -78,7 +78,7 @@ public class ServiceTestDeploymentContributor extends JerseyServiceDeploymentCon // 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-service-webhdfs/src/test/java/org/apache/knox/gateway/hdfs/dispatch/WebHdfsHaDispatchTest.java ---------------------------------------------------------------------- diff --git a/gateway-service-webhdfs/src/test/java/org/apache/knox/gateway/hdfs/dispatch/WebHdfsHaDispatchTest.java b/gateway-service-webhdfs/src/test/java/org/apache/knox/gateway/hdfs/dispatch/WebHdfsHaDispatchTest.java index 4de387a..7d2afad 100644 --- a/gateway-service-webhdfs/src/test/java/org/apache/knox/gateway/hdfs/dispatch/WebHdfsHaDispatchTest.java +++ b/gateway-service-webhdfs/src/test/java/org/apache/knox/gateway/hdfs/dispatch/WebHdfsHaDispatchTest.java @@ -52,7 +52,7 @@ public class WebHdfsHaDispatchTest { 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-shell/src/main/java/org/apache/knox/gateway/shell/Credentials.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/Credentials.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/Credentials.java index 2389146..4cf42f0 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/Credentials.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/Credentials.java @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.ServiceLoader; public class Credentials { - ArrayList<CredentialCollector> collectors = new ArrayList<CredentialCollector>(); + ArrayList<CredentialCollector> collectors = new ArrayList<>(); public Credentials add(String collectorType, String prompt, String name) throws CredentialCollectionException { http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/CreateTable.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/CreateTable.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/CreateTable.java index 6511760..e5075b6 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/CreateTable.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/CreateTable.java @@ -46,7 +46,7 @@ public class CreateTable { private static final String ATTRIBUTE_NAME = "name"; private String tableName; - private List<Attribute> attributes = new ArrayList<Attribute>(); + private List<Attribute> attributes = new ArrayList<>(); private List<Family<Request>> families = new ArrayList<Family<Request>>(); public Request( Hadoop session, String tableName ) { @@ -60,7 +60,7 @@ public class CreateTable { } public Family<Request> family( String name ) { - Family<Request> family = new Family<Request>( this, name ); + Family<Request> family = new Family<>( this, name ); families.add( family ); return family; } http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/Family.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/Family.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/Family.java index c0e423e..4c9388f 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/Family.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/Family.java @@ -23,7 +23,7 @@ public class Family<T extends FamilyContainer> { private T parent; private String name; - private List<Attribute> attributes = new ArrayList<Attribute>(); + private List<Attribute> attributes = new ArrayList<>(); public Family( T parent, String name ) { this.parent = parent; @@ -48,7 +48,7 @@ public class Family<T extends FamilyContainer> { } public Family<T> family( String name ) { - Family<T> family = new Family<T>( parent, name ); + Family<T> family = new Family<>( parent, name ); parent.addFamily( family ); return family; } http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/UpdateTable.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/UpdateTable.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/UpdateTable.java index 4602a6f..02d08e7 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/UpdateTable.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/UpdateTable.java @@ -54,7 +54,7 @@ public class UpdateTable { } public Family<Request> family( String name ) { - Family<Request> family = new Family<Request>( this, name ); + Family<Request> family = new Family<>( this, name ); families.add( family ); return family; } http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/QueryRows.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/QueryRows.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/QueryRows.java index 3c3a1af..b0445d6 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/QueryRows.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/QueryRows.java @@ -34,7 +34,7 @@ public class QueryRows { private String rowsId; private String tableName; - private List<Column> columns = new ArrayList<Column>(); + private List<Column> columns = new ArrayList<>(); private Long startTime; private Long endTime; private Long numVersions; http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/StoreRow.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/StoreRow.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/StoreRow.java index d994dbd..1c30485 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/StoreRow.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/row/StoreRow.java @@ -51,7 +51,7 @@ public class StoreRow { private String rowId; private String tableName; - private List<InsertableColumn> columns = new ArrayList<InsertableColumn>(); + private List<InsertableColumn> columns = new ArrayList<>(); public Request( Hadoop session, String rowId, String tableName ) { super( session ); http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/CreateScanner.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/CreateScanner.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/CreateScanner.java index 91e0316..a183f3d 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/CreateScanner.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hbase/table/scanner/CreateScanner.java @@ -57,7 +57,7 @@ public class CreateScanner { private String tableName; private String startRow; private String endRow; - private List<Column> columns = new ArrayList<Column>(); + private List<Column> columns = new ArrayList<>(); private Integer batch; private Long startTime; private Long endTime; http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Hive.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Hive.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Hive.java index a780c05..7ab79d9 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Hive.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Hive.java @@ -39,7 +39,7 @@ public class Hive { private String group; private String file; private String statusDir; - List<NameValuePair> params = new ArrayList<NameValuePair>(); + List<NameValuePair> params = new ArrayList<>(); public Request( Hadoop session ) { super( session ); http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Java.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Java.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Java.java index eb00e92..eb1cba6 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Java.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Java.java @@ -41,7 +41,7 @@ class Java { String app; String input; String output; - List<NameValuePair> params = new ArrayList<NameValuePair>(); + List<NameValuePair> params = new ArrayList<>(); public Request( Hadoop session ) { super( session ); http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Pig.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Pig.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Pig.java index 8147fb7..5203d81 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Pig.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Pig.java @@ -39,7 +39,7 @@ public class Pig { private String group; private String file; private String statusDir; - List<NameValuePair> params = new ArrayList<NameValuePair>(); + List<NameValuePair> params = new ArrayList<>(); public Request( Hadoop session ) { super( session ); http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Sqoop.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Sqoop.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Sqoop.java index 58945a2..a5b9556 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Sqoop.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Sqoop.java @@ -37,7 +37,7 @@ public class Sqoop { public static class Request extends AbstractRequest<Response> { private String statusDir; - List<NameValuePair> params = new ArrayList<NameValuePair>(); + List<NameValuePair> params = new ArrayList<>(); public Request( Hadoop session ) { super( session ); http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/CMFMasterService.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/CMFMasterService.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/CMFMasterService.java index 99b1c82..bed4a08 100644 --- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/CMFMasterService.java +++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/CMFMasterService.java @@ -134,7 +134,7 @@ public class CMFMasterService { protected void persistMaster(char[] master, File masterFile) { EncryptionResult atom = encryptMaster(master); try { - ArrayList<String> lines = new ArrayList<String>(); + ArrayList<String> lines = new ArrayList<>(); lines.add(MASTER_PERSISTENCE_TAG); String line = Base64.encodeBase64String(( @@ -192,7 +192,7 @@ public class CMFMasterService { // " +" regular expression for 1 or more spaces final String[] argsString = args.split(" +"); - List<String> cmdList = new ArrayList<String>(); + List<String> cmdList = new ArrayList<>(); cmdList.add("/bin/chmod"); cmdList.addAll(Arrays.asList(argsString)); cmdList.add(file.getAbsolutePath()); http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/impl/JWTToken.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/impl/JWTToken.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/impl/JWTToken.java index 3a4b596..a5be576 100644 --- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/impl/JWTToken.java +++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/impl/JWTToken.java @@ -60,7 +60,7 @@ public class JWTToken implements JWT { if (claimsArray[2] != null) { if (audiences == null) { - audiences = new ArrayList<String>(); + audiences = new ArrayList<>(); } audiences.add(claimsArray[2]); } http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/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 afe2db8..01de44d 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 @@ -62,7 +62,7 @@ public class Provider { public Collection<Param> getParamsList(){ - ArrayList<Param> paramList = new ArrayList<Param>(); + ArrayList<Param> paramList = new ArrayList<>(); for(Map.Entry<String, String> entry : params.entrySet()){ Param p = new Param(); http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/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 fc78dd3..c5e2585 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 @@ -62,7 +62,7 @@ public class Service { public List<String> getUrls() { if ( urls == null ) { - urls = new ArrayList<String>(); + urls = new ArrayList<>(); } return urls; } @@ -88,7 +88,7 @@ public class Service { public Collection<Param> getParamsList(){ - ArrayList<Param> paramList = new ArrayList<Param>(); + ArrayList<Param> paramList = new ArrayList<>(); for(Map.Entry<String, String> entry : params.entrySet()){ Param p = new Param(); http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Topology.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Topology.java b/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Topology.java index 4caf8e7..ddf8575 100644 --- a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Topology.java +++ b/gateway-spi/src/main/java/org/apache/knox/gateway/topology/Topology.java @@ -35,11 +35,11 @@ public class Topology { private String defaultServicePath = null; private long timestamp; private boolean isGenerated; - public List<Provider> providerList = new ArrayList<Provider>(); + public List<Provider> providerList = new ArrayList<>(); private Map<String,Map<String,Provider>> providerMap = new HashMap<>(); - public List<Service> services = new ArrayList<Service>(); + public List<Service> services = new ArrayList<>(); private MultiKeyMap serviceMap; - private List<Application> applications = new ArrayList<Application>(); + private List<Application> applications = new ArrayList<>(); private Map<String,Application> applicationMap = new HashMap<>(); private CustomDispatch dispatch = null; http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/token/impl/JWTTokenTest.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/token/impl/JWTTokenTest.java b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/token/impl/JWTTokenTest.java index 964ce9c..0eb70c6 100644 --- a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/token/impl/JWTTokenTest.java +++ b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/token/impl/JWTTokenTest.java @@ -82,7 +82,7 @@ public class JWTTokenTest extends org.junit.Assert { claims[1] = "john....@example.com"; claims[2] = null; claims[3] = Long.toString( ( System.currentTimeMillis()/1000 ) + 300); - List<String> audiences = new ArrayList<String>(); + List<String> audiences = new ArrayList<>(); audiences.add("https://login.example.com";); JWT token = new JWTToken("RS256", claims, audiences); @@ -100,7 +100,7 @@ public class JWTTokenTest extends org.junit.Assert { claims[1] = "john....@example.com"; claims[2] = null; claims[3] = Long.toString( ( System.currentTimeMillis()/1000 ) + 300); - List<String> audiences = new ArrayList<String>(); + List<String> audiences = new ArrayList<>(); audiences.add("https://login.example.com";); audiences.add("KNOXSSO"); @@ -119,7 +119,7 @@ public class JWTTokenTest extends org.junit.Assert { claims[1] = "john....@example.com"; claims[2] = "LJM"; claims[3] = Long.toString( ( System.currentTimeMillis()/1000 ) + 300); - ArrayList<String> audiences = new ArrayList<String>(); + ArrayList<String> audiences = new ArrayList<>(); audiences.add("https://login.example.com";); audiences.add("KNOXSSO"); http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestConfig.java ---------------------------------------------------------------------- diff --git a/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestConfig.java b/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestConfig.java index 3c4143b..98e2d33 100644 --- a/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestConfig.java +++ b/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestConfig.java @@ -230,7 +230,7 @@ public class GatewayTestConfig extends Configuration implements GatewayConfig { */ @Override public List getExcludedSSLProtocols() { - List<String> protocols = new ArrayList<String>(); + List<String> protocols = new ArrayList<>(); protocols.add("SSLv3"); return protocols; } @@ -717,7 +717,7 @@ public class GatewayTestConfig extends Configuration implements GatewayConfig { @Override public List<String> getAutoDeployTopologyNames() { - ArrayList<String> names = new ArrayList<String>(); + ArrayList<String> names = new ArrayList<>(); names.add("manager"); names.add("admin"); return null; http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockServer.java ---------------------------------------------------------------------- diff --git a/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockServer.java b/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockServer.java index 2cd43c1..fb8afa1 100644 --- a/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockServer.java +++ b/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockServer.java @@ -50,7 +50,7 @@ public class MockServer { private String name; private Server jetty; - private Queue<MockInteraction> interactions = new LinkedList<MockInteraction>(); + private Queue<MockInteraction> interactions = new LinkedList<>(); public MockServer( String name ) { this.name = name; http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-test/src/test/java/org/apache/knox/gateway/GatewayAppFuncTest.java ---------------------------------------------------------------------- diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayAppFuncTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayAppFuncTest.java index d5f5954..12c668e 100644 --- a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayAppFuncTest.java +++ b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayAppFuncTest.java @@ -660,7 +660,7 @@ public class GatewayAppFuncTest { } public static Collection<String> toNames( File[] files ) { - List<String> names = new ArrayList<String>( files.length ); + List<String> names = new ArrayList<>( files.length ); for( File file : files ) { names.add( file.getAbsolutePath() ); } http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/appender/JdbmStoreAndForwardAppender.java ---------------------------------------------------------------------- diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/appender/JdbmStoreAndForwardAppender.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/appender/JdbmStoreAndForwardAppender.java index d52a875..98cb2ab 100644 --- a/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/appender/JdbmStoreAndForwardAppender.java +++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/audit/log4j/appender/JdbmStoreAndForwardAppender.java @@ -53,7 +53,7 @@ public class JdbmStoreAndForwardAppender extends AppenderSkeleton { @Override public void activateOptions() { try { - queue = new JdbmQueue<LoggingEvent>( file ); + queue = new JdbmQueue<>( file ); } catch ( IOException e ) { throw new IllegalStateException( e ); } http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-util-common/src/main/java/org/apache/knox/gateway/util/IpAddressValidator.java ---------------------------------------------------------------------- diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/IpAddressValidator.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/IpAddressValidator.java index 65aa6fc..8cb1d03 100644 --- a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/IpAddressValidator.java +++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/IpAddressValidator.java @@ -28,12 +28,12 @@ public class IpAddressValidator { /** * The parsed list of ip addresses */ - private ArrayList<String> ipaddr = new ArrayList<String>(); + private ArrayList<String> ipaddr = new ArrayList<>(); /** * IP addresses from the ipaddr list that contain a wildcard character '*' */ - private ArrayList<String> wildCardIPs = new ArrayList<String>(); + private ArrayList<String> wildCardIPs = new ArrayList<>(); /** * Optimization based on empty IP address list or an explicit '*' wildcard @@ -57,8 +57,8 @@ public class IpAddressValidator { */ private void parseIpAddesses(String commaSeparatedIpAddresses) { String[] ips = commaSeparatedIpAddresses.split(","); - ipaddr = new ArrayList<String>(); - wildCardIPs = new ArrayList<String>(); + ipaddr = new ArrayList<>(); + wildCardIPs = new ArrayList<>(); Collections.addAll(ipaddr, ips); if (!ipaddr.contains("*")) { anyIP = false; http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonPath.java ---------------------------------------------------------------------- diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonPath.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonPath.java index 2dd4cb2..fcfb972 100644 --- a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonPath.java +++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonPath.java @@ -128,7 +128,7 @@ public class JsonPath { if( list != null ) { throw new IllegalArgumentException( expression ); } - list = new ArrayList<Segment>(); + list = new ArrayList<>(); segment = new Segment( Segment.Type.ROOT ); list.add( segment ); break; @@ -211,8 +211,8 @@ public class JsonPath { JsonNode child; Match newMatch; List<Match> tempMatches; - List<Match> oldMatches = new ArrayList<Match>(); - List<Match> newMatches = new ArrayList<Match>(); + List<Match> oldMatches = new ArrayList<>(); + List<Match> newMatches = new ArrayList<>(); if( root != null ) { for( Segment seg : segments ) { if( Segment.Type.ROOT == seg.getType() ) { http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/JdbmQueueTest.java ---------------------------------------------------------------------- diff --git a/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/JdbmQueueTest.java b/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/JdbmQueueTest.java index 98cfa2f..885ce55 100644 --- a/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/JdbmQueueTest.java +++ b/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/JdbmQueueTest.java @@ -48,7 +48,7 @@ public class JdbmQueueTest { public void setup() throws IOException { file = new File( "target/JdbmQueueTest" ); cleanup(); - queue = new JdbmQueue<String>( file ); + queue = new JdbmQueue<>( file ); } @After http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-util-common/src/test/java/org/apache/knox/gateway/util/MimeTypeMapTest.java ---------------------------------------------------------------------- diff --git a/gateway-util-common/src/test/java/org/apache/knox/gateway/util/MimeTypeMapTest.java b/gateway-util-common/src/test/java/org/apache/knox/gateway/util/MimeTypeMapTest.java index 730749c..dc24e14 100644 --- a/gateway-util-common/src/test/java/org/apache/knox/gateway/util/MimeTypeMapTest.java +++ b/gateway-util-common/src/test/java/org/apache/knox/gateway/util/MimeTypeMapTest.java @@ -29,7 +29,7 @@ public class MimeTypeMapTest { @Test public void testTypeFallback() throws MimeTypeParseException { - MimeTypeMap<String> map = new MimeTypeMap<String>(); + MimeTypeMap<String> map = new MimeTypeMap<>(); map.put( new MimeType( "text/xml" ), "text/xml" ); map.put( new MimeType( "text/json" ), "text/json" ); http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Command.java ---------------------------------------------------------------------- diff --git a/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Command.java b/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Command.java index 67d10d5..6600f44 100644 --- a/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Command.java +++ b/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Command.java @@ -111,7 +111,7 @@ class Command { } private static List<URL> loadClassPath( File base, String classPath ) throws MalformedURLException { - List<URL> urls = new ArrayList<URL>(); + List<URL> urls = new ArrayList<>(); StringTokenizer parser = new StringTokenizer( classPath, CLASS_PATH_DELIM, false ); while( parser.hasMoreTokens() ) { String libPath = parser.nextToken().trim(); http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/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 b769352..2b157ae 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 @@ -60,7 +60,7 @@ public class Builder { this.port = null; this.isAbsolute = false; this.isDirectory = false; - this.path = new ArrayList<Path>(); + this.path = new ArrayList<>(); this.hasQuery = false; this.query = new LinkedHashMap<String,Query>(); this.extra = null; @@ -136,7 +136,7 @@ public class Builder { } private List<Path> copyPath( List<Path> orig ) { - List<Path> copy = new ArrayList<Path>(); + List<Path> copy = new ArrayList<>(); if( orig != null ) { for( Path path : orig ) { copy.add( new Path( path ) ); http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Matcher.java ---------------------------------------------------------------------- diff --git a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Matcher.java b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Matcher.java index 0c2b58f..f0b7780 100644 --- a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Matcher.java +++ b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Matcher.java @@ -344,8 +344,8 @@ public class Matcher<V> { private class Status { - List<MatchSegment> candidates = new ArrayList<MatchSegment>(); - List<MatchSegment> matches = new ArrayList<MatchSegment>(); + List<MatchSegment> candidates = new ArrayList<>(); + List<MatchSegment> matches = new ArrayList<>(); List<MatchSegment> temp; private void swapMatchesToCandidates() { @@ -383,7 +383,7 @@ public class Matcher<V> { private List<String> getOrAddValues( String name ) { List<String> values = resolve( name ); if( values == null ) { - values = new ArrayList<String>( 1 ); + values = new ArrayList<>( 1 ); map.put( name, values ); } return values; @@ -456,7 +456,7 @@ public class Matcher<V> { private QueryNode addQuery( Template template, V value ) { if( queries == null ) { - queries = new LinkedHashSet<QueryNode>(); + queries = new LinkedHashSet<>(); } QueryNode query = new QueryNode( template, value ); queries.add( query ); http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/MockParams.java ---------------------------------------------------------------------- diff --git a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/MockParams.java b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/MockParams.java index 0990eaa..a5c7dae 100644 --- a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/MockParams.java +++ b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/MockParams.java @@ -34,7 +34,7 @@ public class MockParams implements Params { private List<String> getOrAddValues( String name ) { List<String> values = resolve( name ); if( values == null ) { - values = new ArrayList<String>( 1 ); + values = new ArrayList<>( 1 ); map.put( name, values ); } return values; http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Rewriter.java ---------------------------------------------------------------------- diff --git a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Rewriter.java b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Rewriter.java index f33b3d4..3b26e33 100644 --- a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Rewriter.java +++ b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Rewriter.java @@ -46,7 +46,7 @@ public class Rewriter { } public Rewriter() { - rules = new Matcher<Template>(); + rules = new Matcher<>(); } public void addRule( Template inputTemplate, Template outputTemplate ) { http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/ExpanderTest.java ---------------------------------------------------------------------- diff --git a/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/ExpanderTest.java b/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/ExpanderTest.java index c3506db..c04ffb2 100644 --- a/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/ExpanderTest.java +++ b/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/ExpanderTest.java @@ -414,7 +414,7 @@ public class ExpanderTest { pattern = Parser.parseTemplate( "*://*:*/**/templeton/v1/?{**}" ); template = Parser.parseTemplate( "{$serviceUrl[WEBHCAT]}/v1/?{**}" ); - matcher = new Matcher<Void>(); + matcher = new Matcher<>(); matcher.add( pattern, null ); match = matcher.match( input ); @@ -446,7 +446,7 @@ public class ExpanderTest { pattern = Parser.parseTemplate( "*://*:*/{contextRoot}/?{**}#{fragment}" ); template = Parser.parseTemplate( "{$gateway.url}/foo/{contextRoot}/?{**}#{fragment}" ); - matcher = new Matcher<Void>(); + matcher = new Matcher<>(); matcher.add( pattern, null ); match = matcher.match( input ); @@ -482,7 +482,7 @@ public class ExpanderTest { // Check to make sure that you can use constants within the {} template = Parser.parseTemplate( "{root=ROOT}/{path=**}" ); rewrite = Parser.parseTemplate( "{root}/{path}" ); - matcher = new Matcher<Void>(); + matcher = new Matcher<>(); matcher.add( template, null ); input = Parser.parseLiteral( "ROOT/child/path" ); match = matcher.match( input ); @@ -493,7 +493,7 @@ public class ExpanderTest { // Check to see what happens when you use the special { character within the {}. template = Parser.parseTemplate( "{root={}/{path=**}" ); rewrite = Parser.parseTemplate( "{root}/{path}" ); - matcher = new Matcher<Void>(); + matcher = new Matcher<>(); matcher.add( template, null ); input = Parser.parseLiteral( "{/child/path" ); match = matcher.match( input ); @@ -504,7 +504,7 @@ public class ExpanderTest { // Check to see what happens when you use the special } character within the {}. template = Parser.parseTemplate( "{root=}}/{path=**}" ); rewrite = Parser.parseTemplate( "{root}/{path}" ); - matcher = new Matcher<Void>(); + matcher = new Matcher<>(); matcher.add( template, null ); input = Parser.parseLiteral( "}/child/path" ); match = matcher.match( input ); @@ -515,7 +515,7 @@ public class ExpanderTest { // Check to see what happens when you use the special } character within the {}. template = Parser.parseTemplate( "{root={}}/{path=**}" ); rewrite = Parser.parseTemplate( "{root}/{path}" ); - matcher = new Matcher<Void>(); + matcher = new Matcher<>(); matcher.add( template, null ); input = Parser.parseLiteral( "{}/child/path" ); match = matcher.match( input ); @@ -526,7 +526,7 @@ public class ExpanderTest { template = Parser.parseTemplate( "{var=${*}}/{path=**}" ); rewrite = Parser.parseTemplate( "{var}/{path}" ); - matcher = new Matcher<Void>(); + matcher = new Matcher<>(); matcher.add( template, null ); input = Parser.parseLiteral( "${app.dir}/child/path" ); http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/FunctionTest.java ---------------------------------------------------------------------- diff --git a/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/FunctionTest.java b/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/FunctionTest.java index bc138f8..4721546 100644 --- a/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/FunctionTest.java +++ b/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/FunctionTest.java @@ -155,7 +155,7 @@ public class FunctionTest { @Override public List<String> evaluate( String function, List<String> parameters ) { - List<String> result = new ArrayList<String>( parameters.size() ); + List<String> result = new ArrayList<>( parameters.size() ); for( String parameter : parameters ) { result.add( "<" + function + ":" + parameter + ">" ); }
