cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [06/12] cxf git commit: Removing HashMap parameters
Date Thu, 09 Mar 2017 11:40:43 GMT
http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java
index a670ae9..9d9e242 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMRoundTripTest.java
@@ -57,7 +57,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
         inProperties.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
         inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
@@ -107,7 +107,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
         inProperties.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
         inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
@@ -121,7 +121,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> outConfig = new HashMap<String, Object>();
+        Map<String, Object> outConfig = new HashMap<>();
         outConfig.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN);
         outConfig.put(ConfigurationConstants.PASSWORD_TYPE, "PasswordText");
         outConfig.put(ConfigurationConstants.USER, "username");
@@ -155,7 +155,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
         inProperties.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST);
         inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
@@ -204,7 +204,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
         inProperties.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST);
         inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
@@ -218,7 +218,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> outConfig = new HashMap<String, Object>();
+        Map<String, Object> outConfig = new HashMap<>();
         outConfig.put(ConfigurationConstants.ACTION, ConfigurationConstants.USERNAME_TOKEN);
         outConfig.put(ConfigurationConstants.PASSWORD_TYPE, "PasswordDigest");
         outConfig.put(ConfigurationConstants.USER, "username");
@@ -252,7 +252,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
         inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
         inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
@@ -288,7 +288,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
         inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
         inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
@@ -302,7 +302,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> outConfig = new HashMap<String, Object>();
+        Map<String, Object> outConfig = new HashMap<>();
         outConfig.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
         outConfig.put(ConfigurationConstants.ENCRYPTION_USER, "myalias");
         outConfig.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
@@ -320,7 +320,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
         inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
         inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
@@ -365,7 +365,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
         inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
         inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
@@ -379,7 +379,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> outConfig = new HashMap<String, Object>();
+        Map<String, Object> outConfig = new HashMap<>();
         outConfig.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
         outConfig.put(ConfigurationConstants.ENCRYPTION_USER, "myalias");
         outConfig.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
@@ -413,7 +413,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.ENCRYPT
@@ -457,7 +457,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.ENCRYPT
@@ -474,7 +474,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> outConfig = new HashMap<String, Object>();
+        Map<String, Object> outConfig = new HashMap<>();
         outConfig.put(
             ConfigurationConstants.ACTION,
             ConfigurationConstants.USERNAME_TOKEN + " " + ConfigurationConstants.ENCRYPT
@@ -500,7 +500,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
         inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
@@ -535,7 +535,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
         inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
@@ -549,7 +549,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> outConfig = new HashMap<String, Object>();
+        Map<String, Object> outConfig = new HashMap<>();
         outConfig.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
         outConfig.put(ConfigurationConstants.SIGNATURE_USER, "myalias");
         outConfig.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
@@ -566,7 +566,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.USERNAME_TOKEN
@@ -613,7 +613,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.USERNAME_TOKEN
@@ -630,7 +630,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> outConfig = new HashMap<String, Object>();
+        Map<String, Object> outConfig = new HashMap<>();
         outConfig.put(
             ConfigurationConstants.ACTION,
             ConfigurationConstants.USERNAME_TOKEN + " " + ConfigurationConstants.SIGNATURE
@@ -656,7 +656,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.TIMESTAMP);
         WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
         service.getInInterceptors().add(inInterceptor);
@@ -701,7 +701,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.TIMESTAMP);
         WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
         service.getInInterceptors().add(inInterceptor);
@@ -713,7 +713,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> outConfig = new HashMap<String, Object>();
+        Map<String, Object> outConfig = new HashMap<>();
         outConfig.put(ConfigurationConstants.ACTION, ConfigurationConstants.TIMESTAMP);
         WSS4JStaxOutInterceptor ohandler = new WSS4JStaxOutInterceptor(outConfig);
 
@@ -744,7 +744,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.TIMESTAMP
@@ -789,7 +789,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.TIMESTAMP
@@ -806,7 +806,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> outConfig = new HashMap<String, Object>();
+        Map<String, Object> outConfig = new HashMap<>();
         outConfig.put(
             ConfigurationConstants.ACTION,
             ConfigurationConstants.TIMESTAMP + " " + ConfigurationConstants.SIGNATURE
@@ -831,7 +831,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.TIMESTAMP
@@ -881,7 +881,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
         inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new KeystorePasswordCallback());
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "cxfca.properties");
@@ -921,7 +921,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
         inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new KeystorePasswordCallback());
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "cxfca.properties");
@@ -935,7 +935,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> outConfig = new HashMap<String, Object>();
+        Map<String, Object> outConfig = new HashMap<>();
         outConfig.put(ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE);
         outConfig.put(ConfigurationConstants.SIGNATURE_USER, "alice");
         outConfig.put(ConfigurationConstants.PW_CALLBACK_REF, new KeystorePasswordCallback());
