ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1660602 - in /webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax: ./ ext/ impl/ impl/processor/input/ impl/processor/output/ impl/securityToken/ impl/transformer/
Date Wed, 18 Feb 2015 11:50:53 GMT
Author: coheigea
Date: Wed Feb 18 11:50:53 2015
New Revision: 1660602

URL: http://svn.apache.org/r1660602
Log:
More JDK 7 work

Modified:
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSConstants.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurityProperties.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DecryptInputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/CustomTokenOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptEndingOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptedKeyOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityContextTokenOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SignatureConfirmationOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/UsernameTokenOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SecurityTokenFactoryImpl.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/transformer/STRTransformer.java

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java?rev=1660602&r1=1660601&r2=1660602&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java Wed Feb 18 11:50:53 2015
@@ -501,7 +501,7 @@ public final class ConfigurationConverte
         Object sigParts = config.get(ConfigurationConstants.SIGNATURE_PARTS);
         if (sigParts != null) {
             if (sigParts instanceof String) {
-                List<SecurePart> parts = new ArrayList<SecurePart>();
+                List<SecurePart> parts = new ArrayList<>();
                 splitEncParts((String)sigParts, parts, WSSConstants.NS_SOAP11);
                 for (SecurePart part : parts) {
                     part.setDigestMethod(sigDigestAlgo);
@@ -522,7 +522,7 @@ public final class ConfigurationConverte
         sigParts = config.get(ConfigurationConstants.OPTIONAL_SIGNATURE_PARTS);
         if (sigParts != null) {
             if (sigParts instanceof String) {
-                List<SecurePart> parts = new ArrayList<SecurePart>();
+                List<SecurePart> parts = new ArrayList<>();
                 splitEncParts((String)sigParts, parts, WSSConstants.NS_SOAP11);
                 for (SecurePart part : parts) {
                     part.setRequired(false);
@@ -558,7 +558,7 @@ public final class ConfigurationConverte
         Object encParts = config.get(ConfigurationConstants.ENCRYPTION_PARTS);
         if (encParts != null) {
             if (encParts instanceof String) {
-                List<SecurePart> parts = new ArrayList<SecurePart>();
+                List<SecurePart> parts = new ArrayList<>();
                 splitEncParts((String)encParts, parts, WSSConstants.NS_SOAP11);
                 for (SecurePart part : parts) {
                     properties.addEncryptionPart(part);
@@ -577,7 +577,7 @@ public final class ConfigurationConverte
         encParts = config.get(ConfigurationConstants.OPTIONAL_ENCRYPTION_PARTS);
         if (encParts != null) {
             if (encParts instanceof String) {
-                List<SecurePart> parts = new ArrayList<SecurePart>();
+                List<SecurePart> parts = new ArrayList<>();
                 splitEncParts((String)encParts, parts, WSSConstants.NS_SOAP11);
                 for (SecurePart part : parts) {
                     part.setRequired(false);
@@ -614,7 +614,7 @@ public final class ConfigurationConverte
             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-stax/src/main/java/org/apache/wss4j/stax/ext/WSSConstants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSConstants.java?rev=1660602&r1=1660601&r2=1660602&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSConstants.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSConstants.java Wed Feb 18 11:50:53 2015
@@ -242,7 +242,7 @@ public class WSSConstants extends XMLSec
         PASSWORD_DIGEST(NS_PASSWORD_DIGEST);
 
         private final String namespace;
-        private static final Map<String, UsernameTokenPasswordType> lookup = new HashMap<String, UsernameTokenPasswordType>();
+        private static final Map<String, UsernameTokenPasswordType> lookup = new HashMap<>();
 
         static {
             for (UsernameTokenPasswordType u : EnumSet.allOf(UsernameTokenPasswordType.class))
@@ -262,9 +262,9 @@ public class WSSConstants extends XMLSec
         }
     }
 
-    public static final List<QName> SOAP_11_BODY_PATH = new ArrayList<QName>(2);
-    public static final List<QName> SOAP_11_HEADER_PATH = new ArrayList<QName>(2);
-    public static final List<QName> WSSE_SECURITY_HEADER_PATH = new ArrayList<QName>(3);
+    public static final List<QName> SOAP_11_BODY_PATH = new ArrayList<>(2);
+    public static final List<QName> SOAP_11_HEADER_PATH = new ArrayList<>(2);
+    public static final List<QName> WSSE_SECURITY_HEADER_PATH = new ArrayList<>(3);
 
     static {
         SOAP_11_BODY_PATH.add(WSSConstants.TAG_soap11_Envelope);

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurityProperties.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurityProperties.java?rev=1660602&r1=1660601&r2=1660602&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurityProperties.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurityProperties.java Wed Feb 18 11:50:53 2015
@@ -61,9 +61,9 @@ public class WSSSecurityProperties exten
     private String actor;
     private CallbackHandler callbackHandler;
     private CallbackHandler samlCallbackHandler;
-    private final List<BSPRule> ignoredBSPRules = new LinkedList<BSPRule>();
+    private final List<BSPRule> ignoredBSPRules = new LinkedList<>();
     private boolean disableBSPEnforcement;
-    private final Map<QName, Validator> validators = new HashMap<QName, Validator>();
+    private final Map<QName, Validator> validators = new HashMap<>();
 
     private Integer timestampTTL = 300;
     private Integer timeStampFutureTTL = 60;
@@ -115,8 +115,8 @@ public class WSSSecurityProperties exten
     private boolean enableNonceReplayCache = true;
     private boolean enableSamlOneTimeUseReplayCache = true;
     private boolean validateSamlSubjectConfirmation = true;
-    private Collection<Pattern> subjectDNPatterns = new ArrayList<Pattern>();
-    private List<String> audienceRestrictions = new ArrayList<String>();
+    private Collection<Pattern> subjectDNPatterns = new ArrayList<>();
+    private List<String> audienceRestrictions = new ArrayList<>();
 
     private CallbackHandler attachmentCallbackHandler;
     private Object msgContext;

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java?rev=1660602&r1=1660601&r2=1660602&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSUtils.java Wed Feb 18 11:50:53 2015
@@ -263,7 +263,7 @@ public class WSSUtils extends XMLSecurit
         } else {
             valueType = WSSConstants.NS_X509PKIPathv1;
         }
-        List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(3);
+        List<XMLSecAttribute> attributes = new ArrayList<>(3);
         attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_EncodingType, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
         attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ValueType, valueType));
         attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_wsu_Id, referenceId));
@@ -295,7 +295,7 @@ public class WSSUtils extends XMLSecurit
             throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "invalidCertForSKI");
         }
 
-        List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(2);
+        List<XMLSecAttribute> attributes = new ArrayList<>(2);
         attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_EncodingType, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
         attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_X509SubjectKeyIdentifier));
         abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_KeyIdentifier, false, attributes);
@@ -308,7 +308,7 @@ public class WSSUtils extends XMLSecurit
                                                         OutputProcessorChain outputProcessorChain,
                                                         X509Certificate[] x509Certificates)
             throws XMLStreamException, XMLSecurityException {
-        List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(2);
+        List<XMLSecAttribute> attributes = new ArrayList<>(2);
         attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_EncodingType, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
         attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_X509_V3_TYPE));
         abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_KeyIdentifier, false, attributes);
