You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2017/03/09 10:13:28 UTC

svn commit: r1786125 - in /santuario/xml-security-java/trunk/src: main/java/org/apache/jcp/xml/dsig/internal/dom/ main/java/org/apache/xml/security/c14n/implementations/ main/java/org/apache/xml/security/encryption/ main/java/org/apache/xml/security/ke...

Author: coheigea
Date: Thu Mar  9 10:13:28 2017
New Revision: 1786125

URL: http://svn.apache.org/viewvc?rev=1786125&view=rev
Log:
Removing HashMap parameters

Modified:
    santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/SecurityHeaderHandlerMapper.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/XIncludeHandler.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/SecurePart.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityProperties.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/AbstractSecurityContextImpl.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/DocumentContextImpl.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/InboundSecurityContextImpl.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/OutboundSecurityContextImpl.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureInputHandler.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/DOMNamespaceContext.java
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java
    santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/LocalHttpCacheURIDereferencer.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/DSNamespaceContext.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/EmptyNamespaceTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java Thu Mar  9 10:13:28 2017
@@ -330,7 +330,7 @@ public final class DOMXMLSignature exten
 
         // traverse the Signature and register all objects with IDs that
         // may contain References
-        signatureIdMap = new HashMap<String, XMLStructure>();
+        signatureIdMap = new HashMap<>();
         signatureIdMap.put(id, this);
         signatureIdMap.put(si.getId(), si);
         List<Reference> refs = DOMSignedInfo.getSignedInfoReferences(si);

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java Thu Mar  9 10:13:28 2017
@@ -105,7 +105,7 @@ public final class DOMXPathFilter2Transf
             if (attributes != null) {
                 int length = attributes.getLength();
                 Map<String, String> namespaceMap =
-                    new HashMap<String, String>(length);
+                    new HashMap<>(length);
                 for (int i = 0; i < length; i++) {
                     Attr attr = (Attr)attributes.item(i);
                     String prefix = attr.getPrefix();

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java Thu Mar  9 10:13:28 2017
@@ -72,7 +72,7 @@ public final class DOMXPathTransform ext
         if (attributes != null) {
             int length = attributes.getLength();
             Map<String, String> namespaceMap =
-                new HashMap<String, String>(length);
+                new HashMap<>(length);
             for (int i = 0; i < length; i++) {
                 Attr attr = (Attr)attributes.item(i);
                 String prefix = attr.getPrefix();

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java Thu Mar  9 10:13:28 2017
@@ -59,7 +59,7 @@ public final class XMLDSigRI extends Pro
         /* We are the ApacheXMLDSig provider */
         super("ApacheXMLDSig", 2.10, INFO);
 
-        final Map<Object, Object> map = new HashMap<Object, Object>();
+        final Map<Object, Object> map = new HashMap<>();
         map.put("XMLSignatureFactory.DOM",
                 "org.apache.jcp.xml.dsig.internal.dom.DOMXMLSignatureFactory");
         map.put("KeyInfoFactory.DOM",

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11.java Thu Mar  9 10:13:28 2017
@@ -125,7 +125,7 @@ public abstract class Canonicalizer11 ex
                 return;
             }
 
-            Map<String, Attr> loa = new HashMap<String, Attr>();
+            Map<String, Attr> loa = new HashMap<>();
             List<Attr> baseAttrs = new ArrayList<>();
             boolean successiveOmitted = true;
             for (; size >= 0; size--) {

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java Thu Mar  9 10:13:28 2017
@@ -119,7 +119,7 @@ public abstract class Canonicalizer20010
                 return;
             }
 
-            Map<String, Attr> loa = new HashMap<String, Attr>();
+            Map<String, Attr> loa = new HashMap<>();
             for (; size >= 0; size--) {
                 e = levels.get(size);
                 Iterator<Attr> it = e.nodes.iterator();

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java Thu Mar  9 10:13:28 2017
@@ -245,7 +245,7 @@ public abstract class CanonicalizerBase
         final OutputStream writer = this.writer;
         final Node excludeNode = this.excludeNode;
         final boolean includeComments = this.includeComments;
-        Map<String, byte[]> cache = new HashMap<String, byte[]>();
+        Map<String, byte[]> cache = new HashMap<>();
         do {
             switch (currentNode.getNodeType()) {
 
@@ -400,7 +400,7 @@ public abstract class CanonicalizerBase
         Node parentNode = null;
         OutputStream writer = this.writer;
         int documentLevel = NODE_BEFORE_DOCUMENT_ELEMENT;
-        Map<String, byte[]> cache = new HashMap<String, byte[]>();
+        Map<String, byte[]> cache = new HashMap<>();
         do {
             switch (currentNode.getNodeType()) {
 

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java Thu Mar  9 10:13:28 2017
@@ -187,7 +187,7 @@ public abstract class AbstractSerializer
             outputStreamWriter.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?><dummy");
 
             // Run through each node up to the document node and find any xmlns: nodes
-            Map<String, String> storedNamespaces = new HashMap<String, String>();
+            Map<String, String> storedNamespaces = new HashMap<>();
             Node wk = ctx;
             while (wk != null) {
                 NamedNodeMap atts = wk.getAttributes();
@@ -229,7 +229,7 @@ public abstract class AbstractSerializer
         sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?><dummy");
 
         // Run through each node up to the document node and find any xmlns: nodes
-        Map<String, String> storedNamespaces = new HashMap<String, String>();
+        Map<String, String> storedNamespaces = new HashMap<>();
         Node wk = ctx;
         while (wk != null) {
             NamedNodeMap atts = wk.getAttributes();

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/encryption/XMLCipher.java Thu Mar  9 10:13:28 2017
@@ -3241,7 +3241,7 @@ public class XMLCipher {
         private class EncryptionPropertyImpl implements EncryptionProperty {
             private String target;
             private String id;
-            private Map<String, String> attributeMap = new HashMap<String, String>();
+            private Map<String, String> attributeMap = new HashMap<>();
             private List<Element> encryptionInformation;
 
             /**

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolverSpi.java Thu Mar  9 10:13:28 2017
@@ -225,7 +225,7 @@ public abstract class KeyResolverSpi {
      */
     public void engineSetProperty(String key, String value) {
         if (properties == null) {
-            properties = new HashMap<String, String>();
+            properties = new HashMap<>();
         }
         properties.put(key, value);
     }

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Manifest.java Thu Mar  9 10:13:28 2017
@@ -513,7 +513,7 @@ public class Manifest extends SignatureE
      */
     public void setResolverProperty(String key, String value) {
         if (resolverProperties == null) {
-            resolverProperties = new HashMap<String, String>(10);
+            resolverProperties = new HashMap<>(10);
         }
         this.resolverProperties.put(key, value);
     }

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/SecurityHeaderHandlerMapper.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/SecurityHeaderHandlerMapper.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/SecurityHeaderHandlerMapper.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/SecurityHeaderHandlerMapper.java Thu Mar  9 10:13:28 2017
@@ -44,7 +44,7 @@ public class SecurityHeaderHandlerMapper
     protected static synchronized void init(SecurityHeaderHandlersType securityHeaderHandlersType,
             Class<?> callingClass) throws Exception {
         List<HandlerType> handlerList = securityHeaderHandlersType.getHandler();
-        handlerClassMap = new HashMap<QName, Class<?>>(handlerList.size() + 1);
+        handlerClassMap = new HashMap<>(handlerList.size() + 1);
         for (int i = 0; i < handlerList.size(); i++) {
             HandlerType handlerType = handlerList.get(i);
             QName qName = new QName(handlerType.getURI(), handlerType.getNAME());

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java Thu Mar  9 10:13:28 2017
@@ -46,9 +46,9 @@ public class TransformerAlgorithmMapper
     protected static synchronized void init(TransformAlgorithmsType transformAlgorithms,
             Class<?> callingClass) throws Exception {
         List<TransformAlgorithmType> algorithms = transformAlgorithms.getTransformAlgorithm();
-        algorithmsClassMapInOut = new HashMap<String, Class<?>>();
-        algorithmsClassMapIn = new HashMap<String, Class<?>>();
-        algorithmsClassMapOut = new HashMap<String, Class<?>>();
+        algorithmsClassMapInOut = new HashMap<>();
+        algorithmsClassMapIn = new HashMap<>();
+        algorithmsClassMapOut = new HashMap<>();
 
         for (int i = 0; i < algorithms.size(); i++) {
             TransformAlgorithmType algorithmType = algorithms.get(i);

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/XIncludeHandler.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/XIncludeHandler.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/XIncludeHandler.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/XIncludeHandler.java Thu Mar  9 10:13:28 2017
@@ -70,7 +70,7 @@ public class XIncludeHandler extends Def
     private URL systemId;
     private boolean skipEvents = false;
 
-    Map<URI, Document> uriDocMap = new HashMap<URI, Document>();
+    Map<URI, Document> uriDocMap = new HashMap<>();
 
     public XIncludeHandler(ContentHandler contentHandler) {
         this.contentHandler = contentHandler;

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/SecurePart.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/SecurePart.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/SecurePart.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/SecurePart.java Thu Mar  9 10:13:28 2017
@@ -45,7 +45,7 @@ public class SecurePart {
             return this.modifier;
         }
 
-        private static final Map<String, Modifier> modifierMap = new HashMap<String, Modifier>();
+        private static final Map<String, Modifier> modifierMap = new HashMap<>();
 
         static {
             for (Modifier modifier : EnumSet.allOf(Modifier.class)) {

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityProperties.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityProperties.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityProperties.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityProperties.java Thu Mar  9 10:13:28 2017
@@ -73,7 +73,7 @@ public class XMLSecurityProperties {
 
     private QName idAttributeNS = XMLSecurityConstants.ATT_NULL_Id;
 
-    private final Map<String, Key> keyNameMap = new HashMap<String, Key>();
+    private final Map<String, Key> keyNameMap = new HashMap<>();
 
     private boolean signatureGenerateIds = true;
     private boolean signatureIncludeDigestTransform = true;

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/AbstractSecurityContextImpl.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/AbstractSecurityContextImpl.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/AbstractSecurityContextImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/AbstractSecurityContextImpl.java Thu Mar  9 10:13:28 2017
@@ -97,7 +97,7 @@ public class AbstractSecurityContextImpl
     public <T, U> void putAsMap(Object key, T mapKey, U mapValue) {
         Map<T, U> entry = (Map<T, U>) content.get(key);
         if (entry == null) {
-            entry = new HashMap<T, U>();
+            entry = new HashMap<>();
             content.put(key, entry);
         }
         entry.put(mapKey, mapValue);

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/DocumentContextImpl.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/DocumentContextImpl.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/DocumentContextImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/DocumentContextImpl.java Thu Mar  9 10:13:28 2017
@@ -34,7 +34,7 @@ public class DocumentContextImpl impleme
     private String encoding;
     private String baseURI;
     private final Map<Integer, XMLSecurityConstants.ContentType> contentTypeMap = new TreeMap<Integer, XMLSecurityConstants.ContentType>();
-    private final Map<Object, Integer> processorToIndexMap = new HashMap<Object, Integer>();
+    private final Map<Object, Integer> processorToIndexMap = new HashMap<>();
 
     @Override
     public String getEncoding() {

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/InboundSecurityContextImpl.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/InboundSecurityContextImpl.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/InboundSecurityContextImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/InboundSecurityContextImpl.java Thu Mar  9 10:13:28 2017
@@ -39,7 +39,7 @@ public class InboundSecurityContextImpl
 
     private static final Boolean allowMD5Algorithm = Boolean.valueOf(ConfigurationProperties.getProperty("AllowMD5Algorithm"));
     private final Map<String, SecurityTokenProvider<? extends InboundSecurityToken>> securityTokenProviders =
-            new HashMap<String, SecurityTokenProvider<? extends InboundSecurityToken>>();
+            new HashMap<>();
 
     @Override
     protected void forwardSecurityEvent(SecurityEvent securityEvent) throws XMLSecurityException {

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/OutboundSecurityContextImpl.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/OutboundSecurityContextImpl.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/OutboundSecurityContextImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/OutboundSecurityContextImpl.java Thu Mar  9 10:13:28 2017
@@ -36,7 +36,7 @@ import java.util.Map;
 public class OutboundSecurityContextImpl extends AbstractSecurityContextImpl implements OutboundSecurityContext {
 
     private final Map<String, SecurityTokenProvider<OutboundSecurityToken>> securityTokenProviders =
-            new HashMap<String, SecurityTokenProvider<OutboundSecurityToken>>();
+            new HashMap<>();
 
     @Override
     public void registerSecurityTokenProvider(String id, SecurityTokenProvider<OutboundSecurityToken> securityTokenProvider) {

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java Thu Mar  9 10:13:28 2017
@@ -96,7 +96,7 @@ public abstract class AbstractDecryptInp
         this.keyInfoType = keyInfoType;
 
         final List<JAXBElement<ReferenceType>> dataReferenceOrKeyReference = referenceList.getDataReferenceOrKeyReference();
-        references = new HashMap<String, ReferenceType>(dataReferenceOrKeyReference.size() + 1); //+1 because the HashMap will resize otherwise
+        references = new HashMap<>(dataReferenceOrKeyReference.size() + 1); //+1 because the HashMap will resize otherwise
         processedReferences = new ArrayList<>(dataReferenceOrKeyReference.size());
 
         Iterator<JAXBElement<ReferenceType>> referenceTypeIterator = dataReferenceOrKeyReference.iterator();

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureInputHandler.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureInputHandler.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureInputHandler.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureInputHandler.java Thu Mar  9 10:13:28 2017
@@ -321,7 +321,7 @@ public abstract class AbstractSignatureI
 
                 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: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java Thu Mar  9 10:13:28 2017
@@ -366,7 +366,7 @@ public abstract class AbstractSignatureR
 
             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: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java Thu Mar  9 10:13:28 2017
@@ -276,7 +276,7 @@ public abstract class AbstractSignatureE
                 }
                 this.inclusiveNamespacePrefixes = prefixes.toString();
 
-                transformerProperties = new HashMap<String, Object>(2);
+                transformerProperties = new HashMap<>(2);
                 transformerProperties.put(
                         Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST, new ArrayList<>(prefixSet));
             }

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java Thu Mar  9 10:13:28 2017
@@ -227,7 +227,7 @@ public abstract class AbstractSignatureO
                 }
                 signaturePartDef.setInclusiveNamespacesPrefixes(prefixes.toString());
                 List<String> inclusiveNamespacePrefixes = new ArrayList<>(prefixSet);
-                transformerProperties = new HashMap<String, Object>();
+                transformerProperties = new HashMap<>();
                 transformerProperties.put(
                         Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST, inclusiveNamespacePrefixes);
             }

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/DOMNamespaceContext.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/DOMNamespaceContext.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/DOMNamespaceContext.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/DOMNamespaceContext.java Thu Mar  9 10:13:28 2017
@@ -34,7 +34,7 @@ import org.w3c.dom.Node;
  */
 public class DOMNamespaceContext implements NamespaceContext {
 
-    private Map<String, String> namespaceMap = new HashMap<String, String>();
+    private Map<String, String> namespaceMap = new HashMap<>();
 
     public DOMNamespaceContext(Node contextNode) {
         addNamespaces(contextNode);

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolverSpi.java Thu Mar  9 10:13:28 2017
@@ -55,7 +55,7 @@ public abstract class ResourceResolverSp
      */
     public void engineSetProperty(String key, String value) {
         if (properties == null) {
-            properties = new HashMap<String, String>();
+            properties = new HashMap<>();
         }
         properties.put(key, value);
     }
@@ -80,7 +80,7 @@ public abstract class ResourceResolverSp
     public void engineAddProperies(Map<String, String> newProperties) {
         if (newProperties != null && !newProperties.isEmpty()) {
             if (properties == null) {
-                properties = new HashMap<String, String>();
+                properties = new HashMap<>();
             }
             properties.putAll(newProperties);
         }

Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/LocalHttpCacheURIDereferencer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/LocalHttpCacheURIDereferencer.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/LocalHttpCacheURIDereferencer.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/LocalHttpCacheURIDereferencer.java Thu Mar  9 10:13:28 2017
@@ -48,7 +48,7 @@ public class LocalHttpCacheURIDereferenc
         String base = BASEDIR == null ? "./": BASEDIR;
         File dir = new File(base + FS + "src/test/resources" + FS + "javax" +
             FS + "xml" + FS + "crypto" + FS + "dsig");
-        uriMap = new HashMap<String, File>();
+        uriMap = new HashMap<>();
         uriMap.put("http://www.w3.org/TR/xml-stylesheet",
                    new File(dir, "xml-stylesheet"));
         uriMap.put("http://www.w3.org/Signature/2002/04/xml-stylesheet.b64",

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/DSNamespaceContext.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/DSNamespaceContext.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/DSNamespaceContext.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/DSNamespaceContext.java Thu Mar  9 10:13:28 2017
@@ -30,7 +30,7 @@ import javax.xml.namespace.NamespaceCont
 public class DSNamespaceContext implements NamespaceContext {
 
     private Map<String, String> namespaceMap =
-        new HashMap<String, String>();
+        new HashMap<>();
 
     public DSNamespaceContext() {
         namespaceMap.put("ds", "http://www.w3.org/2000/09/xmldsig#");

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer11Test.java Thu Mar  9 10:13:28 2017
@@ -276,7 +276,7 @@ public class Canonicalizer11Test extends
         String c14nURI = Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS;
         boolean validating = true;
 
-        Map<String, String> namespace = new HashMap<String, String>();
+        Map<String, String> namespace = new HashMap<>();
         namespace.put("ietf", "http://www.ietf.org");
         String xpath =
             "(//. | //@* | //namespace::*)"
@@ -314,7 +314,7 @@ public class Canonicalizer11Test extends
         String c14nURI = Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS;
         boolean validating = true;
 
-        Map<String, String> namespace = new HashMap<String, String>();
+        Map<String, String> namespace = new HashMap<>();
         namespace.put("ietf", "http://www.ietf.org");
         String xpath =
             "(//. | //@* | //namespace::*)"
@@ -338,7 +338,7 @@ public class Canonicalizer11Test extends
                                ) throws IOException, FileNotFoundException, SAXException,
                                    ParserConfigurationException, CanonicalizationException,
                                    InvalidCanonicalizerException, TransformerException, XPathExpressionException {
-        Map<String, String> namespace = new HashMap<String, String>();
+        Map<String, String> namespace = new HashMap<>();
         return c14nAndCompare(fileIn, fileRef, fileOut,
             c14nURI, validating, xpath, namespace);
     }

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315Test.java Thu Mar  9 10:13:28 2017
@@ -569,7 +569,7 @@ public class Canonicalizer20010315Test e
         String c14nURI = Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
         boolean validating = true;
 
-        Map<String, String> namespace = new HashMap<String, String>();
+        Map<String, String> namespace = new HashMap<>();
         namespace.put("ietf", "http://www.ietf.org");
         String xpath =
             "(//. | //@* | //namespace::*)"
@@ -622,7 +622,7 @@ public class Canonicalizer20010315Test e
             + "count(id(\"E3\")|ancestor-or-self::node()) = count(ancestor-or-self::node()) "
             + "]";
 
-        Map<String, String> namespace = new HashMap<String, String>();
+        Map<String, String> namespace = new HashMap<>();
         namespace.put("ietf", "http://www.ietf.org");
 
         XPathFactory xpf = XPathFactory.newInstance();
@@ -1025,7 +1025,7 @@ public class Canonicalizer20010315Test e
                                ) throws IOException, FileNotFoundException, SAXException,
                                    ParserConfigurationException, CanonicalizationException,
                                    InvalidCanonicalizerException, TransformerException, XPathExpressionException {
-        Map<String, String> namespace = new HashMap<String, String>();
+        Map<String, String> namespace = new HashMap<>();
         return c14nAndCompare(fileIn, fileRef, fileOut,
             c14nURI, validating, xpath, namespace);
     }

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/BaltimoreEncTest.java Thu Mar  9 10:13:28 2017
@@ -575,7 +575,7 @@ public class BaltimoreEncTest extends or
 
         XPathFactory xpf = XPathFactory.newInstance();
         XPath xpath = xpf.newXPath();
-        Map<String, String> namespace = new HashMap<String, String>();
+        Map<String, String> namespace = new HashMap<>();
         namespace.put("x", "urn:example:po");
         DSNamespaceContext context = new DSNamespaceContext(namespace);
         xpath.setNamespaceContext(context);

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java Thu Mar  9 10:13:28 2017
@@ -727,7 +727,7 @@ public class XMLEncryption11Test extends
 
         XPathFactory xpf = XPathFactory.newInstance();
         XPath xpath = xpf.newXPath();
-        Map<String, String> namespace = new HashMap<String, String>();
+        Map<String, String> namespace = new HashMap<>();
         namespace.put("x", "urn:example:po");
         DSNamespaceContext context = new DSNamespaceContext(namespace);
         xpath.setNamespaceContext(context);

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/XPointerResourceResolver.java Thu Mar  9 10:13:28 2017
@@ -120,7 +120,7 @@ public class XPointerResourceResolver ex
         String parts[] = xpURI.substring(1).split("\\s");
 
         int i = 0;
-        Map<String, String> namespaces = new HashMap<String, String>();
+        Map<String, String> namespaces = new HashMap<>();
 
         if (parts.length > 1) {
 

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/EmptyNamespaceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/EmptyNamespaceTest.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/EmptyNamespaceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/transforms/EmptyNamespaceTest.java Thu Mar  9 10:13:28 2017
@@ -72,7 +72,7 @@ public class EmptyNamespaceTest {
 
         List<String> inclusiveNamespaces = Arrays.asList("SOAP-ENV ec ec1 ns0 ns1 ns11 ns2 ns4 ns9".split(" "));
         Canonicalizer20010315_Excl transformer = new Canonicalizer20010315_ExclOmitCommentsTransformer();
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put(Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST, inclusiveNamespaces);
 
         transformer.setProperties(properties);

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/utils/resolver/OfflineResolver.java Thu Mar  9 10:13:28 2017
@@ -55,8 +55,8 @@ public class OfflineResolver extends Res
     static {
         org.apache.xml.security.Init.init();
 
-        _uriMap = new HashMap<String, String>();
-        _mimeMap = new HashMap<String, String>();
+        _uriMap = new HashMap<>();
+        _mimeMap = new HashMap<>();
 
         String basedir =
             System.getProperty("basedir") == null ? "./": System.getProperty("basedir") + "/";

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/c14n/Canonicalizer20010315ExclusiveTest.java Thu Mar  9 10:13:28 2017
@@ -216,7 +216,7 @@ public class Canonicalizer20010315Exclus
         inclusiveNamespaces.add("xsi");
         inclusiveNamespaces.add("wsu");
         Canonicalizer20010315_ExclOmitCommentsTransformer c = new Canonicalizer20010315_ExclOmitCommentsTransformer();
-        Map<String, Object> transformerProperties = new HashMap<String, Object>();
+        Map<String, Object> transformerProperties = new HashMap<>();
         transformerProperties.put(Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST, inclusiveNamespaces);
         c.setProperties(transformerProperties);
         c.setOutputStream(baos);
@@ -253,7 +253,7 @@ public class Canonicalizer20010315Exclus
         List<String> inclusiveNamespaces = new ArrayList<>();
         Canonicalizer20010315_ExclWithCommentsTransformer c =
                 new Canonicalizer20010315_ExclWithCommentsTransformer();
-        Map<String, Object> transformerProperties = new HashMap<String, Object>();
+        Map<String, Object> transformerProperties = new HashMap<>();
         transformerProperties.put(Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST, inclusiveNamespaces);
         c.setProperties(transformerProperties);
         c.setOutputStream(baos);
@@ -306,7 +306,7 @@ public class Canonicalizer20010315Exclus
             inclusiveNamespaces.add("#default");
             inclusiveNamespaces.add("xsi");
             Canonicalizer20010315_ExclOmitCommentsTransformer c = new Canonicalizer20010315_ExclOmitCommentsTransformer();
-            Map<String, Object> transformerProperties = new HashMap<String, Object>();
+            Map<String, Object> transformerProperties = new HashMap<>();
             transformerProperties.put(Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST, inclusiveNamespaces);
             c.setProperties(transformerProperties);
             c.setOutputStream(baos);
@@ -321,7 +321,7 @@ public class Canonicalizer20010315Exclus
             List<String> inclusiveNamespaces = new ArrayList<>();
             inclusiveNamespaces.add("xsi");
             Canonicalizer20010315_ExclOmitCommentsTransformer c = new Canonicalizer20010315_ExclOmitCommentsTransformer();
-            Map<String, Object> transformerProperties = new HashMap<String, Object>();
+            Map<String, Object> transformerProperties = new HashMap<>();
             transformerProperties.put(Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST, inclusiveNamespaces);
             c.setProperties(transformerProperties);
             c.setOutputStream(baos);
@@ -382,7 +382,7 @@ public class Canonicalizer20010315Exclus
             inclusiveNamespaces.add("#default");
             inclusiveNamespaces.add("xsi");
             Canonicalizer20010315_ExclOmitCommentsTransformer c = new Canonicalizer20010315_ExclOmitCommentsTransformer();
-            Map<String, Object> transformerProperties = new HashMap<String, Object>();
+            Map<String, Object> transformerProperties = new HashMap<>();
             transformerProperties.put(Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST, inclusiveNamespaces);
             c.setProperties(transformerProperties);
             c.setOutputStream(baos);
@@ -395,7 +395,7 @@ public class Canonicalizer20010315Exclus
             List<String> inclusiveNamespaces = new ArrayList<>();
             inclusiveNamespaces.add("xsi");
             Canonicalizer20010315_ExclOmitCommentsTransformer c = new Canonicalizer20010315_ExclOmitCommentsTransformer();
-            Map<String, Object> transformerProperties = new HashMap<String, Object>();
+            Map<String, Object> transformerProperties = new HashMap<>();
             transformerProperties.put(Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST, inclusiveNamespaces);
             c.setProperties(transformerProperties);
             c.setOutputStream(baos);
@@ -444,7 +444,7 @@ public class Canonicalizer20010315Exclus
             inclusiveNamespaces.add("#default");
             inclusiveNamespaces.add("xsi");
             Canonicalizer20010315_ExclOmitCommentsTransformer c = new Canonicalizer20010315_ExclOmitCommentsTransformer();
-            Map<String, Object> transformerProperties = new HashMap<String, Object>();
+            Map<String, Object> transformerProperties = new HashMap<>();
             transformerProperties.put(Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST, inclusiveNamespaces);
             c.setProperties(transformerProperties);
             c.setOutputStream(baos);
@@ -458,7 +458,7 @@ public class Canonicalizer20010315Exclus
             List<String> inclusiveNamespaces = new ArrayList<>();
             inclusiveNamespaces.add("xsi");
             Canonicalizer20010315_ExclOmitCommentsTransformer c = new Canonicalizer20010315_ExclOmitCommentsTransformer();
-            Map<String, Object> transformerProperties = new HashMap<String, Object>();
+            Map<String, Object> transformerProperties = new HashMap<>();
             transformerProperties.put(Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST, inclusiveNamespaces);
             c.setProperties(transformerProperties);
             c.setOutputStream(baos);
@@ -507,7 +507,7 @@ public class Canonicalizer20010315Exclus
             inclusiveNamespaces.add("#default");
             inclusiveNamespaces.add("xsi");
             Canonicalizer20010315_ExclOmitCommentsTransformer c = new Canonicalizer20010315_ExclOmitCommentsTransformer();
-            Map<String, Object> transformerProperties = new HashMap<String, Object>();
+            Map<String, Object> transformerProperties = new HashMap<>();
             transformerProperties.put(Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST, inclusiveNamespaces);
             c.setProperties(transformerProperties);
             c.setOutputStream(baos);
@@ -521,7 +521,7 @@ public class Canonicalizer20010315Exclus
             List<String> inclusiveNamespaces = new ArrayList<>();
             inclusiveNamespaces.add("xsi");
             Canonicalizer20010315_ExclOmitCommentsTransformer c = new Canonicalizer20010315_ExclOmitCommentsTransformer();
-            Map<String, Object> transformerProperties = new HashMap<String, Object>();
+            Map<String, Object> transformerProperties = new HashMap<>();
             transformerProperties.put(Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST, inclusiveNamespaces);
             c.setProperties(transformerProperties);
             c.setOutputStream(baos);
@@ -567,7 +567,7 @@ public class Canonicalizer20010315Exclus
         List<String> inclusiveNamespaces = new ArrayList<>();
         inclusiveNamespaces.add("#default");
         Canonicalizer20010315_ExclOmitCommentsTransformer c = new Canonicalizer20010315_ExclOmitCommentsTransformer();
-        Map<String, Object> transformerProperties = new HashMap<String, Object>();
+        Map<String, Object> transformerProperties = new HashMap<>();
         transformerProperties.put(Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST, inclusiveNamespaces);
         transformerProperties.put(Canonicalizer20010315_Excl.PROPAGATE_DEFAULT_NAMESPACE, Boolean.TRUE);
         c.setProperties(transformerProperties);
@@ -609,7 +609,7 @@ public class Canonicalizer20010315Exclus
         List<String> inclusiveNamespaces = new ArrayList<>();
         inclusiveNamespaces.add("#default");
         Canonicalizer20010315_ExclOmitCommentsTransformer c = new Canonicalizer20010315_ExclOmitCommentsTransformer();
-        Map<String, Object> transformerProperties = new HashMap<String, Object>();
+        Map<String, Object> transformerProperties = new HashMap<>();
         transformerProperties.put(Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST, inclusiveNamespaces);
         transformerProperties.put(Canonicalizer20010315_Excl.PROPAGATE_DEFAULT_NAMESPACE, Boolean.TRUE);
         c.setProperties(transformerProperties);
@@ -651,7 +651,7 @@ public class Canonicalizer20010315Exclus
         List<String> inclusiveNamespaces = new ArrayList<>();
         inclusiveNamespaces.add("#default");
         Canonicalizer20010315_ExclOmitCommentsTransformer c = new Canonicalizer20010315_ExclOmitCommentsTransformer();
-        Map<String, Object> transformerProperties = new HashMap<String, Object>();
+        Map<String, Object> transformerProperties = new HashMap<>();
         transformerProperties.put(Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST, inclusiveNamespaces);
         transformerProperties.put(Canonicalizer20010315_Excl.PROPAGATE_DEFAULT_NAMESPACE, Boolean.TRUE);
         c.setProperties(transformerProperties);
@@ -693,7 +693,7 @@ public class Canonicalizer20010315Exclus
         List<String> inclusiveNamespaces = new ArrayList<>();
         inclusiveNamespaces.add("#default");
         Canonicalizer20010315_ExclOmitCommentsTransformer c = new Canonicalizer20010315_ExclOmitCommentsTransformer();
-        Map<String, Object> transformerProperties = new HashMap<String, Object>();
+        Map<String, Object> transformerProperties = new HashMap<>();
         transformerProperties.put(Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST, inclusiveNamespaces);
         transformerProperties.put(Canonicalizer20010315_Excl.PROPAGATE_DEFAULT_NAMESPACE, Boolean.TRUE);
         c.setProperties(transformerProperties);
@@ -730,7 +730,7 @@ public class Canonicalizer20010315Exclus
         List<String> inclusiveNamespaces = new ArrayList<>();
         inclusiveNamespaces.add("#default");
         Canonicalizer20010315_ExclOmitCommentsTransformer c = new Canonicalizer20010315_ExclOmitCommentsTransformer();
-        Map<String, Object> transformerProperties = new HashMap<String, Object>();
+        Map<String, Object> transformerProperties = new HashMap<>();
         transformerProperties.put(Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST, inclusiveNamespaces);
         transformerProperties.put(Canonicalizer20010315_Excl.PROPAGATE_DEFAULT_NAMESPACE, Boolean.TRUE);
         c.setProperties(transformerProperties);

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java Thu Mar  9 10:13:28 2017
@@ -467,7 +467,7 @@ public class BaltimoreEncTest extends or
 
         XPathFactory xpf = XPathFactory.newInstance();
         XPath xpath = xpf.newXPath();
-        Map<String, String> namespace = new HashMap<String, String>();
+        Map<String, String> namespace = new HashMap<>();
         namespace.put("x", "urn:example:po");
         DSNamespaceContext context = new DSNamespaceContext(namespace);
         xpath.setNamespaceContext(context);

Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java?rev=1786125&r1=1786124&r2=1786125&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java Thu Mar  9 10:13:28 2017
@@ -629,7 +629,7 @@ public class XMLEncryption11Test extends
 
         XPathFactory xpf = XPathFactory.newInstance();
         XPath xpath = xpf.newXPath();
-        Map<String, String> namespace = new HashMap<String, String>();
+        Map<String, String> namespace = new HashMap<>();
         namespace.put("x", "urn:example:po");
         DSNamespaceContext context = new DSNamespaceContext(namespace);
         xpath.setNamespaceContext(context);