cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [08/12] cxf git commit: Removing HashMap parameters
Date Thu, 09 Mar 2017 11:40:45 GMT
http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
index de1c5bf..82d4d03 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
@@ -174,7 +174,7 @@ public class JSONProviderTest extends Assert {
                + "}                    ";
 
         JSONProvider<QualifiedStore> p = new JSONProvider<QualifiedStore>();
-        Map<String, String> namespaceMap = new HashMap<String, String>();
+        Map<String, String> namespaceMap = new HashMap<>();
         namespaceMap.put("http://superbooks", "ns1");
         p.setNamespaceMap(namespaceMap);
 
@@ -440,7 +440,7 @@ public class JSONProviderTest extends Assert {
     }
     private void doTestReadFromQualifiedTag(String nsSep) throws Exception {
         JSONProvider<TagVO2> p = new JSONProvider<TagVO2>();
-        Map<String, String> namespaceMap = new HashMap<String, String>();
+        Map<String, String> namespaceMap = new HashMap<>();
         namespaceMap.put("http://tags", "ns1");
         p.setNamespaceMap(namespaceMap);
         if (!".".equals(nsSep)) {
@@ -468,7 +468,7 @@ public class JSONProviderTest extends Assert {
         JSONProvider<TagVO> p = new JSONProvider<TagVO>();
         p.setSupportUnwrapped(true);
 
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         map.put(TagVO.class.getName(), "tagVO");
         p.setWrapperMap(map);
         readUnwrapped(p);
@@ -485,7 +485,7 @@ public class JSONProviderTest extends Assert {
     public void testReadFromUnwrappedQualifiedTagRoot() throws Exception {
         JSONProvider<TagVO2> p = new JSONProvider<TagVO2>();
         p.setSupportUnwrapped(true);
-        Map<String, String> namespaceMap = new HashMap<String, String>();
+        Map<String, String> namespaceMap = new HashMap<>();
         namespaceMap.put("http://tags", "ns1");
         p.setNamespaceMap(namespaceMap);
 
@@ -657,7 +657,7 @@ public class JSONProviderTest extends Assert {
     }
     private void doTestWriteToSingleQualifiedTag(String nsSep) throws Exception {
         JSONProvider<TagVO2> p = new JSONProvider<TagVO2>();
-        Map<String, String> namespaceMap = new HashMap<String, String>();
+        Map<String, String> namespaceMap = new HashMap<>();
         namespaceMap.put("http://tags", "ns1");
         p.setNamespaceMap(namespaceMap);
         if (!".".equals(nsSep)) {
@@ -677,7 +677,7 @@ public class JSONProviderTest extends Assert {
     @Test
     public void testWriteToSingleQualifiedTagBadgerFish() throws Exception {
         JSONProvider<TagVO2> p = new JSONProvider<TagVO2>();
-        Map<String, String> namespaceMap = new HashMap<String, String>();
+        Map<String, String> namespaceMap = new HashMap<>();
         namespaceMap.put("http://tags", "ns2");
         p.setNamespaceMap(namespaceMap);
 
@@ -699,7 +699,7 @@ public class JSONProviderTest extends Assert {
         JSONProvider<TagVO2> p = new JSONProvider<TagVO2>();
         p.setDropRootElement(true);
         p.setIgnoreNamespaces(true);
-        Map<String, String> namespaceMap = new HashMap<String, String>();
+        Map<String, String> namespaceMap = new HashMap<>();
         namespaceMap.put("http://tags", "ns1");
         p.setNamespaceMap(namespaceMap);
         TagVO2 tag = createTag2("a", "b");
@@ -764,7 +764,7 @@ public class JSONProviderTest extends Assert {
         p.setCollectionWrapperName("{http://tags}tag");
         p.setDropCollectionWrapperElement(drop);
         p.setSerializeAsArray(serializeAsArray);
-        Map<String, String> namespaceMap = new HashMap<String, String>();
+        Map<String, String> namespaceMap = new HashMap<>();
         namespaceMap.put("http://tags", "ns1");
         p.setNamespaceMap(namespaceMap);
         p.setIgnoreNamespaces(ignoreNamespaces);
@@ -870,7 +870,7 @@ public class JSONProviderTest extends Assert {
     public void doReadQualifiedCollection(String data, boolean isArray) throws Exception {
 
         JSONProvider provider = new JSONProvider();
-        Map<String, String> namespaceMap = new HashMap<String, String>();
+        Map<String, String> namespaceMap = new HashMap<>();
         namespaceMap.put("http://tags", "ns1");
         provider.setNamespaceMap(namespaceMap);
 
@@ -958,7 +958,7 @@ public class JSONProviderTest extends Assert {
     @Test
     public void testWriteListOfDerivedTypes() throws Exception {
         JSONProvider<Books2> p = new JSONProvider<Books2>();
-        Map<String, String> namespaceMap = new HashMap<String, String>();
+        Map<String, String> namespaceMap = new HashMap<>();
         namespaceMap.put("http://www.w3.org/2001/XMLSchema-instance", "xsins");
         p.setNamespaceMap(namespaceMap);
         Books2 books2 = new Books2();
@@ -977,7 +977,7 @@ public class JSONProviderTest extends Assert {
     @Test
     public void testReadListOfDerivedTypes() throws Exception {
         JSONProvider<Books2> p = new JSONProvider<Books2>();
-        Map<String, String> namespaceMap = new HashMap<String, String>();
+        Map<String, String> namespaceMap = new HashMap<>();
         namespaceMap.put("http://www.w3.org/2001/XMLSchema-instance", "xsins");
         p.setNamespaceMap(namespaceMap);
         String data = "{\"books2\":{\"books\":{\"@xsins.type\":\"superBook\",\"id\":123,"
@@ -997,7 +997,7 @@ public class JSONProviderTest extends Assert {
     @Test
     public void testReadListOfDerivedTypesWithNullField() throws Exception {
         JSONProvider<Books2> p = new JSONProvider<Books2>();
-        Map<String, String> namespaceMap = new HashMap<String, String>();
+        Map<String, String> namespaceMap = new HashMap<>();
         namespaceMap.put("http://www.w3.org/2001/XMLSchema-instance", "xsins");
         p.setNamespaceMap(namespaceMap);
         String data = "{\"books2\":{\"books\":{\"@xsins.type\":\"superBook\",\"id\":123,"
@@ -1286,9 +1286,9 @@ public class JSONProviderTest extends Assert {
 
     private void readTagVO2AfterTransform(String data, String keyValue) throws Exception {
         JSONProvider<TagVO2> provider = new JSONProvider<TagVO2>();
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         map.put(keyValue, "{http://tags}thetag");
-        Map<String, String> nsmap = new HashMap<String, String>();
+        Map<String, String> nsmap = new HashMap<>();
         nsmap.put("http://bar", "t");
         provider.setNamespaceMap(nsmap);
         provider.setInTransformElements(map);
@@ -1305,7 +1305,7 @@ public class JSONProviderTest extends Assert {
     public void testInNsElementsFromLocals() throws Exception {
         String data = "{tagholder:{thetag:{\"group\":\"B\",\"name\":\"A\"}}}";
         JSONProvider<TagVO2Holder> provider = new JSONProvider<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);
@@ -1321,7 +1321,7 @@ public class JSONProviderTest extends Assert {
     @Test
     public void testOutAttributesAsElements() throws Exception {
         JSONProvider<TagVO2Holder> provider = new JSONProvider<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);
@@ -1390,7 +1390,7 @@ public class JSONProviderTest extends Assert {
         //Provider
         JSONProvider<List<?>> provider = new JSONProvider<List<?>>();
         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);
@@ -1427,10 +1427,10 @@ public class JSONProviderTest extends Assert {
 
     private void readTagVOAfterTransform(String data, String keyValue) throws Exception {
         JSONProvider<TagVO> provider = new JSONProvider<TagVO>();
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         map.put(keyValue, "tagVO");
         provider.setInTransformElements(map);
-        Map<String, String> nsmap = new HashMap<String, String>();
+        Map<String, String> nsmap = new HashMap<>();
         nsmap.put("http://bar", "t");
         provider.setNamespaceMap(nsmap);
         ByteArrayInputStream is = new ByteArrayInputStream(data.getBytes());
@@ -1502,7 +1502,7 @@ public class JSONProviderTest 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");
@@ -1516,7 +1516,7 @@ public class JSONProviderTest extends Assert {
     @Test
     public void testOutAppendNsElementBeforeLocal() throws Exception {
         JSONProvider<TagVO> provider = new JSONProvider<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");
@@ -1530,7 +1530,7 @@ public class JSONProviderTest extends Assert {
     @Test
     public void testOutAppendLocalBeforeLocal() throws Exception {
         JSONProvider<TagVO> provider = new JSONProvider<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");
@@ -1545,11 +1545,11 @@ public class JSONProviderTest extends Assert {
     public void testOutAppendElementsSameNs() throws Exception {
         JSONProvider<TagVO2> provider = new JSONProvider<TagVO2>();
 
-        Map<String, String> namespaceMap = new HashMap<String, String>();
+        Map<String, String> namespaceMap = new HashMap<>();
         namespaceMap.put("http://tags", "ns2");
         provider.setNamespaceMap(namespaceMap);
 
-        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");
@@ -1564,11 +1564,11 @@ public class JSONProviderTest extends Assert {
     public void testOutAppendElementsDiffNs() throws Exception {
         JSONProvider<TagVO2> provider = new JSONProvider<TagVO2>();
 
-        Map<String, String> namespaceMap = new HashMap<String, String>();
+        Map<String, String> namespaceMap = new HashMap<>();
         namespaceMap.put("http://tags", "ns2");
         provider.setNamespaceMap(namespaceMap);
 
-        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");
@@ -1582,10 +1582,10 @@ public class JSONProviderTest extends Assert {
     @Test
     public void testOutElementsMapLocalNsToLocalNs() throws Exception {
         JSONProvider<TagVO2> provider = new JSONProvider<TagVO2>();
-        Map<String, String> namespaceMap = new HashMap<String, String>();
+        Map<String, String> namespaceMap = new HashMap<>();
         namespaceMap.put("http://tags", "ns2");
         provider.setNamespaceMap(namespaceMap);
-        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");
@@ -1600,7 +1600,7 @@ public class JSONProviderTest extends Assert {
     @Test
     public void testOutElementsMapLocalNsToLocal() throws Exception {
         JSONProvider<TagVO2> provider = new JSONProvider<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");
@@ -1614,9 +1614,9 @@ public class JSONProviderTest extends Assert {
     @Test
     public void testOutElementsMapLocalToLocalNs() throws Exception {
         JSONProvider<TagVO> provider = new JSONProvider<TagVO>();
-        Map<String, String> namespaceMap = new HashMap<String, String>();
+        Map<String, String> namespaceMap = new HashMap<>();
         namespaceMap.put("http://tags", "ns1");
-        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");
@@ -1630,7 +1630,7 @@ public class JSONProviderTest extends Assert {
     @Test
     public void testOutElementsMapLocalToLocal() throws Exception {
         JSONProvider<TagVO> provider = new JSONProvider<TagVO>();
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         map.put("tagVO", "supertag");
         map.put("group", "group2");
         provider.setOutTransformElements(map);
@@ -1654,7 +1654,7 @@ public class JSONProviderTest extends Assert {
     public void testWriteReadDerivedNamespace() throws Exception {
         JSONProvider<Base1> provider = new JSONProvider<Base1>();
         provider.setMarshallAsJaxbElement(true);
-        Map<String, String> namespaceMap = new HashMap<String, String>();
+        Map<String, String> namespaceMap = new HashMap<>();
         namespaceMap.put("http://derivedtest", "derivedtestnamespace");
         provider.setNamespaceMap(namespaceMap);
 
@@ -1670,7 +1670,7 @@ public class JSONProviderTest extends Assert {
     private void readBase(String data) throws Exception {
         JSONProvider<Base1> provider = new JSONProvider<Base1>();
         provider.setUnmarshallAsJaxbElement(true);
-        Map<String, String> namespaceMap = new HashMap<String, String>();
+        Map<String, String> namespaceMap = new HashMap<>();
         namespaceMap.put("http://derivedtest", "derivedtestnamespace");
         provider.setNamespaceMap(namespaceMap);
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java
index e6449b9..3a5bbb0 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/Beanspector.java
@@ -173,7 +173,7 @@ public class Beanspector<T> {
     }
 
     private Map< Class< ? >, Class< ? > > getPrimitiveWrappers() {
-        final Map< Class< ? >, Class< ? > > wrappers = new HashMap< Class< ? >, Class< ? > >();
+        final Map< Class< ? >, Class< ? > > wrappers = new HashMap<>();
 
         wrappers.put(boolean.class, Boolean.class);
         wrappers.put(byte.class, Byte.class);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/InterfaceProxy.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/InterfaceProxy.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/InterfaceProxy.java
index 393cd27..a194a1a 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/InterfaceProxy.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/InterfaceProxy.java
@@ -25,7 +25,7 @@ import java.util.Map;
 
 public class InterfaceProxy implements InvocationHandler {
 
-    private Map<String, Object> map = new HashMap<String, Object>();
+    private Map<String, Object> map = new HashMap<>();
 
     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
         String methodName = method.getName();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchBean.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchBean.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchBean.java
index 3094166..28f18c3 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchBean.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/SearchBean.java
@@ -27,7 +27,7 @@ import java.util.Set;
  * subsequently introspected or converted into different language expressions
  */
 public class SearchBean {
-    private Map<String, String> values = new HashMap<String, String>(1);
+    private Map<String, String> values = new HashMap<>(1);
 
     public void set(String name, String value) {
         values.put(name, value);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SimpleSearchConditionTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SimpleSearchConditionTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SimpleSearchConditionTest.java
index f22ae06..a5644d4 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SimpleSearchConditionTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/SimpleSearchConditionTest.java
@@ -128,7 +128,7 @@ public class SimpleSearchConditionTest {
     public void testCtorMapCondSupported() {
         for (ConditionType ct : ConditionType.values()) {
             try {
-                Map<String, ConditionType> map = new HashMap<String, ConditionType>();
+                Map<String, ConditionType> map = new HashMap<>();
                 map.put("foo", ct);
                 new SimpleSearchCondition<SingleAttr>(map, attr);
                 if (!supported.contains(ct)) {
@@ -286,7 +286,7 @@ public class SimpleSearchConditionTest {
 
     @Test
     public void testIsMetMappedOperators() {
-        Map<String, ConditionType> map = new HashMap<String, ConditionType>();
+        Map<String, ConditionType> map = new HashMap<>();
         map.put("foo", ConditionType.LESS_THAN);
         map.put("bar", ConditionType.GREATER_THAN);
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java
index 4ea5043..1ceca1b 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/client/FiqlSearchConditionBuilderTest.java
@@ -91,7 +91,7 @@ public class FiqlSearchConditionBuilderTest extends Assert {
     @Test
     public void testEqualToDateWithCustomFormat() throws ParseException {
 
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put(SearchUtils.DATE_FORMAT_PROPERTY, "yyyy-MM-dd'T'HH:mm:ss");
         props.put(SearchUtils.TIMEZONE_SUPPORT_PROPERTY, "false");
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java
index da90f82..315db8e 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/fiql/FiqlParserTest.java
@@ -179,7 +179,7 @@ public class FiqlParserTest extends Assert {
 
     @Test
     public void testParseDateWithCustomFormat() throws SearchParseException, ParseException {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         props.put(SearchUtils.DATE_FORMAT_PROPERTY, "yyyy-MM-dd'T'HH:mm:ss");
         props.put(SearchUtils.TIMEZONE_SUPPORT_PROPERTY, "false");
         parser = new FiqlParser<Condition>(Condition.class, props);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorFiqlTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorFiqlTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorFiqlTest.java
index e94fe8e..7a6ad77 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorFiqlTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorFiqlTest.java
@@ -233,7 +233,7 @@ public class JPATypedQueryVisitorFiqlTest extends AbstractJPATypedQueryVisitorTe
 
     @Test
     public void testEqualsAddressQuery3() throws Exception {
-        Map<String, String> beanPropertiesMap = new HashMap<String, String>();
+        Map<String, String> beanPropertiesMap = new HashMap<>();
         beanPropertiesMap.put("street", "address.street");
         beanPropertiesMap.put("housenum", "address.houseNumber");
         List<Book> books =
@@ -247,7 +247,7 @@ public class JPATypedQueryVisitorFiqlTest extends AbstractJPATypedQueryVisitorTe
 
     @Test
     public void testEqualsAddressQuery4() throws Exception {
-        Map<String, String> beanPropertiesMap = new HashMap<String, String>();
+        Map<String, String> beanPropertiesMap = new HashMap<>();
         beanPropertiesMap.put("street", "address.street");
         List<Book> books = queryBooks("street==Str*t*", null, beanPropertiesMap);
         assertEquals(3, books.size());
@@ -255,7 +255,7 @@ public class JPATypedQueryVisitorFiqlTest extends AbstractJPATypedQueryVisitorTe
 
     @Test
     public void testEqualsAddressQuery5() throws Exception {
-        Map<String, String> beanPropertiesMap = new HashMap<String, String>();
+        Map<String, String> beanPropertiesMap = new HashMap<>();
         beanPropertiesMap.put("street", "address.street");
         List<Book> books = queryBooks("street==Street&'3", null, beanPropertiesMap);
         assertEquals(1, books.size());

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java
index fceb9be..affab8f 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java
@@ -196,7 +196,7 @@ public class JPATypedQueryVisitorODataTest extends AbstractJPATypedQueryVisitorT
 
     @Test
     public void testEqualsAddressQuery3() throws Exception {
-        Map<String, String> beanPropertiesMap = new HashMap<String, String>();
+        Map<String, String> beanPropertiesMap = new HashMap<>();
         beanPropertiesMap.put("street", "address.street");
         beanPropertiesMap.put("housenum", "address.houseNumber");
         List<Book> books =
@@ -209,7 +209,7 @@ public class JPATypedQueryVisitorODataTest extends AbstractJPATypedQueryVisitorT
 
     @Test
     public void testEqualsAddressQuery4() throws Exception {
-        Map<String, String> beanPropertiesMap = new HashMap<String, String>();
+        Map<String, String> beanPropertiesMap = new HashMap<>();
         beanPropertiesMap.put("street", "address.street");
         List<Book> books = queryBooks("street eq 'Str*t*'", null, beanPropertiesMap);
         assertEquals(3, books.size());
@@ -217,7 +217,7 @@ public class JPATypedQueryVisitorODataTest extends AbstractJPATypedQueryVisitorT
 
     @Test
     public void testEqualsAddressQuery5() throws Exception {
-        Map<String, String> beanPropertiesMap = new HashMap<String, String>();
+        Map<String, String> beanPropertiesMap = new HashMap<>();
         beanPropertiesMap.put("street", "address.street");
         List<Book> books = queryBooks("street eq 'Street&''3'", null, beanPropertiesMap);
         assertEquals(1, books.size());

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwa/AlgorithmUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwa/AlgorithmUtils.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwa/AlgorithmUtils.java
index 0e1fd23..2006bf2 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwa/AlgorithmUtils.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwa/AlgorithmUtils.java
@@ -131,7 +131,7 @@ public final class AlgorithmUtils {
     private static final Map<String, String> JAVA_TO_JWA_NAMES;
     private static final Map<String, String> JWA_TO_JAVA_NAMES;
     static {
-        JAVA_TO_JWA_NAMES = new HashMap<String, String>();
+        JAVA_TO_JWA_NAMES = new HashMap<>();
         JAVA_TO_JWA_NAMES.put(HMAC_SHA_256_JAVA, HMAC_SHA_256_ALGO);
         JAVA_TO_JWA_NAMES.put(HMAC_SHA_384_JAVA, HMAC_SHA_384_ALGO);
         JAVA_TO_JWA_NAMES.put(HMAC_SHA_512_JAVA, HMAC_SHA_512_ALGO);
@@ -156,7 +156,7 @@ public final class AlgorithmUtils {
         JAVA_TO_JWA_NAMES.put(AES_CBC_ALGO_JAVA, A128CBC_HS256_ALGO);
         JAVA_TO_JWA_NAMES.put(AES_CBC_ALGO_JAVA, A192CBC_HS384_ALGO);
         JAVA_TO_JWA_NAMES.put(AES_CBC_ALGO_JAVA, A256CBC_HS512_ALGO);
-        JWA_TO_JAVA_NAMES = new HashMap<String, String>();
+        JWA_TO_JAVA_NAMES = new HashMap<>();
         JWA_TO_JAVA_NAMES.put(HMAC_SHA_256_ALGO, HMAC_SHA_256_JAVA);
         JWA_TO_JAVA_NAMES.put(HMAC_SHA_384_ALGO, HMAC_SHA_384_JAVA);
         JWA_TO_JAVA_NAMES.put(HMAC_SHA_512_ALGO, HMAC_SHA_512_JAVA);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AesCbcHmacJweEncryption.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AesCbcHmacJweEncryption.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AesCbcHmacJweEncryption.java
index c30a364..0713100 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AesCbcHmacJweEncryption.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AesCbcHmacJweEncryption.java
@@ -34,12 +34,12 @@ public class AesCbcHmacJweEncryption extends JweEncryption {
     private static final Map<String, String> AES_HMAC_MAP;
     private static final Map<String, Integer> AES_CEK_SIZE_MAP;
     static {
-        AES_HMAC_MAP = new HashMap<String, String>();
+        AES_HMAC_MAP = new HashMap<>();
         AES_HMAC_MAP.put(ContentAlgorithm.A128CBC_HS256.getJwaName(), AlgorithmUtils.HMAC_SHA_256_JAVA);
         AES_HMAC_MAP.put(ContentAlgorithm.A192CBC_HS384.getJwaName(), AlgorithmUtils.HMAC_SHA_384_JAVA);
         AES_HMAC_MAP.put(ContentAlgorithm.A256CBC_HS512.getJwaName(), AlgorithmUtils.HMAC_SHA_512_JAVA);
 
-        AES_CEK_SIZE_MAP = new HashMap<String, Integer>();
+        AES_CEK_SIZE_MAP = new HashMap<>();
         AES_CEK_SIZE_MAP.put(ContentAlgorithm.A128CBC_HS256.getJwaName(), 32);
         AES_CEK_SIZE_MAP.put(ContentAlgorithm.A192CBC_HS384.getJwaName(), 48);
         AES_CEK_SIZE_MAP.put(ContentAlgorithm.A256CBC_HS512.getJwaName(), 64);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhAesWrapKeyEncryptionAlgorithm.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhAesWrapKeyEncryptionAlgorithm.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhAesWrapKeyEncryptionAlgorithm.java
index 2da1749..f90fb33 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhAesWrapKeyEncryptionAlgorithm.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhAesWrapKeyEncryptionAlgorithm.java
@@ -32,7 +32,7 @@ public class EcdhAesWrapKeyEncryptionAlgorithm implements KeyEncryptionProvider
 
     private static final Map<String, String> ECDH_AES_MAP;
     static {
-        ECDH_AES_MAP = new HashMap<String, String>();
+        ECDH_AES_MAP = new HashMap<>();
         ECDH_AES_MAP.put(KeyAlgorithm.ECDH_ES_A128KW.getJwaName(), KeyAlgorithm.A128KW.getJwaName());
         ECDH_AES_MAP.put(KeyAlgorithm.ECDH_ES_A192KW.getJwaName(), KeyAlgorithm.A192KW.getJwaName());
         ECDH_AES_MAP.put(KeyAlgorithm.ECDH_ES_A256KW.getJwaName(), KeyAlgorithm.A256KW.getJwaName());

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
index 777dbb0..cf482dd 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
@@ -45,17 +45,17 @@ public class PbesHmacAesWrapKeyEncryptionAlgorithm implements KeyEncryptionProvi
     private static final Map<String, String> PBES_AES_MAP;
     private static final Map<String, Integer> DERIVED_KEY_SIZE_MAP;
     static {
-        PBES_HMAC_MAP = new HashMap<String, Integer>();
+        PBES_HMAC_MAP = new HashMap<>();
         PBES_HMAC_MAP.put(KeyAlgorithm.PBES2_HS256_A128KW.getJwaName(), 256);
         PBES_HMAC_MAP.put(KeyAlgorithm.PBES2_HS384_A192KW.getJwaName(), 384);
         PBES_HMAC_MAP.put(KeyAlgorithm.PBES2_HS512_A256KW.getJwaName(), 512);
 
-        PBES_AES_MAP = new HashMap<String, String>();
+        PBES_AES_MAP = new HashMap<>();
         PBES_AES_MAP.put(KeyAlgorithm.PBES2_HS256_A128KW.getJwaName(), KeyAlgorithm.A128KW.getJwaName());
         PBES_AES_MAP.put(KeyAlgorithm.PBES2_HS384_A192KW.getJwaName(), KeyAlgorithm.A192KW.getJwaName());
         PBES_AES_MAP.put(KeyAlgorithm.PBES2_HS512_A256KW.getJwaName(), KeyAlgorithm.A256KW.getJwaName());
 
-        DERIVED_KEY_SIZE_MAP = new HashMap<String, Integer>();
+        DERIVED_KEY_SIZE_MAP = new HashMap<>();
         DERIVED_KEY_SIZE_MAP.put(KeyAlgorithm.PBES2_HS256_A128KW.getJwaName(), 16);
         DERIVED_KEY_SIZE_MAP.put(KeyAlgorithm.PBES2_HS384_A192KW.getJwaName(), 24);
         DERIVED_KEY_SIZE_MAP.put(KeyAlgorithm.PBES2_HS512_A256KW.getJwaName(), 32);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JwkUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JwkUtils.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JwkUtils.java
index 0aa09f4..4b67ff6 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JwkUtils.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwk/JwkUtils.java
@@ -78,7 +78,7 @@ import org.apache.cxf.rt.security.crypto.MessageDigestUtils;
 public final class JwkUtils {
     private static final Map<KeyType, List<String>> JWK_REQUIRED_FIELDS_MAP;
     static {
-        JWK_REQUIRED_FIELDS_MAP = new HashMap<KeyType, List<String>>();
+        JWK_REQUIRED_FIELDS_MAP = new HashMap<>();
         JWK_REQUIRED_FIELDS_MAP.put(KeyType.RSA, Arrays.asList(
             JsonWebKey.RSA_PUBLIC_EXP, JsonWebKey.KEY_TYPE, JsonWebKey.RSA_MODULUS));
         JWK_REQUIRED_FIELDS_MAP.put(KeyType.EC, Arrays.asList(

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/EcDsaJwsSignatureVerifier.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/EcDsaJwsSignatureVerifier.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/EcDsaJwsSignatureVerifier.java
index 272e6fa..456b75a 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/EcDsaJwsSignatureVerifier.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/EcDsaJwsSignatureVerifier.java
@@ -31,7 +31,7 @@ import org.apache.cxf.rs.security.jose.jwa.SignatureAlgorithm;
 public class EcDsaJwsSignatureVerifier extends PublicKeyJwsSignatureVerifier {
     static final Map<String, Integer> SIGNATURE_LENGTH_MAP;
     static {
-        SIGNATURE_LENGTH_MAP = new HashMap<String, Integer>();
+        SIGNATURE_LENGTH_MAP = new HashMap<>();
         SIGNATURE_LENGTH_MAP.put(SignatureAlgorithm.ES256.getJwaName(), 64);
         SIGNATURE_LENGTH_MAP.put(SignatureAlgorithm.ES384.getJwaName(), 96);
         SIGNATURE_LENGTH_MAP.put(SignatureAlgorithm.ES512.getJwaName(), 132);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/client/OAuthClientUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/client/OAuthClientUtils.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/client/OAuthClientUtils.java
index db8c3ea..58630d5 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/client/OAuthClientUtils.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/client/OAuthClientUtils.java
@@ -77,7 +77,7 @@ public final class OAuthClientUtils {
     }
 
     public static Map<String, Object> prepareOAuthRsaProperties(PrivateKey pk) {
-        Map<String, Object> props = new HashMap<String, Object>();
+        Map<String, Object> props = new HashMap<>();
         props.put(OAuth.OAUTH_SIGNATURE_METHOD, OAuth.RSA_SHA1);
         props.put(RSA_SHA1.PRIVATE_KEY, pk);
         return props;
@@ -88,7 +88,7 @@ public final class OAuthClientUtils {
                                         URI callback,
                                         Map<String, String> extraParams,
                                         Map<String, Object> oauthConsumerProps) throws OAuthServiceException {
-        Map<String, String> parameters = new HashMap<String, String>();
+        Map<String, String> parameters = new HashMap<>();
         if (extraParams != null) {
             parameters.putAll(extraParams);
         }
@@ -134,7 +134,7 @@ public final class OAuthClientUtils {
                                        Token requestToken,
                                        String verifier,
                                        Map<String, Object> oauthConsumerProps) throws OAuthServiceException {
-        Map<String, String> parameters = new HashMap<String, String>();
+        Map<String, String> parameters = new HashMap<>();
         parameters.put(OAuth.OAUTH_CONSUMER_KEY, consumer.getKey());
         parameters.put(OAuth.OAUTH_TOKEN, requestToken.getToken());
         parameters.put(OAuth.OAUTH_VERIFIER, verifier);
@@ -168,7 +168,7 @@ public final class OAuthClientUtils {
                                                    String method,
                                                    String requestURI,
                                                    Map<String, Object> oauthConsumerProps) {
-        Map<String, String> parameters = new HashMap<String, String>();
+        Map<String, String> parameters = new HashMap<>();
         parameters.put(OAuth.OAUTH_CONSUMER_KEY, consumer.getKey());
         if (accessToken != null) {
             parameters.put(OAuth.OAUTH_TOKEN, accessToken.getToken());

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java
index df0da4f..b98aeda 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java
@@ -291,7 +291,7 @@ public class AbstractAuthFilter {
                 return params;
             }
 
-            Map<String, String[]> newParams = new HashMap<String, String[]>();
+            Map<String, String[]> newParams = new HashMap<>();
             for (Map.Entry<String, String[]> entry : params.entrySet()) {
                 if (ALLOWED_OAUTH_PARAMETERS.contains(entry.getKey())) {
                     newParams.put(entry.getKey(), entry.getValue());

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java
index 2f94200..28ce89a 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AccessTokenHandler.java
@@ -90,7 +90,7 @@ public class AccessTokenHandler {
             AccessToken accessToken = dataProvider.createAccessToken(reg);
 
             //create response
-            Map<String, Object> responseParams = new HashMap<String, Object>();
+            Map<String, Object> responseParams = new HashMap<>();
             responseParams.put(OAuth.OAUTH_TOKEN, accessToken.getTokenKey());
             responseParams.put(OAuth.OAUTH_TOKEN_SECRET, accessToken.getTokenSecret());
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java
index 1c6ba2d..584166c 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java
@@ -99,7 +99,7 @@ public class AuthorizationRequestHandler {
 
             boolean allow = OAuthConstants.AUTHORIZATION_DECISION_ALLOW.equals(decision);
 
-            Map<String, String> queryParams = new HashMap<String, String>();
+            Map<String, String> queryParams = new HashMap<>();
             if (allow) {
                 SecurityContext sc = (SecurityContext)mc.get(SecurityContext.class.getName());
                 List<String> roleNames = Collections.emptyList();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/RequestTokenHandler.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/RequestTokenHandler.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/RequestTokenHandler.java
index 6689a64..04b619a 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/RequestTokenHandler.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/RequestTokenHandler.java
@@ -96,7 +96,7 @@ public class RequestTokenHandler {
                 LOG.log(Level.FINE, "Preparing Temporary Credentials Endpoint correct response");
             }
             //create response
-            Map<String, Object> responseParams = new HashMap<String, Object>();
+            Map<String, Object> responseParams = new HashMap<>();
             responseParams.put(OAuth.OAUTH_TOKEN, requestToken.getTokenKey());
             responseParams.put(OAuth.OAUTH_TOKEN_SECRET, requestToken.getTokenSecret());
             responseParams.put(OAuth.OAUTH_CALLBACK_CONFIRMED, Boolean.TRUE);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java
index 5186ab4..6baac3c 100644
--- a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java
+++ b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java
@@ -150,7 +150,7 @@ public final class OAuthUtils {
             // when processing a user confirmation with only 3 parameters expected
             String ct = request.getContentType();
             if (ct != null && MediaType.APPLICATION_FORM_URLENCODED.equals(ct)) {
-                Map<String, List<String>> map = new HashMap<String, List<String>>();
+                Map<String, List<String>> map = new HashMap<>();
                 for (Entry<String, String> param : params) {
                     map.put(param.getKey(), Collections.singletonList(param.getValue()));
                 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessTokenValidation.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessTokenValidation.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessTokenValidation.java
index 2334bbf..e4c1b7e 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessTokenValidation.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessTokenValidation.java
@@ -58,7 +58,7 @@ public class AccessTokenValidation {
     private List<OAuthPermission> tokenScopes = new LinkedList<OAuthPermission>();
     private List<String> audiences = new LinkedList<String>();
     private String clientCodeVerifier;
-    private Map<String, String> extraProps = new HashMap<String, String>();
+    private Map<String, String> extraProps = new HashMap<>();
 
     public AccessTokenValidation() {
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java
index 7141b0c..1d981ac 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java
@@ -59,7 +59,7 @@ public class Client implements Serializable {
     private List<String> registeredScopes = new LinkedList<String>();
     private List<String> registeredAudiences = new LinkedList<String>();
 
-    private Map<String, String> properties = new HashMap<String, String>();
+    private Map<String, String> properties = new HashMap<>();
     private UserSubject subject;
     private UserSubject resourceOwnerSubject;
     private long registeredAt;

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java
index 65cd913..7a48504 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthAuthorizationData.java
@@ -48,7 +48,7 @@ public class OAuthAuthorizationData extends OAuthRedirectionState implements Ser
     private String applicationDescription;
     private String applicationLogoUri;
     private List<String> applicationCertificates = new LinkedList<String>();
-    private Map<String, String> extraApplicationProperties = new HashMap<String, String>();
+    private Map<String, String> extraApplicationProperties = new HashMap<>();
     private boolean implicitFlow;
 
     private List<OAuthPermission> permissions;

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/TokenIntrospection.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/TokenIntrospection.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/TokenIntrospection.java
index 92dc38c..94e63e5 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/TokenIntrospection.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/TokenIntrospection.java
@@ -37,7 +37,7 @@ public class TokenIntrospection {
     private String iss;
     private String jti;
 
-    private Map<String, String> extensions = new HashMap<String, String>();
+    private Map<String, String> extensions = new HashMap<>();
 
     public TokenIntrospection() {
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java
index 8d27148..7621481 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java
@@ -45,7 +45,7 @@ public class UserSubject implements Serializable {
     private String login;
     private String id;
     private List<String> roles = new LinkedList<String>();
-    private Map<String, String> properties = new HashMap<String, String>();
+    private Map<String, String> properties = new HashMap<>();
     private AuthenticationMethod am;
 
     public UserSubject() {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthScopesFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthScopesFilter.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthScopesFilter.java
index faa2b2d..cc12eec 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthScopesFilter.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/OAuthScopesFilter.java
@@ -58,8 +58,8 @@ public class OAuthScopesFilter implements ContainerRequestFilter {
 
     @Context
     private MessageContext mc;
-    private Map<String, List<String>> scopesMap = new HashMap<String, List<String>>();
-    private Map<String, Boolean> scopesMatchAllMap = new HashMap<String, Boolean>();
+    private Map<String, List<String>> scopesMap = new HashMap<>();
+    private Map<String, Boolean> scopesMatchAllMap = new HashMap<>();
     private Set<String> confidentialClientMethods = new HashSet<>();
 
     public void setSecuredObject(Object object) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
index 339e07d..dec7775 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
@@ -45,7 +45,7 @@ public abstract class AbstractOAuthDataProvider implements OAuthDataProvider, Cl
     private long accessTokenLifetime = 3600L;
     private long refreshTokenLifetime; // refresh tokens are eternal by default
     private boolean recycleRefreshTokens = true;
-    private Map<String, OAuthPermission> permissionMap = new HashMap<String, OAuthPermission>();
+    private Map<String, OAuthPermission> permissionMap = new HashMap<>();
     private MessageContext messageContext;
     private List<String> defaultScopes;
     private List<String> requiredScopes;

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/AbstractHawkAccessTokenValidator.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/AbstractHawkAccessTokenValidator.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/AbstractHawkAccessTokenValidator.java
index 0c3b94b..2194a0b 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/AbstractHawkAccessTokenValidator.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/tokens/hawk/AbstractHawkAccessTokenValidator.java
@@ -98,7 +98,7 @@ public abstract class AbstractHawkAccessTokenValidator implements AccessTokenVal
 
     protected static Map<String, String> getSchemeParameters(String authData) {
         String[] attributePairs = authData.split(",");
-        Map<String, String> attributeMap = new HashMap<String, String>();
+        Map<String, String> attributeMap = new HashMap<>();
         for (String pair : attributePairs) {
             String[] pairValues = pair.trim().split("=", 2);
             attributeMap.put(pairValues[0].trim(), pairValues[1].trim().replaceAll("\"", ""));

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/crypto/ModelEncryptionSupport.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/crypto/ModelEncryptionSupport.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/crypto/ModelEncryptionSupport.java
index d69d83e..97e3dcb 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/crypto/ModelEncryptionSupport.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/crypto/ModelEncryptionSupport.java
@@ -463,7 +463,7 @@ public final class ModelEncryptionSupport {
     }
 
     public static Map<String, String> parseSimpleMap(String mapStr) {
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         List<String> entries = parseSimpleList(mapStr);
         for (String entry : entries) {
             String[] pair = entry.split("=");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/crypto/EncryptingDataProvider.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/crypto/EncryptingDataProvider.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/crypto/EncryptingDataProvider.java
index 4c6c4f7..a3357d5 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/crypto/EncryptingDataProvider.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/utils/crypto/EncryptingDataProvider.java
@@ -44,7 +44,7 @@ public class EncryptingDataProvider implements OAuthDataProvider {
     SecretKey key;
     private Map<String, String> clients;
     private Set<String> tokens = new HashSet<>();
-    private Map<String, String> refreshTokens = new HashMap<String, String>();
+    private Map<String, String> refreshTokens = new HashMap<>();
 
     public EncryptingDataProvider() throws Exception {
         key = CryptoUtils.getSecretKey("AES");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
index e64ce35..3fb8c90 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/utils/OidcUtils.java
@@ -73,7 +73,7 @@ public final class OidcUtils {
 
     private static final Map<String, List<String>> SCOPES_MAP;
     static {
-        SCOPES_MAP = new HashMap<String, List<String>>();
+        SCOPES_MAP = new HashMap<>();
         SCOPES_MAP.put(PHONE_SCOPE, PHONE_CLAIMS);
         SCOPES_MAP.put(EMAIL_SCOPE, EMAIL_CLAIMS);
         SCOPES_MAP.put(ADDRESS_SCOPE, ADDRESS_CLAIMS);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/Activator.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/Activator.java b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/Activator.java
index 7889563..0321a95 100644
--- a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/Activator.java
+++ b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/Activator.java
@@ -80,7 +80,7 @@ public class Activator implements BundleActivator {
         }
 
         private Map<String, Object> toMap(Dictionary<String, ?> properties) {
-            Map<String, Object> props = new HashMap<String, Object>();
+            Map<String, Object> props = new HashMap<>();
             if (properties == null) {
                 return props;
             }

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
index f7c168c..4b3ed0c 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
@@ -445,7 +445,7 @@ public class JettyHTTPDestinationTest extends Assert {
         EndpointReferenceType refWithId = destination.getAddressWithId(id);
         String pathInfo = EndpointReferenceUtils.getAddress(refWithId);
 
-        Map<String, Object> context = new HashMap<String, Object>();
+        Map<String, Object> context = new HashMap<>();
         assertNull("fails with no context", destination.getId(context));
 
         context.put(Message.PATH_INFO, pathInfo);
@@ -461,7 +461,7 @@ public class JettyHTTPDestinationTest extends Assert {
         final String id = "ID3";
         EndpointReferenceType refWithId = destination.getAddressWithId(id);
 
-        Map<String, Object> context = new HashMap<String, Object>();
+        Map<String, Object> context = new HashMap<>();
         assertNull("fails with no context", destination.getId(context));
 
         AddressingProperties maps = EasyMock.createMock(AddressingProperties.class);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletContext.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletContext.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletContext.java
index 74eb883..2bae2de 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletContext.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletContext.java
@@ -99,7 +99,7 @@ public class NettyServletContext implements ServletContext {
 
     public void addInitParameter(String name, String value) {
         if (this.initParameters == null) {
-            this.initParameters = new HashMap<String, String>();
+            this.initParameters = new HashMap<>();
         }
         this.initParameters.put(name, value);
     }
@@ -143,7 +143,7 @@ public class NettyServletContext implements ServletContext {
     @Override
     public void setAttribute(String name, Object object) {
         if (this.attributes == null) {
-            this.attributes = new HashMap<String, Object>();
+            this.attributes = new HashMap<>();
         }
         this.attributes.put(name, object);
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
index 613c68d..3483847 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
@@ -446,7 +446,7 @@ public class NettyHttpDestinationTest extends Assert {
         EndpointReferenceType refWithId = destination.getAddressWithId(id);
         String pathInfo = EndpointReferenceUtils.getAddress(refWithId);
 
-        Map<String, Object> context = new HashMap<String, Object>();
+        Map<String, Object> context = new HashMap<>();
         assertNull("fails with no context", destination.getId(context));
 
         context.put(Message.PATH_INFO, pathInfo);
@@ -462,7 +462,7 @@ public class NettyHttpDestinationTest extends Assert {
         final String id = "ID3";
         EndpointReferenceType refWithId = destination.getAddressWithId(id);
 
-        Map<String, Object> context = new HashMap<String, Object>();
+        Map<String, Object> context = new HashMap<>();
         assertNull("fails with no context", destination.getId(context));
 
         AddressingProperties maps = EasyMock.createMock(AddressingProperties.class);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
index 1f6508d..18a87f0 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
@@ -448,7 +448,7 @@ public class UndertowHTTPDestinationTest extends Assert {
         EndpointReferenceType refWithId = destination.getAddressWithId(id);
         String pathInfo = EndpointReferenceUtils.getAddress(refWithId);
 
-        Map<String, Object> context = new HashMap<String, Object>();
+        Map<String, Object> context = new HashMap<>();
         assertNull("fails with no context", destination.getId(context));
 
         context.put(Message.PATH_INFO, pathInfo);
@@ -464,7 +464,7 @@ public class UndertowHTTPDestinationTest extends Assert {
         final String id = "ID3";
         EndpointReferenceType refWithId = destination.getAddressWithId(id);
 
-        Map<String, Object> context = new HashMap<String, Object>();
+        Map<String, Object> context = new HashMap<>();
         assertNull("fails with no context", destination.getId(context));
 
         AddressingProperties maps = EasyMock.createMock(AddressingProperties.class);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index 30798f7..c809c2e 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -1868,7 +1868,7 @@ public abstract class HTTPConduit
                                            Message message) throws IOException {
         Map<String, Integer> visitedURLs = CastUtils.cast((Map<?, ?>)message.get(KEY_VISITED_URLS));
         if (visitedURLs == null) {
-            visitedURLs = new HashMap<String, Integer>();
+            visitedURLs = new HashMap<>();
             message.put(KEY_VISITED_URLS, visitedURLs);
         }
         Integer visitCount = visitedURLs.get(lastURL);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java
index ac12a63..9d3d1a3 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java
@@ -166,7 +166,7 @@ public class DigestAuthSupplier implements HttpAuthSupplier {
                         + qop + ":" + hasha2;
                 }
                 String response = encode(digester.digest(serverDigestValue.getBytes("US-ASCII")));
-                Map<String, String> outParams = new HashMap<String, String>();
+                Map<String, String> outParams = new HashMap<>();
                 if (qop != null) {
                     outParams.put("qop", "auth");
                 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
index 9d6df79..b1c1a25 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
@@ -98,7 +98,7 @@ public final class HttpAuthHeader {
     }
 
     private Map<String, String> parseHeader() {
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         try {
             StreamTokenizer tok = new StreamTokenizer(new StringReader(this.fullContent));
             tok.quoteChar('"');

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
index ed5f78b..5819686 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
@@ -87,7 +87,7 @@ public abstract class AbstractHTTPServlet extends HttpServlet implements Filter
     private static final Map<String, String> DEFAULT_STATIC_CONTENT_TYPES;
 
     static {
-        DEFAULT_STATIC_CONTENT_TYPES = new HashMap<String, String>();
+        DEFAULT_STATIC_CONTENT_TYPES = new HashMap<>();
         DEFAULT_STATIC_CONTENT_TYPES.put("html", "text/html");
         DEFAULT_STATIC_CONTENT_TYPES.put("txt", "text/plain");
         DEFAULT_STATIC_CONTENT_TYPES.put("css", "text/css");
@@ -193,7 +193,7 @@ public abstract class AbstractHTTPServlet extends HttpServlet implements Filter
     protected static Map<String, String> parseMapSequence(String sequence) {
         if (sequence != null) {
             sequence = sequence.trim();
-            Map<String, String> map = new HashMap<String, String>();
+            Map<String, String> map = new HashMap<>();
             String[] pairs = StringUtils.split(sequence, " ");
             for (String pair : pairs) {
                 String thePair = pair.trim();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
index 1de52fc..88f7f27 100755
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HeadersTest.java
@@ -49,7 +49,7 @@ public class HeadersTest extends Assert {
         IMocksControl control = EasyMock.createNiceControl();
         String[] headerNames = {"Content-Type", "authorization", "soapAction"};
         String[] headerValues = {"text/xml", "Basic Zm9vOmJhcg==", "foo"};
-        Map<String, List<String>> inmap = new HashMap<String, List<String>>();
+        Map<String, List<String>> inmap = new HashMap<>();
         for (int i = 0; i < headerNames.length; i++) {
             inmap.put(headerNames[i], Arrays.asList(headerValues[i]));
         }
@@ -95,7 +95,7 @@ public class HeadersTest extends Assert {
 
     @Test
     public void sensitiveHeadersTest() {
-        Map<String, List<String>> headerMap = new HashMap<String, List<String>>();
+        Map<String, List<String>> headerMap = new HashMap<>();
         headerMap.put("Authorization", Arrays.asList("FAIL"));
         headerMap.put("Proxy-Authorization", Arrays.asList("FAIL"));
         headerMap.put("Content-Type", Arrays.asList("application/xml"));
@@ -112,7 +112,7 @@ public class HeadersTest extends Assert {
 
     @Test
     public void logProtocolHeadersTest() {
-        Map<String, List<String>> headerMap = new HashMap<String, List<String>>();
+        Map<String, List<String>> headerMap = new HashMap<>();
         headerMap.put("Normal-Header", Arrays.asList("normal"));
         headerMap.put("Multivalue-Header", Arrays.asList("first", "second"));
         headerMap.put("Authorization", Arrays.asList("myPassword"));

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/DigestAuthSupplierTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/DigestAuthSupplierTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/DigestAuthSupplierTest.java
index af66dbe..25cda2c 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/DigestAuthSupplierTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/DigestAuthSupplierTest.java
@@ -82,7 +82,7 @@ public class DigestAuthSupplierTest {
         HttpAuthHeader authHeader = new HttpAuthHeader(authToken);
         assertEquals("Digest", authHeader.getAuthType());
         Map<String, String> params = authHeader.getParams();
-        Map<String, String> expectedParams = new HashMap<String, String>();
+        Map<String, String> expectedParams = new HashMap<>();
         expectedParams.put("response", "28e616b6868f60aaf9b19bb5b172f076");
         expectedParams.put("cnonce", "27db039b76362f3d55da10652baee38c");
         expectedParams.put("username", "testUser");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/HttpAuthHeaderTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/HttpAuthHeaderTest.java b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/HttpAuthHeaderTest.java
index 06c8065..89e4ccb 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/HttpAuthHeaderTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/HttpAuthHeaderTest.java
@@ -32,7 +32,7 @@ public class HttpAuthHeaderTest {
         HttpAuthHeader authHeader = new HttpAuthHeader("Digest nonce=\"TUzZmQyYw==\", username=\"testUser\"");
         assertEquals("Digest", authHeader.getAuthType());
         Map<String, String> params = authHeader.getParams();
-        Map<String, String> expectedParams = new HashMap<String, String>();
+        Map<String, String> expectedParams = new HashMap<>();
         expectedParams.put("username", "testUser");
         expectedParams.put("nonce", "TUzZmQyYw==");
         assertEquals(expectedParams, params);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
index d2edf73..ad4bbf4 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSEndpoint.java
@@ -54,8 +54,8 @@ public class JMSEndpoint {
 
     public static final String JAXWS_PROPERTY_PREFIX = "jms.";
 
-    private Map<String, String> jndiParameters = new HashMap<String, String>();
-    private Map<String, String> parameters = new HashMap<String, String>();
+    private Map<String, String> jndiParameters = new HashMap<>();
+    private Map<String, String> parameters = new HashMap<>();
 
     private String endpointUri;
     private ConnectionFactory connectionFactory;
@@ -124,7 +124,7 @@ public class JMSEndpoint {
             configureProperties(query);
 
             // Use the properties like e.g. from JAXWS properties with "jms." prefix
-            Map<String, Object> jmsProps = new HashMap<String, Object>();
+            Map<String, Object> jmsProps = new HashMap<>();
             if (ei != null) {
                 getJaxWsJmsProps(ei.getProperties(), jmsProps);
             }

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSURIParser.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSURIParser.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSURIParser.java
index 95b426f..60dfb87 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSURIParser.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/uri/JMSURIParser.java
@@ -75,7 +75,7 @@ final class JMSURIParser {
     }
 
     public Map<String, Object> parseQuery() {
-        Map<String, Object> rc = new HashMap<String, Object>();
+        Map<String, Object> rc = new HashMap<>();
         if (query != null) {
             String[] parameters = StringUtils.split(query, "&");
             for (String parameter : parameters) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/MyBeanLocator.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/MyBeanLocator.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/MyBeanLocator.java
index 5783475..15b5165 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/MyBeanLocator.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/uri/MyBeanLocator.java
@@ -28,7 +28,7 @@ import org.apache.cxf.configuration.ConfiguredBeanLocator;
 
 public class MyBeanLocator implements ConfiguredBeanLocator {
     ConfiguredBeanLocator cbl;
-    Map<String, Object> registry = new HashMap<String, Object>();
+    Map<String, Object> registry = new HashMap<>();
 
     public MyBeanLocator(ConfiguredBeanLocator cbl) {
         this.cbl = cbl;

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPConduit.java b/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPConduit.java
index f9bd4e9..0810c49 100644
--- a/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPConduit.java
+++ b/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPConduit.java
@@ -98,7 +98,7 @@ public class UDPConduit extends AbstractConduit {
 
                 Map<String, Object> mp = null;
                 if (multi) {
-                    mp = new HashMap<String, Object>(message.getExchange());
+                    mp = new HashMap<>(message.getExchange());
                 }
 
                 if (async) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
index 336722f..2e12d5d 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
@@ -142,7 +142,7 @@ public class AhcWebSocketConduit extends URLConnectionHTTPConduit {
                 public void write(byte b[], int off, int len) throws IOException {
                     //REVISIT support multiple writes and flush() to write the entire block data?
                     // or provides the fragment mode?
-                    Map<String, String> headers = new HashMap<String, String>();
+                    Map<String, String> headers = new HashMap<>();
                     headers.put("Content-Type", entity.getContentType());
                     headers.put(requestIdKey, entity.getId());
                     websocket.sendMessage(WebSocketUtils.buildRequest(
@@ -165,7 +165,7 @@ public class AhcWebSocketConduit extends URLConnectionHTTPConduit {
         @Override
         protected void handleNoOutput() throws IOException {
             connect();
-            Map<String, String> headers = new HashMap<String, String>();
+            Map<String, String> headers = new HashMap<>();
             headers.put(requestIdKey, entity.getId());
             websocket.sendMessage(WebSocketUtils.buildRequest(
                 entity.getMethod(), entity.getPath(),

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
index 205976d..de10c1c 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
@@ -66,7 +66,7 @@ public class DefaultProtocolInterceptor extends AtmosphereInterceptorAdapter {
     private static final String REQUEST_DISPATCHED = "request.dispatched";
     private static final String RESPONSE_PARENT = "response.parent";
 
-    private Map<String, AtmosphereResponse> suspendedResponses = new HashMap<String, AtmosphereResponse>();
+    private Map<String, AtmosphereResponse> suspendedResponses = new HashMap<>();
 
     private final AsyncIOInterceptor interceptor = new Interceptor();
 
@@ -304,7 +304,7 @@ public class DefaultProtocolInterceptor extends AtmosphereInterceptorAdapter {
         if (AtmosphereResource.TRANSPORT.WEBSOCKET != response.resource().transport()) {
             return payload;
         }
-        Map<String, String> headers = new HashMap<String, String>();
+        Map<String, String> headers = new HashMap<>();
         if (refid != null) {
             response.addHeader(WebSocketConstants.DEFAULT_RESPONSE_ID_KEY, refid);
             headers.put(WebSocketConstants.DEFAULT_RESPONSE_ID_KEY, refid);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java
index edb46c0..07eb9d0 100755
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/ContextUtilsTest.java
@@ -67,7 +67,7 @@ public class ContextUtilsTest extends Assert {
 
     @Test
     public void testGetActionFromExtensible() {
-        Map<QName, Object> attributes = new HashMap<QName, Object>();
+        Map<QName, Object> attributes = new HashMap<>();
         Extensible ext = control.createMock(Extensible.class);
         EasyMock.expect(ext.getExtensionAttributes()).andReturn(attributes).anyTimes();
         attributes.put(WSA_ACTION_QNAME, "urn:foo:test:2");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
index ce9cdad..8c3cfb2 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
@@ -325,7 +325,7 @@ public class MAPCodecTest extends Assert {
         message.put(mapProperty, maps);
 
 
-        mimeHeaders = new HashMap<String, List<String>>();
+        mimeHeaders = new HashMap<>();
         message.put(MIME_HEADERS, mimeHeaders);
         if (preExistingSOAPAction) {
             List<String> soapAction = new ArrayList<>();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/notification/EventSinkInterfaceNotificationTask.java
----------------------------------------------------------------------
diff --git a/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/notification/EventSinkInterfaceNotificationTask.java b/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/notification/EventSinkInterfaceNotificationTask.java
index b7fd53f..70382fd 100644
--- a/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/notification/EventSinkInterfaceNotificationTask.java
+++ b/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/notification/EventSinkInterfaceNotificationTask.java
@@ -126,7 +126,7 @@ class EventSinkInterfaceNotificationTask implements Runnable {
         }
 
         if (extraClasses != null && extraClasses.length > 0) {
-            Map<String, Object> props = new HashMap<String, Object>();
+            Map<String, Object> props = new HashMap<>();
             props.put("jaxb.additionalContextClasses", extraClasses);
             service.getClientFactoryBean().getServiceFactory().setProperties(props);
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXUtils.java
----------------------------------------------------------------------
diff --git a/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXUtils.java b/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXUtils.java
index 2bf782a..ac47040 100644
--- a/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXUtils.java
+++ b/rt/ws/mex/src/main/java/org/apache/cxf/ws/mex/MEXUtils.java
@@ -52,7 +52,7 @@ public final class MEXUtils {
         EndpointInfo info = server.getEndpoint().getEndpointInfo();
         List<Element> ret = new LinkedList<Element>();
         for (String id : utils.getWSDLIds(message, base, ctxUri, info)) {
-            Map<String, String> params = new HashMap<String, String>();
+            Map<String, String> params = new HashMap<>();
             params.put("wsdl", id);
             ret.add(utils.getDocument(message, base,
                                       params, ctxUri,


Mime
View raw message