@@ -324,7 +324,7 @@ public class WSSUtils extends XMLSecurit
                                                               OutputProcessorChain outputProcessorChain,
                                                               X509Certificate[] x509Certificates)
             throws XMLStreamException, XMLSecurityException {
-        List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(2);
+        List<XMLSecAttribute> attributes = new ArrayList<>(2);
         attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_EncodingType, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
         attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_THUMBPRINT));
         abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_KeyIdentifier, false, attributes);
@@ -355,7 +355,7 @@ public class WSSUtils extends XMLSecurit
                                                                  OutputProcessorChain outputProcessorChain, String identifier)
             throws XMLStreamException, XMLSecurityException {
 
-        List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(2);
+        List<XMLSecAttribute> attributes = new ArrayList<>(2);
         attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_EncodingType, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
         attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_ENCRYPTED_KEY_SHA1));
         abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_KeyIdentifier, false, attributes);
@@ -367,7 +367,7 @@ public class WSSUtils extends XMLSecurit
                                                                  OutputProcessorChain outputProcessorChain, String identifier)
             throws XMLStreamException, XMLSecurityException {
 
-        List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(2);
+        List<XMLSecAttribute> attributes = new ArrayList<>(2);
         attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_EncodingType, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
         attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_Kerberos5_AP_REQ_SHA1));
         abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_KeyIdentifier, false, attributes);
@@ -379,7 +379,7 @@ public class WSSUtils extends XMLSecurit
                                                    OutputProcessorChain outputProcessorChain, String referenceId,
                                                    String valueType, boolean includedInMessage)
             throws XMLStreamException, XMLSecurityException {
-        List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(2);
+        List<XMLSecAttribute> attributes = new ArrayList<>(2);
         String uri = includedInMessage ? "#" + referenceId : referenceId;
         attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_URI, uri));
         if (valueType != null) {
@@ -393,7 +393,7 @@ public class WSSUtils extends XMLSecurit
                                                             OutputProcessorChain outputProcessorChain,
                                                             WSSecurityTokenConstants.TokenType tokenType, String referenceId)
             throws XMLStreamException, XMLSecurityException {
-        List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(1);
+        List<XMLSecAttribute> attributes = new ArrayList<>(1);
         if (WSSecurityTokenConstants.Saml10Token.equals(tokenType) || WSSecurityTokenConstants.Saml11Token.equals(tokenType)) {
             attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_SAML10_TYPE));
         } else if (WSSecurityTokenConstants.Saml20Token.equals(tokenType)) {
@@ -408,7 +408,7 @@ public class WSSUtils extends XMLSecurit
                                                             OutputProcessorChain outputProcessorChain,
                                                             WSSecurityTokenConstants.TokenType tokenType, String referenceId)
             throws XMLStreamException, XMLSecurityException {
-        List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(1);
+        List<XMLSecAttribute> attributes = new ArrayList<>(1);
         if (WSSecurityTokenConstants.Saml10Token.equals(tokenType) || WSSecurityTokenConstants.Saml11Token.equals(tokenType)) {
             attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_SAML10_TYPE));
         } else if (WSSecurityTokenConstants.Saml20Token.equals(tokenType)) {
@@ -422,7 +422,7 @@ public class WSSUtils extends XMLSecurit
     public static void createUsernameTokenReferenceStructure(AbstractOutputProcessor abstractOutputProcessor,
                                                              OutputProcessorChain outputProcessorChain, String tokenId)
             throws XMLStreamException, XMLSecurityException {
-        List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(2);
+        List<XMLSecAttribute> attributes = new ArrayList<>(2);
         attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_URI, "#" + tokenId));
         attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_USERNAMETOKEN_PROFILE_UsernameToken));
         abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_Reference, false, attributes);
