http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EvaluatePreconditionsTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EvaluatePreconditionsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EvaluatePreconditionsTest.java index 00750bc..4e2e2a3 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EvaluatePreconditionsTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/EvaluatePreconditionsTest.java @@ -138,7 +138,7 @@ public class EvaluatePreconditionsTest { protected Request getRequest(final String... headers) { final MessageImpl message = new MessageImpl(); - final Map<String, List<String>> map = new HashMap<String, List<String>>(); + final Map<String, List<String>> map = new HashMap<>(); message.put(Message.PROTOCOL_HEADERS, map); for (int i = 0; i < headers.length; i += 2) { final List<String> l = new ArrayList<>(1);
http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java index cfca8b8..8b29e07 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/MetadataMapTest.java @@ -289,7 +289,7 @@ public class MetadataMapTest extends Assert { @Test(expected = UnsupportedOperationException.class) public void testReadOnlyAdd2() { - Map<String, List<String>> values = new HashMap<String, List<String>>(); + Map<String, List<String>> values = new HashMap<>(); List<String> list = new LinkedList<String>(); list.add("bar"); values.put("baz", list); @@ -300,7 +300,7 @@ public class MetadataMapTest extends Assert { @Test(expected = UnsupportedOperationException.class) public void testReadOnlyAddFirst2() { - Map<String, List<String>> values = new HashMap<String, List<String>>(); + Map<String, List<String>> values = new HashMap<>(); List<String> list = new LinkedList<String>(); list.add("bar"); values.put("baz", list); @@ -311,7 +311,7 @@ public class MetadataMapTest extends Assert { @Test(expected = UnsupportedOperationException.class) public void testReadOnlyPutSingle() { - Map<String, List<String>> values = new HashMap<String, List<String>>(); + Map<String, List<String>> values = new HashMap<>(); MultivaluedMap<String, String> map = new MetadataMap<String, String>(values, false, true, true); map.putSingle("baz", "baz"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java index d017b1e..39ae674 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/UriBuilderImplTest.java @@ -157,7 +157,7 @@ public class UriBuilderImplTest extends Assert { @Test public void testResolveTemplate5() { - Map<String, Object> templs = new HashMap<String, Object>(); + Map<String, Object> templs = new HashMap<>(); templs.put("a", "1"); templs.put("b", "2"); URI uri; @@ -179,7 +179,7 @@ public class UriBuilderImplTest extends Assert { String expected = "path-rootless%2Ftest2/x%25yz/%2Fpath-absolute%2F%2525test1/[email protected]/x%25yz"; - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); map.put("v", new StringBuilder("path-rootless%2Ftest2")); map.put("w", new StringBuilder("x%yz")); map.put("x", new Object() { @@ -207,7 +207,7 @@ public class UriBuilderImplTest extends Assert { String expected = "path-rootless%2Ftest2/x%25yz/%2Fpath-absolute%2F%2525test1/[email protected]/x%25yz"; - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); map.put("x", new StringBuilder("x%yz")); map.put("y", new StringBuffer("/path-absolute/%25test1")); map.put("z", new Object() { @@ -226,7 +226,7 @@ public class UriBuilderImplTest extends Assert { public void testResolveTemplatesMapBooleanSlashEncoded() throws Exception { String expected = "path-rootless%2Ftest2/x%25yz/%2Fpath-absolute%2F%2525test1/[email protected]/x%25yz"; - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); map.put("x", new StringBuilder("x%yz")); map.put("y", new StringBuffer("/path-absolute/%25test1")); map.put("z", new Object() { @@ -244,7 +244,7 @@ public class UriBuilderImplTest extends Assert { public void testResolveTemplatesMapBooleanSlashNotEncoded() throws Exception { String expected = "path-rootless/test2/x%25yz//path-absolute/test1/[email protected]/x%25yz"; - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); map.put("x", new StringBuilder("x%yz")); map.put("y", new StringBuffer("/path-absolute/test1")); map.put("z", new Object() { @@ -308,7 +308,7 @@ public class UriBuilderImplTest extends Assert { @Test public void testQueryParamUsingMapWithTemplateValues() { - Map<String, String> values = new HashMap<String, String>(); + Map<String, String> values = new HashMap<>(); values.put("a", "valueA"); values.put("b", "valueB"); URI uri; @@ -321,7 +321,7 @@ public class UriBuilderImplTest extends Assert { @Test public void testPathAndQueryParamUsingMapWithTemplateValues() { - Map<String, String> values = new HashMap<String, String>(); + Map<String, String> values = new HashMap<>(); values.put("a", "valueA"); values.put("b", "valueB"); values.put("ind", "1"); @@ -623,7 +623,7 @@ public class UriBuilderImplTest extends Assert { @Test public void testBuildFromMapValues() throws Exception { URI uri = new URI("http://zzz";); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("b", "foo"); map.put("a", "bar"); Map<String, String> immutable = Collections.unmodifiableMap(map); @@ -634,7 +634,7 @@ public class UriBuilderImplTest extends Assert { @Test(expected = IllegalArgumentException.class) public void testBuildFromMapMissingValues() throws Exception { URI uri = new URI("http://zzz";); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("b", "foo"); Map<String, String> immutable = Collections.unmodifiableMap(map); new UriBuilderImpl(uri).path("/{b}/{a}/{b}").buildFromMap(immutable); @@ -643,7 +643,7 @@ public class UriBuilderImplTest extends Assert { @Test public void testBuildFromMapValueWithBrackets() throws Exception { URI uri = new URI("http://zzz";); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("a", "{foo}"); Map<String, String> immutable = Collections.unmodifiableMap(map); URI newUri = new UriBuilderImpl(uri).path("/{a}").buildFromMap(immutable); @@ -653,7 +653,7 @@ public class UriBuilderImplTest extends Assert { @Test public void testBuildFromMapValuesPct() throws Exception { URI uri = new URI("http://zzz";); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("a", "foo%25/bar%"); Map<String, String> immutable = Collections.unmodifiableMap(map); URI newUri = new UriBuilderImpl(uri).path("/{a}").buildFromMap(immutable); @@ -664,7 +664,7 @@ public class UriBuilderImplTest extends Assert { @Test public void testBuildFromMapValuesPctEncoded() throws Exception { URI uri = new URI("http://zzz";); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("a", "foo%25"); map.put("b", "bar%"); Map<String, String> immutable = Collections.unmodifiableMap(map); @@ -674,7 +674,7 @@ public class UriBuilderImplTest extends Assert { @Test public void testBuildFromEncodedMapComplex() throws Exception { - Map<String, Object> maps = new HashMap<String, Object>(); + Map<String, Object> maps = new HashMap<>(); maps.put("x", "x%20yz"); maps.put("y", "/path-absolute/%test1"); maps.put("z", "[email protected]"); @@ -691,7 +691,7 @@ public class UriBuilderImplTest extends Assert { @Test public void testBuildFromEncodedMapComplex2() throws Exception { - Map<String, Object> maps = new HashMap<String, Object>(); + Map<String, Object> maps = new HashMap<>(); maps.put("x", "x%yz"); maps.put("y", "/path-absolute/test1"); maps.put("z", "[email protected]"); @@ -709,19 +709,19 @@ public class UriBuilderImplTest extends Assert { @Test public void testBuildFromEncodedMapMultipleTimes() throws Exception { - Map<String, Object> maps = new HashMap<String, Object>(); + Map<String, Object> maps = new HashMap<>(); maps.put("x", "x%yz"); maps.put("y", "/path-absolute/test1"); maps.put("z", "[email protected]"); maps.put("w", "path-rootless/test2"); - Map<String, Object> maps1 = new HashMap<String, Object>(); + Map<String, Object> maps1 = new HashMap<>(); maps1.put("x", "x%20yz"); maps1.put("y", "/path-absolute/test1"); maps1.put("z", "[email protected]"); maps1.put("w", "path-rootless/test2"); - Map<String, Object> maps2 = new HashMap<String, Object>(); + Map<String, Object> maps2 = new HashMap<>(); maps2.put("x", "x%yz"); maps2.put("y", "/path-absolute/test1"); maps2.put("z", "[email protected]"); @@ -752,7 +752,7 @@ public class UriBuilderImplTest extends Assert { @Test(expected = IllegalArgumentException.class) public void testBuildFromEncodedMapWithNullValue() throws Exception { - Map<String, Object> maps = new HashMap<String, Object>(); + Map<String, Object> maps = new HashMap<>(); maps.put("x", null); maps.put("y", "bar"); UriBuilder.fromPath("").path("{x}/{y}").buildFromEncodedMap(maps); @@ -1241,7 +1241,7 @@ public class UriBuilderImplTest extends Assert { @Test public void testToTemplateAndResolved() { - Map<String, Object> templs = new HashMap<String, Object>(); + Map<String, Object> templs = new HashMap<>(); templs.put("a", "1"); templs.put("b", "2"); String template = ((UriBuilderImpl)UriBuilder.fromPath("/{a}/{b}").queryParam("c", "{c}")) @@ -1371,7 +1371,7 @@ public class UriBuilderImplTest extends Assert { @Test public void testNullMapValue() { try { - Map<String, String> maps = new HashMap<String, String>(); + Map<String, String> maps = new HashMap<>(); maps.put("x", null); maps.put("y", "/path-absolute/test1"); maps.put("z", "[email protected]"); @@ -1391,7 +1391,7 @@ public class UriBuilderImplTest extends Assert { @Test public void testMissingMapValue() { try { - Map<String, String> maps = new HashMap<String, String>(); + Map<String, String> maps = new HashMap<>(); maps.put("x", null); maps.put("y", "/path-absolute/test1"); maps.put("z", "[email protected]"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java index d58d13a..97e5363 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java @@ -611,7 +611,7 @@ public class URITemplateTest extends Assert { @Test public void testSubstituteMap() throws Exception { URITemplate ut = new URITemplate("/foo/{a}/{b:\\d\\d}/{c}"); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("c", "foo"); map.put("b", "11"); map.put("a", "bar"); @@ -621,7 +621,7 @@ public class URITemplateTest extends Assert { @Test public void testSubstituteMapSameVars() throws Exception { URITemplate ut = new URITemplate("/foo/{a}/{a}/{a}"); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("a", "bar"); assertEquals("Wrong substitution", "/foo/bar/bar/bar", ut.substitute(map)); } @@ -629,7 +629,7 @@ public class URITemplateTest extends Assert { @Test(expected = IllegalArgumentException.class) public void testSubstituteMapIncomplete() throws Exception { URITemplate ut = new URITemplate("/foo/{a}/{b}/{a:\\d}"); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("b", "bar"); ut.substitute(map); } @@ -637,7 +637,7 @@ public class URITemplateTest extends Assert { @Test public void testSubstituteMapSameVarWithPattern() throws Exception { URITemplate ut = new URITemplate("/foo/{a}/{a:\\d}"); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("a", "0"); assertEquals("Wrong substitution", "/foo/0/0", ut.substitute(map)); } @@ -645,7 +645,7 @@ public class URITemplateTest extends Assert { @Test(expected = IllegalArgumentException.class) public void testSubstituteMapSameVarWithPatternFail() throws Exception { URITemplate ut = new URITemplate("/foo/{a}/{a:\\d}"); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("a", "not-a-digit"); ut.substitute(map); } @@ -653,7 +653,7 @@ public class URITemplateTest extends Assert { @Test public void testSubstituteMapExceeding() throws Exception { URITemplate ut = new URITemplate("/foo/{a}"); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("b", "baz"); map.put("a", "blah"); assertEquals("Wrong substitution", "/foo/blah", ut.substitute(map)); @@ -723,7 +723,7 @@ public class URITemplateTest extends Assert { @Test public void testNestedCurlyBraces() { URITemplate ut = new URITemplate("/foo/{hex:[0-9a-fA-F]{2}}"); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("hex", "FF"); assertEquals("Wrong substitution", "/foo/FF", ut.substitute(map)); } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java index a48fb02..6f2b257 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java @@ -464,7 +464,7 @@ public class JAXBElementProviderTest extends Assert { JAXBElementProvider<List<org.apache.cxf.jaxrs.fortest.jaxb.SuperBook>> provider = new JAXBElementProvider<List<org.apache.cxf.jaxrs.fortest.jaxb.SuperBook>>(); - Map<String, String> prefixes = new HashMap<String, String>(); + Map<String, String> prefixes = new HashMap<>(); prefixes.put("http://superbooks";, "ns1"); prefixes.put("http://books";, "ns2"); provider.setNamespacePrefixes(prefixes); @@ -813,7 +813,7 @@ public class JAXBElementProviderTest extends Assert { private void readTagVO2AfterTransform(String data, String keyValue) throws Exception { JAXBElementProvider<TagVO2> provider = new JAXBElementProvider<TagVO2>(); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put(keyValue, "{http://tags}thetag";); provider.setInTransformElements(map); ByteArrayInputStream is = new ByteArrayInputStream(data.getBytes()); @@ -829,7 +829,7 @@ public class JAXBElementProviderTest extends Assert { String data = "<?xml version='1.0' encoding='UTF-8'?>" + "<tagholder><thetag><group>B</group><name>A</name></thetag></tagholder>"; JAXBElementProvider<TagVO2Holder> provider = new JAXBElementProvider<TagVO2Holder>(); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("tagholder", "{http://tags}tagholder";); map.put("thetag", "{http://tags}thetag";); provider.setInTransformElements(map); @@ -883,7 +883,7 @@ public class JAXBElementProviderTest extends Assert { private void readTagVOAfterTransform(String data, String keyValue) throws Exception { JAXBElementProvider<TagVO> provider = new JAXBElementProvider<TagVO>(); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put(keyValue, "tagVO"); provider.setInTransformElements(map); ByteArrayInputStream is = new ByteArrayInputStream(data.getBytes()); @@ -897,7 +897,7 @@ public class JAXBElementProviderTest extends Assert { @Test public void testOutAttributesAsElements() throws Exception { JAXBElementProvider<TagVO2Holder> provider = new JAXBElementProvider<TagVO2Holder>(); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("{http://tags}thetag";, "thetag"); map.put("{http://tags}tagholder";, "tagholder"); provider.setOutTransformElements(map); @@ -920,7 +920,7 @@ public class JAXBElementProviderTest extends Assert { JAXBElementProvider<List<?>> provider = new JAXBElementProvider<List<?>>(); provider.setMessageContext(new MessageContextImpl(createMessage())); provider.setCollectionWrapperName("tagholders"); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("{http://tags}*";, "*"); provider.setOutTransformElements(map); provider.setAttributesToElements(true); @@ -960,11 +960,11 @@ public class JAXBElementProviderTest extends Assert { public void testOutAppendElementsDiffNs() throws Exception { JAXBElementProvider<TagVO2> provider = new JAXBElementProvider<TagVO2>(); - Map<String, String> prefixes = new HashMap<String, String>(); + Map<String, String> prefixes = new HashMap<>(); prefixes.put("http://tags";, "ns2"); provider.setNamespacePrefixes(prefixes); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("{http://tags}thetag";, "{http://tagsvo2}t";); provider.setOutAppendElements(map); TagVO2 tag = new TagVO2("A", "B"); @@ -979,7 +979,7 @@ public class JAXBElementProviderTest extends Assert { @Test public void testOutAppendNsElementBeforeLocal() throws Exception { JAXBElementProvider<TagVO> provider = new JAXBElementProvider<TagVO>(); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("tagVO", "{http://tagsvo2}t";); provider.setOutAppendElements(map); TagVO tag = new TagVO("A", "B"); @@ -994,7 +994,7 @@ public class JAXBElementProviderTest extends Assert { @Test public void testOutAppendLocalBeforeLocal() throws Exception { JAXBElementProvider<TagVO> provider = new JAXBElementProvider<TagVO>(); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("tagVO", "supertag"); provider.setOutAppendElements(map); TagVO tag = new TagVO("A", "B"); @@ -1010,11 +1010,11 @@ public class JAXBElementProviderTest extends Assert { public void testOutAppendElementsSameNs() throws Exception { JAXBElementProvider<TagVO2> provider = new JAXBElementProvider<TagVO2>(); - Map<String, String> prefixes = new HashMap<String, String>(); + Map<String, String> prefixes = new HashMap<>(); prefixes.put("http://tags";, "ns2"); provider.setNamespacePrefixes(prefixes); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("{http://tags}thetag";, "{http://tags}t";); provider.setOutAppendElements(map); TagVO2 tag = new TagVO2("A", "B"); @@ -1031,10 +1031,10 @@ public class JAXBElementProviderTest extends Assert { @Test public void testOutElementsMapLocalNsToLocalNs() throws Exception { JAXBElementProvider<TagVO2> provider = new JAXBElementProvider<TagVO2>(); - Map<String, String> prefixes = new HashMap<String, String>(); + Map<String, String> prefixes = new HashMap<>(); prefixes.put("http://tags";, "ns2"); provider.setNamespacePrefixes(prefixes); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("{http://tags}thetag";, "{http://tagsvo2}t";); provider.setOutTransformElements(map); TagVO2 tag = new TagVO2("A", "B"); @@ -1050,7 +1050,7 @@ public class JAXBElementProviderTest extends Assert { @Test public void testOutElementsMapLocalNsToLocal() throws Exception { JAXBElementProvider<TagVO2> provider = new JAXBElementProvider<TagVO2>(); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("{http://tags}thetag";, "t"); provider.setOutTransformElements(map); TagVO2 tag = new TagVO2("A", "B"); @@ -1065,7 +1065,7 @@ public class JAXBElementProviderTest extends Assert { @Test public void testOutElementsMapLocalNsToLocalWildcard() throws Exception { JAXBElementProvider<TagVO2Holder> provider = new JAXBElementProvider<TagVO2Holder>(); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("{http://tags}*";, "*"); provider.setOutTransformElements(map); TagVO2 tag = new TagVO2("A", "B"); @@ -1083,11 +1083,11 @@ public class JAXBElementProviderTest extends Assert { public void testOutElementsMapLocalNsToLocalWildcard2() throws Exception { JAXBElementProvider<TagVO2Holder> provider = new JAXBElementProvider<TagVO2Holder>(); - Map<String, String> prefixes = new HashMap<String, String>(); + Map<String, String> prefixes = new HashMap<>(); prefixes.put("http://tags";, "ns2"); provider.setNamespacePrefixes(prefixes); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("{http://tags}*";, "{http://tags2}*";); provider.setOutTransformElements(map); TagVO2 tag = new TagVO2("A", "B"); @@ -1106,7 +1106,7 @@ public class JAXBElementProviderTest extends Assert { @Test public void testOutElementsMapLocalToLocalNs() throws Exception { JAXBElementProvider<TagVO> provider = new JAXBElementProvider<TagVO>(); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("tagVO", "{http://tags}thetag";); provider.setOutTransformElements(map); TagVO tag = new TagVO("A", "B"); @@ -1121,7 +1121,7 @@ public class JAXBElementProviderTest extends Assert { @Test public void testOutElementsMapLocalToLocal() throws Exception { JAXBElementProvider<TagVO> provider = new JAXBElementProvider<TagVO>(); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("tagVO", "thetag"); map.put("group", "group2"); provider.setOutTransformElements(map); @@ -1161,7 +1161,7 @@ public class JAXBElementProviderTest extends Assert { List<String> list = new ArrayList<>(); list.add("{http://tags}thetag";); provider.setOutDropElements(list); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("name", ""); provider.setOutTransformElements(map); TagVO2 tag = new TagVO2("A", "B"); @@ -1417,7 +1417,7 @@ public class JAXBElementProviderTest extends Assert { @Test public void testSetMarshallProperties() throws Exception { - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); props.put(Marshaller.JAXB_FORMATTED_OUTPUT, true); props.put(Marshaller.JAXB_SCHEMA_LOCATION, "foo.xsd"); @@ -1441,7 +1441,7 @@ public class JAXBElementProviderTest extends Assert { private static class TestMarshaller implements Marshaller { - private Map<String, Object> props = new HashMap<String, Object>(); + private Map<String, Object> props = new HashMap<>(); TestMarshaller() { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java index b311ea0..f289681 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java @@ -49,7 +49,7 @@ public class XPathProviderTest extends Assert { XPathProvider<?> provider = new XPathProvider<Object>(); assertFalse(provider.isReadable(Book.class, null, null, null)); assertFalse(provider.isReadable(BookStore.class, null, null, null)); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put(Book.class.getName(), "/"); provider.setExpressions(map); assertFalse(provider.isReadable(BookStore.class, null, null, null)); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/Book.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/Book.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/Book.java index 1bcd364..f767ba5 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/Book.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/Book.java @@ -34,7 +34,7 @@ import javax.xml.bind.annotation.XmlSeeAlso; public class Book implements Comparable<Book> { private String name; private long id; - private Map<Long, Chapter> chapters = new HashMap<Long, Chapter>(); + private Map<Long, Chapter> chapters = new HashMap<>(); public Book() { } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/BookNoSubResource.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/BookNoSubResource.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/BookNoSubResource.java index c71df33..9262f6f 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/BookNoSubResource.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/BookNoSubResource.java @@ -32,7 +32,7 @@ import javax.xml.bind.annotation.XmlRootElement; public class BookNoSubResource { private String name; private long id; - private Map<Long, Chapter> chapters = new HashMap<Long, Chapter>(); + private Map<Long, Chapter> chapters = new HashMap<>(); public BookNoSubResource() { } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreNoAnnotations.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreNoAnnotations.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreNoAnnotations.java index 3b750d4..9e435d5 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreNoAnnotations.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreNoAnnotations.java @@ -25,7 +25,7 @@ import java.util.Map; public class BookStoreNoAnnotations { - private Map<Long, Book> books = new HashMap<Long, Book>(); + private Map<Long, Book> books = new HashMap<>(); public BookStoreNoAnnotations() { Book b = new Book(); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java index 4edc5bd..9d6d9b3 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java @@ -73,7 +73,7 @@ public class ResourceUtilsTest extends Assert { op.setParameters(Collections.singletonList(new Parameter(ParameterType.PATH, "id"))); ur.setOperations(Collections.singletonList(op)); - Map<String, UserResource> resources = new HashMap<String, UserResource>(); + Map<String, UserResource> resources = new HashMap<>(); resources.put(ur.getName(), ur); ClassResourceInfo cri = ResourceUtils.createClassResourceInfo(resources, ur, null, true, true, BusFactory.getDefaultBus()); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java index dba4dbf..a7e9227 100644 --- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java +++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java @@ -269,7 +269,7 @@ public abstract class AbstractJAXWSMethodInvoker extends FactoryInvoker { protected Map<String, Object> removeHandlerProperties(WrappedMessageContext ctx) { Map<String, Scope> scopes = CastUtils.cast((Map<?, ?>)ctx.get(WrappedMessageContext.SCOPES)); - Map<String, Object> handlerScopedStuff = new HashMap<String, Object>(); + Map<String, Object> handlerScopedStuff = new HashMap<>(); if (scopes != null) { for (Map.Entry<String, Scope> scope : scopes.entrySet()) { if (scope.getValue() == Scope.HANDLER) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java index 7752e6d..f6e2e2b 100644 --- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java +++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java @@ -229,7 +229,7 @@ public class EndpointImpl extends javax.xml.ws.Endpoint return server.getEndpoint(); } if (properties == null) { - properties = new HashMap<String, Object>(); + properties = new HashMap<>(); } return properties; } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java index 4ebc8ac..88d92db 100644 --- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java +++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java @@ -116,7 +116,7 @@ public class ServiceImpl extends ServiceDelegate { private QName serviceName; private Class<?> clazz; - private Map<QName, PortInfoImpl> portInfos = new HashMap<QName, PortInfoImpl>(); + private Map<QName, PortInfoImpl> portInfos = new HashMap<>(); private WebServiceFeature serviceFeatures[]; public ServiceImpl(Bus b, URL url, QName name, Class<?> cls, WebServiceFeature ... f) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedAttachments.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedAttachments.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedAttachments.java index fc2a14c..009e200 100644 --- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedAttachments.java +++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedAttachments.java @@ -42,7 +42,7 @@ class WrappedAttachments implements Set<Attachment> { WrappedAttachments(Map<String, DataHandler> attachments) { this.attachments = attachments; - this.cache = new HashMap<String, Attachment>(); + this.cache = new HashMap<>(); } public int size() { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java index 10e2046..466dd69 100644 --- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java +++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/context/WrappedMessageContext.java @@ -47,8 +47,8 @@ import org.apache.cxf.service.model.EndpointInfo; public class WrappedMessageContext implements MessageContext { public static final String SCOPES = WrappedMessageContext.class.getName() + ".SCOPES"; - private static Map<String, String> cxf2jaxwsMap = new HashMap<String, String>(); - private static Map<String, String> jaxws2cxfMap = new HashMap<String, String>(); + private static Map<String, String> cxf2jaxwsMap = new HashMap<>(); + private static Map<String, String> jaxws2cxfMap = new HashMap<>(); static { cxf2jaxwsMap.put(Message.ENDPOINT_ADDRESS, @@ -131,7 +131,7 @@ public class WrappedMessageContext implements MessageContext { } } if (scopes == null) { - scopes = new HashMap<String, Scope>(); + scopes = new HashMap<>(); message.put(SCOPES, scopes); } } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java index a523398..d658a59 100644 --- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java +++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java @@ -171,7 +171,7 @@ public class HandlerChainBuilder { return; } - Map<String, String> params = new HashMap<String, String>(); + Map<String, String> params = new HashMap<>(); for (ParamValueType param : h.getInitParam()) { params.put(trimString(param.getParamName() == null ? null : param.getParamName().getValue()), http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerResolverImpl.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerResolverImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerResolverImpl.java index df09737..94cba80 100644 --- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerResolverImpl.java +++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerResolverImpl.java @@ -36,7 +36,7 @@ import org.apache.cxf.resource.ResourceManager; @SuppressWarnings("rawtypes") public class HandlerResolverImpl implements HandlerResolver { private final Map<PortInfo, List<Handler>> handlerMap - = new HashMap<PortInfo, List<Handler>>(); + = new HashMap<>(); //private QName service; private Class<?> annotationClass; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java index 7b9a148..707feb2 100644 --- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java +++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java @@ -85,11 +85,11 @@ public class JaxWsServiceConfiguration extends AbstractServiceConfiguration { private Map<Method, Annotation[][]> methodAnnotationCache; public JaxWsServiceConfiguration() { - responseMethodClassCache = new HashMap<Object, Class<?>>(); - requestMethodClassCache = new HashMap<Object, Class<?>>(); + responseMethodClassCache = new HashMap<>(); + requestMethodClassCache = new HashMap<>(); responseMethodClassNotFoundCache = new ArrayList<>(); requestMethodClassNotFoundCache = new ArrayList<>(); - methodAnnotationCache = new HashMap<Method, Annotation[][]>(); + methodAnnotationCache = new HashMap<>(); } @Override http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java index 44bec1d..57aeb59 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java @@ -135,7 +135,7 @@ public class ConfiguredEndpointTest extends Assert { CXFBusFactory cf = new CXFBusFactory(); factory = cf; BusFactory.setDefaultBus(null); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(Configurer.USER_CFG_FILE_PROPERTY_NAME, "org/apache/cxf/jaxws/configured-endpoints.xml"); BusFactory.setDefaultBus(cf.createBus(null, properties)); @@ -259,7 +259,7 @@ public class ConfiguredEndpointTest extends Assert { CXFBusFactory cf = new CXFBusFactory(); factory = cf; BusFactory.setDefaultBus(null); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(Configurer.USER_CFG_FILE_PROPERTY_NAME, "org/apache/cxf/jaxws/configured-endpoints.xml"); BusFactory.setDefaultBus(cf.createBus(null, properties)); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java index ed41631..7932802 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsServerFactoryBeanTest.java @@ -66,7 +66,7 @@ public class JaxWsServerFactoryBeanTest extends AbstractJaxWsTest { sf.setStart(false); Map<String, Object> props = sf.getProperties(); if (props == null) { - props = new HashMap<String, Object>(); + props = new HashMap<>(); } props.put("jaxb.additionalContextClasses", new Class[] {DescriptionType.class, DisplayNameType.class}); @@ -109,7 +109,7 @@ public class JaxWsServerFactoryBeanTest extends AbstractJaxWsTest { def.setExtensionRegistry(bus.getExtension(WSDLManager.class).getExtensionRegistry()); Document doc = wsdlWriter.getDocument(def); - Map<String, String> ns = new HashMap<String, String>(); + Map<String, String> ns = new HashMap<>(); ns.put("wsdl", "http://schemas.xmlsoap.org/wsdl/";); ns.put("soap", "http://schemas.xmlsoap.org/wsdl/soap/";); XPathUtils xpather = new XPathUtils(ns); @@ -144,7 +144,7 @@ public class JaxWsServerFactoryBeanTest extends AbstractJaxWsTest { def.setExtensionRegistry(bus.getExtension(WSDLManager.class).getExtensionRegistry()); Document doc = wsdlWriter.getDocument(def); - Map<String, String> ns = new HashMap<String, String>(); + Map<String, String> ns = new HashMap<>(); ns.put("wsdl", "http://schemas.xmlsoap.org/wsdl/";); ns.put("soap", "http://schemas.xmlsoap.org/wsdl/soap/";); XPathUtils xpather = new XPathUtils(ns); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java index 0f5e783..70a4ddf 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WebServiceContextImplTest.java @@ -84,7 +84,7 @@ public class WebServiceContextImplTest extends Assert { public void testSetHttpRequestHeadersScope() { MessageImpl msg = new MessageImpl(); MessageContext context = new WrappedMessageContext(msg); - Map<String, List<String>> headers = new HashMap<String, List<String>>(); + Map<String, List<String>> headers = new HashMap<>(); List<String> values = new ArrayList<>(); values.add("Value1"); headers.put("Header1", values); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java index b1d5e63..de9a8b9 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java @@ -37,7 +37,7 @@ import org.junit.Test; public class WrappedAttachmentsTest extends Assert { @Test public void testCreateAndModify() { - Map<String, DataHandler> content = new HashMap<String, DataHandler>(); + Map<String, DataHandler> content = new HashMap<>(); content.put("att-1", new DataHandler(new ByteArrayDataSource("Hello world!".getBytes(), "text/plain"))); content.put("att-2", new DataHandler(new ByteArrayDataSource("Hola mundo!".getBytes(), "text/plain"))); WrappedAttachments attachments = new WrappedAttachments(content); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedMessageContextTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedMessageContextTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedMessageContextTest.java index d055ba8..da19e9c 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedMessageContextTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedMessageContextTest.java @@ -48,7 +48,7 @@ public class WrappedMessageContextTest extends Assert { DataHandler dh1 = new DataHandler(new ByteArrayDataSource("Hello world!".getBytes(), "text/plain")); DataHandler dh2 = new DataHandler(new ByteArrayDataSource("Hola mundo!".getBytes(), "text/plain")); DataHandler dh3 = new DataHandler(new ByteArrayDataSource("Bonjour tout le monde!".getBytes(), "text/plain")); - Map<String, DataHandler> jattachments = new HashMap<String, DataHandler>(); + Map<String, DataHandler> jattachments = new HashMap<>(); context.put(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS, jattachments); jattachments.put("attachment-1", dh1); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/InitParamResourceResolverTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/InitParamResourceResolverTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/InitParamResourceResolverTest.java index fefb496..b345cdc 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/InitParamResourceResolverTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/InitParamResourceResolverTest.java @@ -48,7 +48,7 @@ public class InitParamResourceResolverTest extends Assert { public static final String BOOLEAN_PARAM = "booleanParam"; public static final String BOOLEAN_VALUE = "true"; - private Map<String, String> params = new HashMap<String, String>(); + private Map<String, String> params = new HashMap<>(); private InitParamResourceResolver resolver; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java index 9aa3523..b791b16 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java @@ -48,9 +48,9 @@ public class ContextPropertiesMappingTest extends Assert { private static final String REQUEST_METHOD = "GET"; private static final String HEADER = "header"; - private Map<String, Object> message = new HashMap<String, Object>(); - private Map<String, Object> requestContext = new HashMap<String, Object>(); - private Map<String, Object> responseContext = new HashMap<String, Object>(); + private Map<String, Object> message = new HashMap<>(); + private Map<String, Object> requestContext = new HashMap<>(); + private Map<String, Object> responseContext = new HashMap<>(); @Before public void setUp() throws Exception { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java index c0460dd..f230cea 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java @@ -85,7 +85,7 @@ public class PolicyAnnotationTest extends Assert { def.setExtensionRegistry(bus.getExtension(WSDLManager.class).getExtensionRegistry()); Element wsdl = wsdlWriter.getDocument(def).getDocumentElement(); - Map<String, String> ns = new HashMap<String, String>(); + Map<String, String> ns = new HashMap<>(); ns.put("wsdl", WSDLConstants.NS_WSDL11); ns.put("wsu", "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";); @@ -154,7 +154,7 @@ public class PolicyAnnotationTest extends Assert { def.setExtensionRegistry(bus.getExtension(WSDLManager.class).getExtensionRegistry()); Element wsdl = wsdlWriter.getDocument(def).getDocumentElement(); - Map<String, String> ns = new HashMap<String, String>(); + Map<String, String> ns = new HashMap<>(); ns.put("wsdl", WSDLConstants.NS_WSDL11); ns.put("wsu", "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";); @@ -211,7 +211,7 @@ public class PolicyAnnotationTest extends Assert { def.setExtensionRegistry(bus.getExtension(WSDLManager.class).getExtensionRegistry()); Element wsdl = wsdlWriter.getDocument(def).getDocumentElement(); - Map<String, String> ns = new HashMap<String, String>(); + Map<String, String> ns = new HashMap<>(); ns.put("wsdl", WSDLConstants.NS_WSDL11); ns.put("wsu", "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";); ns.put("wsp", Constants.URI_POLICY_13_NS); @@ -254,7 +254,7 @@ public class PolicyAnnotationTest extends Assert { def.setExtensionRegistry(bus.getExtension(WSDLManager.class).getExtensionRegistry()); Element wsdl = wsdlWriter.getDocument(def).getDocumentElement(); - Map<String, String> ns = new HashMap<String, String>(); + Map<String, String> ns = new HashMap<>(); ns.put("wsdl", WSDLConstants.NS_WSDL11); ns.put("wsu", "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";); ns.put("wsp", Constants.URI_POLICY_13_NS); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java index cecb587..295ae19 100644 --- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java +++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/transport/http_jaxws_spi/JAXWSHttpSpiDestinationTest.java @@ -107,7 +107,7 @@ public class JAXWSHttpSpiDestinationTest extends Assert { expect(exchange.getPathInfo()).andReturn(null); expect(exchange.getRequestURI()).andReturn(CONTEXT_PATH); expect(exchange.getContextPath()).andReturn(CONTEXT_PATH); - Map<String, List<String>> reqHeaders = new HashMap<String, List<String>>(); + Map<String, List<String>> reqHeaders = new HashMap<>(); reqHeaders.put("Content-Type", Collections.singletonList("text/xml")); expect(exchange.getRequestHeaders()).andReturn(reqHeaders).anyTimes(); OutputStream responseBody = control.createMock(OutputStream.class); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java ---------------------------------------------------------------------- diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java index bf503fe..600a2f8 100644 --- a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java +++ b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java @@ -472,8 +472,8 @@ public class DynamicClientFactory { List<ServiceInfo> serviceList, SchemaCollection schemaCollection) { - Map<String, Element> done = new HashMap<String, Element>(); - Map<String, Element> notDone = new HashMap<String, Element>(); + Map<String, Element> done = new HashMap<>(); + Map<String, Element> notDone = new HashMap<>(); OASISCatalogManager catalog = bus.getExtension(OASISCatalogManager.class); for (XmlSchema schema : schemaCollection.getXmlSchemas()) { if (XMLConstants.W3C_XML_SCHEMA_NS_URI.equals(schema.getTargetNamespace())) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java ---------------------------------------------------------------------- diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java index 4ca552e..bfac3fc 100644 --- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java +++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java @@ -133,7 +133,7 @@ public class ClientProxyFactoryBean extends AbstractBasicInterceptorProvider { configureObject(); if (properties == null) { - properties = new HashMap<String, Object>(); + properties = new HashMap<>(); } if (username != null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java ---------------------------------------------------------------------- diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java index 58d5740..bf0ee17 100644 --- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java +++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java @@ -95,7 +95,7 @@ public class WSDLGetUtils { String base, String ctxUri, EndpointInfo endpointInfo) { - Map<String, String> params = new HashMap<String, String>(); + Map<String, String> params = new HashMap<>(); params.put("wsdl", ""); getDocument(message, base, params, ctxUri, @@ -109,7 +109,7 @@ public class WSDLGetUtils { String base, String ctxUri, EndpointInfo endpointInfo) { - Map<String, String> params = new HashMap<String, String>(); + Map<String, String> params = new HashMap<>(); params.put("wsdl", ""); getDocument(message, base, params, ctxUri, @@ -118,7 +118,7 @@ public class WSDLGetUtils { Map<String, SchemaReference> mp = CastUtils.cast((Map<?, ?>)endpointInfo.getService() .getProperty(SCHEMAS_KEY)); - Map<String, String> schemas = new HashMap<String, String>(); + Map<String, String> schemas = new HashMap<>(); for (Map.Entry<String, SchemaReference> ent : mp.entrySet()) { params.clear(); params.put("xsd", ent.getKey()); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java index 181c625..23a4c3f 100644 --- a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java +++ b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java @@ -83,7 +83,7 @@ public class ClientFactoryBeanTest extends AbstractSimpleFrontendTest { cfBean.setServiceClass(HelloService.class); Map<String, Object> props = cfBean.getProperties(); if (props == null) { - props = new HashMap<String, Object>(); + props = new HashMap<>(); } props.put("jaxb.additionalContextClasses", new Class[] {GreetMe.class, GreetMeOneWay.class}); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java index 1c590ed..c96f653 100644 --- a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java +++ b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java @@ -128,7 +128,7 @@ public class ReflectionServiceFactoryTest extends AbstractSimpleFrontendTest { serviceFactory.setServiceClass(HelloService.class); serviceFactory.setWrapped(wrapped); - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); props.put("test", "test"); serviceFactory.setProperties(props); @@ -158,7 +158,7 @@ public class ReflectionServiceFactoryTest extends AbstractSimpleFrontendTest { svrBean.setServiceBean(new HelloServiceImpl()); svrBean.setBus(getBus()); - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); props.put("test", "test"); serviceFactory.setProperties(props); svrBean.setProperties(props); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java index 1d7ff20..86a54a7 100644 --- a/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java +++ b/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java @@ -90,7 +90,7 @@ public class ServerFactoryTest extends AbstractSimpleFrontendTest { Map<String, Object> props = svrBean.getProperties(); if (props == null) { - props = new HashMap<String, Object>(); + props = new HashMap<>(); } props.put("jaxb.additionalContextClasses", new Class[] {GreetMe.class, GreetMeOneWay.class}); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/BasicNameManager.java ---------------------------------------------------------------------- diff --git a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/BasicNameManager.java b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/BasicNameManager.java index 7538373..3d89cb3 100644 --- a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/BasicNameManager.java +++ b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/BasicNameManager.java @@ -72,7 +72,7 @@ public class BasicNameManager implements NameManager { } private void initialize(ServiceInfo service, Endpoint endpoint) { - nsPrefixMap = new HashMap<String, String>(); + nsPrefixMap = new HashMap<>(); if (endpoint != null) { JavascriptOptionsFeature options = getOptions(endpoint); if (options.getNamespacePrefixMap() != null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java ---------------------------------------------------------------------- diff --git a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java index 2f70349..6287697 100755 --- a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java +++ b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java @@ -87,7 +87,7 @@ public class JavascriptUtils { public JavascriptUtils(StringBuilder code) { this.code = code; - defaultValueForSimpleType = new HashMap<String, String>(); + defaultValueForSimpleType = new HashMap<>(); defaultValueForSimpleType.put("int", "0"); defaultValueForSimpleType.put("unsignedInt", "0"); defaultValueForSimpleType.put("long", "0"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/NamespacePrefixAccumulator.java ---------------------------------------------------------------------- diff --git a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/NamespacePrefixAccumulator.java b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/NamespacePrefixAccumulator.java index c090338..b0597ba 100644 --- a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/NamespacePrefixAccumulator.java +++ b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/NamespacePrefixAccumulator.java @@ -39,7 +39,7 @@ public class NamespacePrefixAccumulator { public NamespacePrefixAccumulator(SchemaCollection schemaCollection) { attributes = new StringBuilder(); prefixes = new HashSet<>(); - fallbackNamespacePrefixMap = new HashMap<String, String>(); + fallbackNamespacePrefixMap = new HashMap<>(); nsCounter = 0; this.schemaCollection = schemaCollection; } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java ---------------------------------------------------------------------- diff --git a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java index dd93c3e..c103ef0 100755 --- a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java +++ b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/service/ServiceJavascriptBuilder.java @@ -147,9 +147,9 @@ public class ServiceJavascriptBuilder extends ServiceModelVisitor { operationsWithNameConflicts = new HashSet<>(); inputMessagesWithNameConflicts = new HashSet<>(); outputMessagesWithNameConflicts = new HashSet<>(); - localOperationsNameMap = new HashMap<String, OperationInfo>(); - localInputMessagesNameMap = new HashMap<String, MessageInfo>(); - localOutputMessagesNameMap = new HashMap<String, MessageInfo>(); + localOperationsNameMap = new HashMap<>(); + localInputMessagesNameMap = new HashMap<>(); + localOutputMessagesNameMap = new HashMap<>(); code.append("function " + currentInterfaceClassName + " () {\n"); utils.appendLine("this.jsutils = new CxfApacheOrgUtil();"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java ---------------------------------------------------------------------- diff --git a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java index db5e57e..b92ae68 100644 --- a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java +++ b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java @@ -111,7 +111,7 @@ public class JsXMLHttpRequest extends ScriptableObject { private boolean errorFlag; public JsXMLHttpRequest() { - requestHeaders = new HashMap<String, String>(); + requestHeaders = new HashMap<>(); storedMethod = null; } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java ---------------------------------------------------------------------- diff --git a/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java b/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java index c916d29..9156b2c 100644 --- a/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java +++ b/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java @@ -63,7 +63,7 @@ public class InstrumentationManagerImpl extends JMXConnectorPolicyType implements InstrumentationManager, BusLifeCycleListener { private static final Logger LOG = LogUtils.getL7dLogger(InstrumentationManagerImpl.class); - private static Map<String, String>mbeanServerIDMap = new HashMap<String, String>(); + private static Map<String, String>mbeanServerIDMap = new HashMap<>(); private Bus bus; private MBServerConnectorFactory mcf; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanInfoSupporter.java ---------------------------------------------------------------------- diff --git a/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanInfoSupporter.java b/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanInfoSupporter.java index b4c4dd7..4a5f5e4 100644 --- a/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanInfoSupporter.java +++ b/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanInfoSupporter.java @@ -42,13 +42,13 @@ import org.apache.cxf.management.annotation.ManagedResource; public class ModelMBeanInfoSupporter { protected Map<String, ModelMBeanAttributeInfo> attributes - = new HashMap<String, ModelMBeanAttributeInfo>(); + = new HashMap<>(); protected Map<String, ModelMBeanNotificationInfo> notifications - = new HashMap<String, ModelMBeanNotificationInfo>(); + = new HashMap<>(); protected Map<Constructor<?>, ModelMBeanConstructorInfo> constructors - = new HashMap<Constructor<?>, ModelMBeanConstructorInfo>(); + = new HashMap<>(); protected Map<String, ModelMBeanOperationInfo> operations - = new HashMap<String, ModelMBeanOperationInfo>(); + = new HashMap<>(); public ModelMBeanInfoSupporter() { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java ---------------------------------------------------------------------- diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java index 3724bcc..4a82349 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java @@ -1066,12 +1066,12 @@ public abstract class AbstractClient implements Client { Map<String, Object> reqContext = null; Map<String, Object> resContext = null; if (context == null) { - context = new HashMap<String, Object>(); + context = new HashMap<>(); } reqContext = CastUtils.cast((Map<?, ?>)context.get(REQUEST_CONTEXT)); resContext = CastUtils.cast((Map<?, ?>)context.get(RESPONSE_CONTEXT)); if (reqContext == null) { - reqContext = new HashMap<String, Object>(cfg.getRequestContext()); + reqContext = new HashMap<>(cfg.getRequestContext()); context.put(REQUEST_CONTEXT, reqContext); } reqContext.put(Message.PROTOCOL_HEADERS, message.get(Message.PROTOCOL_HEADERS)); @@ -1080,7 +1080,7 @@ public abstract class AbstractClient implements Client { reqContext.put(PROXY_PROPERTY, proxy); if (resContext == null) { - resContext = new HashMap<String, Object>(); + resContext = new HashMap<>(); context.put(RESPONSE_CONTEXT, resContext); } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientConfiguration.java ---------------------------------------------------------------------- diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientConfiguration.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientConfiguration.java index f103a2c..6d3c817 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientConfiguration.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientConfiguration.java @@ -58,8 +58,8 @@ public class ClientConfiguration implements InterceptorProvider, ConduitSelector = new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>(); private ConduitSelector conduitSelector; private Bus bus; - private Map<String, Object> requestContext = new HashMap<String, Object>(); - private Map<String, Object> responseContext = new HashMap<String, Object>(); + private Map<String, Object> requestContext = new HashMap<>(); + private Map<String, Object> responseContext = new HashMap<>(); private long synchronousTimeout = 60000; private boolean shutdownBusOnClose; http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java ---------------------------------------------------------------------- diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java index 7362b71..36368b2 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java @@ -408,7 +408,7 @@ public class ClientProxyImpl extends AbstractClient implements List<String> methodVars = ori.getURITemplate().getVariables(); List<Parameter> paramsList = getParameters(map, ParameterType.PATH); - Map<String, BeanPair> beanParamValues = new HashMap<String, BeanPair>(beanParams.size()); + Map<String, BeanPair> beanParamValues = new HashMap<>(beanParams.size()); for (Parameter p : beanParams) { beanParamValues.putAll(getValuesFromBeanParam(params[p.getIndex()], PathParam.class)); } @@ -515,7 +515,7 @@ public class ClientProxyImpl extends AbstractClient implements } private Map<String, BeanPair> getValuesFromBeanParam(Object bean, Class<? extends Annotation> annClass) { - Map<String, BeanPair> values = new HashMap<String, BeanPair>(); + Map<String, BeanPair> values = new HashMap<>(); getValuesFromBeanParam(bean, annClass, values); return values; } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/cache/CacheControlClientReaderInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/cache/CacheControlClientReaderInterceptor.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/cache/CacheControlClientReaderInterceptor.java index 58fe0ff..3b83979 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/cache/CacheControlClientReaderInterceptor.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/cache/CacheControlClientReaderInterceptor.java @@ -146,7 +146,7 @@ public class CacheControlClientReaderInterceptor implements ReaderInterceptor { } private Map<String, String> computeCacheHeaders(final MultivaluedMap<String, String> responseHeaders) { - final Map<String, String> cacheHeaders = new HashMap<String, String>(2); + final Map<String, String> cacheHeaders = new HashMap<>(2); final String etagHeader = responseHeaders.getFirst(HttpHeaders.ETAG); if (etagHeader != null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImpl.java ---------------------------------------------------------------------- diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImpl.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImpl.java index c62b28a..68f4be6 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImpl.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImpl.java @@ -271,7 +271,7 @@ public class InvocationBuilderImpl implements Invocation.Builder { Map<String, Object> contextProps = WebClient.getConfig(webClient).getRequestContext(); Map<String, Object> filterProps = CastUtils.cast((Map<?, ?>)contextProps.get(PROPERTY_KEY)); if (filterProps == null) { - filterProps = new HashMap<String, Object>(); + filterProps = new HashMap<>(); contextProps.put(PROPERTY_KEY, filterProps); } if (value == null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/AbstractJaxRsClientConfiguration.java ---------------------------------------------------------------------- diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/AbstractJaxRsClientConfiguration.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/AbstractJaxRsClientConfiguration.java index f0087da..7edfc5b 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/AbstractJaxRsClientConfiguration.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/AbstractJaxRsClientConfiguration.java @@ -76,7 +76,7 @@ public abstract class AbstractJaxRsClientConfiguration implements ApplicationCon } } - Map<String, String> extraHeaders = new HashMap<String, String>(); + Map<String, String> extraHeaders = new HashMap<>(); if (!StringUtils.isEmpty(accept)) { extraHeaders.put("Accept", accept); } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/Book.java ---------------------------------------------------------------------- diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/Book.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/Book.java index 7cc387d..e1ea38b 100644 --- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/Book.java +++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/Book.java @@ -32,7 +32,7 @@ import javax.xml.bind.annotation.XmlRootElement; public class Book implements Comparable<Book> { private String name; private long id; - private Map<Long, Chapter> chapters = new HashMap<Long, Chapter>(); + private Map<Long, Chapter> chapters = new HashMap<>(); public Book() { } http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreNoAnnotations.java ---------------------------------------------------------------------- diff --git a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreNoAnnotations.java b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreNoAnnotations.java index 3b750d4..9e435d5 100644 --- a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreNoAnnotations.java +++ b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/resources/BookStoreNoAnnotations.java @@ -25,7 +25,7 @@ import java.util.Map; public class BookStoreNoAnnotations { - private Map<Long, Book> books = new HashMap<Long, Book>(); + private Map<Long, Book> books = new HashMap<>(); public BookStoreNoAnnotations() { Book b = new Book(); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java ---------------------------------------------------------------------- diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java index 6d340a4..5807e8d 100644 --- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java +++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUtils.java @@ -48,7 +48,7 @@ public final class SwaggerUtils { private static final Logger LOG = LogUtils.getL7dLogger(ResourceUtils.class); private static final Map<String, String> SWAGGER_TYPE_MAP; static { - SWAGGER_TYPE_MAP = new HashMap<String, String>(); + SWAGGER_TYPE_MAP = new HashMap<>(); SWAGGER_TYPE_MAP.put("string", "String"); SWAGGER_TYPE_MAP.put("integer", "long"); SWAGGER_TYPE_MAP.put("float", "float"); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java ---------------------------------------------------------------------- diff --git a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java index e4ce0e1..e8d9e5e 100644 --- a/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java +++ b/rt/rs/description/src/test/java/org/apache/cxf/jaxrs/model/wadl/WadlGeneratorJsonTest.java @@ -69,7 +69,7 @@ public class WadlGeneratorJsonTest extends Assert { ClassResourceInfo cri = ResourceUtils.createClassResourceInfo(BookChapters.class, BookChapters.class, true, true); final Message m = mockMessage("http://localhost:8080/baz";, "/bookstore/1", WadlGenerator.WADL_QUERY, cri); - Map<String, List<String>> headers = new HashMap<String, List<String>>(); + Map<String, List<String>> headers = new HashMap<>(); headers.put("Accept", Collections.singletonList("application/json")); m.put(Message.PROTOCOL_HEADERS, headers); http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpPreStreamInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpPreStreamInterceptor.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpPreStreamInterceptor.java index 807f301..fe42439 100644 --- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpPreStreamInterceptor.java +++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsonp/JsonpPreStreamInterceptor.java @@ -61,7 +61,7 @@ public class JsonpPreStreamInterceptor extends AbstractJsonpOutInterceptor imple protected void setContentType(Message message) { Map<String, List<String>> headers = (Map<String, List<String>>)message.get(Message.PROTOCOL_HEADERS); if (headers == null) { - headers = new HashMap<String, List<String>>(); + headers = new HashMap<>(); message.put(Message.PROTOCOL_HEADERS, headers); } headers.put(Message.CONTENT_TYPE, Collections.singletonList(getMediaType()));
