Repository: knox Updated Branches: refs/heads/master 3f360a77b -> a46a232b7
KNOX-1536 - Removing more redundant type declarations Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/a46a232b Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/a46a232b Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/a46a232b Branch: refs/heads/master Commit: a46a232b7e2281a8625c8413df9c416dbc1923d4 Parents: 3f360a7 Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Oct 23 14:53:07 2018 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Oct 23 14:53:07 2018 +0100 ---------------------------------------------------------------------- .../org/apache/knox/gateway/i18n/messages/MessagesFactory.java | 2 +- .../i18n/messages/loggers/sout/SoutMessageLoggerFactory.java | 2 +- .../i18n/messages/loggers/test/TestMessageLoggerFactory.java | 2 +- .../apache/knox/gateway/i18n/resources/ResourcesFactory.java | 2 +- .../gateway/services/topology/DefaultTopologyServiceTest.java | 2 +- .../java/org/apache/knox/gateway/websockets/BadUrlTest.java | 2 +- .../org/apache/knox/gateway/websockets/WebsocketEchoTest.java | 2 +- .../gateway/websockets/WebsocketMultipleConnectionTest.java | 2 +- .../org/apache/knox/gateway/shell/hbase/table/CreateTable.java | 2 +- .../org/apache/knox/gateway/shell/hbase/table/UpdateTable.java | 2 +- .../src/main/java/org/apache/knox/gateway/launcher/Config.java | 2 +- .../java/org/apache/knox/gateway/util/urltemplate/Builder.java | 2 +- .../java/org/apache/knox/gateway/util/urltemplate/Matcher.java | 4 ++-- .../java/org/apache/knox/gateway/util/urltemplate/Segment.java | 6 +++--- 14 files changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/a46a232b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessagesFactory.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessagesFactory.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessagesFactory.java index a53b889..ff9e95c 100644 --- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessagesFactory.java +++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/MessagesFactory.java @@ -31,7 +31,7 @@ import java.util.concurrent.ConcurrentHashMap; public class MessagesFactory { private static MessageLoggerFactory loggers = getMessageLoggerFactory(); - private static Map<Class<?>, Object> proxies = new ConcurrentHashMap<Class<?>, Object>(); + private static Map<Class<?>, Object> proxies = new ConcurrentHashMap<>(); @SuppressWarnings( "unchecked" ) public static <T> T get( Class<T> clazz ) { http://git-wip-us.apache.org/repos/asf/knox/blob/a46a232b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/sout/SoutMessageLoggerFactory.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/sout/SoutMessageLoggerFactory.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/sout/SoutMessageLoggerFactory.java index c20aa08..04a7d84 100644 --- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/sout/SoutMessageLoggerFactory.java +++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/sout/SoutMessageLoggerFactory.java @@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap; public class SoutMessageLoggerFactory implements MessageLoggerFactory { private static SoutMessageLoggerFactory INSTANCE; - private static final Map<String,MessageLogger> LOGGERS = new ConcurrentHashMap<String,MessageLogger>(); + private static final Map<String,MessageLogger> LOGGERS = new ConcurrentHashMap<>(); public static SoutMessageLoggerFactory getFactory() { if( INSTANCE == null ) { http://git-wip-us.apache.org/repos/asf/knox/blob/a46a232b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageLoggerFactory.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageLoggerFactory.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageLoggerFactory.java index 35108c0..e398365 100644 --- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageLoggerFactory.java +++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/messages/loggers/test/TestMessageLoggerFactory.java @@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap; public class TestMessageLoggerFactory implements MessageLoggerFactory { private static TestMessageLoggerFactory INSTANCE; - private static final Map<String,MessageLogger> LOGGERS = new ConcurrentHashMap<String,MessageLogger>(); + private static final Map<String,MessageLogger> LOGGERS = new ConcurrentHashMap<>(); public static TestMessageLoggerFactory getFactory() { if( INSTANCE == null ) { http://git-wip-us.apache.org/repos/asf/knox/blob/a46a232b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/ResourcesFactory.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/ResourcesFactory.java b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/ResourcesFactory.java index c005448..de835a5 100644 --- a/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/ResourcesFactory.java +++ b/gateway-i18n/src/main/java/org/apache/knox/gateway/i18n/resources/ResourcesFactory.java @@ -26,7 +26,7 @@ import java.util.concurrent.ConcurrentHashMap; */ public class ResourcesFactory { - private static Map<Class<?>, Object> proxies = new ConcurrentHashMap<Class<?>, Object>(); + private static Map<Class<?>, Object> proxies = new ConcurrentHashMap<>(); @SuppressWarnings( "unchecked" ) public static <T> T get( Class<T> clazz ) { http://git-wip-us.apache.org/repos/asf/knox/blob/a46a232b/gateway-server/src/test/java/org/apache/knox/gateway/services/topology/DefaultTopologyServiceTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/services/topology/DefaultTopologyServiceTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/services/topology/DefaultTopologyServiceTest.java index ac50312..e63a6c8 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/services/topology/DefaultTopologyServiceTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/services/topology/DefaultTopologyServiceTest.java @@ -594,7 +594,7 @@ public class DefaultTopologyServiceTest { private class TestTopologyListener implements TopologyListener { - ArrayList<List<TopologyEvent>> events = new ArrayList<List<TopologyEvent>>(); + ArrayList<List<TopologyEvent>> events = new ArrayList<>(); @Override public void handleTopologyEvent(List<TopologyEvent> events) { http://git-wip-us.apache.org/repos/asf/knox/blob/a46a232b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadUrlTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadUrlTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadUrlTest.java index f669404..885dbbc 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadUrlTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadUrlTest.java @@ -294,7 +294,7 @@ public class BadUrlTest { private static class TestTopologyListener implements TopologyListener { - public ArrayList<List<TopologyEvent>> events = new ArrayList<List<TopologyEvent>>(); + public ArrayList<List<TopologyEvent>> events = new ArrayList<>(); @Override public void handleTopologyEvent(List<TopologyEvent> events) { http://git-wip-us.apache.org/repos/asf/knox/blob/a46a232b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoTest.java index fa389e2..02b8dec 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoTest.java @@ -373,7 +373,7 @@ public class WebsocketEchoTest { private static class TestTopologyListener implements TopologyListener { - public ArrayList<List<TopologyEvent>> events = new ArrayList<List<TopologyEvent>>(); + public ArrayList<List<TopologyEvent>> events = new ArrayList<>(); @Override public void handleTopologyEvent(List<TopologyEvent> events) { http://git-wip-us.apache.org/repos/asf/knox/blob/a46a232b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketMultipleConnectionTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketMultipleConnectionTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketMultipleConnectionTest.java index cc59a8e..c8b9545 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketMultipleConnectionTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketMultipleConnectionTest.java @@ -365,7 +365,7 @@ public class WebsocketMultipleConnectionTest { private static class TestTopologyListener implements TopologyListener { - public ArrayList<List<TopologyEvent>> events = new ArrayList<List<TopologyEvent>>(); + public ArrayList<List<TopologyEvent>> events = new ArrayList<>(); @Override public void handleTopologyEvent(List<TopologyEvent> events) { http://git-wip-us.apache.org/repos/asf/knox/blob/a46a232b/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 e5075b6..8d00b10 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 @@ -47,7 +47,7 @@ public class CreateTable { private String tableName; private List<Attribute> attributes = new ArrayList<>(); - private List<Family<Request>> families = new ArrayList<Family<Request>>(); + private List<Family<Request>> families = new ArrayList<>(); public Request( Hadoop session, String tableName ) { super( session ); http://git-wip-us.apache.org/repos/asf/knox/blob/a46a232b/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 02d08e7..7271d73 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 @@ -46,7 +46,7 @@ public class UpdateTable { private static final String ATTRIBUTE_NAME = "name"; private String tableName; - private List<Family<Request>> families = new ArrayList<Family<Request>>(); + private List<Family<Request>> families = new ArrayList<>(); public Request( Hadoop session, String tableName ) { super( session ); http://git-wip-us.apache.org/repos/asf/knox/blob/a46a232b/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Config.java ---------------------------------------------------------------------- diff --git a/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Config.java b/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Config.java index 63d7709..ce62750 100644 --- a/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Config.java +++ b/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Config.java @@ -39,7 +39,7 @@ public class Config { Map<String,Map<String,String>> sections; public Config() { - sections = new LinkedHashMap<String,Map<String,String>>(); + sections = new LinkedHashMap<>(); } public void load( Reader reader ) throws IOException { http://git-wip-us.apache.org/repos/asf/knox/blob/a46a232b/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 2b157ae..533dc54 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 @@ -62,7 +62,7 @@ public class Builder { this.isDirectory = false; this.path = new ArrayList<>(); this.hasQuery = false; - this.query = new LinkedHashMap<String,Query>(); + this.query = new LinkedHashMap<>(); this.extra = null; this.hasFragment = false; this.fragment = null; http://git-wip-us.apache.org/repos/asf/knox/blob/a46a232b/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 f0b7780..d307156 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 @@ -56,7 +56,7 @@ public class Matcher<V> { private PathNode root; public Matcher() { - map = new LinkedHashMap<Template,V>(); + map = new LinkedHashMap<>(); root = new PathNode( null, null ); } @@ -447,7 +447,7 @@ public class Matcher<V> { private PathNode addPath( Segment path ) { if( children == null ) { - children = new LinkedHashMap<Segment,PathNode>(); + children = new LinkedHashMap<>(); } PathNode child = new PathNode( this, path ); children.put( path, child ); http://git-wip-us.apache.org/repos/asf/knox/blob/a46a232b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Segment.java ---------------------------------------------------------------------- diff --git a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Segment.java b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Segment.java index e1c1205..61eb1d4 100644 --- a/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Segment.java +++ b/gateway-util-urltemplate/src/main/java/org/apache/knox/gateway/util/urltemplate/Segment.java @@ -47,19 +47,19 @@ abstract class Segment { // protected Segment( String paramName, String valuePattern ) { // this.paramName = paramName; -// this.values = new LinkedHashMap<String,Value>(); +// this.values = new LinkedHashMap<>(); // this.values.put( valuePattern, new Value( valuePattern ) ); // } protected Segment( Token token ) { this.token = token; - this.values = new LinkedHashMap<String,Value>(); + this.values = new LinkedHashMap<>(); this.values.put( token.effectivePattern, new Value( token ) ); } // protected Segment( Segment that ) { // this.paramName = that.paramName; -// this.values = new LinkedHashMap<String,Value>(); +// this.values = new LinkedHashMap<>(); // for( Value thatValue : that.getValues() ) { // Value thisValue = new Value( thatValue ); // this.values.put( thisValue.getPattern(), thisValue );