@@ -445,7 +445,7 @@ public class WSSUtils extends XMLSecurit
         while (encryptionPartDefIterator.hasNext()) {
             EncryptionPartDef encryptionPartDef = encryptionPartDefIterator.next();
 
-            attributes = new ArrayList<XMLSecAttribute>(1);
+            attributes = new ArrayList<>(1);
             attributes.add(abstractOutputProcessor.createAttribute(
                     XMLSecurityConstants.ATT_NULL_URI, "#" + encryptionPartDef.getEncRefId()));
             abstractOutputProcessor.createStartElementAndOutputAsEvent(
@@ -455,7 +455,7 @@ public class WSSUtils extends XMLSecurit
             if (compressionAlgorithm != null) {
                 abstractOutputProcessor.createStartElementAndOutputAsEvent(
                         outputProcessorChain, XMLSecurityConstants.TAG_dsig_Transforms, true, null);
-                attributes = new ArrayList<XMLSecAttribute>(1);
+                attributes = new ArrayList<>(1);
                 attributes.add(abstractOutputProcessor.createAttribute(
                         XMLSecurityConstants.ATT_NULL_Algorithm, compressionAlgorithm));
                 abstractOutputProcessor.createStartElementAndOutputAsEvent(
@@ -490,7 +490,7 @@ public class WSSUtils extends XMLSecurit
                 continue;
             }
 
-            List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(3);
+            List<XMLSecAttribute> attributes = new ArrayList<>(3);
             attributes.add(abstractOutputProcessor.createAttribute(XMLSecurityConstants.ATT_NULL_Id,
                     encryptionPartDef.getEncRefId()));
             if (encryptionPartDef.getModifier() == SecurePart.Modifier.Element) {
@@ -508,7 +508,7 @@ public class WSSUtils extends XMLSecurit
             abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain,
                     XMLSecurityConstants.TAG_xenc_EncryptedData, true, attributes);
 
-            attributes = new ArrayList<XMLSecAttribute>(1);
+            attributes = new ArrayList<>(1);
             attributes.add(abstractOutputProcessor.createAttribute(XMLSecurityConstants.ATT_NULL_Algorithm,
                     abstractOutputProcessor.getSecurityProperties().getEncryptionSymAlgorithm()));
             abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain,
@@ -520,7 +520,7 @@ public class WSSUtils extends XMLSecurit
             abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain,
                     XMLSecurityConstants.TAG_dsig_KeyInfo, true, null);
 
-            attributes = new ArrayList<XMLSecAttribute>(1);
+            attributes = new ArrayList<>(1);
             attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_wsse11_TokenType,
                     WSSConstants.NS_WSS_ENC_KEY_VALUE_TYPE));
             abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain,
@@ -541,7 +541,7 @@ public class WSSUtils extends XMLSecurit
             abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain,
                     XMLSecurityConstants.TAG_xenc_CipherData, false, null);
 
-            attributes = new ArrayList<XMLSecAttribute>(1);
+            attributes = new ArrayList<>(1);
             attributes.add(abstractOutputProcessor.createAttribute(WSSConstants.ATT_NULL_URI,
                     "cid:" + encryptionPartDef.getCipherReferenceId()));
             abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain,
@@ -550,7 +550,7 @@ public class WSSUtils extends XMLSecurit
             abstractOutputProcessor.createStartElementAndOutputAsEvent(
                     outputProcessorChain, XMLSecurityConstants.TAG_xenc_Transforms, false, null);
 
