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:18 UTC
[1/3] knox git commit: KNOX-1536 - Replace redundant types with the
diamond operator
Repository: knox
Updated Branches:
refs/heads/master 76770fbea -> 84d794f84
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/MatcherTest.java
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/MatcherTest.java b/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/MatcherTest.java
index 6ec5238..0e8941f 100644
--- a/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/MatcherTest.java
+++ b/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/MatcherTest.java
@@ -61,7 +61,7 @@ public class MatcherTest {
Template patternTemplate, inputTemplate;
Matcher<String>.Match match;
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
patternTemplate = Parser.parseTemplate( "*://*:*/a/{pathB=**}/c" );
matcher.add( patternTemplate, "webhdfs" );
inputTemplate = Parser.parseLiteral( "s://h:5/a/b1/b2/c" );
@@ -70,7 +70,7 @@ public class MatcherTest {
assertThat( match.getValue(), is( "webhdfs" ) );
assertThat( match.getParams().resolve( "pathB" ), hasItems( "b1", "b2" ) );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
inputTemplate = Parser.parseLiteral( "s://h:5/a/b/c" );
patternTemplate = Parser.parseTemplate( "{scheme=*}://{host=*}:{port=*}/a/{pathB=**}/c" );
matcher.add( patternTemplate, "webhdfs" );
@@ -80,7 +80,7 @@ public class MatcherTest {
assertThat( match.getParams().resolve( "pathB" ), hasItems( "b" ) );
// KNOX-357
-// matcher = new Matcher<String>();
+// matcher = new Matcher<>();
// inputTemplate = Parser.parse( "s://h:5/a/c" );
// patternTemplate = Parser.parse( "{scheme=*}://{host=*}:{port=*}/a/{pathB=**}/c" );
// matcher.add( patternTemplate, "webhdfs" );
@@ -88,7 +88,7 @@ public class MatcherTest {
// assertThat( match, notNullValue() );
// assertThat( match.getValue(), is( "webhdfs" ) );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
inputTemplate = Parser.parseLiteral( "s://h:5/a/b" );
patternTemplate = Parser.parseTemplate( "{scheme=*}://{host=*}:{port=*}/{pathA=**}/b" );
matcher.add( patternTemplate, "webhdfs" );
@@ -97,7 +97,7 @@ public class MatcherTest {
assertThat( match.getValue(), is( "webhdfs" ) );
// KNOX-357
-// matcher = new Matcher<String>();
+// matcher = new Matcher<>();
// inputTemplate = Parser.parse( "s://h:5/b" );
// patternTemplate = Parser.parse( "{scheme=*}://{host=*}:{port=*}/{pathA=**}/b" );
// matcher.add( patternTemplate, "webhdfs" );
@@ -112,7 +112,7 @@ public class MatcherTest {
Template patternTemplate, inputTemplate;
Matcher<String>.Match match;
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
inputTemplate = Parser.parseLiteral( "https://127.0.0.1:8443/webhdfs/v1/tmp?op=LISTSTATUS" );
patternTemplate = Parser.parseTemplate( "*://*:*/webhdfs/{version}/{path=**}?{**}" );
matcher.add( patternTemplate, "webhdfs" );
@@ -120,7 +120,7 @@ public class MatcherTest {
assertThat( match, notNullValue() );
assertThat( match.getValue(), is( "webhdfs" ) );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
inputTemplate = Parser.parseLiteral( "https://127.0.0.1:8443/top/webhdfs/v1/tmp?op=LISTSTATUS" );
patternTemplate = Parser.parseTemplate( "*://*:*/**/webhdfs/{version}/{path=**}?{**}" );
matcher.add( patternTemplate, "webhdfs" );
@@ -128,7 +128,7 @@ public class MatcherTest {
assertThat( match, notNullValue() );
assertThat( match.getValue(), is( "webhdfs" ) );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
inputTemplate = Parser.parseLiteral( "https://127.0.0.1:8443/a/b/c" );
patternTemplate = Parser.parseTemplate( "*://*:*/**/c" );
matcher.add( patternTemplate, "webhdfs" );
@@ -136,7 +136,7 @@ public class MatcherTest {
assertThat( match, notNullValue() );
assertThat( match.getValue(), is( "webhdfs" ) );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
inputTemplate = Parser.parseLiteral( "https://127.0.0.1:8443/a/b/c/d" );
patternTemplate = Parser.parseTemplate( "*://*:*/{pathA=**}/b/{pathC=**}/d" );
matcher.add( patternTemplate, "webhdfs" );
@@ -146,7 +146,7 @@ public class MatcherTest {
assertThat( match.getParams().resolve( "pathA" ), hasItems( "a" ) );
assertThat( match.getParams().resolve( "pathC" ), hasItems( "c" ) );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
inputTemplate = Parser.parseLiteral( "https://127.0.0.1:8443/a1/a2/b/c1/c2/d" );
patternTemplate = Parser.parseTemplate( "*://*:*/{pathA=**}/b/{pathC=**}/d" );
matcher.add( patternTemplate, "webhdfs" );
@@ -157,7 +157,7 @@ public class MatcherTest {
assertThat( match.getParams().resolve( "pathC" ), hasItems( "c1", "c2" ) );
// KNOX-357
-// matcher = new Matcher<String>();
+// matcher = new Matcher<>();
// inputTemplate = Parser.parse( "https://0.0.0.0:0/b" );
// patternTemplate = Parser.parse( "*://*:*/**/b/**" );
// matcher.add( patternTemplate, "webhdfs" );
@@ -166,7 +166,7 @@ public class MatcherTest {
// assertThat( match.getValue(), is( "webhdfs" ) );
// KNOX-357
-// matcher = new Matcher<String>();
+// matcher = new Matcher<>();
// inputTemplate = Parser.parse( "https://127.0.0.1:8443/webhdfs/v1/tmp?op=LISTSTATUS" );
// patternTemplate = Parser.parse( "*://*:*/**/webhdfs/{version}/{path=**}?{**}" );
// matcher.add( patternTemplate, "webhdfs" );
@@ -182,7 +182,7 @@ public class MatcherTest {
Matcher<String>.Match match;
// First verify that if .../test_table/test_row/family1... works.
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
inputTemplate = Parser.parseLiteral( "https://localhost:8443/gateway/sandbox/hbase/test_table/test_row/family1:row2_col1,family2/0,9223372036854775807?v=1" );
patternTemplate = Parser.parseTemplate( "*://*:*/**/webhdfs/{version}/{path=**}?{**}" );
matcher.add( patternTemplate, "webhdfs" );
@@ -190,7 +190,7 @@ public class MatcherTest {
assertThat( match, nullValue() );
// Then reproduce the issue with .../test_table/*/family1..
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
inputTemplate = Parser.parseLiteral( "https://localhost:8443/gateway/sandbox/hbase/test_table/*/family1:row2_col1,family2/0,9223372036854775807?v=1" );
patternTemplate = Parser.parseTemplate( "*://*:*/**/webhdfs/{version}/{path=**}?{**}" );
matcher.add( patternTemplate, "webhdfs" );
@@ -198,7 +198,7 @@ public class MatcherTest {
assertThat( match, nullValue() );
// Reproduce the issue where the wrong match was picked when there was a "*" in the input URL template.
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
inputTemplate = Parser.parseLiteral( "https://localhost:8443/gateway/sandbox/hbase/test_table/*/family1:row2_col1,family2/0,9223372036854775807?v=1" );
patternTemplate = Parser.parseTemplate( "*://*:*/**/webhdfs/{version}/{path=**}?{**}" );
matcher.add( patternTemplate, "webhdfs" );
@@ -216,7 +216,7 @@ public class MatcherTest {
///////
patternTemplate = Parser.parseTemplate( "*://*:*" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( patternTemplate, "test-match" );
inputTemplate = Parser.parseLiteral( "test-scheme://test-host:42" );
@@ -231,7 +231,7 @@ public class MatcherTest {
///////
patternTemplate = Parser.parseTemplate( "*://*:*/" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( patternTemplate, "test-match" );
inputTemplate = Parser.parseLiteral( "test-scheme://test-host:42" );
@@ -246,7 +246,7 @@ public class MatcherTest {
///////
patternTemplate = Parser.parseTemplate( "*://*:*/*" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( patternTemplate, "test-match" );
inputTemplate = Parser.parseLiteral( "test-scheme://test-host:42" );
@@ -261,7 +261,7 @@ public class MatcherTest {
///////
patternTemplate = Parser.parseTemplate( "*://*:*/**" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( patternTemplate, "test-match" );
//KM: I'm not sure what the correct behavior is here.
@@ -277,7 +277,7 @@ public class MatcherTest {
///////
patternTemplate = Parser.parseTemplate( "*://*:*/{path=*}" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( patternTemplate, "test-match" );
inputTemplate = Parser.parseLiteral( "test-scheme://test-host:42" );
@@ -292,7 +292,7 @@ public class MatcherTest {
///////
patternTemplate = Parser.parseTemplate( "*://*:*/{path=**}" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( patternTemplate, "test-match" );
//KM: I'm not sure what the correct behavior is here.
@@ -309,7 +309,7 @@ public class MatcherTest {
@Test
public void testDefaultPortMatching() throws Exception {
- Matcher<String> matcher = new Matcher<String>();
+ Matcher<String> matcher = new Matcher<>();
Template patternTemplate, inputTemplate;
Matcher<String>.Match match;
@@ -345,14 +345,14 @@ public class MatcherTest {
patternTemplate = Parser.parseTemplate( "{*}://{host}:{*}/{**=**}?{**}" );
inputTemplate = Parser.parseLiteral( "test-scheme://test-input-host:42/test-path/test-file?test-name=test-value" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( patternTemplate, "test-math" );
match = matcher.match( inputTemplate );
assertThat( "Should match because the path ** should include both test-path and test-file", match, notNullValue() );
patternTemplate = Parser.parseTemplate( "{*}://{host}:{*}/{**}?{**}" );
inputTemplate = Parser.parseLiteral( "test-scheme://test-input-host:42/test-path/test-file?test-name=test-value" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( patternTemplate, "test-math" );
match = matcher.match( inputTemplate );
assertThat( "Should match because the path ** should include both test-path and test-file", match, notNullValue() );
@@ -366,12 +366,12 @@ public class MatcherTest {
patternTemplate = Parser.parseTemplate( "/path?{query}" );
inputTemplate = Parser.parseLiteral( "/path" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( patternTemplate, "T" );
match = matcher.match( inputTemplate );
assertThat( "Should not match because input does not contain the required query.", match, nullValue() );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( Parser.parseTemplate( "/path?{query}" ), "T1" );
matcher.add( Parser.parseTemplate( "/path" ), "T2" );
inputTemplate = Parser.parseLiteral( "/path" );
@@ -381,7 +381,7 @@ public class MatcherTest {
patternTemplate = Parser.parseTemplate( "/path?{query}" );
inputTemplate = Parser.parseLiteral( "/path?query=value" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( patternTemplate, "T" );
match = matcher.match( inputTemplate );
assertThat( "Should match because input does contain the required query.", match, notNullValue() );
@@ -390,21 +390,21 @@ public class MatcherTest {
patternTemplate = Parser.parseTemplate( "/path?{*}" );
inputTemplate = Parser.parseLiteral( "/path" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( patternTemplate, "T" );
match = matcher.match( inputTemplate );
assertThat( "Should not match because input does not contain the required query.", match, nullValue() );
patternTemplate = Parser.parseTemplate( "/path?*" );
inputTemplate = Parser.parseLiteral( "/path" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( patternTemplate, "T" );
match = matcher.match( inputTemplate );
assertThat( "Should not match because input does not contain the required query.", match, nullValue() );
patternTemplate = Parser.parseTemplate( "/path?*" );
inputTemplate = Parser.parseLiteral( "/path?query=value" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( patternTemplate, "T" );
match = matcher.match( inputTemplate );
assertThat(
@@ -416,7 +416,7 @@ public class MatcherTest {
patternTemplate = Parser.parseTemplate( "/path?{*}" );
inputTemplate = Parser.parseLiteral( "/path?query=value" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( patternTemplate, "T" );
match = matcher.match( inputTemplate );
assertThat( "Should match because input does contain the required query.", match, notNullValue() );
@@ -424,21 +424,21 @@ public class MatcherTest {
patternTemplate = Parser.parseTemplate( "/path?{**}" );
inputTemplate = Parser.parseLiteral( "/path" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( patternTemplate, "T" );
match = matcher.match( inputTemplate );
assertThat( "Should match because the template has an optional query.", match, notNullValue() );
patternTemplate = Parser.parseTemplate( "/path?**" );
inputTemplate = Parser.parseLiteral( "/path" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( patternTemplate, "T" );
match = matcher.match( inputTemplate );
assertThat( "Should match because the template has an optional extra query.", match, notNullValue() );
patternTemplate = Parser.parseTemplate( "/path?**" );
inputTemplate = Parser.parseLiteral( "/path?query=value" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( patternTemplate, "T" );
match = matcher.match( inputTemplate );
assertThat( "Should match because the template has an optional extra query.", match, notNullValue() );
@@ -446,7 +446,7 @@ public class MatcherTest {
patternTemplate = Parser.parseTemplate( "/path?{**}" );
inputTemplate = Parser.parseLiteral( "/path?query=value" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( patternTemplate, "T" );
match = matcher.match( inputTemplate );
assertThat( "Should match because the template has an optional extra query.", match, notNullValue() );
@@ -455,14 +455,14 @@ public class MatcherTest {
patternTemplate = Parser.parseTemplate( "/path?{query}&{*}" );
inputTemplate = Parser.parseLiteral( "/path?query=value" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( patternTemplate, "T" );
match = matcher.match( inputTemplate );
assertThat( "Should not match because input does not contain the required extra query.", match, nullValue() );
patternTemplate = Parser.parseTemplate( "/path?{query}&{*}" );
inputTemplate = Parser.parseLiteral( "/path?query=value&extra=extra-value" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( patternTemplate, "T" );
match = matcher.match( inputTemplate );
assertThat( "Should match because input does contain the required query.", match, notNullValue() );
@@ -471,7 +471,7 @@ public class MatcherTest {
patternTemplate = Parser.parseTemplate( "/path?{query=**}" );
inputTemplate = Parser.parseLiteral( "/path?query=value1&query=value2" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( patternTemplate, "T" );
match = matcher.match( inputTemplate );
assertThat( "Should match because input does contain the required query.", match, notNullValue() );
@@ -481,7 +481,7 @@ public class MatcherTest {
patternTemplate = Parser.parseTemplate( "/path?{query}" );
inputTemplate = Parser.parseLiteral( "/path?query=value1&query=value2" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( patternTemplate, "T" );
match = matcher.match( inputTemplate );
assertThat( "Should match because input does contain the required query.", match, notNullValue() );
@@ -497,7 +497,7 @@ public class MatcherTest {
Template patternTemplate, inputTemplate;
Matcher<String>.Match match;
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
pattern = "foo://username:password@example.com:8042/over/there/index.dtb?type=animal&name=narwhal#nose";
patternTemplate = Parser.parseTemplate( pattern );
matcher.add( patternTemplate, pattern );
@@ -507,7 +507,7 @@ public class MatcherTest {
assertThat( match.getTemplate(), sameInstance( patternTemplate ) );
assertThat( match.getValue(), equalTo( pattern ) );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
pattern = "foo://username:password@example.com:8042/over/there/index.dtb?type=animal&name=narwhal#nose";
patternTemplate = Parser.parseTemplate( pattern );
matcher.add( patternTemplate, pattern );
@@ -530,7 +530,7 @@ public class MatcherTest {
Template patternTemplate, inputTemplate;
Matcher<String>.Match match;
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
pattern = "path";
patternTemplate = Parser.parseTemplate( pattern );
matcher.add( patternTemplate, pattern );
@@ -542,7 +542,7 @@ public class MatcherTest {
assertThat( match.getValue(), equalTo( pattern ) );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
pattern = "/path";
patternTemplate = Parser.parseTemplate( pattern );
matcher.add( patternTemplate, pattern );
@@ -552,7 +552,7 @@ public class MatcherTest {
assertThat( match.getTemplate(), sameInstance( patternTemplate ) );
assertThat( match.getValue(), equalTo( pattern ) );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
pattern = "path/path";
patternTemplate = Parser.parseTemplate( pattern );
matcher.add( patternTemplate, pattern );
@@ -562,7 +562,7 @@ public class MatcherTest {
assertThat( match.getTemplate(), sameInstance( patternTemplate ) );
assertThat( match.getValue(), equalTo( pattern ) );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
pattern = "*/path";
patternTemplate = Parser.parseTemplate( pattern );
matcher.add( patternTemplate, pattern );
@@ -572,7 +572,7 @@ public class MatcherTest {
assertThat( match.getTemplate(), sameInstance( patternTemplate ) );
assertThat( match.getValue(), equalTo( pattern ) );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
pattern = "**/path";
patternTemplate = Parser.parseTemplate( pattern );
matcher.add( patternTemplate, pattern );
@@ -582,7 +582,7 @@ public class MatcherTest {
assertThat( match.getTemplate(), sameInstance( patternTemplate ) );
assertThat( match.getValue(), equalTo( pattern ) );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
pattern = "path-1/{path=**}/path-4";
patternTemplate = Parser.parseTemplate( pattern );
matcher.add( patternTemplate, pattern );
@@ -594,7 +594,7 @@ public class MatcherTest {
assertThat( match.getParams().resolve( "path" ).get( 0 ), equalTo( "path-2" ) );
assertThat( match.getParams().resolve( "path" ).get( 1 ), equalTo( "path-3" ) );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
pattern = "/";
patternTemplate = Parser.parseTemplate( pattern );
matcher.add( patternTemplate, pattern );
@@ -604,7 +604,7 @@ public class MatcherTest {
assertThat( match.getTemplate(), sameInstance( patternTemplate ) );
assertThat( match.getValue(), equalTo( pattern ) );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
pattern = "";
patternTemplate = Parser.parseTemplate( pattern );
matcher.add( patternTemplate, pattern );
@@ -617,7 +617,7 @@ public class MatcherTest {
@Test
public void testVariousPatterns() throws URISyntaxException {
- Matcher<String> matcher = new Matcher<String>();
+ Matcher<String> matcher = new Matcher<>();
matcher.add( Parser.parseTemplate( "/webhdfs" ), "/webhdfs" );
matcher.add( Parser.parseTemplate( "/webhdfs/dfshealth.jsp" ), "/webhdfs/dfshealth.jsp" );
matcher.add( Parser.parseTemplate( "/webhdfs/*.jsp" ), "/webhdfs/*.jsp" );
@@ -641,7 +641,7 @@ public class MatcherTest {
@Test
public void testStar() throws URISyntaxException {
- Matcher<String> matcher = new Matcher<String>();
+ Matcher<String> matcher = new Matcher<>();
matcher.add( Parser.parseTemplate( "/webhdfs/*" ), "/webhdfs/*" );
assertValidMatch( matcher, "/webhdfs/*", "/webhdfs/*" );
assertValidMatch( matcher, "/webhdfs/file", "/webhdfs/*" );
@@ -652,7 +652,7 @@ public class MatcherTest {
@Test
public void testGlob() throws URISyntaxException {
- Matcher<String> matcher = new Matcher<String>();
+ Matcher<String> matcher = new Matcher<>();
matcher.add( Parser.parseTemplate( "/webhdfs/**" ), "/webhdfs/**" );
assertValidMatch( matcher, "/webhdfs/file", "/webhdfs/**" );
assertValidMatch( matcher, "/webhdfs/path/", "/webhdfs/**" );
@@ -662,7 +662,7 @@ public class MatcherTest {
@Test
public void testMatrixParam() throws URISyntaxException {
- Matcher<String> matcher = new Matcher<String>();
+ Matcher<String> matcher = new Matcher<>();
matcher.add( Parser.parseTemplate( "/webhdfs/**" ), "/webhdfs/**" );
matcher.add( Parser.parseTemplate( "/webhdfs/browseDirectory.jsp;dn=*" ), "/webhdfs/browseDirectory.jsp;dn=*" );
assertValidMatch( matcher, "/webhdfs/browseDirectory.jsp;dn=X", "/webhdfs/browseDirectory.jsp;dn=*" );
@@ -670,14 +670,14 @@ public class MatcherTest {
@Test
public void testTwoGlobsAtDifferentDepths() throws URISyntaxException {
- Matcher<String> matcher = new Matcher<String>();
+ Matcher<String> matcher = new Matcher<>();
matcher.add( Parser.parseTemplate( "/webhdfs/**" ), "/webhdfs/**" );
matcher.add( Parser.parseTemplate( "/webhdfs/v1/**" ), "/webhdfs/v1/**" );
assertValidMatch( matcher, "/webhdfs/file", "/webhdfs/**" );
assertValidMatch( matcher, "/webhdfs/v1/file", "/webhdfs/v1/**" );
// Reverse the put order.
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( Parser.parseTemplate( "/webhdfs/v1/**" ), "/webhdfs/v1/**" );
matcher.add( Parser.parseTemplate( "/webhdfs/**" ), "/webhdfs/**" );
assertValidMatch( matcher, "/webhdfs/file", "/webhdfs/**" );
@@ -686,14 +686,14 @@ public class MatcherTest {
@Test
public void testGlobsVsStarsAtSameDepth() throws URISyntaxException {
- Matcher<String> matcher = new Matcher<String>();
+ Matcher<String> matcher = new Matcher<>();
matcher.add( Parser.parseTemplate( "/webhdfs/*" ), "/webhdfs/*" );
matcher.add( Parser.parseTemplate( "/webhdfs/**" ), "/webhdfs/**" );
assertValidMatch( matcher, "/webhdfs/file", "/webhdfs/*" ); // The star should be picked in preference to the glob.
assertValidMatch( matcher, "/webhdfs/path/file", "/webhdfs/**" );
// Reverse the put order.
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( Parser.parseTemplate( "/webhdfs/**" ), "/webhdfs/**" );
matcher.add( Parser.parseTemplate( "/webhdfs/*" ), "/webhdfs/*" );
assertValidMatch( matcher, "/webhdfs/path/file", "/webhdfs/**" );
@@ -702,19 +702,19 @@ public class MatcherTest {
@Test
public void testMatchingPatternsWithinPathSegments() throws URISyntaxException {
- Matcher<String> matcher = new Matcher<String>();
+ Matcher<String> matcher = new Matcher<>();
matcher.add( Parser.parseTemplate( "/path/{file}" ), "default" );
assertValidMatch( matcher, "/path/file-name", "default" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( Parser.parseTemplate( "/path/{file=*}" ), "*" );
assertValidMatch( matcher, "/path/some-name", "*" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( Parser.parseTemplate( "/path/{more=**}" ), "**" );
assertValidMatch( matcher, "/path/some-path/some-name", "**" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( Parser.parseTemplate( "/path/{regex=prefix*suffix}" ), "regex" );
assertValidMatch( matcher, "/path/prefix-middle-suffix", "regex" );
assertValidMatch( matcher, "/path/not-prefix-middle-suffix", null );
@@ -722,19 +722,19 @@ public class MatcherTest {
@Test
public void testMatchingPatternsWithinQuerySegments() throws URISyntaxException {
- Matcher<String> matcher = new Matcher<String>();
+ Matcher<String> matcher = new Matcher<>();
matcher.add( Parser.parseTemplate( "?query={queryParam}" ), "default" );
assertValidMatch( matcher, "?query=value", "default" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( Parser.parseTemplate( "?query={queryParam=*}" ), "*" );
assertValidMatch( matcher, "?query=some-value", "*" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( Parser.parseTemplate( "?query={queryParam=**}" ), "**" );
assertValidMatch( matcher, "?query=some-value", "**" );
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
matcher.add( Parser.parseTemplate( "?query={queryParam=prefix*suffix}" ), "regex" );
assertValidMatch( matcher, "?query=prefix-middle-suffix", "regex" );
assertValidMatch( matcher, "?query=not-prefix-middle-suffix", null );
@@ -742,7 +742,7 @@ public class MatcherTest {
@Test
public void testMatchingForTemplatesThatVaryOnlyByQueryParams() throws URISyntaxException {
- Matcher<String> matcher = new Matcher<String>();
+ Matcher<String> matcher = new Matcher<>();
addTemplate( matcher, "?one={queryParam}" );
addTemplate( matcher, "?two={queryParam}" );
@@ -762,7 +762,7 @@ public class MatcherTest {
template = Parser.parseTemplate( "{scheme}://{username}:{password}@{host}:{port}/{root}/{path}/{file}?queryA={paramA}&queryB={paramB}#{fragment}" );
input = Parser.parseLiteral( "http://horton:hadoop@hortonworks.com:80/top/middle/end?queryA=valueA&queryB=valueB#section" );
- matcher = new Matcher<Void>( template, null );
+ matcher = new Matcher<>( template, null );
match = matcher.match( input );
params = match.getParams();
@@ -801,17 +801,17 @@ public class MatcherTest {
// template = Parser.parse( "*://*:*/**/webhdfs/v1/**?**" );
// input = Parser.parse( "http://localhost:53221/gateway/cluster/webhdfs/v1/tmp/GatewayWebHdfsFuncTest/testBasicHdfsUseCase/dir?user.name=hdfs&op=MKDIRS" );
-// matcher = new Matcher<String>( template, "test-value" );
+// matcher = new Matcher<>( template, "test-value" );
// match = matcher.match( input );
// assertThat( (String)match.getValue(), is( "test-value" ) );
//
// template = Parser.parse( "*://*:*/**/webhdfs/v1/{path=**}?{**=*}" );
// input = Parser.parse( "http://localhost:53221/gateway/cluster/webhdfs/v1/tmp/GatewayWebHdfsFuncTest/testBasicHdfsUseCase/dir?user.name=hdfs&op=MKDIRS" );
-// matcher = new Matcher<String>( template, "test-value-2" );
+// matcher = new Matcher<>( template, "test-value-2" );
// match = matcher.match( input );
// assertThat( (String)match.getValue(), is( "test-value-2" ) );
//
-// stringMatcher = new Matcher<String>();
+// stringMatcher = new Matcher<>();
// template = Parser.parse( "*://*:*/**/webhdfs/data/v1/{path=**}?host={host=*}&port={port=*}&{**=*}" );
// stringMatcher.add( template, "test-value-C" );
// template = Parser.parse( "*://*:*/**/webhdfs/v1/{path=**}?{**=*}" );
@@ -822,7 +822,7 @@ public class MatcherTest {
// assertThat( (String)match.getValue(), is( "test-value-B" ) );
// This is just a reverse of the above. The order caused a bug.
- stringMatcher = new Matcher<String>();
+ stringMatcher = new Matcher<>();
template = Parser.parseTemplate( "*://*:*/**/webhdfs/v1/{path=**}?{**=*}" );
stringMatcher.add( template, "test-value-B" );
template = Parser.parseTemplate( "*://*:*/**/webhdfs/data/v1/{path=**}?host={host=*}&port={port=*}&{**=*}" );
@@ -844,7 +844,7 @@ public class MatcherTest {
template = Parser.parseTemplate( "{path-queryParam}" );
input = Parser.parseLiteral( "path-value" );
- matcher = new Matcher<Void>( template, null );
+ matcher = new Matcher<>( template, null );
match = matcher.match( input );
params = match.getParams();
assertThat( params, notNullValue() );
@@ -855,7 +855,7 @@ public class MatcherTest {
template = Parser.parseTemplate( "/some-path/{path-queryParam}" );
input = Parser.parseLiteral( "/some-path/path-value" );
- matcher = new Matcher<Void>( template, null );
+ matcher = new Matcher<>( template, null );
match = matcher.match( input );
params = match.getParams();
assertThat( params, notNullValue() );
@@ -866,7 +866,7 @@ public class MatcherTest {
template = Parser.parseTemplate( "/some-path/{path-queryParam}/some-other-path" );
input = Parser.parseLiteral( "/some-path/path-value/some-other-path" );
- matcher = new Matcher<Void>( template, null );
+ matcher = new Matcher<>( template, null );
match = matcher.match( input );
params = match.getParams();
assertThat( params, notNullValue() );
@@ -877,7 +877,7 @@ public class MatcherTest {
template = Parser.parseTemplate( "{path=**}" );
input = Parser.parseLiteral( "A/B" );
- matcher = new Matcher<Void>( template, null );
+ matcher = new Matcher<>( template, null );
match = matcher.match( input );
params = match.getParams();
assertThat( params, notNullValue() );
@@ -889,7 +889,7 @@ public class MatcherTest {
template = Parser.parseTemplate( "/top/{mid=**}/end" );
input = Parser.parseLiteral( "/top/A/B/end" );
- matcher = new Matcher<Void>( template, null );
+ matcher = new Matcher<>( template, null );
match = matcher.match( input );
params = match.getParams();
assertThat( params, notNullValue() );
@@ -901,7 +901,7 @@ public class MatcherTest {
template = Parser.parseTemplate( "*://*:*/{path=**}?{**}" );
input = Parser.parseLiteral( "http://host:port/pathA/pathB" );
- matcher = new Matcher<Void>( template, null );
+ matcher = new Matcher<>( template, null );
match = matcher.match( input );
params = match.getParams();
assertThat( params.resolve( "path" ), hasItem( "pathA" ) );
@@ -910,7 +910,7 @@ public class MatcherTest {
template = Parser.parseTemplate( "*://*:*/{path=**}?{**}" );
input = Parser.parseLiteral( "http://host:port/pathA/pathB" );
- matcher = new Matcher<Void>( template, null );
+ matcher = new Matcher<>( template, null );
match = matcher.match( input );
params = match.getParams();
assertThat( params.resolve( "path" ), hasItem( "pathA" ) );
@@ -919,7 +919,7 @@ public class MatcherTest {
template = Parser.parseTemplate( "*://*:*/{path=**}?{**}" );
input = Parser.parseLiteral( "http://host:port/pathA/pathB" );
- matcher = new Matcher<Void>( template, null );
+ matcher = new Matcher<>( template, null );
match = matcher.match( input );
params = match.getParams();
assertThat( params.resolve( "path" ), hasItem( "pathA" ) );
@@ -937,7 +937,7 @@ public class MatcherTest {
template = Parser.parseTemplate( "?query-queryParam={queryParam-name}" );
input = Parser.parseLiteral( "?query-queryParam=queryParam-value" );
- matcher = new Matcher<Void>( template, null );
+ matcher = new Matcher<>( template, null );
match = matcher.match( input );
params = match.getParams();
assertThat( params, notNullValue() );
@@ -948,7 +948,7 @@ public class MatcherTest {
template = Parser.parseTemplate( "?query-queryParam={queryParam-name}" );
input = Parser.parseLiteral( "?query-queryParam=queryParam-value" );
- matcher = new Matcher<Void>( template, null );
+ matcher = new Matcher<>( template, null );
match = matcher.match( input );
params = match.getParams();
assertThat( params, notNullValue() );
@@ -968,7 +968,7 @@ public class MatcherTest {
template = Parser.parseTemplate( "" );
input = Parser.parseLiteral( "" );
- matcher = new Matcher<Void>( template, null );
+ matcher = new Matcher<>( template, null );
match = matcher.match( input );
params = match.getParams();
assertThat( params, notNullValue() );
@@ -982,7 +982,7 @@ public class MatcherTest {
Matcher<String> matcher;
Matcher<?>.Match match;
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
template = Parser.parseTemplate( "*://*:*/**/webhdfs/v1/{path=**}?{**}" );
matcher.add( template, "test-value" );
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/ParserTest.java
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/ParserTest.java b/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/ParserTest.java
index db9b744..9e64bf9 100644
--- a/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/ParserTest.java
+++ b/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/ParserTest.java
@@ -1287,7 +1287,7 @@ public class ParserTest {
Template input;
Matcher<String> matcher;
- matcher = new Matcher<String>();
+ matcher = new Matcher<>();
template = Parser.parseTemplate( "*://*:*/**/webhdfs/v1/{path=**}?{**}" );
matcher.add( template, "test-value" );
http://git-wip-us.apache.org/repos/asf/knox/blob/84d794f8/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/RewriterTest.java
----------------------------------------------------------------------
diff --git a/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/RewriterTest.java b/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/RewriterTest.java
index 2ea738d..1244f84 100644
--- a/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/RewriterTest.java
+++ b/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/RewriterTest.java
@@ -407,7 +407,7 @@ public class RewriterTest {
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;
}
[3/3] knox git commit: KNOX-1536 - Replace redundant types with the
diamond operator
Posted by co...@apache.org.
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();
[2/3] knox git commit: KNOX-1536 - Replace redundant types with the
diamond operator
Posted by co...@apache.org.
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.doe@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.doe@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.doe@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 + ">" );
}