@@ -954,7 +954,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT
@@ -997,7 +997,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT
@@ -1015,7 +1015,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> outConfig = new HashMap<String, Object>();
+        Map<String, Object> outConfig = new HashMap<>();
         outConfig.put(
             ConfigurationConstants.ACTION,
             ConfigurationConstants.ENCRYPT + " " + ConfigurationConstants.SIGNATURE
@@ -1038,14 +1038,14 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
         inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
         WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
         service.getInInterceptors().add(inInterceptor);
 
-        Map<String, Object> outProperties = new HashMap<String, Object>();
+        Map<String, Object> outProperties = new HashMap<>();
         outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
         outProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
         outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
@@ -1092,14 +1092,14 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
         inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
         WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
         service.getInInterceptors().add(inInterceptor);
 
-        Map<String, Object> outProperties = new HashMap<String, Object>();
+        Map<String, Object> outProperties = new HashMap<>();
         outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
         outProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
         outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
@@ -1116,7 +1116,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> clientOutConfig = new HashMap<String, Object>();
+        Map<String, Object> clientOutConfig = new HashMap<>();
         clientOutConfig.put(
             ConfigurationConstants.ACTION, ConfigurationConstants.SIGNATURE
         );
@@ -1127,7 +1127,7 @@ public class StaxToDOMRoundTripTest extends AbstractSecurityTest {
 
         client.getOutInterceptors().add(clientOhandler);
 
-        Map<String, Object> clientInConfig = new HashMap<String, Object>();
+        Map<String, Object> clientInConfig = new HashMap<>();
         clientInConfig.put(ConfigurationConstants.PW_CALLBACK_REF, new TestPwdCallback());
         clientInConfig.put(ConfigurationConstants.ENABLE_SIGNATURE_CONFIRMATION, "true");
         clientInConfig.put(ConfigurationConstants.SIG_VER_PROP_FILE, "insecurity.properties");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java
index 2f581ef..6322245 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/StaxToDOMSignatureIdentifierTest.java
@@ -52,7 +52,7 @@ public class StaxToDOMSignatureIdentifierTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
         inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
@@ -90,7 +90,7 @@ public class StaxToDOMSignatureIdentifierTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
         inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
@@ -128,7 +128,7 @@ public class StaxToDOMSignatureIdentifierTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
         inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
@@ -166,7 +166,7 @@ public class StaxToDOMSignatureIdentifierTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
         inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
@@ -205,7 +205,7 @@ public class StaxToDOMSignatureIdentifierTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
         inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/TestPwdCallback.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/TestPwdCallback.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/TestPwdCallback.java
index 9ab0959..eb233a9 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/TestPwdCallback.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/TestPwdCallback.java
@@ -30,7 +30,7 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
 
 public class TestPwdCallback implements CallbackHandler {
 
-    private static Map<String, String> passwords = new HashMap<String, String>();
+    private static Map<String, String> passwords = new HashMap<>();
 
     static {
         passwords.put("myalias", "myAliasPassword");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
index 9437951..b6f64c8 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
@@ -87,13 +87,13 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
 
     @Test
     public void testSignature() throws Exception {
-        Map<String, Object> outProperties = new HashMap<String, Object>();
+        Map<String, Object> outProperties = new HashMap<>();
         outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
         outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
         outProperties.put(WSHandlerConstants.USER, "myalias");
         outProperties.put("password", "myAliasPassword");
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
 
@@ -113,14 +113,14 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
 
     @Test
     public void testDirectReferenceSignature() throws Exception {
-        Map<String, Object> outProperties = new HashMap<String, Object>();
+        Map<String, Object> outProperties = new HashMap<>();
         outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
         outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "outsecurity.properties");
         outProperties.put(WSHandlerConstants.USER, "myalias");
         outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
         outProperties.put("password", "myAliasPassword");
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
 
@@ -141,13 +141,13 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
 
     @Test
     public void testEncryption() throws Exception {
-        Map<String, Object> outProperties = new HashMap<String, Object>();
+        Map<String, Object> outProperties = new HashMap<>();
         outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
         outProperties.put(WSHandlerConstants.ENC_PROP_FILE, "outsecurity.properties");
         outProperties.put(WSHandlerConstants.USER, "myalias");
         outProperties.put("password", "myAliasPassword");
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT);
         inProperties.put(WSHandlerConstants.DEC_PROP_FILE, "insecurity.properties");
         inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
@@ -189,7 +189,7 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
 
     @Test
     public void testEncryptedUsernameToken() throws Exception {
-        Map<String, Object> outProperties = new HashMap<String, Object>();
+        Map<String, Object> outProperties = new HashMap<>();
         outProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.ENCRYPT
@@ -203,7 +203,7 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
             "{Content}{" + WSConstants.WSSE_NS + "}UsernameToken"
         );
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.ENCRYPT
@@ -241,13 +241,13 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
 
     @Test
     public void testUsernameToken() throws Exception {
-        Map<String, Object> outProperties = new HashMap<String, Object>();
+        Map<String, Object> outProperties = new HashMap<>();
         outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
         outProperties.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_TEXT);
         outProperties.put(WSHandlerConstants.USER, "alice");
         outProperties.put("password", "alicePassword");
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
         inProperties.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST);
         inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback());
@@ -302,7 +302,7 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
         db.setEntityResolver(new NullResolver());
         doc = StaxUtils.read(db, reader, false);
 
-        final Map<String, Object> properties = new HashMap<String, Object>();
+        final Map<String, Object> properties = new HashMap<>();
         properties.put(
             WSS4JInInterceptor.PROCESSOR_MAP,
             createCustomProcessorMap()
@@ -361,8 +361,8 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
         db.setEntityResolver(new NullResolver());
         doc = StaxUtils.read(db, reader, false);
 
-        final Map<String, Object> properties = new HashMap<String, Object>();
-        final Map<QName, Object> customMap = new HashMap<QName, Object>();
+        final Map<String, Object> properties = new HashMap<>();
+        final Map<QName, Object> customMap = new HashMap<>();
         customMap.put(
             new QName(
                 WSConstants.SIG_NS,
@@ -398,7 +398,7 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
 
     @Test
     public void testPKIPath() throws Exception {
-        Map<String, Object> outProperties = new HashMap<String, Object>();
+        Map<String, Object> outProperties = new HashMap<>();
         outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
         outProperties.put(WSHandlerConstants.USER, "alice");
         outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "alice.properties");
@@ -406,7 +406,7 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
         outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
         outProperties.put(WSHandlerConstants.USE_SINGLE_CERTIFICATE, "false");
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "cxfca.properties");
 
@@ -427,7 +427,7 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
 
     @Test
     public void testUsernameTokenSignature() throws Exception {
-        Map<String, Object> outProperties = new HashMap<String, Object>();
+        Map<String, Object> outProperties = new HashMap<>();
         outProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.SIGNATURE);
@@ -441,7 +441,7 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
             "org.apache.cxf.ws.security.wss4j.TestPwdCallback"
         );
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.SIGNATURE
@@ -468,7 +468,7 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
      *              processing on the input)
      */
     private Map<QName, String> createCustomProcessorMap() {
-        final Map<QName, String> ret = new HashMap<QName, String>();
+        final Map<QName, String> ret = new HashMap<>();
         ret.put(
             new QName(
                 WSConstants.SIG_NS,

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java
index 9cea4b7..46339f8 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java
@@ -155,7 +155,7 @@ public class WSS4JOutInterceptorTest extends AbstractSecurityTest {
         PhaseInterceptor<SoapMessage> handler = ohandler.createEndingInterceptor();
 
         CountingUsernameTokenAction action = new CountingUsernameTokenAction();
-        Map<Object, Object> customActions = new HashMap<Object, Object>(1);
+        Map<Object, Object> customActions = new HashMap<>(1);
         customActions.put(WSConstants.UT, action);
 
         msg.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
@@ -199,7 +199,7 @@ public class WSS4JOutInterceptorTest extends AbstractSecurityTest {
         PhaseInterceptor<SoapMessage> handler = ohandler.createEndingInterceptor();
 
         CountingUsernameTokenAction action = new CountingUsernameTokenAction();
-        Map<Object, Object> customActions = new HashMap<Object, Object>(1);
+        Map<Object, Object> customActions = new HashMap<>(1);
         customActions.put(12345, action);
 
         msg.put(WSHandlerConstants.ACTION, "12345");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java
index a65acdf..2fba85e 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/DOMToStaxSamlTest.java
@@ -67,7 +67,7 @@ public class DOMToStaxSamlTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
         properties.put(
             WSHandlerConstants.SAML_CALLBACK_REF, new SAML1CallbackHandler()
@@ -98,7 +98,7 @@ public class DOMToStaxSamlTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED);
         properties.put(WSHandlerConstants.SAML_CALLBACK_REF, new SAML1CallbackHandler());
 
@@ -130,7 +130,7 @@ public class DOMToStaxSamlTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
         properties.put(
             WSHandlerConstants.SAML_CALLBACK_REF, new SAML2CallbackHandler()
@@ -161,7 +161,7 @@ public class DOMToStaxSamlTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED);
         properties.put(WSHandlerConstants.SAML_CALLBACK_REF, new SAML2CallbackHandler());
 
@@ -200,7 +200,7 @@ public class DOMToStaxSamlTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED);
         SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
         callbackHandler.setConfirmationMethod(SAML1Constants.CONF_HOLDER_KEY);
@@ -250,7 +250,7 @@ public class DOMToStaxSamlTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED);
         SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
         callbackHandler.setConfirmationMethod(SAML2Constants.CONF_HOLDER_KEY);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java
index 4fd06d8..2eaf438 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/SamlTokenTest.java
@@ -82,13 +82,13 @@ public class SamlTokenTest extends AbstractSecurityTest {
     }
 
     private SecurityContext testSaml1Token(boolean allowUnsignedPrincipal) throws Exception {
-        Map<String, Object> outProperties = new HashMap<String, Object>();
+        Map<String, Object> outProperties = new HashMap<>();
         outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
         outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, new SAML1CallbackHandler());
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
-        final Map<QName, Object> customMap = new HashMap<QName, Object>();
+        final Map<QName, Object> customMap = new HashMap<>();
         CustomSamlValidator validator = new CustomSamlValidator();
         customMap.put(WSConstants.SAML_TOKEN, validator);
         customMap.put(WSConstants.SAML2_TOKEN, validator);
@@ -98,7 +98,7 @@ public class SamlTokenTest extends AbstractSecurityTest {
         xpaths.add("//wsse:Security");
         xpaths.add("//wsse:Security/saml1:Assertion");
 
-        Map<String, String> inMessageProperties = new HashMap<String, String>();
+        Map<String, String> inMessageProperties = new HashMap<>();
         if (allowUnsignedPrincipal) {
             inMessageProperties.put(SecurityConstants.ENABLE_UNSIGNED_SAML_ASSERTION_PRINCIPAL, "true");
         }
@@ -121,7 +121,7 @@ public class SamlTokenTest extends AbstractSecurityTest {
 
     @Test
     public void testSaml1TokenSignedSenderVouches() throws Exception {
-        Map<String, Object> outProperties = new HashMap<String, Object>();
+        Map<String, Object> outProperties = new HashMap<>();
         outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED);
         outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, new SAML1CallbackHandler());
         outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
@@ -129,13 +129,13 @@ public class SamlTokenTest extends AbstractSecurityTest {
         outProperties.put("password", "password");
         outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "alice.properties");
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.SAML_TOKEN_UNSIGNED + " " + WSHandlerConstants.SIGNATURE
         );
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
-        final Map<QName, Object> customMap = new HashMap<QName, Object>();
+        final Map<QName, Object> customMap = new HashMap<>();
         CustomSamlValidator validator = new CustomSamlValidator();
         customMap.put(WSConstants.SAML_TOKEN, validator);
         customMap.put(WSConstants.SAML2_TOKEN, validator);
@@ -145,7 +145,7 @@ public class SamlTokenTest extends AbstractSecurityTest {
         xpaths.add("//wsse:Security");
         xpaths.add("//wsse:Security/saml1:Assertion");
 
-        Map<String, String> inMessageProperties = new HashMap<String, String>();
+        Map<String, String> inMessageProperties = new HashMap<>();
         Message message = makeInvocation(outProperties, xpaths, inProperties, inMessageProperties);
 
         final List<WSHandlerResult> handlerResults =
@@ -164,13 +164,13 @@ public class SamlTokenTest extends AbstractSecurityTest {
      */
     @Test
     public void testSaml2Token() throws Exception {
-        Map<String, Object> outProperties = new HashMap<String, Object>();
+        Map<String, Object> outProperties = new HashMap<>();
         outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
         outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, new SAML2CallbackHandler());
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
-        final Map<QName, Object> customMap = new HashMap<QName, Object>();
+        final Map<QName, Object> customMap = new HashMap<>();
         CustomSamlValidator validator = new CustomSamlValidator();
         validator.setRequireSAML1Assertion(false);
         customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -181,7 +181,7 @@ public class SamlTokenTest extends AbstractSecurityTest {
         xpaths.add("//wsse:Security");
         xpaths.add("//wsse:Security/saml2:Assertion");
 
-        Map<String, String> inMessageProperties = new HashMap<String, String>();
+        Map<String, String> inMessageProperties = new HashMap<>();
         inMessageProperties.put(SecurityConstants.VALIDATE_SAML_SUBJECT_CONFIRMATION, "false");
         Message message = makeInvocation(outProperties, xpaths, inProperties, inMessageProperties);
 
@@ -198,7 +198,7 @@ public class SamlTokenTest extends AbstractSecurityTest {
 
     @Test
     public void testSaml2TokenSignedSenderVouches() throws Exception {
-        Map<String, Object> outProperties = new HashMap<String, Object>();
+        Map<String, Object> outProperties = new HashMap<>();
         outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED);
         outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, new SAML2CallbackHandler());
         outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
@@ -206,13 +206,13 @@ public class SamlTokenTest extends AbstractSecurityTest {
         outProperties.put("password", "password");
         outProperties.put(WSHandlerConstants.SIG_PROP_FILE, "alice.properties");
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.SAML_TOKEN_UNSIGNED + " " + WSHandlerConstants.SIGNATURE
         );
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
-        final Map<QName, Object> customMap = new HashMap<QName, Object>();
+        final Map<QName, Object> customMap = new HashMap<>();
         CustomSamlValidator validator = new CustomSamlValidator();
         validator.setRequireSAML1Assertion(false);
         customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -223,7 +223,7 @@ public class SamlTokenTest extends AbstractSecurityTest {
         xpaths.add("//wsse:Security");
         xpaths.add("//wsse:Security/saml2:Assertion");
 
-        Map<String, String> inMessageProperties = new HashMap<String, String>();
+        Map<String, String> inMessageProperties = new HashMap<>();
         inMessageProperties.put(SecurityConstants.VALIDATE_SAML_SUBJECT_CONFIRMATION, "false");
         Message message = makeInvocation(outProperties, xpaths, inProperties, inMessageProperties);
 
@@ -245,7 +245,7 @@ public class SamlTokenTest extends AbstractSecurityTest {
      */
     @Test
     public void testSaml1TokenHOK() throws Exception {
-        Map<String, Object> outProperties = new HashMap<String, Object>();
+        Map<String, Object> outProperties = new HashMap<>();
         outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED);
         outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
         outProperties.put(WSHandlerConstants.USER, "alice");
@@ -256,13 +256,13 @@ public class SamlTokenTest extends AbstractSecurityTest {
         callbackHandler.setSignAssertion(true);
         outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler);
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.SAML_TOKEN_SIGNED + " " + WSHandlerConstants.SIGNATURE
         );
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
-        final Map<QName, Object> customMap = new HashMap<QName, Object>();
+        final Map<QName, Object> customMap = new HashMap<>();
         CustomSamlValidator validator = new CustomSamlValidator();
         customMap.put(WSConstants.SAML_TOKEN, validator);
         customMap.put(WSConstants.SAML2_TOKEN, validator);
@@ -301,7 +301,7 @@ public class SamlTokenTest extends AbstractSecurityTest {
      */
     @Test
     public void testSaml2TokenHOK() throws Exception {
-        Map<String, Object> outProperties = new HashMap<String, Object>();
+        Map<String, Object> outProperties = new HashMap<>();
         outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED);
         outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
         outProperties.put(WSHandlerConstants.USER, "alice");
@@ -312,13 +312,13 @@ public class SamlTokenTest extends AbstractSecurityTest {
         callbackHandler.setSignAssertion(true);
         outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler);
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.SAML_TOKEN_SIGNED + " " + WSHandlerConstants.SIGNATURE
         );
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
-        final Map<QName, Object> customMap = new HashMap<QName, Object>();
+        final Map<QName, Object> customMap = new HashMap<>();
         CustomSamlValidator validator = new CustomSamlValidator();
         customMap.put(WSConstants.SAML_TOKEN, validator);
         customMap.put(WSConstants.SAML2_TOKEN, validator);
@@ -365,7 +365,7 @@ public class SamlTokenTest extends AbstractSecurityTest {
      */
     @Test
     public void testSaml2TokenWithRoles() throws Exception {
-        Map<String, Object> outProperties = new HashMap<String, Object>();
+        Map<String, Object> outProperties = new HashMap<>();
         outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
         outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
         outProperties.put(WSHandlerConstants.USER, "alice");
@@ -379,12 +379,12 @@ public class SamlTokenTest extends AbstractSecurityTest {
 
         outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler);
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED
         );
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
-        final Map<QName, Object> customMap = new HashMap<QName, Object>();
+        final Map<QName, Object> customMap = new HashMap<>();
         CustomSamlValidator validator = new CustomSamlValidator();
         validator.setRequireSAML1Assertion(false);
         validator.setRequireSenderVouches(false);
@@ -397,7 +397,7 @@ public class SamlTokenTest extends AbstractSecurityTest {
         xpaths.add("//wsse:Security");
         xpaths.add("//wsse:Security/saml2:Assertion");
 
-        Map<String, String> inMessageProperties = new HashMap<String, String>();
+        Map<String, String> inMessageProperties = new HashMap<>();
         inMessageProperties.put(SecurityConstants.VALIDATE_SAML_SUBJECT_CONFIRMATION, "false");
         Message message = makeInvocation(outProperties, xpaths, inProperties, inMessageProperties);
 
@@ -423,7 +423,7 @@ public class SamlTokenTest extends AbstractSecurityTest {
      */
     @Test
     public void testSaml2TokenWithRolesSingleValue() throws Exception {
-        Map<String, Object> outProperties = new HashMap<String, Object>();
+        Map<String, Object> outProperties = new HashMap<>();
         outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
         outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
         outProperties.put(WSHandlerConstants.USER, "alice");
@@ -437,12 +437,12 @@ public class SamlTokenTest extends AbstractSecurityTest {
 
         outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler);
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED
         );
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
-        final Map<QName, Object> customMap = new HashMap<QName, Object>();
+        final Map<QName, Object> customMap = new HashMap<>();
         CustomSamlValidator validator = new CustomSamlValidator();
         validator.setRequireSAML1Assertion(false);
         validator.setRequireSenderVouches(false);
@@ -455,7 +455,7 @@ public class SamlTokenTest extends AbstractSecurityTest {
         xpaths.add("//wsse:Security");
         xpaths.add("//wsse:Security/saml2:Assertion");
 
-        Map<String, String> inMessageProperties = new HashMap<String, String>();
+        Map<String, String> inMessageProperties = new HashMap<>();
         inMessageProperties.put(SecurityConstants.VALIDATE_SAML_SUBJECT_CONFIRMATION, "false");
         Message message = makeInvocation(outProperties, xpaths, inProperties, inMessageProperties);
 
@@ -480,7 +480,7 @@ public class SamlTokenTest extends AbstractSecurityTest {
      */
     @Test
     public void testSaml1TokenWithRoles() throws Exception {
-        Map<String, Object> outProperties = new HashMap<String, Object>();
+        Map<String, Object> outProperties = new HashMap<>();
         outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
         outProperties.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
         outProperties.put(WSHandlerConstants.USER, "alice");
@@ -494,12 +494,12 @@ public class SamlTokenTest extends AbstractSecurityTest {
 
         outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler);
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED
         );
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
-        final Map<QName, Object> customMap = new HashMap<QName, Object>();
+        final Map<QName, Object> customMap = new HashMap<>();
         CustomSamlValidator validator = new CustomSamlValidator();
         validator.setRequireSAML1Assertion(true);
         validator.setRequireSenderVouches(false);
@@ -512,7 +512,7 @@ public class SamlTokenTest extends AbstractSecurityTest {
         xpaths.add("//wsse:Security");
         xpaths.add("//wsse:Security/saml1:Assertion");
 
-        Map<String, String> inMessageProperties = new HashMap<String, String>();
+        Map<String, String> inMessageProperties = new HashMap<>();
         inMessageProperties.put(SecurityConstants.VALIDATE_SAML_SUBJECT_CONFIRMATION, "false");
         Message message = makeInvocation(outProperties, xpaths, inProperties, inMessageProperties);
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
index 9f3aa6f..905f96b 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/StaxToDOMSamlTest.java
@@ -63,9 +63,9 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
-        final Map<QName, Object> customMap = new HashMap<QName, Object>();
+        final Map<QName, Object> customMap = new HashMap<>();
         CustomSamlValidator validator = new CustomSamlValidator();
         customMap.put(WSConstants.SAML_TOKEN, validator);
         customMap.put(WSConstants.SAML2_TOKEN, validator);
@@ -100,9 +100,9 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
-        final Map<QName, Object> customMap = new HashMap<QName, Object>();
+        final Map<QName, Object> customMap = new HashMap<>();
         CustomSamlValidator validator = new CustomSamlValidator();
         customMap.put(WSConstants.SAML_TOKEN, validator);
         customMap.put(WSConstants.SAML2_TOKEN, validator);
@@ -120,7 +120,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> outConfig = new HashMap<String, Object>();
+        Map<String, Object> outConfig = new HashMap<>();
         outConfig.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
         outConfig.put(ConfigurationConstants.SAML_CALLBACK_REF, new SAML1CallbackHandler());
         WSS4JStaxOutInterceptor ohandler = new WSS4JStaxOutInterceptor(outConfig);
@@ -135,13 +135,13 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.SAML_TOKEN_UNSIGNED + " " + WSHandlerConstants.SIGNATURE
         );
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
-        final Map<QName, Object> customMap = new HashMap<QName, Object>();
+        final Map<QName, Object> customMap = new HashMap<>();
         CustomSamlValidator validator = new CustomSamlValidator();
         customMap.put(WSConstants.SAML_TOKEN, validator);
         customMap.put(WSConstants.SAML2_TOKEN, validator);
@@ -179,13 +179,13 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.SAML_TOKEN_UNSIGNED + " " + WSHandlerConstants.SIGNATURE
         );
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
-        final Map<QName, Object> customMap = new HashMap<QName, Object>();
+        final Map<QName, Object> customMap = new HashMap<>();
         CustomSamlValidator validator = new CustomSamlValidator();
         customMap.put(WSConstants.SAML_TOKEN, validator);
         customMap.put(WSConstants.SAML2_TOKEN, validator);
@@ -201,7 +201,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> outConfig = new HashMap<String, Object>();
+        Map<String, Object> outConfig = new HashMap<>();
         outConfig.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_SIGNED);
         outConfig.put(ConfigurationConstants.SAML_CALLBACK_REF, new SAML1CallbackHandler());
         outConfig.put(ConfigurationConstants.PW_CALLBACK_REF, new PasswordCallbackHandler());
@@ -218,9 +218,9 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
-        final Map<QName, Object> customMap = new HashMap<QName, Object>();
+        final Map<QName, Object> customMap = new HashMap<>();
         CustomSamlValidator validator = new CustomSamlValidator();
         validator.setRequireSAML1Assertion(false);
         customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -256,9 +256,9 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
-        final Map<QName, Object> customMap = new HashMap<QName, Object>();
+        final Map<QName, Object> customMap = new HashMap<>();
         CustomSamlValidator validator = new CustomSamlValidator();
         validator.setRequireSAML1Assertion(false);
         customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -277,7 +277,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> outConfig = new HashMap<String, Object>();
+        Map<String, Object> outConfig = new HashMap<>();
         outConfig.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
         outConfig.put(ConfigurationConstants.SAML_CALLBACK_REF, new SAML2CallbackHandler());
         WSS4JStaxOutInterceptor ohandler = new WSS4JStaxOutInterceptor(outConfig);
@@ -292,13 +292,13 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.SAML_TOKEN_UNSIGNED + " " + WSHandlerConstants.SIGNATURE
         );
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
-        final Map<QName, Object> customMap = new HashMap<QName, Object>();
+        final Map<QName, Object> customMap = new HashMap<>();
         CustomSamlValidator validator = new CustomSamlValidator();
         validator.setRequireSAML1Assertion(false);
         customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -337,13 +337,13 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.SAML_TOKEN_UNSIGNED + " " + WSHandlerConstants.SIGNATURE
         );
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
-        final Map<QName, Object> customMap = new HashMap<QName, Object>();
+        final Map<QName, Object> customMap = new HashMap<>();
         CustomSamlValidator validator = new CustomSamlValidator();
         validator.setRequireSAML1Assertion(false);
         customMap.put(WSConstants.SAML_TOKEN, validator);
@@ -360,7 +360,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> outConfig = new HashMap<String, Object>();
+        Map<String, Object> outConfig = new HashMap<>();
         outConfig.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_SIGNED);
         outConfig.put(ConfigurationConstants.SAML_CALLBACK_REF, new SAML2CallbackHandler());
         outConfig.put(ConfigurationConstants.PW_CALLBACK_REF, new PasswordCallbackHandler());
@@ -377,13 +377,13 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.SAML_TOKEN_SIGNED + " " + WSHandlerConstants.SIGNATURE
         );
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
-        final Map<QName, Object> customMap = new HashMap<QName, Object>();
+        final Map<QName, Object> customMap = new HashMap<>();
         CustomSamlValidator validator = new CustomSamlValidator();
         customMap.put(WSConstants.SAML_TOKEN, validator);
         customMap.put(WSConstants.SAML2_TOKEN, validator);
@@ -437,13 +437,13 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.SAML_TOKEN_SIGNED + " " + WSHandlerConstants.SIGNATURE
         );
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
-        final Map<QName, Object> customMap = new HashMap<QName, Object>();
+        final Map<QName, Object> customMap = new HashMap<>();
         CustomSamlValidator validator = new CustomSamlValidator();
         customMap.put(WSConstants.SAML_TOKEN, validator);
         customMap.put(WSConstants.SAML2_TOKEN, validator);
@@ -459,7 +459,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> outConfig = new HashMap<String, Object>();
+        Map<String, Object> outConfig = new HashMap<>();
         outConfig.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_SIGNED);
         SAML1CallbackHandler callbackHandler = new SAML1CallbackHandler();
         callbackHandler.setSignAssertion(true);
@@ -490,13 +490,13 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.SAML_TOKEN_SIGNED + " " + WSHandlerConstants.SIGNATURE
         );
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
-        final Map<QName, Object> customMap = new HashMap<QName, Object>();
+        final Map<QName, Object> customMap = new HashMap<>();
         CustomSamlValidator validator = new CustomSamlValidator();
         customMap.put(WSConstants.SAML_TOKEN, validator);
         customMap.put(WSConstants.SAML2_TOKEN, validator);
@@ -558,13 +558,13 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
         // Create + configure service
         Service service = createService();
 
-        Map<String, Object> inProperties = new HashMap<String, Object>();
+        Map<String, Object> inProperties = new HashMap<>();
         inProperties.put(
             WSHandlerConstants.ACTION,
             WSHandlerConstants.SAML_TOKEN_SIGNED + " " + WSHandlerConstants.SIGNATURE
         );
         inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
-        final Map<QName, Object> customMap = new HashMap<QName, Object>();
+        final Map<QName, Object> customMap = new HashMap<>();
         CustomSamlValidator validator = new CustomSamlValidator();
         customMap.put(WSConstants.SAML_TOKEN, validator);
         customMap.put(WSConstants.SAML2_TOKEN, validator);
@@ -580,7 +580,7 @@ public class StaxToDOMSamlTest extends AbstractSecurityTest {
         client.getInInterceptors().add(new LoggingInInterceptor());
         client.getOutInterceptors().add(new LoggingOutInterceptor());
 
-        Map<String, Object> outConfig = new HashMap<String, Object>();
+        Map<String, Object> outConfig = new HashMap<>();
         outConfig.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_SIGNED);
         SAML2CallbackHandler callbackHandler = new SAML2CallbackHandler();
         callbackHandler.setSignAssertion(true);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/FragmentDialect.java
----------------------------------------------------------------------
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/FragmentDialect.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/FragmentDialect.java
index 41869d3..576f5a7 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/FragmentDialect.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/FragmentDialect.java
@@ -68,7 +68,7 @@ public class FragmentDialect implements Dialect {
     private Pattern goodXPathPattern;
 
     public FragmentDialect() {
-        languages = new HashMap<String, FragmentDialectLanguage>();
+        languages = new HashMap<>();
         languages.put(FragmentDialectConstants.QNAME_LANGUAGE_IRI, new FragmentDialectLanguageQName());
         languages.put(FragmentDialectConstants.XPATH10_LANGUAGE_IRI, new FragmentDialectLanguageXPath10());
         if (badXPathPattern == null) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/manager/MemoryResourceManager.java
----------------------------------------------------------------------
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/manager/MemoryResourceManager.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/manager/MemoryResourceManager.java
index 9609013e..70d54b8 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/manager/MemoryResourceManager.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/manager/MemoryResourceManager.java
@@ -61,7 +61,7 @@ public class MemoryResourceManager implements ResourceManager {
     private WebServiceContext context;
 
     public MemoryResourceManager() {
-        storage = new HashMap<String, String>();
+        storage = new HashMap<>();
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resource/ResourceLocal.java
----------------------------------------------------------------------
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resource/ResourceLocal.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resource/ResourceLocal.java
index e81dd86..47df2e3 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resource/ResourceLocal.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resource/ResourceLocal.java
@@ -59,7 +59,7 @@ public class ResourceLocal implements Resource {
     protected Map<String, Dialect> dialects;
 
     public ResourceLocal() {
-        dialects = new HashMap<String, Dialect>();
+        dialects = new HashMap<>();
         dialects.put(FragmentDialectConstants.FRAGMENT_2011_03_IRI, new FragmentDialect());
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resourcefactory/ResourceFactoryImpl.java
----------------------------------------------------------------------
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resourcefactory/ResourceFactoryImpl.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resourcefactory/ResourceFactoryImpl.java
index 4fd228f..ba0e812 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resourcefactory/ResourceFactoryImpl.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/resourcefactory/ResourceFactoryImpl.java
@@ -50,7 +50,7 @@ public class ResourceFactoryImpl implements ResourceFactory {
     protected Map<String, Dialect> dialects;
 
     public ResourceFactoryImpl() {
-        dialects = new HashMap<String, Dialect>();
+        dialects = new HashMap<>();
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/IntegrationBaseTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/IntegrationBaseTest.java b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/IntegrationBaseTest.java
index 8f0c6e3..d9a3595 100644
--- a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/IntegrationBaseTest.java
+++ b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/IntegrationBaseTest.java
@@ -172,7 +172,7 @@ public class IntegrationBaseTest {
 
         Map<String, Object> props = factory.getProperties();
         if (props == null) {
-            props = new HashMap<String, Object>();
+            props = new HashMap<>();
         }
         props.put("jaxb.additionalContextClasses",
                 ExpressionType.class);

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
----------------------------------------------------------------------
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
index 0d91fe2..b02f434 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/JAXBExtensionHelper.java
@@ -86,7 +86,7 @@ import org.apache.cxf.staxutils.transform.OutTransformWriter;
  * JAXBExtensionHelper
  */
 public class JAXBExtensionHelper implements ExtensionSerializer, ExtensionDeserializer {
-    static final Map<Class<?>, Integer> WSDL_INDENT_MAP = new HashMap<Class<?>, Integer>();
+    static final Map<Class<?>, Integer> WSDL_INDENT_MAP = new HashMap<>();
     private static final Logger LOG = LogUtils.getL7dLogger(JAXBExtensionHelper.class);
     private static final int DEFAULT_INDENT_LEVEL = 2;
 
@@ -312,7 +312,7 @@ public class JAXBExtensionHelper implements ExtensionSerializer, ExtensionDeseri
                 new PrettyPrintXMLStreamWriter(fact.createXMLStreamWriter(pw), 2, getIndentLevel(parent));
 
             if (namespace != null && !namespace.equals(jaxbNamespace)) {
-                Map<String, String> outMap = new HashMap<String, String>();
+                Map<String, String> outMap = new HashMap<>();
                 outMap.put("{" + jaxbNamespace + "}*", "{" + namespace + "}*");
                 writer = new OutTransformWriter(writer,
                                                 outMap,
@@ -321,7 +321,7 @@ public class JAXBExtensionHelper implements ExtensionSerializer, ExtensionDeseri
                                                 false,
                                                 "");
             }
-            Map<String, String> nspref = new HashMap<String, String>();
+            Map<String, String> nspref = new HashMap<>();
             for (Object ent : wsdl.getNamespaces().entrySet()) {
                 Map.Entry<?, ?> entry = (Map.Entry<?, ?>)ent;
                 nspref.put((String)entry.getValue(), (String)entry.getKey());

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ClassReader.java
----------------------------------------------------------------------
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ClassReader.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ClassReader.java
index fbf8541..6c79834 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ClassReader.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ClassReader.java
@@ -107,7 +107,7 @@ class ClassReader extends ByteArrayInputStream {
     }
 
     protected static Map<String, Method> findAttributeReaders(Class<?> c) {
-        Map<String, Method> map = new HashMap<String, Method>();
+        Map<String, Method> map = new HashMap<>();
         Method[] methods = c.getMethods();
 
         for (int i = 0; i < methods.length; i++) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ParamReader.java
----------------------------------------------------------------------
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ParamReader.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ParamReader.java
index e440ee9..1a2c61c 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ParamReader.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ParamReader.java
@@ -44,7 +44,7 @@ import java.util.Map;
  */
 class ParamReader extends ClassReader {
     private String methodName;
-    private Map<String, MethodInfo> methods = new HashMap<String, MethodInfo>();
+    private Map<String, MethodInfo> methods = new HashMap<>();
     private Class<?>[] paramTypes;
 
     /**

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
----------------------------------------------------------------------
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
index cf56655..e1d8660 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
@@ -155,7 +155,7 @@ public class ReflectionServiceFactoryBean extends org.apache.cxf.service.factory
     protected ParameterizedType serviceType;
     protected Map<Type, Map<String, Class<?>>> parameterizedTypes;
 
-    protected final Map<String, String> schemaLocationMapping = new HashMap<String, String>();
+    protected final Map<String, String> schemaLocationMapping = new HashMap<>();
 
     private List<AbstractServiceConfiguration> serviceConfigurations =
         new ArrayList<>();
@@ -175,8 +175,8 @@ public class ReflectionServiceFactoryBean extends org.apache.cxf.service.factory
 
     private List<Feature> features;
 
-    private Map<Method, Boolean> wrappedCache = new HashMap<Method, Boolean>();
-    private Map<Method, Boolean> isRpcCache = new HashMap<Method, Boolean>();
+    private Map<Method, Boolean> wrappedCache = new HashMap<>();
+    private Map<Method, Boolean> isRpcCache = new HashMap<>();
     private String styleCache;
     private Boolean defWrappedCache;
 
@@ -640,7 +640,7 @@ public class ReflectionServiceFactoryBean extends org.apache.cxf.service.factory
 
         InterfaceInfo intf = getInterfaceInfo();
 
-        Map<QName, Method> validMethods = new HashMap<QName, Method>();
+        Map<QName, Method> validMethods = new HashMap<>();
         for (Method m : methods) {
             if (isValidMethod(m)) {
                 QName opName = getOperationName(intf, m);
@@ -892,7 +892,7 @@ public class ReflectionServiceFactoryBean extends org.apache.cxf.service.factory
             //early iterate over FaultInfo before cycling on exception types
             //as fi.getMessageParts() is very time-consuming due to elements
             //copy in ArrayList constructor
-            mpiMap = new HashMap<FaultInfo, List<MessagePartInfo>>();
+            mpiMap = new HashMap<>();
             for (FaultInfo fi : o.getFaults()) {
                 mpiMap.put(fi, fi.getMessageParts());
             }
@@ -2353,7 +2353,7 @@ public class ReflectionServiceFactoryBean extends org.apache.cxf.service.factory
         return serviceClass;
     }
     private void processParameterizedTypes() {
-        parameterizedTypes = new HashMap<Type, Map<String, Class<?>>>();
+        parameterizedTypes = new HashMap<>();
         if (serviceClass.isInterface()) {
             processTypes(serviceClass, serviceType);
         } else {
@@ -2369,7 +2369,7 @@ public class ReflectionServiceFactoryBean extends org.apache.cxf.service.factory
         if (tp instanceof ParameterizedType) {
             ParameterizedType ptp = (ParameterizedType)tp;
             Type c = ptp.getRawType();
-            Map<String, Class<?>> m = new HashMap<String, Class<?>>();
+            Map<String, Class<?>> m = new HashMap<>();
             parameterizedTypes.put(c, m);
             final Type[] ptpActualTypeArgs = ptp.getActualTypeArguments();
             final TypeVariable<?>[] scTypeArgs = sc.getTypeParameters();

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/XercesSchemaValidationUtils.java
----------------------------------------------------------------------
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/XercesSchemaValidationUtils.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/XercesSchemaValidationUtils.java
index 3e11698..ac403b4 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/XercesSchemaValidationUtils.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/XercesSchemaValidationUtils.java
@@ -156,7 +156,7 @@ class XercesSchemaValidationUtils {
         throws Exception {
 
         final List<DOMLSInput> inputs = new ArrayList<>();
-        final Map<String, LSInput> resolverMap = new HashMap<String, LSInput>();
+        final Map<String, LSInput> resolverMap = new HashMap<>();
 
         for (XmlSchema schema : collection.getXmlSchemas()) {
             if (XMLConstants.W3C_XML_SCHEMA_NS_URI.equals(schema.getTargetNamespace())) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/NSManager.java
----------------------------------------------------------------------
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/NSManager.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/NSManager.java
index 3b83a22..73a5094 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/NSManager.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/NSManager.java
@@ -40,7 +40,7 @@ import org.apache.cxf.wsdl.WSDLConstants;
 ***/
 
 final class NSManager {
-    private final Map<String, String> cache = new HashMap<String, String>();
+    private final Map<String, String> cache = new HashMap<>();
 
 
     NSManager() {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java
----------------------------------------------------------------------
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java
index 44d19c5..05912cf 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SOAPBindingUtil.java
@@ -56,7 +56,7 @@ import org.apache.cxf.wsdl.WSDLConstants;
 
 
 public final class SOAPBindingUtil {
-    private static Map<String, String> bindingMap = new HashMap<String, String>();
+    private static Map<String, String> bindingMap = new HashMap<>();
 
     static {
         bindingMap.put("RPC", "SOAPBinding.Style.RPC");

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
----------------------------------------------------------------------
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
index 9a01416..25c552d 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/SchemaUtil.java
@@ -48,7 +48,7 @@ import static org.apache.cxf.helpers.CastUtils.cast;
 
 public final class SchemaUtil {
     private final Map<String, Element> schemaList;
-    private final Map<String, String> catalogResolved = new HashMap<String, String>();
+    private final Map<String, String> catalogResolved = new HashMap<>();
     private final Bus bus;
 
     public SchemaUtil(final Bus b, final Map<String, Element> s) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/885b65d3/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
----------------------------------------------------------------------
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
index 90e045e..5e69199 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/ServiceWSDLBuilder.java
@@ -112,7 +112,7 @@ public class ServiceWSDLBuilder {
     public ServiceWSDLBuilder(Bus b, List<ServiceInfo> services) {
         this.services = services;
         bus = b;
-        ns2prefix = new HashMap<String, String>();
+        ns2prefix = new HashMap<>();
         nsMan = new NSManager();
     }
 
@@ -376,8 +376,8 @@ public class ServiceWSDLBuilder {
 
         Types types = def.createTypes();
 
-        Map<String, Schema> namespaceToSchemaMap = new HashMap<String, Schema>();
-        Map<String, SchemaInfo> namespaceToSchemaInfo = new HashMap<String, SchemaInfo>();
+        Map<String, Schema> namespaceToSchemaMap = new HashMap<>();
+        Map<String, SchemaInfo> namespaceToSchemaInfo = new HashMap<>();
 
         for (SchemaInfo schemaInfo : schemas) {
             Schema schema = getSchemaImplementation(def);


Mime
View raw message