-            attributes = new ArrayList<XMLSecAttribute>(1);
+            attributes = new ArrayList<>(1);
             attributes.add(abstractOutputProcessor.createAttribute(
                     XMLSecurityConstants.ATT_NULL_Algorithm, WSSConstants.SWA_ATTACHMENT_CIPHERTEXT_TRANS));
             abstractOutputProcessor.createStartElementAndOutputAsEvent(

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java?rev=1660602&r1=1660601&r2=1660602&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java Wed Feb 18 11:50:53 2015
@@ -152,8 +152,7 @@ public class InboundWSSecurityContextImp
 
         HttpsTokenSecurityEvent httpsTokenSecurityEvent = null;
 
-        List<TokenSecurityEvent<? extends InboundSecurityToken>> tokenSecurityEvents =
-                new ArrayList<TokenSecurityEvent<? extends InboundSecurityToken>>();
+        List<TokenSecurityEvent<? extends InboundSecurityToken>> tokenSecurityEvents = new ArrayList<>();
         Iterator<SecurityEvent> securityEventIterator = securityEventDeque.iterator();
         while (securityEventIterator.hasNext()) {
             SecurityEvent securityEvent = securityEventIterator.next();
@@ -200,24 +199,24 @@ public class InboundWSSecurityContextImp
             TokenSecurityEvent<? extends InboundSecurityToken> tokenSecurityEvent = supportingTokensIterator.next();
             List<InboundSecurityToken> signingSecurityTokens = isSignedToken(tokenSecurityEvent, securityEventDeque, httpsTokenSecurityEvent);
 
-            List<QName> signatureElementPath = new ArrayList<QName>(4);
+            List<QName> signatureElementPath = new ArrayList<>(4);
             signatureElementPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
             signatureElementPath.add(WSSConstants.TAG_dsig_Signature);
             boolean signsSignature = signsElement(tokenSecurityEvent, signatureElementPath, securityEventDeque);
             boolean encryptsSignature = encryptsElement(tokenSecurityEvent, signatureElementPath, securityEventDeque);
 
-            List<QName> signatureConfirmationElementPath = new ArrayList<QName>(4);
+            List<QName> signatureConfirmationElementPath = new ArrayList<>(4);
             signatureConfirmationElementPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
             signatureConfirmationElementPath.add(WSSConstants.TAG_wsse11_SignatureConfirmation);
             boolean signsSignatureConfirmation = signsElement(tokenSecurityEvent, signatureConfirmationElementPath, securityEventDeque);
             boolean encryptsSignatureConfirmation = encryptsElement(tokenSecurityEvent, signatureConfirmationElementPath, securityEventDeque);
 
-            List<QName> timestampElementPath = new ArrayList<QName>(4);
+            List<QName> timestampElementPath = new ArrayList<>(4);
             timestampElementPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
             timestampElementPath.add(WSSConstants.TAG_wsu_Timestamp);
             boolean signsTimestamp = signsElement(tokenSecurityEvent, timestampElementPath, securityEventDeque);
 
-            List<QName> usernameTokenElementPath = new ArrayList<QName>(4);
+            List<QName> usernameTokenElementPath = new ArrayList<>(4);
             usernameTokenElementPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
             usernameTokenElementPath.add(WSSConstants.TAG_wsse_UsernameToken);
             boolean encryptsUsernameToken = encryptsElement(tokenSecurityEvent, usernameTokenElementPath, securityEventDeque);
@@ -357,7 +356,7 @@ public class InboundWSSecurityContextImp
             TokenSecurityEvent<? extends InboundSecurityToken> tokenSecurityEvent,
             List<TokenSecurityEvent<? extends InboundSecurityToken>> tokenSecurityEventList) {
         if (tokenSecurityEventList == Collections.<TokenSecurityEvent<? extends InboundSecurityToken>>emptyList()) {
-            tokenSecurityEventList = new ArrayList<TokenSecurityEvent<? extends InboundSecurityToken>>();
+            tokenSecurityEventList = new ArrayList<>();
         }
         tokenSecurityEventList.add(tokenSecurityEvent);
         return tokenSecurityEventList;
@@ -430,7 +429,7 @@ public class InboundWSSecurityContextImp
     }
 
     private List<InboundSecurityToken> getSigningToken(TokenSecurityEvent<? extends SecurityToken> tokenSecurityEvent, Deque<SecurityEvent> securityEventDeque) throws XMLSecurityException {
-        List<InboundSecurityToken> signingSecurityTokens = new ArrayList<InboundSecurityToken>();
+        List<InboundSecurityToken> signingSecurityTokens = new ArrayList<>();
 
         for (Iterator<SecurityEvent> iterator = securityEventDeque.iterator(); iterator.hasNext(); ) {
             SecurityEvent securityEvent = iterator.next();
@@ -465,7 +464,7 @@ public class InboundWSSecurityContextImp
     private List<InboundSecurityToken> isSignedToken(TokenSecurityEvent<? extends SecurityToken> tokenSecurityEvent,
                                               Deque<SecurityEvent> securityEventDeque,
                                               HttpsTokenSecurityEvent httpsTokenSecurityEvent) throws XMLSecurityException {
-        List<InboundSecurityToken> securityTokenList = new ArrayList<InboundSecurityToken>();
+        List<InboundSecurityToken> securityTokenList = new ArrayList<>();
         if (httpsTokenSecurityEvent != null) {
             securityTokenList.add(httpsTokenSecurityEvent.getSecurityToken());
             return securityTokenList;
@@ -491,7 +490,7 @@ public class InboundWSSecurityContextImp
                                                  Deque<SecurityEvent> securityEventDeque,
                                                  HttpsTokenSecurityEvent httpsTokenSecurityEvent) throws XMLSecurityException {
 
-        List<InboundSecurityToken> securityTokenList = new ArrayList<InboundSecurityToken>();
+        List<InboundSecurityToken> securityTokenList = new ArrayList<>();
         if (httpsTokenSecurityEvent != null) {
             securityTokenList.add(httpsTokenSecurityEvent.getSecurityToken());
             return securityTokenList;
@@ -589,7 +588,7 @@ public class InboundWSSecurityContextImp
 
     @Override
     public void ignoredBSPRules(List<BSPRule> bspRules) {
-        ignoredBSPRules = new ArrayList<BSPRule>(bspRules);
+        ignoredBSPRules = new ArrayList<>(bspRules);
     }
 
     public boolean isDisableBSPEnforcement() {

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DecryptInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DecryptInputProcessor.java?rev=1660602&r1=1660601&r2=1660602&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DecryptInputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DecryptInputProcessor.java Wed Feb 18 11:50:53 2015
@@ -85,7 +85,7 @@ public class DecryptInputProcessor exten
     private static final Long maximumAllowedDecompressedBytes =
             Long.valueOf(ConfigurationProperties.getProperty("MaximumAllowedDecompressedBytes"));
 
-    private List<DeferredAttachment> attachmentReferences = new ArrayList<DeferredAttachment>();
+    private List<DeferredAttachment> attachmentReferences = new ArrayList<>();
 
     public DecryptInputProcessor(KeyInfoType keyInfoType, ReferenceList referenceList,
                                  WSSSecurityProperties securityProperties, WSInboundSecurityContext securityContext)

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java?rev=1660602&r1=1660601&r2=1660602&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java Wed Feb 18 11:50:53 2015
@@ -94,8 +94,8 @@ public class SAMLTokenInputHandler exten
 
     private static final DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
 
-    private static final List<QName> saml1TokenPath = new ArrayList<QName>(WSSConstants.WSSE_SECURITY_HEADER_PATH);
-    private static final List<QName> saml2TokenPath = new ArrayList<QName>(WSSConstants.WSSE_SECURITY_HEADER_PATH);
+    private static final List<QName> saml1TokenPath = new ArrayList<>(WSSConstants.WSSE_SECURITY_HEADER_PATH);
+    private static final List<QName> saml2TokenPath = new ArrayList<>(WSSConstants.WSSE_SECURITY_HEADER_PATH);
 
     static {
         documentBuilderFactory.setNamespaceAware(true);
@@ -573,7 +573,7 @@ public class SAMLTokenInputHandler exten
         private SamlAssertionWrapper samlAssertionWrapper;
         private SecurityTokenProvider<InboundSecurityToken> securityTokenProvider;
         private InboundSecurityToken subjectSecurityToken;
-        private List<SignedElementSecurityEvent> samlTokenSignedElementSecurityEvents = new ArrayList<SignedElementSecurityEvent>();
+        private List<SignedElementSecurityEvent> samlTokenSignedElementSecurityEvents = new ArrayList<>();
         private SignedPartSecurityEvent bodySignedPartSecurityEvent;
 
         SAMLTokenVerifierInputProcessor(XMLSecurityProperties securityProperties, SamlAssertionWrapper samlAssertionWrapper,

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java?rev=1660602&r1=1660601&r2=1660602&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java Wed Feb 18 11:50:53 2015
@@ -130,7 +130,7 @@ public class WSSSignatureReferenceVerify
                                 "empty", "First transform must be Attachment[Content|Complete]SignatureTransform"
                         );
                     }
-                    Map<String, Object> transformerProperties = new HashMap<String, Object>(2);
+                    Map<String, Object> transformerProperties = new HashMap<>(2);
                     transformerProperties.put(
                             AttachmentContentSignatureTransform.ATTACHMENT, attachment);
                     transformer.setProperties(transformerProperties);
@@ -349,7 +349,7 @@ public class WSSSignatureReferenceVerify
 
                     Map<String, Object> transformerProperties = null;
                     if (inclusiveNamespacesType != null) {
-                        transformerProperties = new HashMap<String, Object>();
+                        transformerProperties = new HashMap<>();
                         transformerProperties.put(
                                 Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST,
                                 inclusiveNamespacesType.getPrefixList());
@@ -370,7 +370,7 @@ public class WSSSignatureReferenceVerify
 
             Map<String, Object> transformerProperties = null;
             if (inclusiveNamespacesType != null) {
-                transformerProperties = new HashMap<String, Object>();
+                transformerProperties = new HashMap<>();
                 transformerProperties.put(
                         Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST,
                         inclusiveNamespacesType.getPrefixList());

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java?rev=1660602&r1=1660601&r2=1660602&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java Wed Feb 18 11:50:53 2015
@@ -156,7 +156,7 @@ public class BinarySecurityTokenOutputPr
                 if (WSSConstants.ENCRYPT_WITH_KERBEROS_TOKEN.equals(getAction())
                     || WSSConstants.SIGNATURE_WITH_KERBEROS_TOKEN.equals(getAction())
                     || WSSConstants.KERBEROS_TOKEN.equals(getAction())) {
-                    List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(3);
+                    List<XMLSecAttribute> attributes = new ArrayList<>(3);
                     attributes.add(createAttribute(WSSConstants.ATT_NULL_EncodingType, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
                     attributes.add(createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_GSS_Kerberos5_AP_REQ));
                     attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, securityToken.getId()));

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/CustomTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/CustomTokenOutputProcessor.java?rev=1660602&r1=1660601&r2=1660602&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/CustomTokenOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/CustomTokenOutputProcessor.java Wed Feb 18 11:50:53 2015
@@ -112,8 +112,8 @@ public class CustomTokenOutputProcessor
                 throws XMLStreamException, XMLSecurityException {
 
             NamedNodeMap namedNodeMap = element.getAttributes();
-            List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(namedNodeMap.getLength());
-            List<XMLSecNamespace> namespaces = new ArrayList<XMLSecNamespace>(namedNodeMap.getLength());
+            List<XMLSecAttribute> attributes = new ArrayList<>(namedNodeMap.getLength());
+            List<XMLSecNamespace> namespaces = new ArrayList<>(namedNodeMap.getLength());
             for (int i = 0; i < namedNodeMap.getLength(); i++) {
                 Attr attribute = (Attr) namedNodeMap.item(i);
                 if (attribute.getPrefix() == null) {

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java?rev=1660602&r1=1660601&r2=1660602&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java Wed Feb 18 11:50:53 2015
@@ -221,7 +221,7 @@ public class DerivedKeyTokenOutputProces
 
                 OutputProcessorChain subOutputProcessorChain = outputProcessorChain.createSubChain(this);
 
-                List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(1);
+                List<XMLSecAttribute> attributes = new ArrayList<>(1);
                 attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, securityToken.getId()));
                 createStartElementAndOutputAsEvent(subOutputProcessorChain, headerElementName, true, attributes);
 
@@ -253,7 +253,7 @@ public class DerivedKeyTokenOutputProces
                 throws XMLStreamException, XMLSecurityException {
 
             SecurityToken wrappingToken = securityToken.getKeyWrappingToken();
-            List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(2);
+            List<XMLSecAttribute> attributes = new ArrayList<>(2);
             attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, IDGenerator.generateID(null)));
             if (WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference.equals(keyIdentifier) && !useSingleCertificate) {
                 attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_X509PKIPathv1));

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptEndingOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptEndingOutputProcessor.java?rev=1660602&r1=1660601&r2=1660602&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptEndingOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptEndingOutputProcessor.java Wed Feb 18 11:50:53 2015
@@ -75,7 +75,7 @@ public class EncryptEndingOutputProcesso
                                 outputProcessorChain.getSecurityContext().getAsList(SecurityHeaderOrder.class);
                         List<SecurityHeaderOrder> tmpList = null;
                         if (securityHeaderOrderList != null) {
-                            tmpList = new ArrayList<SecurityHeaderOrder>(securityHeaderOrderList);
+                            tmpList = new ArrayList<>(securityHeaderOrderList);
                             securityHeaderOrderList.clear();
                         }
                         

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java?rev=1660602&r1=1660601&r2=1660602&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java Wed Feb 18 11:50:53 2015
@@ -268,7 +268,7 @@ public class EncryptOutputProcessor exte
                 throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_ENCRYPTION, e);
             }
 
-            final Map<String, String> headers = new HashMap<String, String>();
+            final Map<String, String> headers = new HashMap<>();
             headers.putAll(attachment.getHeaders());
             resultAttachment.setSourceStream(
                     AttachmentUtils.setupAttachmentEncryptionStream(
@@ -340,7 +340,7 @@ public class EncryptOutputProcessor exte
                 && Modifier.Content != super.getEncryptionPartDef().getModifier()) {
                 doEncryptedHeader = true;
 
-                List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(1);
+                List<XMLSecAttribute> attributes = new ArrayList<>(1);
 
                 @SuppressWarnings("unchecked")
                 Iterator<Attribute> attributeIterator = getXmlSecStartElement().getAttributes();
@@ -388,7 +388,7 @@ public class EncryptOutputProcessor exte
             
             KeyIdentifier keyIdentifier = ((WSSSecurityProperties) getSecurityProperties()).getEncryptionKeyIdentifier();
             if (WSSecurityTokenConstants.KeyIdentifier_EncryptedKeySha1Identifier.equals(keyIdentifier)) {
-                List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(1);
+                List<XMLSecAttribute> attributes = new ArrayList<>(1);
                 attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_WSS_ENC_KEY_VALUE_TYPE));
                 createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_SecurityTokenReference, false, attributes);
                 
@@ -398,7 +398,7 @@ public class EncryptOutputProcessor exte
                     WSSUtils.createEncryptedKeySha1IdentifierStructure(this, outputProcessorChain, getEncryptionPartDef().getSymmetricKey());
                 }
             } else if (WSSecurityTokenConstants.KeyIdentifier_KerberosSha1Identifier.equals(keyIdentifier)) {
-                List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(1);
+                List<XMLSecAttribute> attributes = new ArrayList<>(1);
                 attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_Kerberos5_AP_REQ));
                 createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_SecurityTokenReference, false, attributes);
                 
@@ -406,25 +406,25 @@ public class EncryptOutputProcessor exte
             } else {
                 boolean isSAMLToken = false;
                 if (WSSecurityTokenConstants.KerberosToken.equals(securityToken.getTokenType())) {
-                    List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(2);
+                    List<XMLSecAttribute> attributes = new ArrayList<>(2);
                     attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, IDGenerator.generateID(null)));
                     attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_GSS_Kerberos5_AP_REQ));
                     createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_SecurityTokenReference, false, attributes);
                 } else if (WSSecurityTokenConstants.Saml10Token.equals(securityToken.getTokenType())
                     || WSSecurityTokenConstants.Saml11Token.equals(securityToken.getTokenType())) {
-                    List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(2);
+                    List<XMLSecAttribute> attributes = new ArrayList<>(2);
                     attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, IDGenerator.generateID(null)));
                     attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_SAML11_TOKEN_PROFILE_TYPE));
                     createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_SecurityTokenReference, false, attributes);
                     isSAMLToken = true;
                 } else if (WSSecurityTokenConstants.Saml20Token.equals(securityToken.getTokenType())) {
-                    List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(2);
+                    List<XMLSecAttribute> attributes = new ArrayList<>(2);
                     attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, IDGenerator.generateID(null)));
                     attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_SAML20_TOKEN_PROFILE_TYPE));
                     createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_SecurityTokenReference, false, attributes);
                     isSAMLToken = true;
                 } else if (WSSecurityTokenConstants.EncryptedKeyToken.equals(securityToken.getTokenType())) {
-                    List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(2);
+                    List<XMLSecAttribute> attributes = new ArrayList<>(2);
                     attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, IDGenerator.generateID(null)));
                     attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_WSS_ENC_KEY_VALUE_TYPE));
                     createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_SecurityTokenReference, false, attributes);
