ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1660428 [1/2] - in /webservices/wss4j/trunk/ws-security-dom/src: main/java/org/apache/wss4j/dom/ main/java/org/apache/wss4j/dom/action/ main/java/org/apache/wss4j/dom/bsp/ main/java/org/apache/wss4j/dom/handler/ main/java/org/apache/wss4j/...
Date Tue, 17 Feb 2015 15:57:21 GMT
Author: coheigea
Date: Tue Feb 17 15:57:19 2015
New Revision: 1660428

URL: http://svn.apache.org/r1660428
Log:
More JDK7 refactoring

Modified:
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSDocInfo.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSSConfig.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSSecurityEngine.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/bsp/BSPEnforcer.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/RequestData.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandlerConstants.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignature.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Timestamp.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/DOMSAMLUtil.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/AbstractSAMLCallbackHandler.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomHandler.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/KeystoreCallbackHandler.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SecretKeyCallbackHandler.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/UsernamePasswordCallbackHandler.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomTokenTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentCallbackHandler.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyActionTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TestMessageTransformer.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/TimestampTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/token/BSTKerberosTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenActionTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenCustomSignatureTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenDerivedTest.java
    webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSDocInfo.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSDocInfo.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSDocInfo.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSDocInfo.java Tue Feb 17 15:57:19 2015
