cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [02/12] cxf git commit: Removing HashMap parameters
Date Thu, 09 Mar 2017 11:40:39 GMT
http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java
index 7232055..bef8096 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/UsernamePasswordCallback.java
@@ -29,7 +29,7 @@ import javax.security.auth.callback.UnsupportedCallbackException;
 import org.apache.wss4j.common.ext.WSPasswordCallback;
 
 public class UsernamePasswordCallback implements CallbackHandler {
-    private Map<String, String> passwords = new HashMap<String, String>();
+    private Map<String, String> passwords = new HashMap<>();
 
     public UsernamePasswordCallback() {
         passwords.put("Alice", "ecilA");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
index 5bb1060..0ee3226 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCUnitTest.java
@@ -205,7 +205,7 @@ public class WSSCUnitTest extends AbstractBusClientServerTestBase {
 
         stsClient.setPolicy(createSymmetricBindingPolicy());
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("security.encryption.username", "bob");
         TokenCallbackHandler callbackHandler = new TokenCallbackHandler();
         properties.put("security.callback-handler", callbackHandler);
@@ -240,7 +240,7 @@ public class WSSCUnitTest extends AbstractBusClientServerTestBase {
 
         stsClient.setPolicy(createSymmetricBindingPolicy());
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put("security.encryption.username", "bob");
         TokenCallbackHandler callbackHandler = new TokenCallbackHandler();
         properties.put("security.callback-handler", callbackHandler);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/SHA512PolicyLoader.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/SHA512PolicyLoader.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/SHA512PolicyLoader.java
index 79f6e4e..64a3b58 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/SHA512PolicyLoader.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/SHA512PolicyLoader.java
@@ -52,7 +52,7 @@ public class SHA512PolicyLoader implements AlgorithmSuiteLoader {
         AssertionBuilderRegistry reg = bus.getExtension(AssertionBuilderRegistry.class);
         if (reg != null) {
             String ns = "http://cxf.apache.org/custom/security-policy";
-            final Map<QName, Assertion> assertions = new HashMap<QName, Assertion>();
+            final Map<QName, Assertion> assertions = new HashMap<>();
             QName qName = new QName(ns, "Basic128RsaSha512");
             assertions.put(qName, new PrimitiveAssertion(qName));
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/AbstractWSATestBase.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/AbstractWSATestBase.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/AbstractWSATestBase.java
index 1c671a2..e7f2e90 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/AbstractWSATestBase.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/AbstractWSATestBase.java
@@ -75,7 +75,7 @@ public class AbstractWSATestBase extends AbstractBusClientServerTestBase {
         String s = log.substring(log.indexOf("Payload: ") + 9);
         Document doc = StaxUtils.read(new StringReader(s));
 
-        Map<String, String> ns = new HashMap<String, String>();
+        Map<String, String> ns = new HashMap<>();
         ns.put("wsa", "http://www.w3.org/2005/08/addressing");
         ns.put("soap", "http://schemas.xmlsoap.org/soap/envelope/");
         XPathUtils xpathu = new XPathUtils(ns);
@@ -85,7 +85,7 @@ public class AbstractWSATestBase extends AbstractBusClientServerTestBase {
         String s = log.substring(log.indexOf("Payload: ") + 9);
         Document doc = StaxUtils.read(new StringReader(s));
 
-        Map<String, String> ns = new HashMap<String, String>();
+        Map<String, String> ns = new HashMap<>();
         ns.put("wsa", "http://www.w3.org/2005/08/addressing");
         ns.put("soap", "http://schemas.xmlsoap.org/soap/envelope/");
         XPathUtils xpathu = new XPathUtils(ns);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/Server.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/Server.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/Server.java
index db8015a..ca492f4 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/Server.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/Server.java
@@ -112,7 +112,7 @@ public class Server extends AbstractBusTestServerBase {
                 throw new RuntimeException(e);
             }
 
-            Map<String, String> ns = new HashMap<String, String>();
+            Map<String, String> ns = new HashMap<>();
             ns.put("ns", "http://apache.org/cxf/systest/ws/addr_feature/");
             XPathUtils xp = new XPathUtils(ns);
             String o = (String)xp.getValue("/ns:addNumbers/ns:number1", el, XPathConstants.STRING);
@@ -144,7 +144,7 @@ public class Server extends AbstractBusTestServerBase {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-            Map<String, String> ns = new HashMap<String, String>();
+            Map<String, String> ns = new HashMap<>();
             ns.put("ns", "http://apache.org/cxf/systest/ws/addr_feature/");
             XPathUtils xp = new XPathUtils(ns);
             String o = (String)xp.getValue("/ns:addNumbers/ns:number1", el, XPathConstants.STRING);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/DecoupledJMSTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/DecoupledJMSTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/DecoupledJMSTest.java
index f0cb0d0..43cad0b 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/DecoupledJMSTest.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/DecoupledJMSTest.java
@@ -73,7 +73,7 @@ public class DecoupledJMSTest extends MAPTestBase {
     @BeforeClass
     public static void startServers() throws Exception {
 
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         if (System.getProperty("org.apache.activemq.default.directory.prefix") != null) {
             props.put("org.apache.activemq.default.directory.prefix",
                       System.getProperty("org.apache.activemq.default.directory.prefix"));

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
index b12a9dc..bb2b326 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
@@ -339,7 +339,7 @@ public abstract class MAPTestBase extends AbstractClientServerTestBase implement
                 return null;
             }
         } else {
-            checkPointMessageIDs = new HashMap<String, String>();
+            checkPointMessageIDs = new HashMap<>();
             messageIDs.put(checkPoint, checkPointMessageIDs);
         }
         checkPointMessageIDs.put(id, id);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java
index 48376a3..84fd947 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java
@@ -46,7 +46,7 @@ public class MAPVerifier extends AbstractPhaseInterceptor<Message> {
 
     public MAPVerifier() {
         super(Phase.POST_LOGICAL);
-        mapProperties = new HashMap<String, Object>();
+        mapProperties = new HashMap<>();
         mapProperties.put(MAPTest.INBOUND_KEY, ADDRESSING_PROPERTIES_INBOUND);
         mapProperties.put(MAPTest.OUTBOUND_KEY, ADDRESSING_PROPERTIES_OUTBOUND);
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/NonDecoupledJMSTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/NonDecoupledJMSTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/NonDecoupledJMSTest.java
index f5e3d48..d3e4e88 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/NonDecoupledJMSTest.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/NonDecoupledJMSTest.java
@@ -72,7 +72,7 @@ public class NonDecoupledJMSTest extends MAPTestBase {
     @BeforeClass
     public static void startServers() throws Exception {
 
-        Map<String, String> props = new HashMap<String, String>();
+        Map<String, String> props = new HashMap<>();
         if (System.getProperty("org.apache.activemq.default.directory.prefix") != null) {
             props.put("org.apache.activemq.default.directory.prefix",
                       System.getProperty("org.apache.activemq.default.directory.prefix"));

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/testutils/src/main/java/org/apache/cxf/customer/bare/CustomerService.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/cxf/customer/bare/CustomerService.java b/testutils/src/main/java/org/apache/cxf/customer/bare/CustomerService.java
index 93d39fa..848ce03 100644
--- a/testutils/src/main/java/org/apache/cxf/customer/bare/CustomerService.java
+++ b/testutils/src/main/java/org/apache/cxf/customer/bare/CustomerService.java
@@ -38,7 +38,7 @@ import org.apache.cxf.customer.Customers;
 @WebService(targetNamespace = "http://cxf.apache.org/jra")
 public class CustomerService {
     long currentId = 1;
-    Map<Long, Customer> customers = new HashMap<Long, Customer>();
+    Map<Long, Customer> customers = new HashMap<>();
 
     @Resource
     private WebServiceContext context;

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceImpl.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceImpl.java b/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceImpl.java
index 79d0967..5f6c0fa 100644
--- a/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceImpl.java
+++ b/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceImpl.java
@@ -28,7 +28,7 @@ import javax.jws.WebService;
 @WebService(endpointInterface = "org.apache.cxf.customer.book.BookService")
 public class BookServiceImpl implements BookService {
     long currentId = 1;
-    Map<Long, Book> books = new HashMap<Long, Book>();
+    Map<Long, Book> books = new HashMap<>();
 
     public BookServiceImpl() {
         Book book = createBook();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceWrappedImpl.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceWrappedImpl.java b/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceWrappedImpl.java
index 179cbe7..6902ab1 100644
--- a/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceWrappedImpl.java
+++ b/testutils/src/main/java/org/apache/cxf/customer/book/BookServiceWrappedImpl.java
@@ -27,7 +27,7 @@ import javax.jws.WebService;
 
 @WebService(endpointInterface = "org.apache.cxf.customer.book.BookService")
 public class BookServiceWrappedImpl implements BookServiceWrapped {
-    Map<Long, Book> books = new HashMap<Long, Book>();
+    Map<Long, Book> books = new HashMap<>();
 
     public BookServiceWrappedImpl() {
         Book book = createBook();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/testutils/src/main/java/org/apache/cxf/customer/wraped/CustomerService.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/cxf/customer/wraped/CustomerService.java b/testutils/src/main/java/org/apache/cxf/customer/wraped/CustomerService.java
index 578980b..2ca6b04 100644
--- a/testutils/src/main/java/org/apache/cxf/customer/wraped/CustomerService.java
+++ b/testutils/src/main/java/org/apache/cxf/customer/wraped/CustomerService.java
@@ -33,7 +33,7 @@ import org.apache.cxf.customer.Customers;
 @WebService(targetNamespace = "http://cxf.apache.org/jra")
 public class CustomerService {
     long currentId = 1;
-    Map<Long, Customer> customers = new HashMap<Long, Customer>();
+    Map<Long, Customer> customers = new HashMap<>();
 
     public CustomerService() {
         Customer customer = createCustomer();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/testutils/src/main/java/org/apache/cxf/test/TestUtilities.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/cxf/test/TestUtilities.java b/testutils/src/main/java/org/apache/cxf/test/TestUtilities.java
index 9a7f9bb..384ae7b 100644
--- a/testutils/src/main/java/org/apache/cxf/test/TestUtilities.java
+++ b/testutils/src/main/java/org/apache/cxf/test/TestUtilities.java
@@ -76,7 +76,7 @@ public class TestUtilities {
     /**
      * Namespaces for the XPath expressions.
      */
-    private Map<String, String> namespaces = new HashMap<String, String>();
+    private Map<String, String> namespaces = new HashMap<>();
 
     /**
      * This class provides utilities to several conflicting inheritance stacks

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/testutils/src/main/java/org/apache/cxf/test/XPathAssert.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/cxf/test/XPathAssert.java b/testutils/src/main/java/org/apache/cxf/test/XPathAssert.java
index c356066..5284c3e 100644
--- a/testutils/src/main/java/org/apache/cxf/test/XPathAssert.java
+++ b/testutils/src/main/java/org/apache/cxf/test/XPathAssert.java
@@ -188,7 +188,7 @@ public final class XPathAssert {
     }
 
     public static void assertNoFault(Node node) throws Exception {
-        Map<String, String> namespaces = new HashMap<String, String>();
+        Map<String, String> namespaces = new HashMap<>();
         namespaces.put("s", "http://schemas.xmlsoap.org/soap/envelope/");
         namespaces.put("s12", "http://www.w3.org/2003/05/soap-envelope");
 
@@ -197,7 +197,7 @@ public final class XPathAssert {
     }
 
     public static void assertFault(Node node) throws Exception {
-        Map<String, String> namespaces = new HashMap<String, String>();
+        Map<String, String> namespaces = new HashMap<>();
         namespaces.put("s", "http://schemas.xmlsoap.org/soap/envelope/");
         namespaces.put("s12", "http://www.w3.org/2003/05/soap-envelope");
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java b/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
index f2df8b7..7bdb6cd 100644
--- a/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
+++ b/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
@@ -168,7 +168,7 @@ public class ServerLauncher {
 
         if (inProcess) {
             Class<?> cls;
-            Map<String, String> old = new HashMap<String, String>();
+            Map<String, String> old = new HashMap<>();
             try {
                 if (null != properties) {
                     for (Map.Entry<String, String> entry : properties.entrySet()) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/testutils/src/main/java/org/apache/hello_world_soap_http/AnnotatedGreeterImpl.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/hello_world_soap_http/AnnotatedGreeterImpl.java b/testutils/src/main/java/org/apache/hello_world_soap_http/AnnotatedGreeterImpl.java
index 4205dbd..0c8e175 100644
--- a/testutils/src/main/java/org/apache/hello_world_soap_http/AnnotatedGreeterImpl.java
+++ b/testutils/src/main/java/org/apache/hello_world_soap_http/AnnotatedGreeterImpl.java
@@ -45,7 +45,7 @@ public class AnnotatedGreeterImpl {
 
     private WebServiceContext context;
 
-    private final Map<String, Integer> invocationCount = new HashMap<String, Integer>();
+    private final Map<String, Integer> invocationCount = new HashMap<>();
 
     public AnnotatedGreeterImpl() {
         invocationCount.put("sayHi", 0);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/testutils/src/main/java/org/apache/hello_world_soap_http/AnnotatedGreeterNoOverloadImpl.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/hello_world_soap_http/AnnotatedGreeterNoOverloadImpl.java b/testutils/src/main/java/org/apache/hello_world_soap_http/AnnotatedGreeterNoOverloadImpl.java
index 8bde762..3687388 100644
--- a/testutils/src/main/java/org/apache/hello_world_soap_http/AnnotatedGreeterNoOverloadImpl.java
+++ b/testutils/src/main/java/org/apache/hello_world_soap_http/AnnotatedGreeterNoOverloadImpl.java
@@ -45,7 +45,7 @@ public class AnnotatedGreeterNoOverloadImpl {
 
     private WebServiceContext context;
 
-    private final Map<String, Integer> invocationCount = new HashMap<String, Integer>();
+    private final Map<String, Integer> invocationCount = new HashMap<>();
 
     public AnnotatedGreeterNoOverloadImpl() {
         invocationCount.put("sayHi", 0);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/testutils/src/main/java/org/apache/hello_world_soap_http/AnotherDerivedGreeterImpl.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/hello_world_soap_http/AnotherDerivedGreeterImpl.java b/testutils/src/main/java/org/apache/hello_world_soap_http/AnotherDerivedGreeterImpl.java
index 7a87fb6..1e25685 100644
--- a/testutils/src/main/java/org/apache/hello_world_soap_http/AnotherDerivedGreeterImpl.java
+++ b/testutils/src/main/java/org/apache/hello_world_soap_http/AnotherDerivedGreeterImpl.java
@@ -43,7 +43,7 @@ public class AnotherDerivedGreeterImpl implements GreeterEndpointInterface {
 
     private static final Logger LOG =
         Logger.getLogger(DerivedGreeterImpl.class.getName());
-    private final Map<String, Integer> invocationCount = new HashMap<String, Integer>();
+    private final Map<String, Integer> invocationCount = new HashMap<>();
 
     public AnotherDerivedGreeterImpl() {
         invocationCount.put("sayHi", 0);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/testutils/src/main/java/org/apache/hello_world_soap_http/DerivedGreeterImpl.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/hello_world_soap_http/DerivedGreeterImpl.java b/testutils/src/main/java/org/apache/hello_world_soap_http/DerivedGreeterImpl.java
index 080af9e..32e3fc9 100644
--- a/testutils/src/main/java/org/apache/hello_world_soap_http/DerivedGreeterImpl.java
+++ b/testutils/src/main/java/org/apache/hello_world_soap_http/DerivedGreeterImpl.java
@@ -43,7 +43,7 @@ public class DerivedGreeterImpl implements Greeter {
 
     private static final Logger LOG =
         Logger.getLogger(DerivedGreeterImpl.class.getName());
-    private final Map<String, Integer> invocationCount = new HashMap<String, Integer>();
+    private final Map<String, Integer> invocationCount = new HashMap<>();
 
     public DerivedGreeterImpl() {
         invocationCount.put("sayHi", 0);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/testutils/src/test/java/org/apache/cxf/test/XPathAssertTest.java
----------------------------------------------------------------------
diff --git a/testutils/src/test/java/org/apache/cxf/test/XPathAssertTest.java b/testutils/src/test/java/org/apache/cxf/test/XPathAssertTest.java
index 33d7615..581c971 100644
--- a/testutils/src/test/java/org/apache/cxf/test/XPathAssertTest.java
+++ b/testutils/src/test/java/org/apache/cxf/test/XPathAssertTest.java
@@ -61,7 +61,7 @@ public class XPathAssertTest extends Assert {
     public void testAssertNamespace() throws Exception {
         Document document = StaxUtils.read(getClass().getResourceAsStream("test2.xml"));
 
-        Map<String, String> namespaces = new HashMap<String, String>();
+        Map<String, String> namespaces = new HashMap<>();
         namespaces.put("a", "urn:foo");
         namespaces.put("z", "urn:z");
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java b/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java
index 4560480..dd18b99 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java
@@ -261,7 +261,7 @@ public abstract class AbstractCXFToolContainer extends AbstractToolContainer {
      * @param stringArrayKeys, contains keys, whose value should be string array
      */
     protected Map<String, Object> getParametersMap(Set<String> stringArrayKeys) {
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         CommandDocument doc = getCommandDocument();
         if (doc == null) {
             return map;

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java b/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
index 25032e9..c7cf43a 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
@@ -76,7 +76,7 @@ public class ProcessorTestBase extends Assert {
 
     protected File output;
     protected ToolContext env = new ToolContext();
-    protected Map<QName, Set<String>> qnameAtts = new HashMap<QName, Set<String>>();
+    protected Map<QName, Set<String>> qnameAtts = new HashMap<>();
 
     public ProcessorTestBase() {
         addQNameAttribute(new QName(Constants.URI_2001_SCHEMA_XSD, "element"), "type");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java b/tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java
index 8798241..a0b2cb3 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/Tag.java
@@ -76,7 +76,7 @@ public class Tag {
 
     public Map<QName, String> getAttributes() {
         if (attributes == null) {
-            attributes = new HashMap<QName, String>();
+            attributes = new HashMap<>();
         }
         return attributes;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
index 98bbea0..d89c822 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
@@ -41,8 +41,8 @@ public class ToolContext {
     private String packageName;
     private boolean packageNameChanged;
     private ToolErrorListener errors;
-    private Map<String, String> namespacePackageMap = new HashMap<String, String>();
-    private Map<String, String> excludeNamespacePackageMap = new HashMap<String, String>();
+    private Map<String, String> namespacePackageMap = new HashMap<>();
+    private Map<String, String> excludeNamespacePackageMap = new HashMap<>();
     private List<InputSource> jaxbBindingFiles = new ArrayList<>();
     private List<String> excludePkgList = new ArrayList<>();
     private List<String> excludeFileList = new ArrayList<>();
@@ -143,7 +143,7 @@ public class ToolContext {
 
     public void put(String key, Object value) {
         if (paramMap == null) {
-            paramMap = new HashMap<String, Object>();
+            paramMap = new HashMap<>();
         }
         paramMap.put(key, value);
     }
@@ -307,11 +307,11 @@ public class ToolContext {
         ToolContext newCopy = new ToolContext();
 
         newCopy.javaModel = javaModel;
-        newCopy.paramMap = new HashMap<String, Object>(paramMap);
+        newCopy.paramMap = new HashMap<>(paramMap);
         newCopy.packageName = packageName;
         newCopy.packageNameChanged = packageNameChanged;
-        newCopy.namespacePackageMap = new HashMap<String, String>(namespacePackageMap);
-        newCopy.excludeNamespacePackageMap = new HashMap<String, String>(excludeNamespacePackageMap);
+        newCopy.namespacePackageMap = new HashMap<>(namespacePackageMap);
+        newCopy.excludeNamespacePackageMap = new HashMap<>(excludeNamespacePackageMap);
         newCopy.jaxbBindingFiles = new ArrayList<>(jaxbBindingFiles);
         newCopy.excludePkgList = new ArrayList<>(excludePkgList);
         newCopy.excludeFileList = new ArrayList<>(excludeFileList);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java b/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java
index 8e9ab4c..49603cb 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java
@@ -43,7 +43,7 @@ public final class VelocityGenerator {
     private static final Logger LOG = LogUtils.getL7dLogger(VelocityGenerator.class);
     private static boolean initialized;
 
-    private final Map<String, Object> attributes = new HashMap<String, Object>();
+    private final Map<String, Object> attributes = new HashMap<>();
     private String baseDir;
 
     public VelocityGenerator() {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
index a598738..76e37b3 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
@@ -51,14 +51,14 @@ public class JavaMethod implements JavaAnnotatable {
     private JavaInterface javaInterface;
     private final List<JavaParameter> parameters = new ArrayList<>();
     private final List<JavaException> exceptions = new ArrayList<>();
-    private final Map<String, JAnnotation> annotations = new HashMap<String, JAnnotation>();
+    private final Map<String, JAnnotation> annotations = new HashMap<>();
 
     private JavaCodeBlock block;
 
     private boolean async;
 
     static {
-        PRIMITIVE_MAP = new HashMap<String, String>();
+        PRIMITIVE_MAP = new HashMap<>();
         PRIMITIVE_MAP.put("java.lang.Character", "char");
         PRIMITIVE_MAP.put("java.lang.Boolean", "boolean");
         PRIMITIVE_MAP.put("java.lang.Integer", "int");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaParameter.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaParameter.java b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaParameter.java
index d34e9a9..e073433 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaParameter.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaParameter.java
@@ -30,7 +30,7 @@ public class JavaParameter extends JavaType implements JavaAnnotatable {
     private String partName;
 
     private JavaMethod javaMethod;
-    private Map<String, JAnnotation> annotations = new HashMap<String, JAnnotation>();
+    private Map<String, JAnnotation> annotations = new HashMap<>();
 
     /**
      * Describe callback here.

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaType.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaType.java b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaType.java
index 83aaea4..311656a 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaType.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaType.java
@@ -29,7 +29,7 @@ import javax.xml.namespace.QName;
 public class JavaType {
 
     public enum Style { IN, OUT, INOUT }
-    private static Map<String, String> typeMapping = new HashMap<String, String>();
+    private static Map<String, String> typeMapping = new HashMap<>();
 
     static {
         typeMapping.put("boolean", "false");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/common/src/main/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtil.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtil.java b/tools/common/src/main/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtil.java
index 755f074..a88f04f 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtil.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/util/BuiltInTypesJavaMappingUtil.java
@@ -38,7 +38,7 @@ public final class BuiltInTypesJavaMappingUtil {
         nameSpaces.add(NS_XSI.toLowerCase());
     }
 
-    private static Map<String, String> jTypeMapping = new HashMap<String, String>();
+    private static Map<String, String> jTypeMapping = new HashMap<>();
     static {
         jTypeMapping.put("string", "java.lang.String");
         jTypeMapping.put("integer", "java.math.BigInteger");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java b/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java
index 4f7a82c..01d84cf 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/util/ClassCollector.java
@@ -31,13 +31,13 @@ public class ClassCollector {
 
     private Map<String, String> seiClassNames
         = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
-    private Map<String, String> typesClassNames = new HashMap<String, String>();
-    private Map<String, String> exceptionClassNames = new HashMap<String, String>();
-    private Map<String, String> serviceClassNames = new HashMap<String, String>();
-    private Map<String, String> implClassNames = new HashMap<String, String>();
-    private final Map<String, String> clientClassNames = new HashMap<String, String>();
-    private final Map<String, String> serverClassNames = new HashMap<String, String>();
-    private final Map<String, String> reservedClassNames = new HashMap<String, String>();
+    private Map<String, String> typesClassNames = new HashMap<>();
+    private Map<String, String> exceptionClassNames = new HashMap<>();
+    private Map<String, String> serviceClassNames = new HashMap<>();
+    private Map<String, String> implClassNames = new HashMap<>();
+    private final Map<String, String> clientClassNames = new HashMap<>();
+    private final Map<String, String> serverClassNames = new HashMap<>();
+    private final Map<String, String> reservedClassNames = new HashMap<>();
 
 
     private final Set<String> typesPackages = new HashSet<>();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/common/src/main/java/org/apache/cxf/tools/util/PropertyUtil.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/util/PropertyUtil.java b/tools/common/src/main/java/org/apache/cxf/tools/util/PropertyUtil.java
index 0ac8d42..737d0ec 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/util/PropertyUtil.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/util/PropertyUtil.java
@@ -31,7 +31,7 @@ import org.apache.cxf.common.util.StringUtils;
 
 public class PropertyUtil {
     private static final String DEFAULT_DELIM = "=";
-    private Map<String, String>  maps = new HashMap<String, String>();
+    private Map<String, String>  maps = new HashMap<>();
 
     public void load(InputStream is, String delim) throws IOException {
         try (BufferedReader br = new BufferedReader(new InputStreamReader(is))) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/common/src/test/java/org/apache/cxf/tools/common/ProcessorEnvironmentTest.java
----------------------------------------------------------------------
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/ProcessorEnvironmentTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/ProcessorEnvironmentTest.java
index ce3b1be..c4b1bc3 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/ProcessorEnvironmentTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/ProcessorEnvironmentTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 public class ProcessorEnvironmentTest extends Assert {
     @Test
     public void testGet() {
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         map.put("k1", "v1");
         ToolContext env = new ToolContext();
         env.setParameters(map);
@@ -38,7 +38,7 @@ public class ProcessorEnvironmentTest extends Assert {
 
     @Test
     public void testPut() {
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         map.put("k1", "v1");
         ToolContext env = new ToolContext();
         env.setParameters(map);
@@ -49,7 +49,7 @@ public class ProcessorEnvironmentTest extends Assert {
 
     @Test
     public void testRemove() {
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         map.put("k1", "v1");
         ToolContext env = new ToolContext();
         env.setParameters(map);
@@ -62,7 +62,7 @@ public class ProcessorEnvironmentTest extends Assert {
 
     @Test
     public void testContainsKey() {
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         map.put("k1", "v1");
         ToolContext env = new ToolContext();
         env.setParameters(map);
@@ -71,7 +71,7 @@ public class ProcessorEnvironmentTest extends Assert {
 
     @Test
     public void testGetDefaultValue() {
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         map.put("k1", "v1");
         ToolContext env = new ToolContext();
         env.setParameters(map);
@@ -84,7 +84,7 @@ public class ProcessorEnvironmentTest extends Assert {
 
     @Test
     public void testOptionSet() {
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         map.put("k1", "true");
         ToolContext env = new ToolContext();
         env.setParameters(map);
@@ -95,7 +95,7 @@ public class ProcessorEnvironmentTest extends Assert {
 
     @Test
     public void testGetBooleanValue() {
-        Map<String, Object> map = new HashMap<String, Object>();
+        Map<String, Object> map = new HashMap<>();
         map.put("k1", "true");
         ToolContext env = new ToolContext();
         env.setParameters(map);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMap.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMap.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMap.java
index 7ff797d..5bcabf3 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMap.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMap.java
@@ -29,7 +29,7 @@ import org.apache.cxf.binding.corba.wsdl.CorbaType;
 public class CorbaPrimitiveMap extends PrimitiveMapBase {
 
     public CorbaPrimitiveMap() {
-        corbaPrimitiveMap = new HashMap<String, QName>();
+        corbaPrimitiveMap = new HashMap<>();
         initialiseMap();
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/ProcessorEnvironment.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/ProcessorEnvironment.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/ProcessorEnvironment.java
index 3c676e9..55c6483 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/ProcessorEnvironment.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/ProcessorEnvironment.java
@@ -33,9 +33,9 @@ public class ProcessorEnvironment {
 
     private Map<String, Object> paramMap;
     private String packageName;
-    private Map<String, String> namespacePackageMap = new HashMap<String, String>();
-    private Map<String, String> excludeNamespacePackageMap = new HashMap<String, String>();
-    private final Map<String, InputSource> jaxbBindingFiles = new HashMap<String, InputSource>();
+    private Map<String, String> namespacePackageMap = new HashMap<>();
+    private Map<String, String> excludeNamespacePackageMap = new HashMap<>();
+    private final Map<String, InputSource> jaxbBindingFiles = new HashMap<>();
 
     public ProcessorEnvironment() {
     }
@@ -90,7 +90,7 @@ public class ProcessorEnvironment {
 
     public void put(String key, Object value) {
         if (paramMap == null) {
-            paramMap = new HashMap<String, Object>();
+            paramMap = new HashMap<>();
         }
         paramMap.put(key, value);
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/XmlSchemaPrimitiveMap.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/XmlSchemaPrimitiveMap.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/XmlSchemaPrimitiveMap.java
index d359fdd..efd5b82 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/XmlSchemaPrimitiveMap.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/XmlSchemaPrimitiveMap.java
@@ -31,7 +31,7 @@ public class XmlSchemaPrimitiveMap {
     private Map<QName, QName> xmlSchemaPrimitiveMap;
 
     public XmlSchemaPrimitiveMap() {
-        xmlSchemaPrimitiveMap = new HashMap<QName, QName>();
+        xmlSchemaPrimitiveMap = new HashMap<>();
         initializeMap();
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlRoot.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlRoot.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlRoot.java
index 11f6f47..73ed2c2 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlRoot.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlRoot.java
@@ -32,7 +32,7 @@ public final class IdlRoot extends IdlScopeBase {
 
     private IdlRoot() {
         super(null, "");
-        primitiveTypes = new HashMap<String, IdlType>();
+        primitiveTypes = new HashMap<>();
         includeList = new ArrayList<>();
 
         for (short i = IdlPrimitive.MINIMUM; i <= IdlPrimitive.MAXIMUM; ++i) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/DefineState.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/DefineState.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/DefineState.java
index 1b4a497..05ccab9 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/DefineState.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/DefineState.java
@@ -27,7 +27,7 @@ import java.util.Map;
  */
 public class DefineState {
 
-    Map<String, String> defines = new HashMap<String, String>();
+    Map<String, String> defines = new HashMap<>();
 
     public DefineState(Map<String, String> initialDefines) {
         if (initialDefines != null) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/AttributeVisitor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/AttributeVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/AttributeVisitor.java
index 6461beb..4b1af8b 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/AttributeVisitor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/AttributeVisitor.java
@@ -57,8 +57,8 @@ import org.apache.ws.commons.schema.XmlSchemaType;
 
 public class AttributeVisitor extends VisitorBase {
 
-    private static Map<String, String> duplicateTypeTrackerMap = new HashMap<String, String>();
-//    private static Map<String, String> duplicateMessageTrackerMap = new HashMap<String, String>();
+    private static Map<String, String> duplicateTypeTrackerMap = new HashMap<>();
+//    private static Map<String, String> duplicateMessageTrackerMap = new HashMap<>();
 
     private static final String GETTER_PREFIX = "_get_";
     private static final String SETTER_PREFIX = "_set_";

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/DeferredActionCollection.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/DeferredActionCollection.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/DeferredActionCollection.java
index e0a078b..4a296cd 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/DeferredActionCollection.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/DeferredActionCollection.java
@@ -34,7 +34,7 @@ import java.util.Map;
  */
 
 public final class DeferredActionCollection {
-    Map<String, List<DeferredAction>> deferredActions = new HashMap<String, List<DeferredAction>>();
+    Map<String, List<DeferredAction>> deferredActions = new HashMap<>();
     public void add(Scope scope, DeferredAction action) {
         List<DeferredAction> list = deferredActions.get(scope.toString());
         if (list == null) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java
index f245319..c795bcf 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java
@@ -430,7 +430,7 @@ public class IDLToWSDLProcessor extends IDLProcessor {
     }
 
     private Map<String, String> getServiceNames(Binding[] bindings, boolean isDefaultMapping) {
-        Map<String, String> serviceNames = new HashMap<String, String>();
+        Map<String, String> serviceNames = new HashMap<>();
         for (int i = 0; i < bindings.length; i++) {
             QName portTypeName = bindings[i].getPortType().getQName();
             String ns = portTypeName.getNamespaceURI();
@@ -455,7 +455,7 @@ public class IDLToWSDLProcessor extends IDLProcessor {
                                      Binding[] bindings,
                                      boolean isDefaultMapping)
         throws Exception {
-        Map<String, Service> serviceMap = new HashMap<String, Service>();
+        Map<String, Service> serviceMap = new HashMap<>();
         Map<String, String> serviceNames = getServiceNames(bindings, isDefaultMapping);
         for (int i = 0; i < bindings.length; i++) {
             QName portTypeName = bindings[i].getPortType().getQName();
@@ -615,7 +615,7 @@ public class IDLToWSDLProcessor extends IDLProcessor {
     }
 
     private Map<String, String> getModuleToNSMapping(String mapping) throws IOException {
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         if ((mapping != null) && (mapping.length() > 0)) {
             if ((mapping.startsWith("[")) && (mapping.endsWith("]"))) {
                 mapping = mapping.substring(1, mapping.length() - 1);
@@ -664,7 +664,7 @@ public class IDLToWSDLProcessor extends IDLProcessor {
     }
 
     private Map<String, List<String>> getExcludedModules(String modules) {
-        Map<String, List<String>> exModules = new HashMap<String, List<String>>();
+        Map<String, List<String>> exModules = new HashMap<>();
         if ((modules != null) && (modules.length() > 0)) {
             if ((modules.startsWith("[")) && (modules.endsWith("]"))) {
                 modules = modules.substring(1, modules.length() - 1);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ModuleToNSMapper.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ModuleToNSMapper.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ModuleToNSMapper.java
index c84a06c..042a959 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ModuleToNSMapper.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ModuleToNSMapper.java
@@ -33,8 +33,8 @@ public class ModuleToNSMapper {
     boolean defaultMapping = true;
 
     public ModuleToNSMapper() {
-        userMap = new HashMap<String, String>();
-        exModules = new HashMap<String, List<String>>();
+        userMap = new HashMap<>();
+        exModules = new HashMap<>();
     }
 
     public void setDefaultMapping(boolean flag) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopeNameCollection.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopeNameCollection.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopeNameCollection.java
index a2be214..6c7e5ed 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopeNameCollection.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ScopeNameCollection.java
@@ -24,7 +24,7 @@ import java.util.Map;
 
 public final class ScopeNameCollection  {
 
-    Map<String, Scope> scopedNames = new HashMap<String, Scope>();
+    Map<String, Scope> scopedNames = new HashMap<>();
 
     public void add(Scope scope) {
         scopedNames.put(scope.toString(), scope);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java
index 003b77a..ea968a3 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/WSDLSchemaManager.java
@@ -70,11 +70,11 @@ public class WSDLSchemaManager {
     List<DeferredSchemaAttachment> deferredAttachments;
 
     public WSDLSchemaManager() {
-        defns = new HashMap<String, Definition>();
-        schemas = new HashMap<String, XmlSchema>();
-        importedDefns = new HashMap<File, Definition>();
-        importedSchemas = new HashMap<File, XmlSchema>();
-        defnSchemas = new HashMap<String, XmlSchema>();
+        defns = new HashMap<>();
+        schemas = new HashMap<>();
+        importedDefns = new HashMap<>();
+        importedSchemas = new HashMap<>();
+        defnSchemas = new HashMap<>();
 
         deferredAttachments = new ArrayList<>();
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
index 9c85845..9295348 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
@@ -93,7 +93,7 @@ public class WSDLToCorbaBinding {
     ExtensionRegistry extReg;
 
     List<String> interfaceNames = new ArrayList<>();
-    Map<Object, Object> bindingNameMap = new HashMap<Object, Object>();
+    Map<Object, Object> bindingNameMap = new HashMap<>();
     String bindingName;
     String address;
     String addressFile;

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
index f389036..e24b702 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
@@ -104,7 +104,7 @@ public class WSDLToCorbaHelper {
     SchemaCollection xmlSchemaList;
     TypeMappingType typeMappingType;
     Definition def;
-    Map<QName, CorbaType> recursionMap = new HashMap<QName, CorbaType>();
+    Map<QName, CorbaType> recursionMap = new HashMap<>();
 
     public void setTypeMap(TypeMappingType map) {
         typeMappingType = map;

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMapTest.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMapTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMapTest.java
index bf278cb..d1a3a61 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMapTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/common/CorbaPrimitiveMapTest.java
@@ -31,7 +31,7 @@ public class CorbaPrimitiveMapTest extends TestCase {
 
     public void testMap() {
 
-        Map<QName, CorbaType> map = new HashMap<QName, CorbaType>();
+        Map<QName, CorbaType> map = new HashMap<>();
         QName corbaName = new QName("http://cxf.apache.org/bindings/corba", "string", "corba");
         QName typeName = new QName("http://www.w3.org/2001/XMLSchema", "string");
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java
index d499fe5..7f92abc 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/IDLToWSDLGenerationTest.java
@@ -93,7 +93,7 @@ public class IDLToWSDLGenerationTest extends ProcessorTestBase {
         throws Exception {
         URL idl = getClass().getResource(sourceIdlFilename);
         ProcessorEnvironment env = new ProcessorEnvironment();
-        Map<String, Object> cfg = new HashMap<String, Object>();
+        Map<String, Object> cfg = new HashMap<>();
         cfg.put(ToolCorbaConstants.CFG_IDLFILE, new File(idl.toURI()).getAbsolutePath());
         env.setParameters(cfg);
         IDLToWSDLProcessor processor = new IDLToWSDLProcessor();
@@ -357,7 +357,7 @@ public class IDLToWSDLGenerationTest extends ProcessorTestBase {
 
         URL idl = getClass().getResource(idlFilename);
         ProcessorEnvironment env = new ProcessorEnvironment();
-        Map<String, Object> cfg = new HashMap<String, Object>();
+        Map<String, Object> cfg = new HashMap<>();
         cfg.put(ToolCorbaConstants.CFG_IDLFILE, new File(idl.toURI()).getAbsolutePath());
         if (logicalName != null) {
             cfg.put(ToolCorbaConstants.CFG_LOGICAL, logicalName);
@@ -542,7 +542,7 @@ public class IDLToWSDLGenerationTest extends ProcessorTestBase {
             String sourceIdlFilename = "/idl/Enum.idl";
             URL idl = getClass().getResource(sourceIdlFilename);
             ProcessorEnvironment env = new ProcessorEnvironment();
-            Map<String, Object> cfg = new HashMap<String, Object>();
+            Map<String, Object> cfg = new HashMap<>();
             cfg.put(ToolCorbaConstants.CFG_IDLFILE, new File(idl.toURI()).getAbsolutePath());
             cfg.put(ToolCorbaConstants.CFG_WSDL_ENCODING, "UTF-16");
             env.setParameters(cfg);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java
index 8cc22c3..5f42683 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTest.java
@@ -144,7 +144,7 @@ public class WSDLToCorbaBindingTest extends Assert {
                                 "YCORBABinding", "tns");
         Binding binding = model.getBinding(bName);
         TypeMappingType mapType = (TypeMappingType)model.getExtensibilityElements().get(0);
-        Map<String, CorbaType> tmap = new HashMap<String, CorbaType>();
+        Map<String, CorbaType> tmap = new HashMap<>();
         for (CorbaType type : mapType.getStructOrExceptionOrUnion()) {
             tmap.put(type.getName(), type);
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
index 7a2d4e0..0da63d1 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToCorbaBindingTypeTest.java
@@ -513,7 +513,7 @@ public class WSDLToCorbaBindingTypeTest extends Assert {
             assertEquals(2, typemap.getElementsByTagName("corba:struct").getLength());
 
             TypeMappingType mapType = (TypeMappingType)model.getExtensibilityElements().get(0);
-            Map<String, CorbaType> tmap = new HashMap<String, CorbaType>();
+            Map<String, CorbaType> tmap = new HashMap<>();
             for (CorbaType type : mapType.getStructOrExceptionOrUnion()) {
                 tmap.put(type.getName(), type);
             }

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java
index 0b10808..e0ffec4 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java
@@ -82,7 +82,7 @@ public class WSDL11Generator extends AbstractGenerator<Definition> {
                 name = name.substring(0, name.lastIndexOf(".wsdl"));
             }
             builder.setBaseFileName(name);
-            Map<String, SchemaInfo> imports = new HashMap<String, SchemaInfo>();
+            Map<String, SchemaInfo> imports = new HashMap<>();
             def = builder.build(imports);
             wsdlWriter.writeWSDL(def, os);
             os.close();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/AntGenerator.java
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/AntGenerator.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/AntGenerator.java
index 61f581d..706df78 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/AntGenerator.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/AntGenerator.java
@@ -54,8 +54,8 @@ public class AntGenerator extends AbstractGenerator {
         Map<String, JavaInterface> interfaces = javaModel.getInterfaces();
 
 
-        Map<String, String> serverClassNamesMap = new HashMap<String, String>();
-        Map<String, String> clientClassNamesMap = new HashMap<String, String>();
+        Map<String, String> serverClassNamesMap = new HashMap<>();
+        Map<String, String> clientClassNamesMap = new HashMap<>();
         for (JavaInterface intf : interfaces.values()) {
             clientClassNamesMap.put(intf.getName() + "Client",
                                     intf.getFullClassName() + "Client");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java
index cc7afb4..4365af2 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/AegisTest.java
@@ -125,7 +125,7 @@ public class AegisTest extends ToolTestBase {
 
 
     private Map<String, String> getNSMap() {
-        Map<String, String> namespaces = new HashMap<String, String>();
+        Map<String, String> namespaces = new HashMap<>();
         namespaces.put("s", "http://schemas.xmlsoap.org/soap/envelope/");
         namespaces.put("xsd", "http://www.w3.org/2001/XMLSchema");
         namespaces.put("wsdl", "http://schemas.xmlsoap.org/wsdl/");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
index 2c06d65..c22518a 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2ws/JavaToWSTest.java
@@ -347,7 +347,7 @@ public class JavaToWSTest extends ToolTestBase {
         File file = new File(output.getPath() + "/xml-list.wsdl");
 
         Document doc = StaxUtils.read(file);
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         map.put("xsd", "http://www.w3.org/2001/XMLSchema");
         map.put("wsdl", "http://schemas.xmlsoap.org/wsdl/");
         map.put("soap", "http://schemas.xmlsoap.org/wsdl/soap/");
@@ -382,7 +382,7 @@ public class JavaToWSTest extends ToolTestBase {
         File file = new File(output.getPath() + "/xmladapter.wsdl");
 
         Document doc = StaxUtils.read(file);
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         map.put("xsd", "http://www.w3.org/2001/XMLSchema");
         map.put("wsdl", "http://schemas.xmlsoap.org/wsdl/");
         map.put("soap", "http://schemas.xmlsoap.org/wsdl/soap/");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
index c815187..fcd6f8e 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
@@ -664,7 +664,7 @@ public class JavaToProcessorTest extends ProcessorTestBase {
         // schema element
 
         Document doc = StaxUtils.read(wsdlFile);
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         map.put("xsd", "http://www.w3.org/2001/XMLSchema");
         map.put("wsdl", "http://schemas.xmlsoap.org/wsdl/");
         map.put("soap", "http://schemas.xmlsoap.org/wsdl/soap/");
@@ -757,7 +757,7 @@ public class JavaToProcessorTest extends ProcessorTestBase {
         assertTrue(wsdlFile.exists());
 
         Document doc = StaxUtils.read(wsdlFile);
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         map.put("xsd", "http://www.w3.org/2001/XMLSchema");
         map.put("wsdl", "http://schemas.xmlsoap.org/wsdl/");
         map.put("soap", "http://schemas.xmlsoap.org/wsdl/soap/");
@@ -802,7 +802,7 @@ public class JavaToProcessorTest extends ProcessorTestBase {
         assertTrue(wsdlFile.exists());
 
         Document doc = StaxUtils.read(wsdlFile);
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         map.put("xsd", "http://www.w3.org/2001/XMLSchema");
         map.put("wsdl", "http://schemas.xmlsoap.org/wsdl/");
         map.put("soap", "http://schemas.xmlsoap.org/wsdl/soap/");
@@ -846,7 +846,7 @@ public class JavaToProcessorTest extends ProcessorTestBase {
         assertTrue(wsdlFile.exists());
 
         Document doc = StaxUtils.read(wsdlFile);
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         map.put("xsd", "http://www.w3.org/2001/XMLSchema");
         map.put("wsdl", "http://schemas.xmlsoap.org/wsdl/");
         map.put("soap", "http://schemas.xmlsoap.org/wsdl/soap/");
@@ -891,7 +891,7 @@ public class JavaToProcessorTest extends ProcessorTestBase {
         assertTrue(wsdlFile.exists());
 
         Document doc = StaxUtils.read(wsdlFile);
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         map.put("xsd", "http://www.w3.org/2001/XMLSchema");
         map.put("wsdl", "http://schemas.xmlsoap.org/wsdl/");
         map.put("soap", "http://schemas.xmlsoap.org/wsdl/soap/");
@@ -928,7 +928,7 @@ public class JavaToProcessorTest extends ProcessorTestBase {
         assertTrue(wsdlFile.exists());
 
         Document doc = StaxUtils.read(wsdlFile);
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         map.put("xsd", "http://www.w3.org/2001/XMLSchema");
         map.put("wsdl", "http://schemas.xmlsoap.org/wsdl/");
         map.put("soap", "http://schemas.xmlsoap.org/wsdl/soap/");
@@ -955,7 +955,7 @@ public class JavaToProcessorTest extends ProcessorTestBase {
         File wsdlFile = new File(output, "exception-type-adapter.wsdl");
         assertTrue(wsdlFile.exists());
         Document doc = StaxUtils.read(wsdlFile);
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         map.put("xsd", "http://www.w3.org/2001/XMLSchema");
         XPathUtils util = new XPathUtils(map);
         Node nd = util.getValueNode("//xsd:complexType[@name='myClass2']", doc);
@@ -1003,7 +1003,7 @@ public class JavaToProcessorTest extends ProcessorTestBase {
 
         Document doc = StaxUtils.read(wsdlFile);
         //StaxUtils.print(doc);
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, String> map = new HashMap<>();
         map.put("xsd", "http://www.w3.org/2001/XMLSchema");
         map.put("wsdl", "http://schemas.xmlsoap.org/wsdl/");
         map.put("soap", "http://schemas.xmlsoap.org/wsdl/soap/");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java
----------------------------------------------------------------------
diff --git a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java
index 26e0e5b..0258f7a 100644
--- a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java
+++ b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java
@@ -345,7 +345,7 @@ class NewStackTraceErrorHandler implements ErrorHandler {
 
 class SchemaResourceResolver implements LSResourceResolver {
     private static final Logger LOG = LogUtils.getL7dLogger(SchemaValidator.class);
-    private static final Map<String, String> NSFILEMAP = new HashMap<String, String>();
+    private static final Map<String, String> NSFILEMAP = new HashMap<>();
     static {
         NSFILEMAP.put(ToolConstants.XML_NAMESPACE_URI, "xml.xsd");
         NSFILEMAP.put(ToolConstants.WSDL_NAMESPACE_URI, "wsdl.xsd");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/UniqueBodyPartsValidator.java
----------------------------------------------------------------------
diff --git a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/UniqueBodyPartsValidator.java b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/UniqueBodyPartsValidator.java
index 45f33fa..5ec7566 100644
--- a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/UniqueBodyPartsValidator.java
+++ b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/UniqueBodyPartsValidator.java
@@ -49,7 +49,7 @@ public class UniqueBodyPartsValidator extends AbstractDefinitionValidator {
     public boolean isValid() {
         Collection<Binding> bindings = CastUtils.cast(def.getAllBindings().values());
         for (Binding binding : bindings) {
-            uniqueBodyPartsMap = new HashMap<QName, String>();
+            uniqueBodyPartsMap = new HashMap<>();
             List<BindingOperation> ops = CastUtils.cast(binding.getBindingOperations());
             for (BindingOperation op : ops) {
                 Operation operation = op.getOperation();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java
----------------------------------------------------------------------
diff --git a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java
index 5538e7c..364ed8f 100644
--- a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java
+++ b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/ValidatorUtil.java
@@ -140,7 +140,7 @@ public final class ValidatorUtil {
      */
     public static Map<String, Document> getImportedWsdlMap(Document document,
         String basePath) throws IOException, SAXException {
-        Map<String, Document> docMap = new HashMap<String, Document>();
+        Map<String, Document> docMap = new HashMap<>();
         if (document == null) {
             return docMap;
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
----------------------------------------------------------------------
diff --git a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
index 6dc2b0d..889eca6 100644
--- a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
+++ b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSDLRefValidator.java
@@ -84,7 +84,7 @@ public class WSDLRefValidator extends AbstractDefinitionValidator {
 
     private Set<QName> portTypeRefNames = new HashSet<>();
     private Set<QName> messageRefNames = new HashSet<>();
-    private Map<QName, Service> services = new HashMap<QName, Service>();
+    private Map<QName, Service> services = new HashMap<>();
 
     private ValidationResult vResults = new ValidationResult();
 
@@ -108,7 +108,7 @@ public class WSDLRefValidator extends AbstractDefinitionValidator {
         processSchemas(bus);
     }
     private void getSchemas(Bus bus) {
-        Map<String, Element> schemaList = new HashMap<String, Element>();
+        Map<String, Element> schemaList = new HashMap<>();
         SchemaUtil schemaUtil = new SchemaUtil(bus, schemaList);
         List<SchemaInfo> si = new ArrayList<>();
         schemaUtil.getSchemas(definition, schemaCollection, si);
@@ -267,7 +267,7 @@ public class WSDLRefValidator extends AbstractDefinitionValidator {
     }
 
     private Map<QName, XNode> getBindings(Service service) {
-        Map<QName, XNode> bindings = new HashMap<QName, XNode>();
+        Map<QName, XNode> bindings = new HashMap<>();
 
         if (service.getPorts().values().size() == 0) {
             throw new ToolException("Service " + service.getQName() + " does not contain any usable ports");
@@ -287,7 +287,7 @@ public class WSDLRefValidator extends AbstractDefinitionValidator {
     }
 
     private Map<QName, Operation> getOperations(PortType portType) {
-        Map<QName, Operation> operations = new HashMap<QName, Operation>();
+        Map<QName, Operation> operations = new HashMap<>();
         Collection<Operation> pops = CastUtils.cast(portType.getOperations());
         for (Operation op : pops) {
             operations.put(new QName(portType.getQName().getNamespaceURI(), op.getName()), op);
@@ -402,7 +402,7 @@ public class WSDLRefValidator extends AbstractDefinitionValidator {
     }
 
     private void collectValidationPointsForBindings() throws Exception {
-        Map<QName, XNode> vBindingNodes = new HashMap<QName, XNode>();
+        Map<QName, XNode> vBindingNodes = new HashMap<>();
         for (Service service : services.values()) {
             vBindingNodes.putAll(getBindings(service));
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XNode.java
----------------------------------------------------------------------
diff --git a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XNode.java b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XNode.java
index a22cd4d..cefe8e7 100644
--- a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XNode.java
+++ b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/model/XNode.java
@@ -41,7 +41,7 @@ public class XNode {
 
     private XNode failurePoint;
 
-    private Map<String, String> nsMap = new HashMap<String, String>();
+    private Map<String, String> nsMap = new HashMap<>();
 
     public void setFailurePoint(XNode point) {
         this.failurePoint = point;

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java
----------------------------------------------------------------------
diff --git a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java
index 3cf915c..e77d7ea 100644
--- a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java
+++ b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java
@@ -298,7 +298,7 @@ public class JAXRSContainer extends AbstractCXFToolContainer {
             typeToClasses = value instanceof String ? new String[]{(String)value}
                                                    : (String[])value;
         }
-        Map<String, String> typeMap = new HashMap<String, String>();
+        Map<String, String> typeMap = new HashMap<>();
         for (int i = 0; i < typeToClasses.length; i++) {
             int pos = typeToClasses[i].indexOf("=");
             if (pos != -1) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
----------------------------------------------------------------------
diff --git a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
index 4dc3619..df31eb8 100644
--- a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
+++ b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
@@ -141,7 +141,7 @@ public class SourceGenerator {
     private static final Map<String, String> XSD_SPECIFIC_TYPE_MAP;
 
     static {
-        HTTP_METHOD_ANNOTATIONS = new HashMap<String, Class<?>>();
+        HTTP_METHOD_ANNOTATIONS = new HashMap<>();
         HTTP_METHOD_ANNOTATIONS.put("get", GET.class);
         HTTP_METHOD_ANNOTATIONS.put("put", PUT.class);
         HTTP_METHOD_ANNOTATIONS.put("post", POST.class);
@@ -149,7 +149,7 @@ public class SourceGenerator {
         HTTP_METHOD_ANNOTATIONS.put("head", HEAD.class);
         HTTP_METHOD_ANNOTATIONS.put("options", OPTIONS.class);
 
-        PARAM_ANNOTATIONS = new HashMap<String, Class<?>>();
+        PARAM_ANNOTATIONS = new HashMap<>();
         PARAM_ANNOTATIONS.put("template", PathParam.class);
         PARAM_ANNOTATIONS.put("header", HeaderParam.class);
         PARAM_ANNOTATIONS.put("query", QueryParam.class);
@@ -159,7 +159,7 @@ public class SourceGenerator {
         RESOURCE_LEVEL_PARAMS.add("template");
         RESOURCE_LEVEL_PARAMS.add("matrix");
 
-        AUTOBOXED_PRIMITIVES_MAP = new HashMap<String, String>();
+        AUTOBOXED_PRIMITIVES_MAP = new HashMap<>();
         AUTOBOXED_PRIMITIVES_MAP.put(byte.class.getSimpleName(), Byte.class.getSimpleName());
         AUTOBOXED_PRIMITIVES_MAP.put(short.class.getSimpleName(), Short.class.getSimpleName());
         AUTOBOXED_PRIMITIVES_MAP.put(int.class.getSimpleName(), Integer.class.getSimpleName());
@@ -168,7 +168,7 @@ public class SourceGenerator {
         AUTOBOXED_PRIMITIVES_MAP.put(double.class.getSimpleName(), Double.class.getSimpleName());
         AUTOBOXED_PRIMITIVES_MAP.put(boolean.class.getSimpleName(), Boolean.class.getSimpleName());
 
-        XSD_SPECIFIC_TYPE_MAP = new HashMap<String, String>();
+        XSD_SPECIFIC_TYPE_MAP = new HashMap<>();
         XSD_SPECIFIC_TYPE_MAP.put("string", "String");
         XSD_SPECIFIC_TYPE_MAP.put("integer", "long");
         XSD_SPECIFIC_TYPE_MAP.put("float", "float");
@@ -405,7 +405,7 @@ public class SourceGenerator {
             return new GrammarInfo();
         }
 
-        Map<String, String> nsMap = new HashMap<String, String>();
+        Map<String, String> nsMap = new HashMap<>();
         NamedNodeMap attrMap = app.getAppElement().getAttributes();
         for (int i = 0; i < attrMap.getLength(); i++) {
             Node node = attrMap.item(i);
@@ -415,7 +415,7 @@ public class SourceGenerator {
                 nsMap.put(nodeName.substring(6), nsValue);
             }
         }
-        Map<String, String> elementTypeMap = new HashMap<String, String>();
+        Map<String, String> elementTypeMap = new HashMap<>();
         for (SchemaInfo schemaEl : schemaElements) {
             populateElementTypeMap(app, schemaEl.getElement(), schemaEl.getSystemId(), elementTypeMap);
         }
@@ -509,7 +509,7 @@ public class SourceGenerator {
         writeImplementsInterface(sbCode, qname.getLocalPart(), info.isInterfaceGenerated());
         sbCode.append(" {" + getLineSep() + getLineSep());
 
-        Map<String, Integer> methodNameMap = new HashMap<String, Integer>();
+        Map<String, Integer> methodNameMap = new HashMap<>();
         writeMethods(rElement, classPackage, imports, sbCode,
                      info, resourceId, isRoot, "",
                      methodNameMap);
@@ -2033,8 +2033,8 @@ public class SourceGenerator {
     }
 
     private static class GrammarInfo {
-        private Map<String, String> nsMap = new HashMap<String, String>();
-        private Map<String, String> elementTypeMap = new HashMap<String, String>();
+        private Map<String, String> nsMap = new HashMap<>();
+        private Map<String, String> elementTypeMap = new HashMap<>();
         private boolean noTargetNamespace;
         GrammarInfo() {
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
index 783168c..29c623c 100644
--- a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
+++ b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
@@ -781,7 +781,7 @@ public class WSDLToJavaContainer extends AbstractCXFToolContainer {
             //get imported schemas
             int xsdCount = 0;
             SchemaCollection schemas = (SchemaCollection) context.get(ToolConstants.XML_SCHEMA_COLLECTION);
-            Map<String, String> sourceMap = new HashMap<String, String>();
+            Map<String, String> sourceMap = new HashMap<>();
             for (XmlSchema imp : schemas.getXmlSchemas()) {
                 if (imp.getSourceURI() != null && !imp.getSourceURI().contains(".wsdl#")) {
                     String schemaFileName = "schema" + (++xsdCount) + ".xsd";
@@ -791,7 +791,7 @@ public class WSDLToJavaContainer extends AbstractCXFToolContainer {
 
             //get imported wsdls
             List<Definition> defs = (List<Definition>)context.get(ToolConstants.IMPORTED_DEFINITION);
-            Map<String, String> importWSDLMap = new HashMap<String, String>();
+            Map<String, String> importWSDLMap = new HashMap<>();
             for (Definition importDef : defs) {
                 File importedWsdlFile = null;
                 if (!StringUtils.isEmpty(importDef.getDocumentBaseURI())) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilder.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilder.java b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilder.java
index 6b19606..18e44df 100644
--- a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilder.java
+++ b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/WSDLDefinitionBuilder.java
@@ -56,7 +56,7 @@ public class WSDLDefinitionBuilder implements WSDLBuilder<Definition> {
 
 
     private final Map<String, WSDLExtensibilityPlugin> wsdlPlugins
-        = new HashMap<String, WSDLExtensibilityPlugin>();
+        = new HashMap<>();
     private Bus bus;
 
     public WSDLDefinitionBuilder(Bus b) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
index e07948c..6860b01 100644
--- a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
+++ b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
@@ -292,7 +292,7 @@ public class JAXBDataBinding implements DataBindingProfile {
     private static final Logger LOG = LogUtils.getL7dLogger(JAXBDataBinding.class);
 
     private static final Set<String> DEFAULT_TYPE_MAP = new HashSet<>();
-    private static final Map<String, String> JLDEFAULT_TYPE_MAP = new HashMap<String, String>();
+    private static final Map<String, String> JLDEFAULT_TYPE_MAP = new HashMap<>();
 
     private S2JJAXBModel rawJaxbModelGenCode;
     private ToolContext context;

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java b/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
index ce460e3..67ce656 100644
--- a/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
+++ b/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
@@ -172,7 +172,7 @@ public class JavaScriptContainer extends WSDLToJavaContainer {
     }
 
     public void setNamespaceJavascriptPrefixes(ToolContext env) {
-        Map<String, String> nsPrefixMap = new HashMap<String, String>();
+        Map<String, String> nsPrefixMap = new HashMap<>();
         if (env.get(ToolConstants.CFG_JSPACKAGEPREFIX) != null) {
             String[] pns = null;
             try {


Mime
View raw message