@@ -436,7 +436,7 @@ public class EncryptOutputProcessor exte
                     // Always use KeyIdentifier regardless of the configured KeyIdentifier value
                     WSSUtils.createSAMLKeyIdentifierStructure(this, outputProcessorChain, securityToken.getTokenType(), getEncryptionPartDef().getKeyId());
                 } else {
-                    List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(1);
+                    List<XMLSecAttribute> attributes = new ArrayList<>(1);
                     attributes.add(createAttribute(WSSConstants.ATT_NULL_URI, "#" + getEncryptionPartDef().getKeyId()));
                     if (WSSecurityTokenConstants.KerberosToken.equals(securityToken.getTokenType())) {
                         attributes.add(createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_GSS_Kerberos5_AP_REQ));

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptedKeyOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptedKeyOutputProcessor.java?rev=1660602&r1=1660601&r2=1660602&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptedKeyOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptedKeyOutputProcessor.java Wed Feb 18 11:50:53 2015
@@ -229,11 +229,11 @@ public class EncryptedKeyOutputProcessor
                 final X509Certificate x509Certificate = securityToken.getKeyWrappingToken().getX509Certificates()[0];
                 final String encryptionKeyTransportAlgorithm = getSecurityProperties().getEncryptionKeyTransportAlgorithm();
 
-                List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(1);
+                List<XMLSecAttribute> attributes = new ArrayList<>(1);
                 attributes.add(createAttribute(WSSConstants.ATT_NULL_Id, securityToken.getId()));
                 createStartElementAndOutputAsEvent(subOutputProcessorChain, headerElementName, true, attributes);
 
-                attributes = new ArrayList<XMLSecAttribute>(1);
+                attributes = new ArrayList<>(1);
                 attributes.add(createAttribute(WSSConstants.ATT_NULL_Algorithm, encryptionKeyTransportAlgorithm));
                 createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_xenc_EncryptionMethod, false, attributes);
 
