cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [11/12] cxf git commit: Removing HashMap parameters
Date Thu, 09 Mar 2017 11:40:48 GMT
http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
index 191e02f..13f051e 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
@@ -109,7 +109,7 @@ public class InTransformReaderTest extends Assert {
         XMLStreamReader reader =
             StaxUtils.createXMLStreamReader(
                       InTransformReader.class.getResourceAsStream("../resources/complexReqIn1.xml"));
-        Map<String, String> inMap = new HashMap<String, String>();
+        Map<String, String> inMap = new HashMap<>();
         inMap.put("{http://cxf.apache.org/transform/header/element}*",
                 "{http://cxf.apache.org/transform/header/element}*");
 
@@ -129,7 +129,7 @@ public class InTransformReaderTest extends Assert {
             StaxUtils.createXMLStreamReader(
                       InTransformReader.class.getResourceAsStream("../resources/complexReqIn2.xml"));
 
-        Map<String, String> inMap = new HashMap<String, String>();
+        Map<String, String> inMap = new HashMap<>();
         inMap.put("{http://cxf.apache.org/transform/header/element}*",
                 "{http://cxf.apache.org/transform/header/otherelement}*");
         inMap.put("{http://cxf.apache.org/transform/test}*",
@@ -151,7 +151,7 @@ public class InTransformReaderTest extends Assert {
             StaxUtils.createXMLStreamReader(
                       InTransformReader.class.getResourceAsStream("../resources/complexReqIn3.xml"));
 
-        Map<String, String> inMap = new HashMap<String, String>();
+        Map<String, String> inMap = new HashMap<>();
         inMap.put("{http://cxf.apache.org/transform/header/element}*",
                 "{http://cxf.apache.org/transform/header/otherelement}*");
         inMap.put("{http://cxf.apache.org/transform/test}*",
@@ -174,7 +174,7 @@ public class InTransformReaderTest extends Assert {
         XMLStreamReader reader =
             StaxUtils.createXMLStreamReader(
                       InTransformReader.class.getResourceAsStream("../resources/complexReqIn1.xml"));
-        Map<String, String> inMap = new HashMap<String, String>();
+        Map<String, String> inMap = new HashMap<>();
         inMap.put("{http://cxf.apache.org/transform/header/element}*",
                 "{http://cxf.apache.org/transform/header/element}*");
 
@@ -197,7 +197,7 @@ public class InTransformReaderTest extends Assert {
             StaxUtils.createXMLStreamReader(
                       InTransformReader.class.getResourceAsStream("../resources/complexReqIn2.xml"));
 
-        Map<String, String> inMap = new HashMap<String, String>();
+        Map<String, String> inMap = new HashMap<>();
         inMap.put("{http://cxf.apache.org/transform/header/element}*",
                 "{http://cxf.apache.org/transform/header/otherelement}*");
         inMap.put("{http://cxf.apache.org/transform/test}*",
@@ -222,7 +222,7 @@ public class InTransformReaderTest extends Assert {
             StaxUtils.createXMLStreamReader(
                       InTransformReader.class.getResourceAsStream("../resources/complexReqIn3.xml"));
 
-        Map<String, String> inMap = new HashMap<String, String>();
+        Map<String, String> inMap = new HashMap<>();
         inMap.put("{http://cxf.apache.org/transform/header/element}*",
                 "{http://cxf.apache.org/transform/header/otherelement}*");
         inMap.put("{http://cxf.apache.org/transform/test}*",
@@ -247,11 +247,11 @@ public class InTransformReaderTest extends Assert {
 
     @Test
     public void testReadWithReplaceAppend() throws Exception {
-        Map<String, String> transformElements = new HashMap<String, String>();
+        Map<String, String> transformElements = new HashMap<>();
         transformElements.put("requestValue",
                               "{http://cxf.apache.org/hello_world_soap_http/types}requestType");
 
-        Map<String, String> appendElements = new HashMap<String, String>();
+        Map<String, String> appendElements = new HashMap<>();
         appendElements.put("requestValue",
                            "{http://cxf.apache.org/hello_world_soap_http/types}greetMe");
 
@@ -262,20 +262,20 @@ public class InTransformReaderTest extends Assert {
 
     @Test
     public void testReadWithReplaceAppendDelete() throws Exception {
-        Map<String, String> transformElements = new HashMap<String, String>();
+        Map<String, String> transformElements = new HashMap<>();
         transformElements.put("requestValue",
                               "{http://cxf.apache.org/hello_world_soap_http/types}requestType");
         transformElements.put("{http://cxf.apache.org/hello_world_soap_http/types}requestDate",
                               "");
 
-        Map<String, String> appendElements = new HashMap<String, String>();
+        Map<String, String> appendElements = new HashMap<>();
         appendElements.put("requestValue",
                            "{http://cxf.apache.org/hello_world_soap_http/types}greetMe");
 
         List<String> dropElements = new ArrayList<>();
         dropElements.add("value");
 
-        Map<String, String> transformAttributes = new HashMap<String, String>();
+        Map<String, String> transformAttributes = new HashMap<>();
         transformAttributes.put("num", "");
         transformAttributes.put("nombre", "{http://cxf.apache.org/hello_world_soap_http/types}name");
 
@@ -287,7 +287,7 @@ public class InTransformReaderTest extends Assert {
 
     @Test
     public void testReadWithChangeNamespaces() throws Exception {
-        Map<String, String> transformElements = new HashMap<String, String>();
+        Map<String, String> transformElements = new HashMap<>();
         transformElements.put("*",
                               "{http://cxf.apache.org/hello_world_soap_http/types}*");
 
@@ -298,7 +298,7 @@ public class InTransformReaderTest extends Assert {
 
     @Test
     public void testReadWithDeleteAttributes() throws Exception {
-        Map<String, String> transformAttributes = new HashMap<String, String>();
+        Map<String, String> transformAttributes = new HashMap<>();
         transformAttributes.put("{http://www.w3.org/2001/XMLSchema-instance}type",
                                 "");
 
@@ -309,7 +309,7 @@ public class InTransformReaderTest extends Assert {
 
     @Test
     public void testReadWithAppendPreInclude1() throws Exception {
-        Map<String, String> appendElements = new HashMap<String, String>();
+        Map<String, String> appendElements = new HashMap<>();
         appendElements.put("{http://xml.amazon.com/AWSECommerceService/2004-08-01}ItemId",
                            "{http://xml.amazon.com/AWSECommerceService/2004-08-01}IdType=ASIN");
         TransformTestUtils.transformInStreamAndCompare("../resources/amazonIn1.xml",
@@ -320,7 +320,7 @@ public class InTransformReaderTest extends Assert {
 
     @Test
     public void testReadWithAppendPreInclude2() throws Exception {
-        Map<String, String> appendElements = new HashMap<String, String>();
+        Map<String, String> appendElements = new HashMap<>();
         appendElements.put("{http://xml.amazon.com/AWSECommerceService/2004-08-01}ItemId",
                            "{http://xml.amazon.com/AWSECommerceService/2004-08-01}IdType=ASIN");
         TransformTestUtils.transformInStreamAndCompare("../resources/amazonIn1nospace.xml",
@@ -331,10 +331,10 @@ public class InTransformReaderTest extends Assert {
 
     @Test
     public void testReadWithAppendPreWrap1() throws Exception {
-        Map<String, String> transformElements = new HashMap<String, String>();
+        Map<String, String> transformElements = new HashMap<>();
         transformElements.put("payload",
                               "{http://www.w3.org/2003/05/soap-envelope}Envelope");
-        Map<String, String> appendElements = new HashMap<String, String>();
+        Map<String, String> appendElements = new HashMap<>();
         appendElements.put("{http://apache.org/cxf/calculator/types}add",
                            "{http://www.w3.org/2003/05/soap-envelope}Body");
         TransformTestUtils.transformInStreamAndCompare("../resources/AddRequestIn2.xml",
@@ -344,10 +344,10 @@ public class InTransformReaderTest extends Assert {
 
     @Test
     public void testReadWithAppendPreWrap2() throws Exception {
-        Map<String, String> transformElements = new HashMap<String, String>();
+        Map<String, String> transformElements = new HashMap<>();
         transformElements.put("payload",
                               "{http://www.w3.org/2003/05/soap-envelope}Envelope");
-        Map<String, String> appendElements = new HashMap<String, String>();
+        Map<String, String> appendElements = new HashMap<>();
         appendElements.put("{http://apache.org/cxf/calculator/types}add",
                            "{http://www.w3.org/2003/05/soap-envelope}Body");
         TransformTestUtils.transformInStreamAndCompare("../resources/AddRequestIn2nospace.xml",
@@ -357,7 +357,7 @@ public class InTransformReaderTest extends Assert {
 
     @Test
     public void testReadWithAppendPostInclude1() throws Exception {
-        Map<String, String> appendElements = new HashMap<String, String>();
+        Map<String, String> appendElements = new HashMap<>();
         appendElements.put("{http://xml.amazon.com/AWSECommerceService/2004-08-01}Request/",
                            "{http://xml.amazon.com/AWSECommerceService/2004-08-01}ItemId=0486411214");
         TransformTestUtils.transformInStreamAndCompare("../resources/amazonIn2.xml",
@@ -368,7 +368,7 @@ public class InTransformReaderTest extends Assert {
 
     @Test
     public void testReadWithAppendPostInclude2() throws Exception {
-        Map<String, String> appendElements = new HashMap<String, String>();
+        Map<String, String> appendElements = new HashMap<>();
         appendElements.put("{http://xml.amazon.com/AWSECommerceService/2004-08-01}Request/",
                            "{http://xml.amazon.com/AWSECommerceService/2004-08-01}ItemId=0486411214");
         TransformTestUtils.transformInStreamAndCompare("../resources/amazonIn2nospace.xml",
@@ -379,7 +379,7 @@ public class InTransformReaderTest extends Assert {
 
     @Test
     public void testReadWithAppendPostWrap1() throws Exception {
-        Map<String, String> appendElements = new HashMap<String, String>();
+        Map<String, String> appendElements = new HashMap<>();
         appendElements.put("{http://www.w3.org/2003/05/soap-envelope}Body/",
                            "{http://apache.org/cxf/calculator/types}add");
         TransformTestUtils.transformInStreamAndCompare("../resources/AddRequestIn1.xml",
@@ -390,7 +390,7 @@ public class InTransformReaderTest extends Assert {
 
     @Test
     public void testReadWithAppendPostWrap2() throws Exception {
-        Map<String, String> appendElements = new HashMap<String, String>();
+        Map<String, String> appendElements = new HashMap<>();
         appendElements.put("{http://www.w3.org/2003/05/soap-envelope}Body/",
                            "{http://apache.org/cxf/calculator/types}add");
         TransformTestUtils.transformInStreamAndCompare("../resources/AddRequestIn1nospace.xml",
@@ -401,7 +401,7 @@ public class InTransformReaderTest extends Assert {
 
     @Test
     public void testReadWithAppendPostWrapReplaceDrop() throws Exception {
-        Map<String, String> transformElements = new HashMap<String, String>();
+        Map<String, String> transformElements = new HashMap<>();
         transformElements.put("payload",
                               "{http://www.w3.org/2003/05/soap-envelope}Envelope");
         transformElements.put("params",
@@ -412,7 +412,7 @@ public class InTransformReaderTest extends Assert {
                               "{http://apache.org/cxf/calculator/types}arg1");
         transformElements.put("i3",
                               "");
-        Map<String, String> appendElements = new HashMap<String, String>();
+        Map<String, String> appendElements = new HashMap<>();
         appendElements.put("payload/",
                            "{http://www.w3.org/2003/05/soap-envelope}Body");
         List<String> dropElements = new ArrayList<>();
@@ -426,7 +426,7 @@ public class InTransformReaderTest extends Assert {
 
     @Test
     public void testOldSTSTransform() throws Exception {
-        Map<String, String> transformElements = new HashMap<String, String>();
+        Map<String, String> transformElements = new HashMap<>();
 
         transformElements.put("{http://docs.oasis-open.org/ws-sx/ws-trust/200512}*",
                               "{http://schemas.xmlsoap.org/ws/2005/02/trust}*");
@@ -440,7 +440,7 @@ public class InTransformReaderTest extends Assert {
 
     @Test
     public void testPreservePrefixBindings() throws Exception {
-        Map<String, String> transformElements = new HashMap<String, String>();
+        Map<String, String> transformElements = new HashMap<>();
         transformElements.put("{urn:abc}*",
                               "{urn:a}*");
 
@@ -451,7 +451,7 @@ public class InTransformReaderTest extends Assert {
 
     @Test
     public void testReadNamespaceWithDuplicatePrefixes() throws Exception {
-        Map<String, String> transformElements = new HashMap<String, String>();
+        Map<String, String> transformElements = new HashMap<>();
         transformElements.put("{http://bar.com/foo}*",
                               "{http://bar.com/foobar}*");
         TransformTestUtils.transformInStreamAndCompare("../resources/multiNS2In1.xml",

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
index 21e8701..4788c5a 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
@@ -54,7 +54,7 @@ public class OutTransformWriterTest extends Assert {
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         XMLStreamWriter writer = StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name());
 
-        Map<String, String> outMap = new HashMap<String, String>();
+        Map<String, String> outMap = new HashMap<>();
         outMap.put("{http://testbeans.com}*", "{http://testbeans.com/v2}*");
         OutTransformWriter transformWriter = new OutTransformWriter(writer,
                                                                     outMap,
@@ -77,7 +77,7 @@ public class OutTransformWriterTest extends Assert {
 
         JAXBContext context = JAXBContext.newInstance(TestBean.class);
         Marshaller m = context.createMarshaller();
-        Map<String, String> outMap = new HashMap<String, String>();
+        Map<String, String> outMap = new HashMap<>();
         outMap.put("{http://testbeans.com}testBean", "{http://testbeans.com/v2}testBean");
         outMap.put("{http://testbeans.com}bean", "{http://testbeans.com/v3}bean");
         OutTransformWriter transformWriter = new OutTransformWriter(writer,
@@ -102,7 +102,7 @@ public class OutTransformWriterTest extends Assert {
     public void testNamespaceConversionAndDefaultNS() throws Exception {
         W3CDOMStreamWriter writer = new W3CDOMStreamWriter();
 
-        Map<String, String> outMap = new HashMap<String, String>();
+        Map<String, String> outMap = new HashMap<>();
         outMap.put("{http://testbeans.com}testBean", "{http://testbeans.com/v2}testBean");
         outMap.put("{http://testbeans.com}bean", "{http://testbeans.com/v3}bean");
         OutTransformWriter transformWriter = new OutTransformWriter(writer,
@@ -165,7 +165,7 @@ public class OutTransformWriterTest extends Assert {
 
     @Test
     public void testReadWithComplexRequestSameNamespace() throws Exception {
-        Map<String, String> inMap = new HashMap<String, String>();
+        Map<String, String> inMap = new HashMap<>();
         inMap.put("{http://cxf.apache.org/transform/header/element}*",
                 "{http://cxf.apache.org/transform/header/element}*");
 
@@ -181,7 +181,7 @@ public class OutTransformWriterTest extends Assert {
 
     @Test
     public void testReadWithComplexRequestMultipleNamespace() throws Exception {
-        Map<String, String> inMap = new HashMap<String, String>();
+        Map<String, String> inMap = new HashMap<>();
         inMap.put("{http://cxf.apache.org/transform/header/element}*",
                 "{http://cxf.apache.org/transform/header/otherelement}*");
         inMap.put("{http://cxf.apache.org/transform/test}*",
@@ -199,7 +199,7 @@ public class OutTransformWriterTest extends Assert {
 
     @Test
     public void testReadWithComplexTransformationNamespace() throws Exception {
-        Map<String, String> inMap = new HashMap<String, String>();
+        Map<String, String> inMap = new HashMap<>();
         inMap.put("{http://cxf.apache.org/transform/header/element}*",
                 "{http://cxf.apache.org/transform/header/otherelement}*");
         inMap.put("{http://cxf.apache.org/transform/test}*",
@@ -220,7 +220,7 @@ public class OutTransformWriterTest extends Assert {
 
     @Test
     public void testReadWithComplexTransformationNamespace2() throws Exception {
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         map.put("{http://testbeans.com/double}*",
             "{http://testbeans.com/double/v2}*");
         map.put("{http://testbeans.com}*",
@@ -288,7 +288,7 @@ public class OutTransformWriterTest extends Assert {
 
     @Test
     public void testRemoveOneNamespace() throws Exception {
-        Map<String, String> inMap = new HashMap<String, String>();
+        Map<String, String> inMap = new HashMap<>();
         inMap.put("{http://cxf.apache.org/vgop/serviceorder/v1_0}result", "result");
         XMLStreamReader reader =
             TransformTestUtils.createOutTransformedStreamReader("../resources/complexReqIn5.xml",
@@ -302,7 +302,7 @@ public class OutTransformWriterTest extends Assert {
 
     @Test
     public void testRemoveOneDefaultNamespace() throws Exception {
-        Map<String, String> inMap = new HashMap<String, String>();
+        Map<String, String> inMap = new HashMap<>();
         inMap.put("{http://cxf.apache.org/hello_world_soap_http/types2}requestType", "requestType");
         XMLStreamReader reader =
             TransformTestUtils.createOutTransformedStreamReader("../resources/greetMe2ReqIn1.xml",
@@ -316,11 +316,11 @@ public class OutTransformWriterTest extends Assert {
 
     @Test
     public void testReadWithReplaceAppend() throws Exception {
-        Map<String, String> transformElements = new HashMap<String, String>();
+        Map<String, String> transformElements = new HashMap<>();
         transformElements.put("requestValue",
                               "{http://cxf.apache.org/hello_world_soap_http/types}requestType");
 
-        Map<String, String> appendElements = new HashMap<String, String>();
+        Map<String, String> appendElements = new HashMap<>();
         appendElements.put("requestValue",
                            "{http://cxf.apache.org/hello_world_soap_http/types}greetMe");
         TransformTestUtils.transformOutStreamAndCompare("../resources/greetMeReqIn1.xml",
@@ -330,20 +330,20 @@ public class OutTransformWriterTest extends Assert {
 
     @Test
     public void testReadWithReplaceAppendDelete() throws Exception {
-        Map<String, String> transformElements = new HashMap<String, String>();
+        Map<String, String> transformElements = new HashMap<>();
         transformElements.put("requestValue",
                               "{http://cxf.apache.org/hello_world_soap_http/types}requestType");
         transformElements.put("{http://cxf.apache.org/hello_world_soap_http/types}requestDate",
                               "");
 
-        Map<String, String> appendElements = new HashMap<String, String>();
+        Map<String, String> appendElements = new HashMap<>();
         appendElements.put("requestValue",
                            "{http://cxf.apache.org/hello_world_soap_http/types}greetMe");
 
         List<String> dropElements = new ArrayList<>();
         dropElements.add("value");
 
-        Map<String, String> transformAttributes = new HashMap<String, String>();
+        Map<String, String> transformAttributes = new HashMap<>();
         transformAttributes.put("num", "");
         transformAttributes.put("nombre", "{http://cxf.apache.org/hello_world_soap_http/types}name");
 
@@ -355,7 +355,7 @@ public class OutTransformWriterTest extends Assert {
 
     @Test
     public void testReadWithChangeNamespaces() throws Exception {
-        Map<String, String> transformElements = new HashMap<String, String>();
+        Map<String, String> transformElements = new HashMap<>();
         transformElements.put("*",
                               "{http://cxf.apache.org/hello_world_soap_http/types}*");
 
@@ -366,7 +366,7 @@ public class OutTransformWriterTest extends Assert {
 
     @Test
     public void testReadWithDeleteAttributes() throws Exception {
-        Map<String, String> transformAttributes = new HashMap<String, String>();
+        Map<String, String> transformAttributes = new HashMap<>();
         transformAttributes.put("{http://www.w3.org/2001/XMLSchema-instance}type",
                                 "");
 
@@ -377,7 +377,7 @@ public class OutTransformWriterTest extends Assert {
 
     @Test
     public void testReadWithAppendPreInclude1() throws Exception {
-        Map<String, String> appendElements = new HashMap<String, String>();
+        Map<String, String> appendElements = new HashMap<>();
         appendElements.put("{http://xml.amazon.com/AWSECommerceService/2004-08-01}ItemId",
                            "{http://xml.amazon.com/AWSECommerceService/2004-08-01}IdType=ASIN");
         TransformTestUtils.transformOutStreamAndCompare("../resources/amazonIn1.xml",
@@ -388,7 +388,7 @@ public class OutTransformWriterTest extends Assert {
 
     @Test
     public void testReadWithAppendPreInclude2() throws Exception {
-        Map<String, String> appendElements = new HashMap<String, String>();
+        Map<String, String> appendElements = new HashMap<>();
         appendElements.put("{http://xml.amazon.com/AWSECommerceService/2004-08-01}ItemId",
                            "{http://xml.amazon.com/AWSECommerceService/2004-08-01}IdType=ASIN");
         TransformTestUtils.transformOutStreamAndCompare("../resources/amazonIn1nospace.xml",
@@ -399,10 +399,10 @@ public class OutTransformWriterTest extends Assert {
 
     @Test
     public void testReadWithAppendPreWrap1() throws Exception {
-        Map<String, String> transformElements = new HashMap<String, String>();
+        Map<String, String> transformElements = new HashMap<>();
         transformElements.put("payload",
                               "{http://www.w3.org/2003/05/soap-envelope}Envelope");
-        Map<String, String> appendElements = new HashMap<String, String>();
+        Map<String, String> appendElements = new HashMap<>();
         appendElements.put("{http://apache.org/cxf/calculator/types}add",
                            "{http://www.w3.org/2003/05/soap-envelope}Body");
         TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn2.xml",
@@ -412,10 +412,10 @@ public class OutTransformWriterTest extends Assert {
 
     @Test
     public void testReadWithAppendPreWrap2() throws Exception {
-        Map<String, String> transformElements = new HashMap<String, String>();
+        Map<String, String> transformElements = new HashMap<>();
         transformElements.put("payload",
                               "{http://www.w3.org/2003/05/soap-envelope}Envelope");
-        Map<String, String> appendElements = new HashMap<String, String>();
+        Map<String, String> appendElements = new HashMap<>();
         appendElements.put("{http://apache.org/cxf/calculator/types}add",
                            "{http://www.w3.org/2003/05/soap-envelope}Body");
         TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn2nospace.xml",
@@ -425,7 +425,7 @@ public class OutTransformWriterTest extends Assert {
 
     @Test
     public void testReadWithAppendPostInclude1() throws Exception {
-        Map<String, String> appendElements = new HashMap<String, String>();
+        Map<String, String> appendElements = new HashMap<>();
         appendElements.put("{http://xml.amazon.com/AWSECommerceService/2004-08-01}Request/",
                            "{http://xml.amazon.com/AWSECommerceService/2004-08-01}ItemId=0486411214");
         TransformTestUtils.transformOutStreamAndCompare("../resources/amazonIn2.xml",
@@ -436,7 +436,7 @@ public class OutTransformWriterTest extends Assert {
 
     @Test
     public void testReadWithAppendPostInclude2() throws Exception {
-        Map<String, String> appendElements = new HashMap<String, String>();
+        Map<String, String> appendElements = new HashMap<>();
         appendElements.put("{http://xml.amazon.com/AWSECommerceService/2004-08-01}Request/",
                            "{http://xml.amazon.com/AWSECommerceService/2004-08-01}ItemId=0486411214");
         TransformTestUtils.transformOutStreamAndCompare("../resources/amazonIn2nospace.xml",
@@ -447,7 +447,7 @@ public class OutTransformWriterTest extends Assert {
 
     @Test
     public void testReadWithAppendPostWrap1() throws Exception {
-        Map<String, String> appendElements = new HashMap<String, String>();
+        Map<String, String> appendElements = new HashMap<>();
         appendElements.put("{http://www.w3.org/2003/05/soap-envelope}Body/",
                            "{http://apache.org/cxf/calculator/types}add");
         TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn1.xml",
@@ -458,7 +458,7 @@ public class OutTransformWriterTest extends Assert {
 
     @Test
     public void testReadWithAppendPostWrap2() throws Exception {
-        Map<String, String> appendElements = new HashMap<String, String>();
+        Map<String, String> appendElements = new HashMap<>();
         appendElements.put("{http://www.w3.org/2003/05/soap-envelope}Body/",
                            "{http://apache.org/cxf/calculator/types}add");
         TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn1nospace.xml",
@@ -469,7 +469,7 @@ public class OutTransformWriterTest extends Assert {
 
     @Test
     public void testReadWithAppendPostWrapReplaceDrop() throws Exception {
-        Map<String, String> transformElements = new HashMap<String, String>();
+        Map<String, String> transformElements = new HashMap<>();
         transformElements.put("payload",
                               "{http://www.w3.org/2003/05/soap-envelope}Envelope");
         transformElements.put("params",
@@ -480,7 +480,7 @@ public class OutTransformWriterTest extends Assert {
                               "{http://apache.org/cxf/calculator/types}arg1");
         transformElements.put("i3",
                               "");
-        Map<String, String> appendElements = new HashMap<String, String>();
+        Map<String, String> appendElements = new HashMap<>();
         appendElements.put("payload/",
                            "{http://www.w3.org/2003/05/soap-envelope}Body");
         List<String> dropElements = new ArrayList<>();
@@ -494,7 +494,7 @@ public class OutTransformWriterTest extends Assert {
 
     @Test
     public void testOldSTSTransform() throws Exception {
-        Map<String, String> transformElements = new HashMap<String, String>();
+        Map<String, String> transformElements = new HashMap<>();
         transformElements.put("{http://docs.oasis-open.org/ws-sx/ws-trust/200512}*",
                               "{http://schemas.xmlsoap.org/ws/2005/02/trust}*");
 
@@ -505,7 +505,7 @@ public class OutTransformWriterTest extends Assert {
 
     @Test
     public void testPreservePrefixBindings() throws Exception {
-        Map<String, String> transformElements = new HashMap<String, String>();
+        Map<String, String> transformElements = new HashMap<>();
         transformElements.put("{urn:abc}*",
                               "{urn:a}*");
 
@@ -536,7 +536,7 @@ public class OutTransformWriterTest extends Assert {
 
     @Test
     public void testNamespacedAttributeDropElement() throws Exception {
-        Map<String, String> transformElements = new HashMap<String, String>();
+        Map<String, String> transformElements = new HashMap<>();
         transformElements.put("{http://www.w3.org/2005/08/addressing}ReplyTo", "");
         TransformTestUtils.transformOutStreamAndCompare("../resources/greetMeWSAReqIn.xml",
                                                         "../resources/greetMeWSAReq.xml",

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/core/src/test/java/org/apache/cxf/staxutils/transform/TransformTestUtils.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/TransformTestUtils.java b/core/src/test/java/org/apache/cxf/staxutils/transform/TransformTestUtils.java
index e2bfe38..1b08c61 100755
--- a/core/src/test/java/org/apache/cxf/staxutils/transform/TransformTestUtils.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/transform/TransformTestUtils.java
@@ -171,7 +171,7 @@ public final class TransformTestUtils {
     private static void verifyAttributes(XMLStreamReader teacher, XMLStreamReader reader) {
         int acount = teacher.getAttributeCount();
         Assert.assertEquals(acount, reader.getAttributeCount());
-        Map<QName, String> attributesMap = new HashMap<QName, String>();
+        Map<QName, String> attributesMap = new HashMap<>();
         // temporarily store all the attributes
         for (int i = 0; i < acount; i++) {
             attributesMap.put(reader.getAttributeName(i), reader.getAttributeValue(i));

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/WriteZoo.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/WriteZoo.java b/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/WriteZoo.java
index 6269934..8267f12 100644
--- a/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/WriteZoo.java
+++ b/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/WriteZoo.java
@@ -74,7 +74,7 @@ public final class WriteZoo {
         Zoo zoo = new Zoo();
         zoo.setFounder("Noah");
         zoo.setName("The Original Zoo");
-        Map<String, Animal> animals = new HashMap<String, Animal>();
+        Map<String, Animal> animals = new HashMap<>();
         Animal a = new Animal();
         a.setName("lion");
         animals.put("lion", a);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java b/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java
index 420d9fd..f250dd8 100644
--- a/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java
+++ b/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java
@@ -35,7 +35,7 @@ import bank.common.Bank;
 
 public class BankImpl implements Bank {
 
-    Map<String, Account> accounts = new HashMap<String, Account>();
+    Map<String, Account> accounts = new HashMap<>();
 
     public boolean createAccount(String name, javax.xml.ws.Holder<Account> account)
         throws AccountAlreadyExistsException {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/BankImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/BankImpl.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/BankImpl.java
index 8e83f31..811a285 100644
--- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/BankImpl.java
+++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/BankImpl.java
@@ -38,7 +38,7 @@ public class BankImpl extends BankPOA {
     BankImpl(POA poa) {
         poa_ = poa;
 
-        accountList = new HashMap<String, Account>();
+        accountList = new HashMap<>();
     }
 
     public Account create_account(String accountName) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/BankImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/BankImpl.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/BankImpl.java
index 63a835b..f0d7733 100644
--- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/BankImpl.java
+++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/BankImpl.java
@@ -37,7 +37,7 @@ public class BankImpl implements Bank {
 
     private Map<String, W3CEndpointReference> accountList =
         new HashMap<String, W3CEndpointReference>();
-    private Map<String, Endpoint> endpointList = new HashMap<String, Endpoint>();
+    private Map<String, Endpoint> endpointList = new HashMap<>();
 
     public BankImpl() {
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/CustomerService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/CustomerService.java b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/CustomerService.java
index 480c2c9..cd25d8c 100644
--- a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -34,8 +34,8 @@ import javax.ws.rs.core.Response;
 @Produces("text/xml")
 public class CustomerService {
     long currentId = 123;
-    Map<Long, Customer> customers = new HashMap<Long, Customer>();
-    Map<Long, Order> orders = new HashMap<Long, Order>();
+    Map<Long, Customer> customers = new HashMap<>();
+    Map<Long, Order> orders = new HashMap<>();
 
     public CustomerService() {
         init();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Order.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Order.java b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Order.java
index a06b68b..49f4d29 100644
--- a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Order.java
+++ b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Order.java
@@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class Order {
     private long id;
     private String description;
-    private Map<Long, Product> products = new HashMap<Long, Product>();
+    private Map<Long, Product> products = new HashMap<>();
 
     public Order() {
         init();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/CustomerServiceImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/CustomerServiceImpl.java b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/CustomerServiceImpl.java
index cd4fd21..dbe4c9c 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/CustomerServiceImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/CustomerServiceImpl.java
@@ -27,7 +27,7 @@ import httpsdemo.common.CustomerService;
 
 public class CustomerServiceImpl implements CustomerService {
     long currentId = 123;
-    Map<Long, Customer> customers = new HashMap<Long, Customer>();
+    Map<Long, Customer> customers = new HashMap<>();
 
     public CustomerServiceImpl() {
         init();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/CustomerService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/CustomerService.java b/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/CustomerService.java
index 0ae60ff..68b24db 100644
--- a/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -29,7 +29,7 @@ import javax.ws.rs.PathParam;
 @Path("/customerservice/")
 public class CustomerService {
     long currentId = 123;
-    Map<Long, Customer> customers = new HashMap<Long, Customer>();
+    Map<Long, Customer> customers = new HashMap<>();
 
     public CustomerService() {
         init();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
index cfb42f5..2be12de 100644
--- a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
+++ b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
@@ -272,7 +272,7 @@ public class Catalog {
     }
 
     private LuceneQueryVisitor< SearchBean > createVisitor() {
-        final Map< String, Class< ? > > fieldTypes = new HashMap< String, Class< ? > >();
+        final Map< String, Class< ? > > fieldTypes = new HashMap<>();
         fieldTypes.put("modified", Date.class);
 
         LuceneQueryVisitor<SearchBean> newVisitor = new LuceneQueryVisitor<SearchBean>(

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StreamingService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StreamingService.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StreamingService.java
index a86c537..f7cd34a 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StreamingService.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StreamingService.java
@@ -60,7 +60,7 @@ import demo.jaxrs.server.SparkUtils;
 public class StreamingService {
     private static final Map<String, MediaType> MEDIA_TYPE_TABLE;
     static {
-        MEDIA_TYPE_TABLE = new HashMap<String, MediaType>();
+        MEDIA_TYPE_TABLE = new HashMap<>();
         MEDIA_TYPE_TABLE.put("pdf", MediaType.valueOf("application/pdf"));
         MEDIA_TYPE_TABLE.put("odt", MediaType.valueOf("application/vnd.oasis.opendocument.text"));
         MEDIA_TYPE_TABLE.put("odp", MediaType.valueOf("application/vnd.oasis.opendocument.presentation"));

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/StreamingService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/StreamingService.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/StreamingService.java
index ff72942..eebd7fd 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/StreamingService.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/StreamingService.java
@@ -52,7 +52,7 @@ import demo.jaxrs.server.SparkUtils;
 public class StreamingService {
     private static final Map<String, MediaType> MEDIA_TYPE_TABLE;
     static {
-        MEDIA_TYPE_TABLE = new HashMap<String, MediaType>();
+        MEDIA_TYPE_TABLE = new HashMap<>();
         MEDIA_TYPE_TABLE.put("pdf", MediaType.valueOf("application/pdf"));
         MEDIA_TYPE_TABLE.put("odt", MediaType.valueOf("application/vnd.oasis.opendocument.text"));
         MEDIA_TYPE_TABLE.put("odp", MediaType.valueOf("application/vnd.oasis.opendocument.presentation"));

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java
index e0cda41..c22a837 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java
@@ -33,8 +33,8 @@ import javax.ws.rs.core.Response;
 public abstract class AbstractCustomerServiceSecured implements CustomerServiceSecured {
 
     protected long currentId = 123;
-    protected Map<Long, Customer> customers = new HashMap<Long, Customer>();
-    protected Map<Long, Order> orders = new HashMap<Long, Order>();
+    protected Map<Long, Customer> customers = new HashMap<>();
+    protected Map<Long, Order> orders = new HashMap<>();
 
     protected AbstractCustomerServiceSecured() {
         init();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceImpl.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceImpl.java
index a0cb13b..eb80680 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceImpl.java
@@ -26,8 +26,8 @@ import javax.ws.rs.core.Response;
 
 public class CustomerServiceImpl implements CustomerService {
     long currentId = 123;
-    Map<Long, Customer> customers = new HashMap<Long, Customer>();
-    Map<Long, Order> orders = new HashMap<Long, Order>();
+    Map<Long, Customer> customers = new HashMap<>();
+    Map<Long, Order> orders = new HashMap<>();
 
     public CustomerServiceImpl() {
         init();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Order.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Order.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Order.java
index f368c83..a7317b5 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Order.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Order.java
@@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class Order {
     private long id;
     private String description;
-    private Map<Long, Product> products = new HashMap<Long, Product>();
+    private Map<Long, Product> products = new HashMap<>();
 
     public Order() {
         init();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/client/Client.java b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/client/Client.java
index b90b3f6..22b2885 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/client/Client.java
@@ -39,7 +39,7 @@ public final class Client {
     }
 
     public static void main(final String[] args) throws Exception {
-        final Map<String, String> properties = new HashMap<String, String>();
+        final Map<String, String> properties = new HashMap<>();
         properties.put(Tracer.SPAN_RECEIVER_CLASSES_KEY, TracingConfiguration.SPAN_RECEIVER.getName());
         properties.put(Tracer.SAMPLER_CLASSES_KEY, AlwaysSampler.class.getName());
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java
index eb63e8c..77fee0f 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java
@@ -55,7 +55,7 @@ public class CatalogApplication extends Application {
     }
 
     private static Map<String, String> getTracingProperties() {
-        final Map<String, String> properties = new HashMap<String, String>();
+        final Map<String, String> properties = new HashMap<>();
         properties.put(Tracer.SPAN_RECEIVER_CLASSES_KEY, TracingConfiguration.SPAN_RECEIVER.getName());
         properties.put(Tracer.SAMPLER_CLASSES_KEY, AlwaysSampler.class.getName());
         return properties;

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
index ce3297c..51ba0e6 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -50,10 +50,10 @@ public class CustomerService {
     private static ExecutorService executor = Executors.newSingleThreadExecutor();
 
     long currentId = 123;
-    Map<Long, Customer> customers = new HashMap<Long, Customer>();
-    Map<Long, Order> orders = new HashMap<Long, Order>();
-    Map<String, WriterHolder<OutputStream>> monitors = new HashMap<String, WriterHolder<OutputStream>>();
-    Map<String, WriterHolder<HttpServletResponse>> monitors2 = new HashMap<String, WriterHolder<HttpServletResponse>>();
+    Map<Long, Customer> customers = new HashMap<>();
+    Map<Long, Order> orders = new HashMap<>();
+    Map<String, WriterHolder<OutputStream>> monitors = new HashMap<>();
+    Map<String, WriterHolder<HttpServletResponse>> monitors2 = new HashMap<>();
 
     public CustomerService() {
         init();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Order.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Order.java b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Order.java
index a06b68b..49f4d29 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Order.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Order.java
@@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class Order {
     private long id;
     private String description;
-    private Map<Long, Product> products = new HashMap<Long, Product>();
+    private Map<Long, Product> products = new HashMap<>();
 
     public Order() {
         init();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
index ce3297c..51ba0e6 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -50,10 +50,10 @@ public class CustomerService {
     private static ExecutorService executor = Executors.newSingleThreadExecutor();
 
     long currentId = 123;
-    Map<Long, Customer> customers = new HashMap<Long, Customer>();
-    Map<Long, Order> orders = new HashMap<Long, Order>();
-    Map<String, WriterHolder<OutputStream>> monitors = new HashMap<String, WriterHolder<OutputStream>>();
-    Map<String, WriterHolder<HttpServletResponse>> monitors2 = new HashMap<String, WriterHolder<HttpServletResponse>>();
+    Map<Long, Customer> customers = new HashMap<>();
+    Map<Long, Order> orders = new HashMap<>();
+    Map<String, WriterHolder<OutputStream>> monitors = new HashMap<>();
+    Map<String, WriterHolder<HttpServletResponse>> monitors2 = new HashMap<>();
 
     public CustomerService() {
         init();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/Order.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/Order.java b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/Order.java
index a06b68b..49f4d29 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/Order.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/Order.java
@@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class Order {
     private long id;
     private String description;
-    private Map<Long, Product> products = new HashMap<Long, Product>();
+    private Map<Long, Product> products = new HashMap<>();
 
     public Order() {
         init();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
index ce3297c..51ba0e6 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -50,10 +50,10 @@ public class CustomerService {
     private static ExecutorService executor = Executors.newSingleThreadExecutor();
 
     long currentId = 123;
-    Map<Long, Customer> customers = new HashMap<Long, Customer>();
-    Map<Long, Order> orders = new HashMap<Long, Order>();
-    Map<String, WriterHolder<OutputStream>> monitors = new HashMap<String, WriterHolder<OutputStream>>();
-    Map<String, WriterHolder<HttpServletResponse>> monitors2 = new HashMap<String, WriterHolder<HttpServletResponse>>();
+    Map<Long, Customer> customers = new HashMap<>();
+    Map<Long, Order> orders = new HashMap<>();
+    Map<String, WriterHolder<OutputStream>> monitors = new HashMap<>();
+    Map<String, WriterHolder<HttpServletResponse>> monitors2 = new HashMap<>();
 
     public CustomerService() {
         init();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/Order.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/Order.java b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/Order.java
index a06b68b..49f4d29 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/Order.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/Order.java
@@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class Order {
     private long id;
     private String description;
-    private Map<Long, Product> products = new HashMap<Long, Product>();
+    private Map<Long, Product> products = new HashMap<>();
 
     public Order() {
         init();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/GetProtectedResourceController.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/GetProtectedResourceController.java b/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/GetProtectedResourceController.java
index 7b5ec25..e68297b 100644
--- a/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/GetProtectedResourceController.java
+++ b/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/GetProtectedResourceController.java
@@ -63,7 +63,7 @@ public class GetProtectedResourceController {
         accessor.requestToken = oAuthParams.getOauthToken();
         accessor.tokenSecret = oAuthParams.getOauthTokenSecret();
 
-        Map<String, String> parameters = new HashMap<String, String>();
+        Map<String, String> parameters = new HashMap<>();
         parameters.put(OAuth.OAUTH_SIGNATURE_METHOD, oAuthParams.getSignatureMethod());
         parameters.put(OAuth.OAUTH_NONCE, UUID.randomUUID().toString());
         parameters.put(OAuth.OAUTH_TIMESTAMP, String.valueOf(System.currentTimeMillis() / 1000));

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TemporaryCredentialsController.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TemporaryCredentialsController.java b/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TemporaryCredentialsController.java
index 03734f7..a78da7e 100644
--- a/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TemporaryCredentialsController.java
+++ b/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TemporaryCredentialsController.java
@@ -75,7 +75,7 @@ public class TemporaryCredentialsController {
                 provider);
             accessor = new OAuthAccessor(consumer);
 
-            Map<String, String> parameters = new HashMap<String, String>();
+            Map<String, String> parameters = new HashMap<>();
             parameters.put(OAuth.OAUTH_SIGNATURE_METHOD, oAuthParams.getSignatureMethod());
             parameters.put(OAuth.OAUTH_NONCE, UUID.randomUUID().toString());
             parameters.put(OAuth.OAUTH_TIMESTAMP, String.valueOf(System.currentTimeMillis() / 1000));

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TokenRequestController.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TokenRequestController.java b/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TokenRequestController.java
index a66bec5..1a1ed06 100644
--- a/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TokenRequestController.java
+++ b/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TokenRequestController.java
@@ -83,7 +83,7 @@ public class TokenRequestController {
             accessor.requestToken = oauthToken;
             accessor.tokenSecret = Common.findCookieValue(request, "tokenSec");
 
-            Map<String, String> parameters = new HashMap<String, String>();
+            Map<String, String> parameters = new HashMap<>();
             parameters.put(OAuth.OAUTH_SIGNATURE_METHOD, oAuthParams.getSignatureMethod());
             parameters.put(OAuth.OAUTH_NONCE, UUID.randomUUID().toString());
             parameters.put(OAuth.OAUTH_TIMESTAMP, String.valueOf(System.currentTimeMillis() / 1000));

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
index 7fdf2db..c7364de 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
+++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
@@ -56,7 +56,7 @@ public final class Client {
             Bus bus = bf.createBus(busFile.toString());
             BusFactory.setDefaultBus(bus);
 
-            Map<String, Object> outProps = new HashMap<String, Object>();
+            Map<String, Object> outProps = new HashMap<>();
             outProps.put("action", "UsernameToken Timestamp Signature Encrypt");
 
             outProps.put("passwordType", "PasswordDigest");
@@ -85,7 +85,7 @@ public final class Client {
             outProps.put("signatureAlgorithm", "http://www.w3.org/2000/09/xmldsig#rsa-sha1");
 
 
-            Map<String, Object> inProps = new HashMap<String, Object>();
+            Map<String, Object> inProps = new HashMap<>();
 
             inProps.put("action", "UsernameToken Timestamp Signature Encrypt");
             inProps.put("passwordType", "PasswordText");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
index ae3d7f1..aa11ef0 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
+++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
@@ -49,7 +49,7 @@ public class Server {
         String address = "http://localhost:9000/SoapContext/GreeterPort";
         EndpointImpl endpoint = (EndpointImpl)Endpoint.publish(address, implementor);
 
-        Map<String, Object> outProps = new HashMap<String, Object>();
+        Map<String, Object> outProps = new HashMap<>();
         outProps.put("action", "UsernameToken Timestamp Signature Encrypt");
 
         outProps.put("passwordType", "PasswordText");
@@ -75,7 +75,7 @@ public class Server {
 
         endpoint.getOutInterceptors().add(new WSS4JOutInterceptor(outProps));
 
-        Map<String, Object> inProps = new HashMap<String, Object>();
+        Map<String, Object> inProps = new HashMap<>();
 
         inProps.put("action", "UsernameToken Timestamp Signature Encrypt");
         inProps.put("passwordType", "PasswordDigest");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/Client.java b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/Client.java
index e083a5f..d91b743 100644
--- a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/Client.java
+++ b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/Client.java
@@ -50,14 +50,14 @@ public final class Client {
             Bus bus = bf.createBus(busFile.toString());
             BusFactory.setDefaultBus(bus);
 
-            Map<String, Object> outProps = new HashMap<String, Object>();
+            Map<String, Object> outProps = new HashMap<>();
             outProps.put("action", "UsernameToken Timestamp");
 
             outProps.put("passwordType", "PasswordDigest");
             outProps.put("user", "abcd");
             outProps.put("passwordCallbackClass", "demo.wssec.client.UTPasswordCallback");
 
-            Map<String, Object> inProps = new HashMap<String, Object>();
+            Map<String, Object> inProps = new HashMap<>();
             inProps.put("action", "UsernameToken Timestamp");
             inProps.put("passwordType", "PasswordText");
             inProps.put("passwordCallbackClass", "demo.wssec.client.UTPasswordCallback");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/Server.java b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/Server.java
index 472d4e3..0414d4d 100644
--- a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/Server.java
+++ b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/Server.java
@@ -44,7 +44,7 @@ public class Server {
         String address = "http://localhost:9000/SoapContext/GreeterPort";
         EndpointImpl impl = (EndpointImpl)Endpoint.publish(address, implementor);
 
-        Map<String, Object> outProps = new HashMap<String, Object>();
+        Map<String, Object> outProps = new HashMap<>();
         outProps.put("action", "UsernameToken Timestamp");
 
         outProps.put("passwordType", "PasswordText");
@@ -53,7 +53,7 @@ public class Server {
 
         impl.getOutInterceptors().add(new WSS4JOutInterceptor(outProps));
 
-        Map<String, Object> inProps = new HashMap<String, Object>();
+        Map<String, Object> inProps = new HashMap<>();
         inProps.put("action", "UsernameToken Timestamp");
         inProps.put("passwordType", "PasswordDigest");
         inProps.put("passwordCallbackClass", "demo.wssec.server.UTPasswordCallback");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java
index c16716f..052c169 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java
@@ -31,7 +31,7 @@ import org.apache.cxf.jca.jarloader.JarLoader;
 public final class PlugInClassLoaderHelper {
     private static final Logger LOG =
         LogUtils.getL7dLogger(PlugInClassLoaderHelper.class);
-    private static Map<String, byte[]> nonClassesMap = new HashMap<String, byte[]>();
+    private static Map<String, byte[]> nonClassesMap = new HashMap<>();
 
 
     private PlugInClassLoaderHelper() {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java b/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java
index 22cc445..f587c1a 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java
@@ -43,7 +43,7 @@ public final class JarLoader {
     // this keys to this map are full distinguished names of the fromat
     // someOuterArchive!/someInnerArchive!/....
     // the values of the archives map are maps of entry names to bytes
-    static Map<String, Object> archives = new HashMap<String, Object>();
+    static Map<String, Object> archives = new HashMap<>();
     static final int CHUNK_SIZE = 4096;
     static final int MAX_CHUNK_SIZE = CHUNK_SIZE * 16;
 
@@ -156,7 +156,7 @@ public final class JarLoader {
 
     private static Map<String, Object> readZipStream(InputStream is) throws IOException {
         ZipInputStream zis = new ZipInputStream(is);
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
 
         for (ZipEntry ze = zis.getNextEntry(); ze != null; ze = zis.getNextEntry()) {
             if (ze.isDirectory()) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfProperties.java
----------------------------------------------------------------------
diff --git a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfProperties.java b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfProperties.java
index 5865562..14dff82 100644
--- a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfProperties.java
+++ b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfProperties.java
@@ -60,7 +60,7 @@ public class CxfProperties {
         /**
          * Servlet init parameters to pass to Apache CXF.
          */
-        private Map<String, String> init = new HashMap<String, String>();
+        private Map<String, String> init = new HashMap<>();
 
         /**
          * Load on startup priority of the Apache CXF servlet.

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
index 79184d9..15d9511 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
@@ -110,7 +110,7 @@ public abstract class AbstractBraveInterceptor extends AbstractBraveProvider imp
         void addHeader(String key, String value) {
             Map<String, List<String>> headers = CastUtils.cast((Map<?, ?>)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(key, Arrays.asList(value));

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java
index bd89f09..7ad551a 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java
@@ -46,7 +46,7 @@ public class BraveStopInterceptor extends AbstractBraveInterceptor {
         Map<String, List<Object>> responseHeaders = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
 
         if (responseHeaders == null) {
-            responseHeaders = new HashMap<String, List<Object>>();
+            responseHeaders = new HashMap<>();
             message.put(Message.PROTOCOL_HEADERS, responseHeaders);
         }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceStopInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceStopInterceptor.java b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceStopInterceptor.java
index 92f3aba..a298c17 100644
--- a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceStopInterceptor.java
+++ b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceStopInterceptor.java
@@ -38,7 +38,7 @@ public class HTraceStopInterceptor extends AbstractHTraceInterceptor {
         Map<String, List<Object>> responseHeaders = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
 
         if (responseHeaders == null) {
-            responseHeaders = new HashMap<String, List<Object>>();
+            responseHeaders = new HashMap<>();
             message.put(Message.PROTOCOL_HEADERS, responseHeaders);
         }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
index 4457860..220bcc1 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
@@ -105,7 +105,7 @@ public class ClassLoaderSwitcher {
 
         log.debug("Classpath: " + urlList.toString());
 
-        origProps = new HashMap<Object, Object>(System.getProperties());
+        origProps = new HashMap<>(System.getProperties());
 
         origClassPath = System.getProperty("java.class.path");
 
@@ -127,7 +127,7 @@ public class ClassLoaderSwitcher {
         }
 
         if (origProps != null) {
-            Map<Object, Object> newProps = new HashMap<Object, Object>(System.getProperties());
+            Map<Object, Object> newProps = new HashMap<>(System.getProperties());
             for (Object o : newProps.keySet()) {
                 if (!origProps.containsKey(o)) {
                     System.clearProperty(o.toString());

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
----------------------------------------------------------------------
diff --git a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
index a1f41b2..2c6eed5 100644
--- a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
+++ b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
@@ -119,7 +119,7 @@ public class WSDLToIDLPlugin extends AbstractMojo {
         //will set some system properties that then interferes with mavens
         //dependency resolution.  (OSX is the major culprit here)
         //We'll save the props and then set them back later.
-        Map<Object, Object> origProps = new HashMap<Object, Object>(System.getProperties());
+        Map<Object, Object> origProps = new HashMap<>(System.getProperties());
 
         String cp = System.getProperty("java.class.path");
 
@@ -173,7 +173,7 @@ public class WSDLToIDLPlugin extends AbstractMojo {
                 System.setProperty("java.class.path", cp);
             }
 
-            Map<Object, Object> newProps = new HashMap<Object, Object>(System.getProperties());
+            Map<Object, Object> newProps = new HashMap<>(System.getProperties());
             for (Object o : newProps.keySet()) {
                 if (!origProps.containsKey(o)) {
                     System.clearProperty(o.toString());

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
----------------------------------------------------------------------
diff --git a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
index 8f4a3cb..0c72dbf 100644
--- a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
+++ b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
@@ -98,7 +98,7 @@ public class ClassLoaderSwitcher {
 
         log.debug("Classpath: " + urlList.toString());
 
-        origProps = new HashMap<Object, Object>(System.getProperties());
+        origProps = new HashMap<>(System.getProperties());
 
         origClassPath = System.getProperty("java.class.path");
 
@@ -120,7 +120,7 @@ public class ClassLoaderSwitcher {
         }
 
         if (origProps != null) {
-            Map<Object, Object> newProps = new HashMap<Object, Object>(System.getProperties());
+            Map<Object, Object> newProps = new HashMap<>(System.getProperties());
             for (Object o : newProps.keySet()) {
                 if (!origProps.containsKey(o)) {
                     System.clearProperty(o.toString());

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java
index 615613f..ef7d483 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java
@@ -107,7 +107,7 @@ public class ClassLoaderSwitcher {
 
         log.debug("Classpath: " + urlList.toString());
 
-        origProps = new HashMap<Object, Object>(System.getProperties());
+        origProps = new HashMap<>(System.getProperties());
 
         origClassPath = System.getProperty("java.class.path");
 
@@ -129,7 +129,7 @@ public class ClassLoaderSwitcher {
         }
 
         if (origProps != null) {
-            Map<Object, Object> newProps = new HashMap<Object, Object>(System.getProperties());
+            Map<Object, Object> newProps = new HashMap<>(System.getProperties());
             for (Object o : newProps.keySet()) {
                 if (!origProps.containsKey(o)) {
                     System.clearProperty(o.toString());

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java
index a8961ba..1cebd2b 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java
@@ -53,7 +53,7 @@ import org.hibernate.validator.HibernateValidatorConfiguration;
 @Path("/bookstore")
 @Produces("application/xml")
 public class BookStore {
-    private Map<Long, Book> books = new HashMap<Long, Book>();
+    private Map<Long, Book> books = new HashMap<>();
 
     @Context
     private UriInfo ui;

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
index f5fad59..7004b65 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
@@ -323,7 +323,7 @@ public class CorbaConduit implements Conduit {
         if (orb == null) {
             prepareOrb();
         }
-        Map<TypeCode, RaisesType> exceptions = new HashMap<TypeCode, RaisesType>();
+        Map<TypeCode, RaisesType> exceptions = new HashMap<>();
         List<RaisesType> exList = operation.getRaises();
         if (exList != null) {
             for (int i = 0; i < exList.size(); ++i) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaTypeMap.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaTypeMap.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaTypeMap.java
index 2d1dbba..4b0f1ca 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaTypeMap.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaTypeMap.java
@@ -38,8 +38,8 @@ public class CorbaTypeMap {
 
     public CorbaTypeMap(String namespace) {
         targetNamespace = namespace;
-        typeMap = new HashMap<String, CorbaType>();
-        typeCodeMap = new HashMap<QName, TypeCode>();
+        typeMap = new HashMap<>();
+        typeCodeMap = new HashMap<>();
     }
 
     public void addType(String name, CorbaType type) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServant.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServant.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServant.java
index 93a08a7..4f5b45c 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServant.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServant.java
@@ -103,7 +103,7 @@ public class CorbaDSIServant extends DynamicImplementation {
         BindingInfo bInfo = destination.getBindingInfo();
         Iterator<BindingOperationInfo> i = bInfo.getOperations().iterator();
 
-        operationMap = new HashMap<String, QName>(bInfo.getOperations().size());
+        operationMap = new HashMap<>(bInfo.getOperations().size());
 
         while (i.hasNext()) {
             BindingOperationInfo bopInfo = i.next();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java
index 24703f5..ae54d73 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java
@@ -318,7 +318,7 @@ public class CorbaStreamWriter implements XMLStreamWriter {
         private CorbaNamespaceContext parent;
 
         public CorbaNamespaceContext() {
-            this.map = new HashMap<String, String>();
+            this.map = new HashMap<>();
         }
 
         private CorbaNamespaceContext(Map<String, String> map, CorbaNamespaceContext p) {
@@ -328,7 +328,7 @@ public class CorbaStreamWriter implements XMLStreamWriter {
 
         public void push() {
             parent = new CorbaNamespaceContext(map, parent);
-            map = new HashMap<String, String>();
+            map = new HashMap<>();
         }
         public void pop() {
             if (parent != null) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtils.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtils.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtils.java
index 56eed7f..d4726cc 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtils.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtils.java
@@ -128,7 +128,7 @@ public final class CorbaHandlerUtils {
                                                              QName idlType,
                                                              CorbaTypeMap typeMap,
                                                              ServiceInfo serviceInfo) {
-        Map<QName, CorbaObjectHandler> seenTypes = new HashMap<QName, CorbaObjectHandler>();
+        Map<QName, CorbaObjectHandler> seenTypes = new HashMap<>();
         return initializeObjectHandler(orb, name, idlType, typeMap, serviceInfo, seenTypes);
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java
index 0a53299..0f7d135 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java
@@ -43,8 +43,8 @@ import org.omg.CORBA.TypeCode;
 
 public final class CorbaAnyHelper {
 
-    private static final Map<QName, QName> SCHEMA_TO_IDL_TYPES = new HashMap<QName, QName>();
-    private static final Map<QName, QName> IDL_TO_SCHEMA_TYPES = new HashMap<QName, QName>();
+    private static final Map<QName, QName> SCHEMA_TO_IDL_TYPES = new HashMap<>();
+    private static final Map<QName, QName> IDL_TO_SCHEMA_TYPES = new HashMap<>();
 
     private static Constructor<?> fixedAnyConstructor;
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java
index c23aed0..89ab320 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java
@@ -34,8 +34,8 @@ import org.omg.CORBA.ORB;
 public final class CorbaBindingHelper {
 
     private static final Logger LOG = LogUtils.getL7dLogger(CorbaBindingHelper.class);
-    private static Map<String, ORB> orbList = new HashMap<String, ORB>();
-    private static Map<String, Integer> orbUseCount = new HashMap<String, Integer>();
+    private static Map<String, ORB> orbList = new HashMap<>();
+    private static Map<String, Integer> orbUseCount = new HashMap<>();
     private static ORB defaultORB;
 
     private CorbaBindingHelper() {


Mime
View raw message