@@ -96,7 +96,7 @@ public class WSDocInfo {
      */
     public void addTokenElement(Element element, boolean checkMultipleElements) throws WSSecurityException {
         if (tokenList == null) {
-            tokenList = new ArrayList<Element>();
+            tokenList = new ArrayList<>();
         }
         
         if (checkMultipleElements) {
@@ -184,7 +184,7 @@ public class WSDocInfo {
      */
     public void addResult(WSSecurityEngineResult result) {
         if (resultsList == null) {
-            resultsList = new ArrayList<WSSecurityEngineResult>();
+            resultsList = new ArrayList<>();
         }
         resultsList.add(result);
     }
@@ -218,7 +218,7 @@ public class WSDocInfo {
      * Get a list of WSSecurityEngineResults of the given Integer tag
      */
     public List<WSSecurityEngineResult> getResultsByTag(Integer tag) {
-        List<WSSecurityEngineResult> foundResults = new ArrayList<WSSecurityEngineResult>();
+        List<WSSecurityEngineResult> foundResults = new ArrayList<>();
         if (resultsList != null) {
             for (WSSecurityEngineResult result : resultsList) {
                 if (result != null) {

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSSConfig.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSSConfig.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSSConfig.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSSConfig.java Tue Feb 17 15:57:19 2015
@@ -73,7 +73,7 @@ public class WSSConfig {
      */
     private static final Map<Integer, Class<?>> DEFAULT_ACTIONS;
     static {
-        final Map<Integer, Class<?>> tmp = new HashMap<Integer, Class<?>>();
+        final Map<Integer, Class<?>> tmp = new HashMap<>();
         try {
             tmp.put(
                 WSConstants.UT,
@@ -132,7 +132,7 @@ public class WSSConfig {
      */
     private static final Map<QName, Class<?>> DEFAULT_PROCESSORS;
     static {
-        final Map<QName, Class<?>> tmp = new HashMap<QName, Class<?>>();
+        final Map<QName, Class<?>> tmp = new HashMap<>();
         try {
             tmp.put(
                 WSSecurityEngine.SAML_TOKEN,
@@ -207,7 +207,7 @@ public class WSSConfig {
      */
     private static final Map<QName, Class<?>> DEFAULT_VALIDATORS;
     static {
-        final Map<QName, Class<?>> tmp = new HashMap<QName, Class<?>>();
+        final Map<QName, Class<?>> tmp = new HashMap<>();
         try {
             tmp.put(
                 WSSecurityEngine.SAML_TOKEN,
@@ -378,8 +378,7 @@ public class WSSConfig {
      * The known actions are initialized from a set of defaults,
      * but the list may be modified via the setAction operations.
      */
-    private final Map<Integer, Object> actionMap = 
-        new HashMap<Integer, Object>(DEFAULT_ACTIONS);
+    private final Map<Integer, Object> actionMap = new HashMap<Integer, Object>(DEFAULT_ACTIONS);
 
     /**
      * The known processors. This map is of the form <QName, Class<?>> or
@@ -387,8 +386,7 @@ public class WSSConfig {
      * The known processors are initialized from a set of defaults,
      * but the list may be modified via the setProcessor operations.
      */
-    private final Map<QName, Object> processorMap = 
-        new HashMap<QName, Object>(DEFAULT_PROCESSORS);
+    private final Map<QName, Object> processorMap = new HashMap<QName, Object>(DEFAULT_PROCESSORS);
     
     /**
      * The known validators. This map is of the form <QName, Class<?>> or
@@ -396,8 +394,7 @@ public class WSSConfig {
      * The known validators are initialized from a set of defaults,
      * but the list may be modified via the setValidator operations.
      */
-    private final Map<QName, Object> validatorMap = 
-        new HashMap<QName, Object>(DEFAULT_VALIDATORS);
+    private final Map<QName, Object> validatorMap = new HashMap<QName, Object>(DEFAULT_VALIDATORS);
     
     static {
         try {

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSSecurityEngine.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSSecurityEngine.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSSecurityEngine.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSSecurityEngine.java Tue Feb 17 15:57:19 2015
@@ -383,7 +383,7 @@ public class WSSecurityEngine {
         Element securityHeader,
         RequestData requestData
     ) throws WSSecurityException {
-        List<WSSecurityEngineResult> returnResults = new ArrayList<WSSecurityEngineResult>();
+        List<WSSecurityEngineResult> returnResults = new ArrayList<>();
         if (securityHeader == null) {
             return returnResults;
         }

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/EncryptionDerivedAction.java Tue Feb 17 15:57:19 2015
@@ -93,7 +93,7 @@ public class EncryptionDerivedAction ext
                 WSEncryptionPart encP = new WSEncryptionPart(reqData.getSoapConstants()
                         .getBodyQName().getLocalPart(), reqData.getSoapConstants()
                         .getEnvelopeURI(), "Content");
-                parts = new ArrayList<WSEncryptionPart>();
+                parts = new ArrayList<>();
                 parts.add(encP);
             }
             

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java Tue Feb 17 15:57:19 2015
@@ -137,7 +137,7 @@ public class SignatureAction implements
                 WSEncryptionPart encP = new WSEncryptionPart(reqData.getSoapConstants()
                         .getBodyQName().getLocalPart(), reqData.getSoapConstants()
                         .getEnvelopeURI(), "Content");
-                parts = new ArrayList<WSEncryptionPart>();
+                parts = new ArrayList<>();
                 parts.add(encP);
             }
             

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureConfirmationAction.java Tue Feb 17 15:57:19 2015
@@ -59,11 +59,11 @@ public class SignatureConfirmationAction
         // Loop over all the (signature) results gathered by all the processors, and store
         // them in a list.
         //
-        final List<Integer> actions = new ArrayList<Integer>(3);
+        final List<Integer> actions = new ArrayList<>(3);
         actions.add(WSConstants.SIGN);
         actions.add(WSConstants.ST_SIGNED);
         actions.add(WSConstants.UT_SIGN);
-        List<WSSecurityEngineResult> signatureActions = new ArrayList<WSSecurityEngineResult>();
+        List<WSSecurityEngineResult> signatureActions = new ArrayList<>();
         for (WSHandlerResult wshResult : results) {
             List<WSSecurityEngineResult> resultList = wshResult.getResults();
 

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureDerivedAction.java Tue Feb 17 15:57:19 2015
@@ -96,7 +96,7 @@ public class SignatureDerivedAction exte
                 WSEncryptionPart encP = new WSEncryptionPart(reqData.getSoapConstants()
                         .getBodyQName().getLocalPart(), reqData.getSoapConstants()
                         .getEnvelopeURI(), "Content");
-                parts = new ArrayList<WSEncryptionPart>();
+                parts = new ArrayList<>();
                 parts.add(encP);
             }
             

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/UsernameTokenSignedAction.java Tue Feb 17 15:57:19 2015
@@ -122,7 +122,7 @@ public class UsernameTokenSignedAction i
             if (soapConstants == null) {
                 soapConstants = WSSecurityUtil.getSOAPConstants(doc.getDocumentElement());
             }
-            parts = new ArrayList<WSEncryptionPart>();
+            parts = new ArrayList<>();
             WSEncryptionPart encP = 
                 new WSEncryptionPart(WSConstants.ELEM_BODY, soapConstants.getEnvelopeURI(), "Content");
             parts.add(encP);

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/bsp/BSPEnforcer.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/bsp/BSPEnforcer.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/bsp/BSPEnforcer.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/bsp/BSPEnforcer.java Tue Feb 17 15:57:19 2015
@@ -41,7 +41,7 @@ public class BSPEnforcer {
     }
     
     public BSPEnforcer(List<BSPRule> bspRules) {
-        ignoredBSPRules = new ArrayList<BSPRule>(bspRules);
+        ignoredBSPRules = new ArrayList<>(bspRules);
     }
     
     public BSPEnforcer(boolean disableBSPRules) {
@@ -63,7 +63,7 @@ public class BSPEnforcer {
     }
 
     public void setIgnoredBSPRules(List<BSPRule> bspRules) {
-        ignoredBSPRules = new ArrayList<BSPRule>(bspRules);
+        ignoredBSPRules = new ArrayList<>(bspRules);
     }
     
     public void setDisableBSPRules(boolean disableBSPRules) {

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/RequestData.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/RequestData.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/RequestData.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/RequestData.java Tue Feb 17 15:57:19 2015
@@ -65,7 +65,7 @@ public class RequestData {
     private EncryptionActionToken encryptionToken;
     private int timeToLive = 300;   // Timestamp: time in seconds between creation and expiry
     private WSSConfig wssConfig;
-    private List<byte[]> signatureValues = new ArrayList<byte[]>();
+    private List<byte[]> signatureValues = new ArrayList<>();
     private WSSecHeader secHeader;
     private int derivedKeyIterations = UsernameToken.DEFAULT_ITERATION;
     private boolean useDerivedKeyForMAC = true;
@@ -76,8 +76,8 @@ public class RequestData {
     private ReplayCache timestampReplayCache;
     private ReplayCache nonceReplayCache;
     private ReplayCache samlOneTimeUseReplayCache;
-    private Collection<Pattern> subjectDNPatterns = new ArrayList<Pattern>();
-    private final List<BSPRule> ignoredBSPRules = new LinkedList<BSPRule>();
+    private Collection<Pattern> subjectDNPatterns = new ArrayList<>();
+    private final List<BSPRule> ignoredBSPRules = new LinkedList<>();
     private boolean appendSignatureAfterTimestamp;
     private int originalSignatureActionPosition;
     private AlgorithmSuite algorithmSuite;
@@ -93,7 +93,7 @@ public class RequestData {
     private PasswordEncryptor passwordEncryptor;
     private String derivedKeyTokenReference;
     private boolean use200512Namespace = true;
-    private final List<String> audienceRestrictions = new ArrayList<String>();
+    private final List<String> audienceRestrictions = new ArrayList<>();
 
     public void clear() {
         soapConstants = null;

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java Tue Feb 17 15:57:19 2015
@@ -193,7 +193,7 @@ public abstract class WSHandler {
         HandlerAction signingAction = getSignatureActionThatSignsATimestamp(actions, reqData);
 
         if (signingAction != null) {
-            actionsToPerform = new ArrayList<HandlerAction>(actions);
+            actionsToPerform = new ArrayList<>(actions);
             Collections.copy(actionsToPerform, actions);
 
             int signatureIndex = actions.indexOf(WSConstants.SIGN);
@@ -258,7 +258,7 @@ public abstract class WSHandler {
             List<byte[]> savedSignatures = 
                 (List<byte[]>)getProperty(reqData.getMsgContext(), WSHandlerConstants.SEND_SIGV);
             if (savedSignatures == null) {
-                savedSignatures = new ArrayList<byte[]>();
+                savedSignatures = new ArrayList<>();
                 setProperty(
                     reqData.getMsgContext(), WSHandlerConstants.SEND_SIGV, savedSignatures
                 );
@@ -380,7 +380,7 @@ public abstract class WSHandler {
     protected boolean checkReceiverResultsAnyOrder(
         List<WSSecurityEngineResult> wsResult, List<Integer> actions
     ) {
-        List<Integer> recordedActions = new ArrayList<Integer>(actions.size());
+        List<Integer> recordedActions = new ArrayList<>(actions.size());
         for (Integer action : actions) {
             recordedActions.add(action);
         }
@@ -1409,7 +1409,7 @@ public abstract class WSHandler {
             String[] certConstraintsList = certConstraints.split(",");
             if (certConstraintsList != null) {
                 Collection<Pattern> subjectCertConstraints = 
-                    new ArrayList<Pattern>(certConstraintsList.length);
+                    new ArrayList<>(certConstraintsList.length);
                 for (String certConstraint : certConstraintsList) {
                     try {
                         subjectCertConstraints.add(Pattern.compile(certConstraint.trim()));

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandlerConstants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandlerConstants.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandlerConstants.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandlerConstants.java Tue Feb 17 15:57:19 2015
@@ -98,7 +98,7 @@ public final class WSHandlerConstants ex
      * </ul>
      * See {@link #SIG_KEY_ID} {@link #ENC_KEY_ID}.
      */
-    private static Map<String, Integer> keyIdentifier = new HashMap<String, Integer>();
+    private static Map<String, Integer> keyIdentifier = new HashMap<>();
 
     static {
         keyIdentifier.put("DirectReference", WSConstants.BST_DIRECT_REFERENCE);

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java Tue Feb 17 15:57:19 2015
@@ -68,7 +68,7 @@ public class WSSecDKEncrypt extends WSSe
                 
         String soapNamespace = WSSecurityUtil.getSOAPNamespace(envelope);
         if (parts == null) {
-            parts = new ArrayList<WSEncryptionPart>(1);
+            parts = new ArrayList<>(1);
             WSEncryptionPart encP = 
                 new WSEncryptionPart(
                     WSConstants.ELEM_BODY, 

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java Tue Feb 17 15:57:19 2015
@@ -100,7 +100,7 @@ public class WSSecDKSign extends WSSecDe
         prepare(doc, secHeader);
         String soapNamespace = WSSecurityUtil.getSOAPNamespace(doc.getDocumentElement());
         if (parts == null) {
-            parts = new ArrayList<WSEncryptionPart>(1);
+            parts = new ArrayList<>(1);
             WSEncryptionPart encP = 
                 new WSEncryptionPart(
                     WSConstants.ELEM_BODY,

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java Tue Feb 17 15:57:19 2015
@@ -139,7 +139,7 @@ public class WSSecEncrypt extends WSSecE
             ephemeralKey = symmetricKey.getEncoded();
         }
 
-        attachmentEncryptedDataElements = new ArrayList<Element>();
+        attachmentEncryptedDataElements = new ArrayList<>();
         
         symmetricKey = KeyUtils.prepareSecretKey(symEncAlgo, ephemeralKey);
         
@@ -200,7 +200,7 @@ public class WSSecEncrypt extends WSSecE
         }
         
         if (parts == null) {
-            parts = new ArrayList<WSEncryptionPart>(1);
+            parts = new ArrayList<>(1);
             String soapNamespace = WSSecurityUtil.getSOAPNamespace(envelope);
             WSEncryptionPart encP = 
                 new WSEncryptionPart(
@@ -372,7 +372,7 @@ public class WSSecEncrypt extends WSSecE
             );
         }
 
-        List<String> encDataRef = new ArrayList<String>();
+        List<String> encDataRef = new ArrayList<>();
         for (int part = 0; part < references.size(); part++) {
             WSEncryptionPart encPart = references.get(part);
 
@@ -507,7 +507,7 @@ public class WSSecEncrypt extends WSSecE
                         throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_ENCRYPTION, e);
                     }
 
-                    Map<String, String> headers = new HashMap<String, String>();
+                    Map<String, String> headers = new HashMap<>();
                     headers.putAll(attachment.getHeaders());
                     resultAttachment.setSourceStream(
                             AttachmentUtils.setupAttachmentEncryptionStream(

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignature.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignature.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignature.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignature.java Tue Feb 17 15:57:19 2015
@@ -370,7 +370,7 @@ public class WSSecSignature extends WSSe
 
         prepare(doc, cr, secHeader);
         if (parts == null) {
-            parts = new ArrayList<WSEncryptionPart>(1);
+            parts = new ArrayList<>(1);
             String soapNamespace = WSSecurityUtil.getSOAPNamespace(doc.getDocumentElement());
             WSEncryptionPart encP = 
                 new WSEncryptionPart(

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java Tue Feb 17 15:57:19 2015
@@ -99,7 +99,7 @@ public class WSSecSignatureBase extends
 
         //create separate list for attachment and append it after same document references
         //are processed.
-        List<javax.xml.crypto.dsig.Reference> attachmentReferenceList = new ArrayList<javax.xml.crypto.dsig.Reference>();
+        List<javax.xml.crypto.dsig.Reference> attachmentReferenceList = new ArrayList<>();
 
         for (WSEncryptionPart encPart : references) {
             if (encPart.getId() != null && encPart.getId().startsWith("cid:")) {
@@ -128,7 +128,7 @@ public class WSSecSignatureBase extends
                     Attachment attachment = attachments.get(i);
 
                     try {
-                        List<Transform> transforms = new ArrayList<Transform>();
+                        List<Transform> transforms = new ArrayList<>();
 
                         AttachmentTransformParameterSpec attachmentTransformParameterSpec =
                                 new AttachmentTransformParameterSpec(
@@ -166,7 +166,7 @@ public class WSSecSignatureBase extends
             }
         }
 
-        List<javax.xml.crypto.dsig.Reference> referenceList = new ArrayList<javax.xml.crypto.dsig.Reference>();
+        List<javax.xml.crypto.dsig.Reference> referenceList = new ArrayList<>();
 
         for (WSEncryptionPart encPart : references) {
             String idToSign = encPart.getId();
@@ -293,7 +293,7 @@ public class WSSecSignatureBase extends
      * Get the List of inclusive prefixes from the DOM Element argument 
      */
     public List<String> getInclusivePrefixes(Element target, boolean excludeVisible) {
-        List<String> result = new ArrayList<String>();
+        List<String> result = new ArrayList<>();
         Node parent = target;
         while (parent.getParentNode() != null &&
             !(Node.DOCUMENT_NODE == parent.getParentNode().getNodeType())) {

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java Tue Feb 17 15:57:19 2015
@@ -229,7 +229,7 @@ public class DerivedKeyToken {
      * @param nonce Value of the Properties/Nonce element
      */
     public void setProperties(String name, String label, String nonce) {
-        Map<String, String> table = new HashMap<String, String>();
+        Map<String, String> table = new HashMap<>();
         table.put("Name", name);
         table.put("Label", label);
         table.put("Nonce", nonce);
@@ -260,7 +260,7 @@ public class DerivedKeyToken {
 
     public Map<String, String> getProperties() {
         if (elementProperties != null) {
-            Map<String, String> table = new HashMap<String, String>();
+            Map<String, String> table = new HashMap<>();
             Node node = elementProperties.getFirstChild();
             while (node != null) {
                 if (Node.ELEMENT_NODE == node.getNodeType()) {

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Timestamp.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Timestamp.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Timestamp.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Timestamp.java Tue Feb 17 15:57:19 2015
@@ -68,7 +68,7 @@ public class Timestamp {
     public Timestamp(Element timestampElement, BSPEnforcer bspEnforcer) throws WSSecurityException {
 
         element = timestampElement;
-        customElements = new ArrayList<Element>();
+        customElements = new ArrayList<>();
 
         String strCreated = null;
         String strExpires = null;
@@ -188,7 +188,7 @@ public class Timestamp {
      */
     public Timestamp(boolean milliseconds, Document doc, WSTimeSource timeSource, int ttl) {
 
-        customElements = new ArrayList<Element>();
+        customElements = new ArrayList<>();
         element = 
             doc.createElementNS(
                 WSConstants.WSU_NS, WSConstants.WSU_PREFIX + ":" + WSConstants.TIMESTAMP_TOKEN_LN

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java Tue Feb 17 15:57:19 2015
@@ -99,7 +99,7 @@ public class EncryptedDataProcessor impl
         Principal principal = null;
         if (secRefToken != null) {
             STRParser strParser = new SecurityTokenRefSTRParser();
-            Map<String, Object> parameters = new HashMap<String, Object>();
+            Map<String, Object> parameters = new HashMap<>();
             parameters.put(SecurityTokenRefSTRParser.SIGNATURE_METHOD, symEncAlgo);
             strParser.parseSecurityTokenReference(
                 secRefToken, request,
@@ -108,7 +108,7 @@ public class EncryptedDataProcessor impl
             byte[] secretKey = strParser.getSecretKey();
             principal = strParser.getPrincipal();
             key = KeyUtils.prepareSecretKey(symEncAlgo, secretKey);
-            encrKeyResults = new ArrayList<WSSecurityEngineResult>();
+            encrKeyResults = new ArrayList<>();
         } else if (encryptedKeyElement != null) {
             EncryptedKeyProcessor encrKeyProc = new EncryptedKeyProcessor();
             encrKeyResults = encrKeyProc.handleToken(encryptedKeyElement, request, wsDocInfo);
@@ -150,8 +150,7 @@ public class EncryptedDataProcessor impl
         wsDocInfo.addResult(result);
         wsDocInfo.addTokenElement(elem);
         
-        List<WSSecurityEngineResult> completeResults = 
-            new ArrayList<WSSecurityEngineResult>();
+        List<WSSecurityEngineResult> completeResults = new ArrayList<>();
         completeResults.addAll(encrKeyResults);
         completeResults.add(result);
         

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java Tue Feb 17 15:57:19 2015
@@ -467,7 +467,7 @@ public class EncryptedKeyProcessor imple
             WSSecurityUtil.getDirectChildElement(
                 xencEncryptedKey, "ReferenceList", WSConstants.ENC_NS
             );
-        List<String> dataRefURIs = new LinkedList<String>();
+        List<String> dataRefURIs = new LinkedList<>();
         if (refList != null) {
             for (Node node = refList.getFirstChild(); node != null; node = node.getNextSibling()) {
                 if (Node.ELEMENT_NODE == node.getNodeType()
@@ -497,7 +497,7 @@ public class EncryptedKeyProcessor imple
         if (dataRefURIs == null || dataRefURIs.isEmpty()) {
             return null;
         }
-        List<WSDataRef> dataRefs = new ArrayList<WSDataRef>();
+        List<WSDataRef> dataRefs = new ArrayList<>();
         for (String dataRefURI : dataRefURIs) {
             WSDataRef dataRef = 
                 decryptDataRef(doc, dataRefURI, docInfo, decryptedBytes, data);

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java Tue Feb 17 15:57:19 2015
@@ -100,7 +100,7 @@ public class ReferenceListProcessor impl
         RequestData data,
         WSDocInfo wsDocInfo
     ) throws WSSecurityException {
-        List<WSDataRef> dataRefs = new ArrayList<WSDataRef>();
+        List<WSDataRef> dataRefs = new ArrayList<>();
         //find out if there's an EncryptedKey in the doc (AsymmetricBinding)
         Element wsseHeaderElement = wsDocInfo.getSecurityHeader();
         boolean asymBinding = WSSecurityUtil.getDirectChildElement(
@@ -180,7 +180,7 @@ public class ReferenceListProcessor impl
             symmetricKey = X509Util.getSharedKey(keyInfoElement, symEncAlgo, data.getCallbackHandler());
         } else {
             STRParser strParser = new SecurityTokenRefSTRParser();
-            Map<String, Object> parameters = new HashMap<String, Object>();
+            Map<String, Object> parameters = new HashMap<>();
             parameters.put(SecurityTokenRefSTRParser.SIGNATURE_METHOD, symEncAlgo);
             strParser.parseSecurityTokenReference(
                 secRefToken, data,

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java Tue Feb 17 15:57:19 2015
@@ -239,7 +239,7 @@ public class SAMLTokenProcessor implemen
             return null;
         }
         
-        List<WSDataRef> protectedRefs = new ArrayList<WSDataRef>();
+        List<WSDataRef> protectedRefs = new ArrayList<>();
         String signatureMethod = 
             xmlSignature.getSignedInfo().getSignatureMethod().getAlgorithm();
         
@@ -259,7 +259,7 @@ public class SAMLTokenProcessor implemen
                 // Set the Transform algorithms as well
                 @SuppressWarnings("unchecked")
                 List<Transform> transforms = (List<Transform>)reference.getTransforms();
-                List<String> transformAlgorithms = new ArrayList<String>(transforms.size());
+                List<String> transformAlgorithms = new ArrayList<>(transforms.size());
                 for (Transform transform : transforms) {
                     transformAlgorithms.add(transform.getAlgorithm());
                 }

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java Tue Feb 17 15:57:19 2015
@@ -160,7 +160,7 @@ public class SignatureProcessor implemen
                 }
             } else {
                 STRParser strParser = new SignatureSTRParser();
-                Map<String, Object> parameters = new HashMap<String, Object>();
+                Map<String, Object> parameters = new HashMap<>();
                 parameters.put(SignatureSTRParser.SIGNATURE_METHOD, signatureMethod);
                 strParser.parseSecurityTokenReference(
                     child, data, wsDocInfo, parameters
@@ -524,7 +524,7 @@ public class SignatureProcessor implemen
         RequestData requestData,
         WSDocInfo wsDocInfo
     ) throws WSSecurityException {
-        List<WSDataRef> protectedRefs = new ArrayList<WSDataRef>();
+        List<WSDataRef> protectedRefs = new ArrayList<>();
         List<?> referencesList = signedInfo.getReferences();
         for (int i = 0; i < referencesList.size(); i++) {
             Reference siRef = (Reference)referencesList.get(i);
@@ -567,7 +567,7 @@ public class SignatureProcessor implemen
                 // Set the Transform algorithms as well
                 @SuppressWarnings("unchecked")
                 List<Transform> transforms = (List<Transform>)siRef.getTransforms();
-                List<String> transformAlgorithms = new ArrayList<String>(transforms.size());
+                List<String> transformAlgorithms = new ArrayList<>(transforms.size());
                 for (Transform transform : transforms) {
                     transformAlgorithms.add(transform.getAlgorithm());
                 }

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/DOMSAMLUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/DOMSAMLUtil.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/DOMSAMLUtil.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/DOMSAMLUtil.java Tue Feb 17 15:57:19 2015
@@ -55,7 +55,7 @@ public final class DOMSAMLUtil  {
         Certificate[] tlsCerts,
         Element body
     ) throws WSSecurityException {
-        final List<Integer> samlActions = new ArrayList<Integer>(2);
+        final List<Integer> samlActions = new ArrayList<>(2);
         samlActions.add(WSConstants.ST_SIGNED);
         samlActions.add(WSConstants.ST_UNSIGNED);
         List<WSSecurityEngineResult> samlResults = 
@@ -65,7 +65,7 @@ public final class DOMSAMLUtil  {
             return;
         }
 
-        final List<Integer> signedActions = new ArrayList<Integer>(2);
+        final List<Integer> signedActions = new ArrayList<>(2);
         signedActions.add(WSConstants.SIGN);
         signedActions.add(WSConstants.UT_SIGN);
         List<WSSecurityEngineResult> signedResults = 

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java Tue Feb 17 15:57:19 2015
@@ -123,7 +123,7 @@ public class WSSecSignatureSAML extends
 
         String soapNamespace = WSSecurityUtil.getSOAPNamespace(doc.getDocumentElement());
         if (parts == null) {
-            parts = new ArrayList<WSEncryptionPart>(1);
+            parts = new ArrayList<>(1);
             WSEncryptionPart encP = 
                 new WSEncryptionPart(WSConstants.ELEM_BODY, soapNamespace, "Content");
             parts.add(encP);

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java Tue Feb 17 15:57:19 2015
@@ -197,7 +197,7 @@ public final class WSSecurityUtil {
         String localName,
         String namespace
     ) {
-        List<Element> children = new ArrayList<Element>();
+        List<Element> children = new ArrayList<>();
         for (
             Node currentChild = fNode.getFirstChild(); 
             currentChild != null; 
@@ -337,7 +337,7 @@ public final class WSSecurityUtil {
         Node startParent = startNode.getParentNode();
         Node processedNode = null;
 
-        List<Element> foundNodes = new ArrayList<Element>();
+        List<Element> foundNodes = new ArrayList<>();
         while (startNode != null) {
             // start node processing at this point
             if (startNode.getNodeType() == Node.ELEMENT_NODE
@@ -899,7 +899,7 @@ public final class WSSecurityUtil {
                     (Integer) result.get(WSSecurityEngineResult.TAG_ACTION);
             if (actions.contains(resultAction)) {
                 if (actionResultList.isEmpty()) {
-                    actionResultList = new ArrayList<WSSecurityEngineResult>();
+                    actionResultList = new ArrayList<>();
                 }
                 actionResultList.add(result);
             }
@@ -908,7 +908,7 @@ public final class WSSecurityUtil {
     }
 
     public static List<Integer> decodeAction(String action) throws WSSecurityException {
-        List<Integer> actions = new ArrayList<Integer>();
+        List<Integer> actions = new ArrayList<>();
         String actionToParse = action;
         if (actionToParse == null) {
             return actions;
@@ -966,7 +966,7 @@ public final class WSSecurityUtil {
         String action, 
         WSSConfig wssConfig
     ) throws WSSecurityException {
-        List<HandlerAction> actions = new ArrayList<HandlerAction>();
+        List<HandlerAction> actions = new ArrayList<>();
         if (action == null) {
             return actions;
         }
@@ -1160,7 +1160,7 @@ public final class WSSecurityUtil {
     listChildren(
         final Node parent
     ) {
-        final List<Node> ret = new ArrayList<Node>();
+        final List<Node> ret = new ArrayList<>();
         if (parent != null) {
             Node node = parent.getFirstChild();
             while (node != null) {
@@ -1182,7 +1182,7 @@ public final class WSSecurityUtil {
         if (a.size() == 0) {
             return b;
         }
-        final List<Node> ret = new ArrayList<Node>();
+        final List<Node> ret = new ArrayList<>();
         if (b.size() == 0) {
             return ret;
         }

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/AbstractSAMLCallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/AbstractSAMLCallbackHandler.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/AbstractSAMLCallbackHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/AbstractSAMLCallbackHandler.java Tue Feb 17 15:57:19 2015
@@ -172,7 +172,7 @@ public abstract class AbstractSAMLCallba
             if (customAttributeValues != null) {
                 attributeBean.setAttributeValues(customAttributeValues);   
             } else {
-                List<Object> attributes = new ArrayList<Object>();
+                List<Object> attributes = new ArrayList<>();
                 attributes.add("user");
                 attributeBean.setAttributeValues(attributes);
             }

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomHandler.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomHandler.java Tue Feb 17 15:57:19 2015
@@ -36,7 +36,7 @@ import java.util.Map;
  */
 public class CustomHandler extends WSHandler {
     
-    private Map<String, Object> optionsMap = new HashMap<String, Object>();
+    private Map<String, Object> optionsMap = new HashMap<>();
 
     public Object 
     getOption(String key) {

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/KeystoreCallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/KeystoreCallbackHandler.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/KeystoreCallbackHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/KeystoreCallbackHandler.java Tue Feb 17 15:57:19 2015
@@ -35,7 +35,7 @@ import java.util.Map;
  */
 public class KeystoreCallbackHandler implements CallbackHandler {
     
-    private Map<String, String> users = new HashMap<String, String>();
+    private Map<String, String> users = new HashMap<>();
     
     public KeystoreCallbackHandler() {
         users.put("wss86", "security");

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SecretKeyCallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SecretKeyCallbackHandler.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SecretKeyCallbackHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SecretKeyCallbackHandler.java Tue Feb 17 15:57:19 2015
@@ -36,7 +36,7 @@ import java.util.Map;
  */
 public class SecretKeyCallbackHandler implements CallbackHandler {
     
-    private Map<String, byte[]> secrets = new HashMap<String, byte[]>();
+    private Map<String, byte[]> secrets = new HashMap<>();
     private byte[] outboundSecret = null;
     
     public void handle(Callback[] callbacks)

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/UsernamePasswordCallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/UsernamePasswordCallbackHandler.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/UsernamePasswordCallbackHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/UsernamePasswordCallbackHandler.java Tue Feb 17 15:57:19 2015
@@ -34,7 +34,7 @@ import java.util.Map;
  */
 public class UsernamePasswordCallbackHandler implements CallbackHandler {
     
-    private Map<String, String> users = new HashMap<String, String>();
+    private Map<String, String> users = new HashMap<>();
     
     public UsernamePasswordCallbackHandler() {
         users.put("wernerd", "verySecret");

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomTokenTest.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomTokenTest.java Tue Feb 17 15:57:19 2015
@@ -80,7 +80,7 @@ public class CustomTokenTest extends org
         
         final Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
         CustomHandler handler = new CustomHandler();
-        List<HandlerAction> actions = new ArrayList<HandlerAction>();
+        List<HandlerAction> actions = new ArrayList<>();
         actions.add(new HandlerAction(WSConstants.CUSTOM_TOKEN, null));
         handler.send(
             doc, 

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SecurityActionTokenTest.java Tue Feb 17 15:57:19 2015
@@ -96,7 +96,7 @@ public class SecurityActionTokenTest ext
         
         final Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
         CustomHandler handler = new CustomHandler();
-        List<HandlerAction> actions = new ArrayList<HandlerAction>();
+        List<HandlerAction> actions = new ArrayList<>();
         actions.add(new HandlerAction(WSConstants.SIGN, actionToken));
         handler.send(
             doc, 
@@ -132,7 +132,7 @@ public class SecurityActionTokenTest ext
         
         final Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
         CustomHandler handler = new CustomHandler();
-        List<HandlerAction> actions = new ArrayList<HandlerAction>();
+        List<HandlerAction> actions = new ArrayList<>();
         actions.add(new HandlerAction(WSConstants.SIGN, actionToken));
         handler.send(
             doc, 
@@ -181,7 +181,7 @@ public class SecurityActionTokenTest ext
         
         final Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
         CustomHandler handler = new CustomHandler();
-        List<HandlerAction> actions = new ArrayList<HandlerAction>();
+        List<HandlerAction> actions = new ArrayList<>();
         actions.add(new HandlerAction(WSConstants.SIGN, actionToken));
         actions.add(new HandlerAction(WSConstants.SIGN, actionToken2));
         actions.add(new HandlerAction(WSConstants.TS, null));
@@ -227,7 +227,7 @@ public class SecurityActionTokenTest ext
         
         final Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
         CustomHandler handler = new CustomHandler();
-        List<HandlerAction> actions = new ArrayList<HandlerAction>();
+        List<HandlerAction> actions = new ArrayList<>();
         actions.add(new HandlerAction(WSConstants.SIGN, actionToken));
         actions.add(new HandlerAction(WSConstants.SIGN, actionToken2));
         actions.add(new HandlerAction(WSConstants.TS, null));
@@ -269,7 +269,7 @@ public class SecurityActionTokenTest ext
         
         final Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
         CustomHandler handler = new CustomHandler();
-        List<HandlerAction> actions = new ArrayList<HandlerAction>();
+        List<HandlerAction> actions = new ArrayList<>();
         actions.add(new HandlerAction(WSConstants.ENCR, actionToken));
         handler.send(
             doc, 
@@ -305,7 +305,7 @@ public class SecurityActionTokenTest ext
         
         final Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
         CustomHandler handler = new CustomHandler();
-        List<HandlerAction> actions = new ArrayList<HandlerAction>();
+        List<HandlerAction> actions = new ArrayList<>();
         actions.add(new HandlerAction(WSConstants.ENCR, actionToken));
         handler.send(
             doc, 
@@ -342,7 +342,7 @@ public class SecurityActionTokenTest ext
         
         final Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
         CustomHandler handler = new CustomHandler();
-        List<HandlerAction> actions = new ArrayList<HandlerAction>();
+        List<HandlerAction> actions = new ArrayList<>();
         actions.add(new HandlerAction(WSConstants.ENCR, actionToken));
         handler.send(
             doc, 
@@ -389,7 +389,7 @@ public class SecurityActionTokenTest ext
         
         final Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
         CustomHandler handler = new CustomHandler();
-        List<HandlerAction> actions = new ArrayList<HandlerAction>();
+        List<HandlerAction> actions = new ArrayList<>();
         actions.add(new HandlerAction(WSConstants.ENCR, actionToken));
         actions.add(new HandlerAction(WSConstants.TS, null));
         actions.add(new HandlerAction(WSConstants.ENCR, actionToken2));
@@ -435,7 +435,7 @@ public class SecurityActionTokenTest ext
         
         final Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
         CustomHandler handler = new CustomHandler();
-        List<HandlerAction> actions = new ArrayList<HandlerAction>();
+        List<HandlerAction> actions = new ArrayList<>();
         actions.add(new HandlerAction(WSConstants.ENCR, actionToken));
         actions.add(new HandlerAction(WSConstants.TS, null));
         actions.add(new HandlerAction(WSConstants.ENCR, actionToken2));
@@ -486,7 +486,7 @@ public class SecurityActionTokenTest ext
         
         final Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
         CustomHandler handler = new CustomHandler();
-        List<HandlerAction> actions = new ArrayList<HandlerAction>();
+        List<HandlerAction> actions = new ArrayList<>();
         actions.add(new HandlerAction(WSConstants.SIGN, actionToken));
         actions.add(new HandlerAction(WSConstants.ENCR, actionToken2));
         handler.send(
@@ -533,7 +533,7 @@ public class SecurityActionTokenTest ext
         
         final Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
         CustomHandler handler = new CustomHandler();
-        List<HandlerAction> actions = new ArrayList<HandlerAction>();
+        List<HandlerAction> actions = new ArrayList<>();
         actions.add(new HandlerAction(WSConstants.SIGN, actionToken2));
         actions.add(new HandlerAction(WSConstants.ENCR, actionToken));
         handler.send(
@@ -576,7 +576,7 @@ public class SecurityActionTokenTest ext
         
         final Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
         CustomHandler handler = new CustomHandler();
-        List<HandlerAction> actions = new ArrayList<HandlerAction>();
+        List<HandlerAction> actions = new ArrayList<>();
         actions.add(new HandlerAction(WSConstants.SIGN, actionToken2));
         actions.add(new HandlerAction(WSConstants.ENCR, actionToken));
         handler.send(

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureConfirmationTest.java Tue Feb 17 15:57:19 2015
@@ -188,7 +188,7 @@ public class SignatureConfirmationTest e
         doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
         msgContext = (java.util.Map<String, Object>)reqData.getMsgContext();
         WSHandlerResult handlerResult = new WSHandlerResult(null, results);
-        List<WSHandlerResult> receivedResults = new ArrayList<WSHandlerResult>();
+        List<WSHandlerResult> receivedResults = new ArrayList<>();
         receivedResults.add(handlerResult);
         msgContext.put(WSHandlerConstants.RECV_RESULTS, receivedResults);
         action = new HandlerAction(WSConstants.NO_SECURITY);
@@ -247,7 +247,7 @@ public class SignatureConfirmationTest e
         doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
         msgContext = (java.util.Map<String, Object>)reqData.getMsgContext();
         WSHandlerResult handlerResult = new WSHandlerResult(null, results);
-        List<WSHandlerResult> receivedResults = new ArrayList<WSHandlerResult>();
+        List<WSHandlerResult> receivedResults = new ArrayList<>();
         receivedResults.add(handlerResult);
         msgContext.put(WSHandlerConstants.RECV_RESULTS, receivedResults);
         handler.send(

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/SignatureUTAliasTest.java Tue Feb 17 15:57:19 2015
@@ -83,7 +83,7 @@ public class SignatureUTAliasTest extend
         
         final Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
         CustomHandler handler = new CustomHandler();
-        List<HandlerAction> actions = new ArrayList<HandlerAction>();
+        List<HandlerAction> actions = new ArrayList<>();
         actions.add(new HandlerAction(WSConstants.UT));
         actions.add(new HandlerAction(WSConstants.SIGN));
         handler.send(

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/UseReqSigCertTest.java Tue Feb 17 15:57:19 2015
@@ -73,7 +73,7 @@ public class UseReqSigCertTest extends o
         
         // Send the request
         CustomHandler handler = new CustomHandler();
-        List<HandlerAction> actions = new ArrayList<HandlerAction>();
+        List<HandlerAction> actions = new ArrayList<>();
         actions.add(new HandlerAction(WSConstants.SIGN));
         actions.add(new HandlerAction(WSConstants.TS));
         handler.send(
@@ -92,7 +92,7 @@ public class UseReqSigCertTest extends o
         // Process the request
         List<WSSecurityEngineResult> results = processRequest(doc);
         WSHandlerResult rResult = new WSHandlerResult("", results);
-        List<WSHandlerResult> handlerResults = new ArrayList<WSHandlerResult>();
+        List<WSHandlerResult> handlerResults = new ArrayList<>();
         handlerResults.add(0, rResult);
         
         // Send the response
@@ -119,7 +119,7 @@ public class UseReqSigCertTest extends o
         
         // Send the request
         CustomHandler handler = new CustomHandler();
-        List<HandlerAction> actions = new ArrayList<HandlerAction>();
+        List<HandlerAction> actions = new ArrayList<>();
         actions.add(new HandlerAction(WSConstants.SIGN));
         actions.add(new HandlerAction(WSConstants.TS));
         handler.send(
@@ -138,7 +138,7 @@ public class UseReqSigCertTest extends o
         // Process the request
         List<WSSecurityEngineResult> results = processRequest(doc);
         WSHandlerResult rResult = new WSHandlerResult("", results);
-        List<WSHandlerResult> handlerResults = new ArrayList<WSHandlerResult>();
+        List<WSHandlerResult> handlerResults = new ArrayList<>();
         handlerResults.add(0, rResult);
         
         // Send the response
@@ -165,7 +165,7 @@ public class UseReqSigCertTest extends o
         
         // Send the request
         CustomHandler handler = new CustomHandler();
-        List<HandlerAction> actions = new ArrayList<HandlerAction>();
+        List<HandlerAction> actions = new ArrayList<>();
         actions.add(new HandlerAction(WSConstants.SIGN));
         actions.add(new HandlerAction(WSConstants.TS));
         handler.send(
@@ -184,7 +184,7 @@ public class UseReqSigCertTest extends o
         // Process the request
         List<WSSecurityEngineResult> results = processRequest(doc);
         WSHandlerResult rResult = new WSHandlerResult("", results);
-        List<WSHandlerResult> handlerResults = new ArrayList<WSHandlerResult>();
+        List<WSHandlerResult> handlerResults = new ArrayList<>();
         handlerResults.add(0, rResult);
         
         // Send the response
@@ -201,7 +201,7 @@ public class UseReqSigCertTest extends o
         reqData.setMsgContext(config);
         
         CustomHandler handler = new CustomHandler();
-        List<Integer> receivedActions = new ArrayList<Integer>();
+        List<Integer> receivedActions = new ArrayList<>();
         receivedActions.add(WSConstants.SIGN);
         receivedActions.add(WSConstants.TS);
         handler.receive(receivedActions, reqData);

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentCallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentCallbackHandler.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentCallbackHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentCallbackHandler.java Tue Feb 17 15:57:19 2015
@@ -40,8 +40,8 @@ import java.util.Map;
 public class AttachmentCallbackHandler implements CallbackHandler {
     
     private final List<Attachment> originalRequestAttachments;
-    private Map<String, Attachment> attachmentMap = new HashMap<String, Attachment>();
-    private List<Attachment> responseAttachments = new ArrayList<Attachment>();
+    private Map<String, Attachment> attachmentMap = new HashMap<>();
+    private List<Attachment> responseAttachments = new ArrayList<>();
     
     public AttachmentCallbackHandler(List<Attachment> attachments) {
         originalRequestAttachments = attachments;
@@ -84,7 +84,7 @@ public class AttachmentCallbackHandler i
     
     // Try to match the Attachment Id. Otherwise, add all Attachments.
     private List<Attachment> getAttachmentsToAdd(String id) {
-        List<Attachment> attachments = new ArrayList<Attachment>();
+        List<Attachment> attachments = new ArrayList<>();
         if (attachmentMap.containsKey(id)) {
             attachments.add(attachmentMap.get(id));
         } else {

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java Tue Feb 17 15:57:19 2015
@@ -70,7 +70,7 @@ public class AttachmentTest extends org.
     }
 
     protected Map<String, String> getHeaders(String attachmentId) {
-        Map<String, String> headers = new HashMap<String, String>();
+        Map<String, String> headers = new HashMap<>();
         headers.put(AttachmentUtils.MIME_HEADER_CONTENT_DESCRIPTION, "Attachment");
         headers.put(AttachmentUtils.MIME_HEADER_CONTENT_DISPOSITION, "attachment; filename=\"fname.ext\"");
         headers.put(AttachmentUtils.MIME_HEADER_CONTENT_ID, "<attachment=" + attachmentId + ">");
@@ -95,7 +95,7 @@ public class AttachmentTest extends org.
         WSSecSignature builder = new WSSecSignature();
         builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
 
-        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<>();
         parts.add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
         parts.add(new WSEncryptionPart("cid:Attachments", "Content"));
         builder.setParts(parts);
@@ -142,7 +142,7 @@ public class AttachmentTest extends org.
         WSSecSignature builder = new WSSecSignature();
         builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
 
-        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<>();
         parts.add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
         parts.add(new WSEncryptionPart("cid:Attachments", "Content"));
         builder.setParts(parts);
@@ -181,7 +181,7 @@ public class AttachmentTest extends org.
                             throw new RuntimeException("wrong attachment requested");
                         }
 
-                        List<Attachment> attachments = new ArrayList<Attachment>();
+                        List<Attachment> attachments = new ArrayList<>();
                         attachment.setSourceStream(new ByteArrayInputStream(
                                 SOAPUtil.SAMPLE_SOAP_MSG.replace("15", "16").getBytes("UTF-8")));
                         attachments.add(attachment);
@@ -200,7 +200,7 @@ public class AttachmentTest extends org.
         WSSecSignature builder = new WSSecSignature();
         builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
 
-        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<>();
         parts.add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
         parts.add(new WSEncryptionPart("cid:Attachments", "Content"));
         builder.setParts(parts);
@@ -247,7 +247,7 @@ public class AttachmentTest extends org.
         WSSecSignature builder = new WSSecSignature();
         builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
 
-        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<>();
         parts.add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
         parts.add(new WSEncryptionPart("cid:Attachments", "Element"));
         builder.setParts(parts);
@@ -287,7 +287,7 @@ public class AttachmentTest extends org.
                             throw new RuntimeException("wrong attachment requested");
                         }
 
-                        List<Attachment> attachments = new ArrayList<Attachment>();
+                        List<Attachment> attachments = new ArrayList<>();
                         attachments.add(attachment);
                         attachmentRequestCallback.setAttachments(attachments);
                     }
@@ -304,7 +304,7 @@ public class AttachmentTest extends org.
         WSSecSignature builder = new WSSecSignature();
         builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
 
-        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<>();
         parts.add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
         parts.add(new WSEncryptionPart("cid:Attachments", "Element"));
         builder.setParts(parts);
@@ -368,7 +368,7 @@ public class AttachmentTest extends org.
         WSSecHeader secHeader = new WSSecHeader();
         secHeader.insertSecurityHeader(doc);
 
-        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<>();
         parts.add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
         parts.add(new WSEncryptionPart("cid:Attachments", "Content"));
         encrypt.setParts(parts);
@@ -429,7 +429,7 @@ public class AttachmentTest extends org.
         WSSecHeader secHeader = new WSSecHeader();
         secHeader.insertSecurityHeader(doc);
 
-        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<>();
         parts.add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
         parts.add(new WSEncryptionPart("cid:Attachments", "Content"));
         encrypt.setParts(parts);
@@ -486,7 +486,7 @@ public class AttachmentTest extends org.
         WSSecHeader secHeader = new WSSecHeader();
         secHeader.insertSecurityHeader(doc);
 
-        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<>();
         parts.add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
         parts.add(new WSEncryptionPart("cid:Attachments", "Content"));
         encrypt.setParts(parts);
@@ -553,7 +553,7 @@ public class AttachmentTest extends org.
         WSSecHeader secHeader = new WSSecHeader();
         secHeader.insertSecurityHeader(doc);
 
-        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<>();
         parts.add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
         parts.add(new WSEncryptionPart("cid:Attachments", "Content"));
         encrypt.setParts(parts);
@@ -619,7 +619,7 @@ public class AttachmentTest extends org.
         WSSecHeader secHeader = new WSSecHeader();
         secHeader.insertSecurityHeader(doc);
 
-        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<>();
         parts.add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
         parts.add(new WSEncryptionPart("cid:Attachments", "Element"));
         encrypt.setParts(parts);
@@ -669,7 +669,7 @@ public class AttachmentTest extends org.
         WSSecHeader secHeader = new WSSecHeader();
         secHeader.insertSecurityHeader(doc);
 
-        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<>();
         parts.add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
         parts.add(new WSEncryptionPart("cid:Attachments", "Element"));
         encrypt.setParts(parts);
@@ -723,7 +723,7 @@ public class AttachmentTest extends org.
         WSSecHeader secHeader = new WSSecHeader();
         secHeader.insertSecurityHeader(doc);
 
-        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<>();
         parts.add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
         parts.add(new WSEncryptionPart("cid:Attachments", "Element"));
         encrypt.setParts(parts);
@@ -786,7 +786,7 @@ public class AttachmentTest extends org.
         WSSecSignature signature = new WSSecSignature();
         signature.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
 
-        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<>();
         parts.add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
         parts.add(new WSEncryptionPart("cid:Attachments", "Element"));
         signature.setParts(parts);
@@ -853,7 +853,7 @@ public class AttachmentTest extends org.
         WSSecSignature signature = new WSSecSignature();
         signature.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
 
-        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<>();
         parts.add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
         parts.add(new WSEncryptionPart("cid:Attachments", "Element"));
         signature.setParts(parts);
@@ -872,7 +872,7 @@ public class AttachmentTest extends org.
                 if (callbacks[0] instanceof AttachmentRequestCallback) {
                     AttachmentRequestCallback attachmentRequestCallback = (AttachmentRequestCallback) callbacks[0];
 
-                    List<Attachment> attachments = new ArrayList<Attachment>();
+                    List<Attachment> attachments = new ArrayList<>();
                     attachments.add(attachment[0]);
                     attachmentRequestCallback.setAttachments(attachments);
                 } else {
@@ -895,7 +895,7 @@ public class AttachmentTest extends org.
                 if (callbacks[0] instanceof AttachmentRequestCallback) {
                     AttachmentRequestCallback attachmentRequestCallback = (AttachmentRequestCallback) callbacks[0];
 
-                    List<Attachment> attachments = new ArrayList<Attachment>();
+                    List<Attachment> attachments = new ArrayList<>();
                     attachments.add(attachment[0]);
                     attachmentRequestCallback.setAttachments(attachments);
                 } else {
@@ -923,7 +923,7 @@ public class AttachmentTest extends org.
                             throw new RuntimeException("wrong attachment requested");
                         }
 
-                        List<Attachment> attachments = new ArrayList<Attachment>();
+                        List<Attachment> attachments = new ArrayList<>();
                         attachments.add(attachment[0]);
 
                         if (attachment[0].getHeaders().size() == 6) {
@@ -955,7 +955,7 @@ public class AttachmentTest extends org.
         encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
         encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
 
-        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<>();
         parts.add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
         parts.add(new WSEncryptionPart("cid:Attachments", "Element"));
         encrypt.setParts(parts);
@@ -1022,7 +1022,7 @@ public class AttachmentTest extends org.
         encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
         encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
 
-        List<WSEncryptionPart> parts = new ArrayList<WSEncryptionPart>();
+        List<WSEncryptionPart> parts = new ArrayList<>();
         parts.add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
         parts.add(new WSEncryptionPart("cid:Attachments", "Element"));
         encrypt.setParts(parts);
@@ -1041,7 +1041,7 @@ public class AttachmentTest extends org.
                 if (callbacks[0] instanceof AttachmentRequestCallback) {
                     AttachmentRequestCallback attachmentRequestCallback = (AttachmentRequestCallback) callbacks[0];
 
-                    List<Attachment> attachments = new ArrayList<Attachment>();
+                    List<Attachment> attachments = new ArrayList<>();
                     attachments.add(attachment[0]);
                     attachmentRequestCallback.setAttachments(attachments);
                 } else {
@@ -1063,7 +1063,7 @@ public class AttachmentTest extends org.
                 if (callbacks[0] instanceof AttachmentRequestCallback) {
                     AttachmentRequestCallback attachmentRequestCallback = (AttachmentRequestCallback) callbacks[0];
 
-                    List<Attachment> attachments = new ArrayList<Attachment>();
+                    List<Attachment> attachments = new ArrayList<>();
                     attachments.add(attachment[0]);
                     attachmentRequestCallback.setAttachments(attachments);
                 } else {
@@ -1094,7 +1094,7 @@ public class AttachmentTest extends org.
                             throw new RuntimeException("wrong attachment requested");
                         }
 
-                        List<Attachment> attachmentList = new ArrayList<Attachment>();
+                        List<Attachment> attachmentList = new ArrayList<>();
                         attachmentList.add(attachment[0]);
                         attachmentRequestCallback.setAttachments(attachmentList);
 

Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyActionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyActionTest.java?rev=1660428&r1=1660427&r2=1660428&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyActionTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyActionTest.java Tue Feb 17 15:57:19 2015
@@ -417,7 +417,7 @@ public class DerivedKeyActionTest extend
         
         final Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
         CustomHandler handler = new CustomHandler();
-        List<HandlerAction> actions = new ArrayList<HandlerAction>();
+        List<HandlerAction> actions = new ArrayList<>();
         actions.add(new HandlerAction(WSConstants.DKT_SIGN));
         actions.add(new HandlerAction(WSConstants.DKT_ENCR));
         handler.send(
@@ -453,7 +453,7 @@ public class DerivedKeyActionTest extend
         
         final Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
         CustomHandler handler = new CustomHandler();
-        List<HandlerAction> actions = new ArrayList<HandlerAction>();
+        List<HandlerAction> actions = new ArrayList<>();
         actions.add(new HandlerAction(WSConstants.DKT_ENCR));
         actions.add(new HandlerAction(WSConstants.DKT_SIGN));
         handler.send(
@@ -495,7 +495,7 @@ public class DerivedKeyActionTest extend
         
         final Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
         CustomHandler handler = new CustomHandler();
-        List<HandlerAction> actions = new ArrayList<HandlerAction>();
+        List<HandlerAction> actions = new ArrayList<>();
         actions.add(new HandlerAction(WSConstants.DKT_SIGN));
         actions.add(new HandlerAction(WSConstants.DKT_ENCR));
         handler.send(
@@ -537,7 +537,7 @@ public class DerivedKeyActionTest extend
         
         final Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
         CustomHandler handler = new CustomHandler();
-        List<HandlerAction> actions = new ArrayList<HandlerAction>();
+        List<HandlerAction> actions = new ArrayList<>();
         actions.add(new HandlerAction(WSConstants.DKT_ENCR));
         actions.add(new HandlerAction(WSConstants.DKT_SIGN));
         handler.send(



Mime
View raw message