@@ -251,14 +251,14 @@ public class EncryptedKeyOutputProcessor
 
                     String encryptionKeyTransportDigestAlgorithm = getSecurityProperties().getEncryptionKeyTransportDigestAlgorithm();
                     if (encryptionKeyTransportDigestAlgorithm != null) {
-                        attributes = new ArrayList<XMLSecAttribute>(1);
+                        attributes = new ArrayList<>(1);
                         attributes.add(createAttribute(XMLSecurityConstants.ATT_NULL_Algorithm, encryptionKeyTransportDigestAlgorithm));
                         createStartElementAndOutputAsEvent(subOutputProcessorChain, XMLSecurityConstants.TAG_dsig_DigestMethod, true, attributes);
                         createEndElementAndOutputAsEvent(subOutputProcessorChain, XMLSecurityConstants.TAG_dsig_DigestMethod);
                     }
 
                     if (encryptionKeyTransportMGFAlgorithm != null) {
-                        attributes = new ArrayList<XMLSecAttribute>(1);
+                        attributes = new ArrayList<>(1);
                         attributes.add(createAttribute(XMLSecurityConstants.ATT_NULL_Algorithm, encryptionKeyTransportMGFAlgorithm));
                         createStartElementAndOutputAsEvent(subOutputProcessorChain, XMLSecurityConstants.TAG_xenc11_MGF, true, attributes);
                         createEndElementAndOutputAsEvent(subOutputProcessorChain, XMLSecurityConstants.TAG_xenc11_MGF);
@@ -362,7 +362,7 @@ public class EncryptedKeyOutputProcessor
                 return;
             } 
             
-            List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(2);
+            List<XMLSecAttribute> attributes = new ArrayList<>(2);
             attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, IDGenerator.generateID(null)));
             if (WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference.equals(keyIdentifier) && !useSingleCertificate) {
                 attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_X509PKIPathv1));

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java?rev=1660602&r1=1660601&r2=1660602&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java Wed Feb 18 11:50:53 2015
@@ -430,7 +430,7 @@ public class SAMLTokenOutputProcessor ex
             OutputProcessorChain outputProcessorChain, SamlAssertionWrapper samlAssertionWrapper,
             String referenceId, String tokenId) throws XMLStreamException, XMLSecurityException {
 
-        List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(2);
+        List<XMLSecAttribute> attributes = new ArrayList<>(2);
         WSSecurityTokenConstants.TokenType tokenType = WSSecurityTokenConstants.Saml11Token;
         if (samlAssertionWrapper.getSamlVersion() == SAMLVersion.VERSION_11) {
             attributes.add(createAttribute(WSSConstants.ATT_wsse11_TokenType, WSSConstants.NS_SAML11_TOKEN_PROFILE_TYPE));

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityContextTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityContextTokenOutputProcessor.java?rev=1660602&r1=1660601&r2=1660602&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityContextTokenOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityContextTokenOutputProcessor.java Wed Feb 18 11:50:53 2015
@@ -158,7 +158,7 @@ public class SecurityContextTokenOutputP
 
                 OutputProcessorChain subOutputProcessorChain = outputProcessorChain.createSubChain(this);
 
-                List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(1);
+                List<XMLSecAttribute> attributes = new ArrayList<>(1);
                 attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, securityToken.getId()));
                 QName identifierName = getIdentifierName();
                 createStartElementAndOutputAsEvent(subOutputProcessorChain, headerElementName, true, attributes);

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java?rev=1660602&r1=1660601&r2=1660602&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java Wed Feb 18 11:50:53 2015
@@ -197,7 +197,7 @@ public class SecurityHeaderOutputProcess
         OutputProcessorChain subOutputProcessorChain,
         boolean mustUnderstand
     ) throws XMLStreamException, XMLSecurityException {
-        List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(1);
+        List<XMLSecAttribute> attributes = new ArrayList<>(1);
         final String actor = ((WSSSecurityProperties) getSecurityProperties()).getActor();
         if (actor != null && !actor.isEmpty()) {
             if (WSSConstants.NS_SOAP11.equals(soapMessageVersion)) {

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SignatureConfirmationOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SignatureConfirmationOutputProcessor.java?rev=1660602&r1=1660601&r2=1660602&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SignatureConfirmationOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SignatureConfirmationOutputProcessor.java Wed Feb 18 11:50:53 2015
@@ -68,7 +68,7 @@ public class SignatureConfirmationOutput
 
                     WSSUtils.updateSecurityHeaderOrder(outputProcessorChain, headerElementName, getAction(), false);
 
-                    List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(2);
+                    List<XMLSecAttribute> attributes = new ArrayList<>(2);
                     attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, IDGenerator.generateID(null)));
                     attributes.add(createAttribute(WSSConstants.ATT_NULL_Value, new Base64(76, new byte[]{'\n'}).encodeToString(signatureValueSecurityEvent.getSignatureValue())));
                     createStartElementAndOutputAsEvent(subOutputProcessorChain, headerElementName, true, attributes);
@@ -78,7 +78,7 @@ public class SignatureConfirmationOutput
 
             if (!aSignatureFound) {
                 WSSUtils.updateSecurityHeaderOrder(outputProcessorChain, headerElementName, getAction(), false);
-                List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(1);
+                List<XMLSecAttribute> attributes = new ArrayList<>(1);
                 attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, IDGenerator.generateID(null)));
                 createStartElementAndOutputAsEvent(subOutputProcessorChain, headerElementName, true, attributes);
                 createEndElementAndOutputAsEvent(subOutputProcessorChain, headerElementName);

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/UsernameTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/UsernameTokenOutputProcessor.java?rev=1660602&r1=1660601&r2=1660602&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/UsernameTokenOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/UsernameTokenOutputProcessor.java Wed Feb 18 11:50:53 2015
@@ -182,7 +182,7 @@ public class UsernameTokenOutputProcesso
 
                 OutputProcessorChain subOutputProcessorChain = outputProcessorChain.createSubChain(this);
 
-                List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(1);
+                List<XMLSecAttribute> attributes = new ArrayList<>(1);
                 attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, this.wsuId));
                 createStartElementAndOutputAsEvent(subOutputProcessorChain, headerElementName, false, attributes);
                 createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsse_Username, false, null);
@@ -190,7 +190,7 @@ public class UsernameTokenOutputProcesso
                 createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsse_Username);
                 if (((WSSSecurityProperties) getSecurityProperties()).getUsernameTokenPasswordType() != WSSConstants.UsernameTokenPasswordType.PASSWORD_NONE
                         && !WSSConstants.USERNAMETOKEN_SIGNED.equals(action)) {
-                    attributes = new ArrayList<XMLSecAttribute>(1);
+                    attributes = new ArrayList<>(1);
                     attributes.add(createAttribute(WSSConstants.ATT_NULL_Type,
                             ((WSSSecurityProperties) getSecurityProperties()).getUsernameTokenPasswordType() == WSSConstants.UsernameTokenPasswordType.PASSWORD_DIGEST
                                     ? WSSConstants.UsernameTokenPasswordType.PASSWORD_DIGEST.getNamespace()
@@ -216,7 +216,7 @@ public class UsernameTokenOutputProcesso
                 }
 
                 if (nonceValue != null && !WSSConstants.USERNAMETOKEN_SIGNED.equals(action)) {
-                    attributes = new ArrayList<XMLSecAttribute>(1);
+                    attributes = new ArrayList<>(1);
                     attributes.add(createAttribute(WSSConstants.ATT_NULL_EncodingType, WSSConstants.SOAPMESSAGE_NS10_BASE64_ENCODING));
                     createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsse_Nonce, false, attributes);
                     createCharactersAndOutputAsEvent(subOutputProcessorChain, new Base64(76, new byte[]{'\n'}).encodeToString(this.nonceValue));

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java?rev=1660602&r1=1660601&r2=1660602&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java Wed Feb 18 11:50:53 2015
@@ -101,7 +101,7 @@ public class WSSSignatureEndingOutputPro
             WSSUtils.createKeyValueTokenStructure(this, outputProcessorChain, x509Certificates);
         } else {
             boolean isSAMLToken = false;
-            List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(2);
+            List<XMLSecAttribute> attributes = new ArrayList<>(2);
             attributes.add(createAttribute(WSSConstants.ATT_wsu_Id, IDGenerator.generateID(null)));
             if (WSSecurityTokenConstants.Saml10Token.equals(securityToken.getTokenType())
                 || WSSecurityTokenConstants.Saml11Token.equals(securityToken.getTokenType())) {
@@ -199,12 +199,12 @@ public class WSSSignatureEndingOutputPro
             createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_dsig_Transforms, false, null);
 
             if (WSSConstants.SOAPMESSAGE_NS10_STRTransform.equals(transforms[0])) {
-                List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(1);
+                List<XMLSecAttribute> attributes = new ArrayList<>(1);
                 attributes.add(createAttribute(WSSConstants.ATT_NULL_Algorithm, transforms[0]));
                 createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_dsig_Transform, false, attributes);
                 if (transforms.length >= 2) {
                     createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_wsse_TransformationParameters, false, null);
-                    attributes = new ArrayList<XMLSecAttribute>(1);
+                    attributes = new ArrayList<>(1);
                     attributes.add(createAttribute(WSSConstants.ATT_NULL_Algorithm, transforms[1]));
                     createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_dsig_CanonicalizationMethod, false, attributes);
                     createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_dsig_CanonicalizationMethod);
@@ -215,7 +215,7 @@ public class WSSSignatureEndingOutputPro
                 for (int i = 0; i < transforms.length; i++) {
                     String transform = transforms[i];
 
-                    List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(1);
+                    List<XMLSecAttribute> attributes = new ArrayList<>(1);
                     attributes.add(createAttribute(WSSConstants.ATT_NULL_Algorithm, transform));
                     createStartElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_dsig_Transform, false, attributes);
 
@@ -223,7 +223,7 @@ public class WSSSignatureEndingOutputPro
                             && !WSSConstants.SWA_ATTACHMENT_CONTENT_SIG_TRANS.equals(transform)
                             && !WSSConstants.SWA_ATTACHMENT_COMPLETE_SIG_TRANS.equals(transform))
                     {
-                        attributes = new ArrayList<XMLSecAttribute>(1);
+                        attributes = new ArrayList<>(1);
                         attributes.add(createAttribute(XMLSecurityConstants.ATT_NULL_PrefixList, signaturePartDef.getInclusiveNamespacesPrefixes()));
                         createStartElementAndOutputAsEvent(subOutputProcessorChain, XMLSecurityConstants.TAG_c14nExcl_InclusiveNamespaces, true, attributes);
                         createEndElementAndOutputAsEvent(subOutputProcessorChain, XMLSecurityConstants.TAG_c14nExcl_InclusiveNamespaces);
@@ -258,7 +258,7 @@ public class WSSSignatureEndingOutputPro
                                 outputProcessorChain.getSecurityContext().getAsList(SecurityHeaderOrder.class);
                         List<SecurityHeaderOrder> tmpList = null;
                         if (securityHeaderOrderList != null) {
-                            tmpList = new ArrayList<SecurityHeaderOrder>(securityHeaderOrderList);
+                            tmpList = new ArrayList<>(securityHeaderOrderList);
                             securityHeaderOrderList.clear();
                         }
                         

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java?rev=1660602&r1=1660601&r2=1660602&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java Wed Feb 18 11:50:53 2015
@@ -103,7 +103,7 @@ public class WSSSignatureOutputProcessor
                         if (attribute != null) {
                             signaturePartDef.setSigRefId(attribute.getValue());
                         } else {
-                            List<XMLSecAttribute> attributeList = new ArrayList<XMLSecAttribute>(1);
+                            List<XMLSecAttribute> attributeList = new ArrayList<>(1);
                             attributeList.add(createAttribute(WSSConstants.ATT_wsu_Id, signaturePartDef.getSigRefId()));
                             xmlSecEvent = addAttributes(xmlSecStartElement, attributeList);
                         }
@@ -201,7 +201,7 @@ public class WSSSignatureOutputProcessor
                 try {
                     Transformer transformer = buildTransformerChain(digestOutputStream, signaturePartDef, null);
 
-                    Map<String, Object> transformerProperties = new HashMap<String, Object>(2);
+                    Map<String, Object> transformerProperties = new HashMap<>(2);
                     transformerProperties.put(
                             AttachmentContentSignatureTransform.ATTACHMENT, attachment);
                     transformer.setProperties(transformerProperties);

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SecurityTokenFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SecurityTokenFactoryImpl.java?rev=1660602&r1=1660601&r2=1660602&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SecurityTokenFactoryImpl.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SecurityTokenFactoryImpl.java Wed Feb 18 11:50:53 2015
@@ -418,7 +418,7 @@ public class SecurityTokenFactoryImpl ex
             final InboundSecurityToken inboundSecurityToken,
             final WSSecurityTokenConstants.KeyIdentifier keyIdentifier) {
 
-        List<Class<?>> implementedInterfaces = new ArrayList<Class<?>>();
+        List<Class<?>> implementedInterfaces = new ArrayList<>();
         getImplementedInterfaces(inboundSecurityToken.getClass(), implementedInterfaces);
         Class<?>[] interfaces = implementedInterfaces.toArray(new Class<?>[implementedInterfaces.size()]);
 

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/transformer/STRTransformer.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/transformer/STRTransformer.java?rev=1660602&r1=1660601&r2=1660602&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/transformer/STRTransformer.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/transformer/STRTransformer.java Wed Feb 18 11:50:53 2015
@@ -36,9 +36,9 @@ public class STRTransformer extends Tran
         if (!(transformer instanceof Canonicalizer20010315_Excl)) {
             throw new WSSecurityException(WSSecurityException.ErrorCode.INVALID_SECURITY);
         }
-        List<String> inclusiveNamespacesPrefixList = new ArrayList<String>();
+        List<String> inclusiveNamespacesPrefixList = new ArrayList<>();
         inclusiveNamespacesPrefixList.add("#default");
-        Map<String, Object> transformerProperties = new HashMap<String, Object>();
+        Map<String, Object> transformerProperties = new HashMap<>();
         transformerProperties.put(
             Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST, inclusiveNamespacesPrefixList);
         transformerProperties.put(Canonicalizer20010315_Excl.PROPAGATE_DEFAULT_NAMESPACE, Boolean.TRUE);



Mime
View raw message