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/02/10 14:18:18 UTC
svn commit: r1782475 [2/3] - in /santuario/xml-security-java/trunk/src:
main/java/org/apache/jcp/xml/dsig/internal/dom/
main/java/org/apache/xml/security/
main/java/org/apache/xml/security/algorithms/implementations/
main/java/org/apache/xml/security/c...
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=1782475&r1=1782474&r2=1782475&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 Fri Feb 10 14:18:16 2017
@@ -51,7 +51,7 @@ public abstract class AbstractSignatureO
private static final transient Logger log = LoggerFactory.getLogger(AbstractSignatureOutputProcessor.class);
- private final List<SignaturePartDef> signaturePartDefList = new ArrayList<SignaturePartDef>();
+ private final List<SignaturePartDef> signaturePartDefList = new ArrayList<>();
private InternalSignatureOutputProcessor activeInternalSignatureOutputProcessor = null;
public AbstractSignatureOutputProcessor() throws XMLSecurityException {
@@ -228,7 +228,7 @@ public abstract class AbstractSignatureO
prefixes.append(prefix);
}
signaturePartDef.setInclusiveNamespacesPrefixes(prefixes.toString());
- List<String> inclusiveNamespacePrefixes = new ArrayList<String>(prefixSet);
+ List<String> inclusiveNamespacePrefixes = new ArrayList<>(prefixSet);
transformerProperties = new HashMap<String, Object>();
transformerProperties.put(
Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST, inclusiveNamespacePrefixes);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLEncryptOutputProcessor.java Fri Feb 10 14:18:16 2017
@@ -139,12 +139,12 @@ public class XMLEncryptOutputProcessor e
createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_KeyInfo, true, null);
- List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(1);
+ List<XMLSecAttribute> attributes = new ArrayList<>(1);
String keyId = IDGenerator.generateID("EK");
attributes.add(createAttribute(XMLSecurityConstants.ATT_NULL_Id, keyId));
createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_xenc_EncryptedKey, true, attributes);
- attributes = new ArrayList<XMLSecAttribute>(1);
+ attributes = new ArrayList<>(1);
attributes.add(createAttribute(XMLSecurityConstants.ATT_NULL_Algorithm, encryptionKeyTransportAlgorithm));
createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_xenc_EncryptionMethod, false, attributes);
@@ -162,14 +162,14 @@ public class XMLEncryptOutputProcessor e
}
if (encryptionKeyTransportDigestAlgorithm != null) {
- attributes = new ArrayList<XMLSecAttribute>(1);
+ attributes = new ArrayList<>(1);
attributes.add(createAttribute(XMLSecurityConstants.ATT_NULL_Algorithm, encryptionKeyTransportDigestAlgorithm));
createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig_DigestMethod, true, attributes);
createEndElementAndOutputAsEvent(outputProcessorChain, 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(outputProcessorChain, XMLSecurityConstants.TAG_xenc11_MGF, true, attributes);
createEndElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_xenc11_MGF);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureEndingOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureEndingOutputProcessor.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureEndingOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureEndingOutputProcessor.java Fri Feb 10 14:18:16 2017
@@ -169,12 +169,12 @@ public class XMLSignatureEndingOutputPro
continue;
}
- List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(1);
+ List<XMLSecAttribute> attributes = new ArrayList<>(1);
attributes.add(createAttribute(XMLSecurityConstants.ATT_NULL_Algorithm, transform));
createStartElementAndOutputAsEvent(subOutputProcessorChain, XMLSecurityConstants.TAG_dsig_Transform, false, attributes);
if (getSecurityProperties().isAddExcC14NInclusivePrefixes()) {
- 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);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureOutputProcessor.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureOutputProcessor.java Fri Feb 10 14:18:16 2017
@@ -91,7 +91,7 @@ public class XMLSignatureOutputProcessor
if (attribute != null) {
signaturePartDef.setSigRefId(attribute.getValue());
} else {
- List<XMLSecAttribute> attributeList = new ArrayList<XMLSecAttribute>(1);
+ List<XMLSecAttribute> attributeList = new ArrayList<>(1);
attributeList.add(createAttribute(securityProperties.getIdAttributeNS(), signaturePartDef.getSigRefId()));
xmlSecEvent = addAttributes(xmlSecStartElement, attributeList);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractInboundSecurityToken.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractInboundSecurityToken.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractInboundSecurityToken.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractInboundSecurityToken.java Fri Feb 10 14:18:16 2017
@@ -51,7 +51,7 @@ public abstract class AbstractInboundSec
private List<QName> elementPath;
private XMLSecEvent xmlSecEvent;
private SecurityTokenConstants.KeyIdentifier keyIdentifier;
- private final List<InboundSecurityToken> wrappedTokens = new ArrayList<InboundSecurityToken>();
+ private final List<InboundSecurityToken> wrappedTokens = new ArrayList<>();
private InboundSecurityToken keyWrappingToken;
private boolean includedInMessage = false;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/GenericOutboundSecurityToken.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/GenericOutboundSecurityToken.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/GenericOutboundSecurityToken.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/GenericOutboundSecurityToken.java Fri Feb 10 14:18:16 2017
@@ -39,7 +39,7 @@ public class GenericOutboundSecurityToke
private SecurityTokenConstants.TokenType tokenType;
private Object processor;
- private final List<OutboundSecurityToken> wrappedTokens = new ArrayList<OutboundSecurityToken>();
+ private final List<OutboundSecurityToken> wrappedTokens = new ArrayList<>();
private OutboundSecurityToken keyWrappingToken;
private Element customTokenReference;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEventBaseImpl.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEventBaseImpl.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEventBaseImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEventBaseImpl.java Fri Feb 10 14:18:16 2017
@@ -73,7 +73,7 @@ public abstract class XMLSecEventBaseImp
@Override
public List<QName> getElementPath() {
- final List<QName> elementPath = new ArrayList<QName>();
+ final List<QName> elementPath = new ArrayList<>();
getElementPath(elementPath);
return elementPath;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartElementImpl.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartElementImpl.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartElementImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartElementImpl.java Fri Feb 10 14:18:16 2017
@@ -56,10 +56,10 @@ public class XMLSecStartElementImpl exte
public XMLSecStartElementImpl(QName elementName, Collection<XMLSecAttribute> attributes, Collection<XMLSecNamespace> namespaces) {
this.elementName = elementName;
if (attributes != null && !attributes.isEmpty()) {
- this.attributes = new ArrayList<XMLSecAttribute>(attributes);
+ this.attributes = new ArrayList<>(attributes);
}
if (namespaces != null && !namespaces.isEmpty()) {
- this.namespaces = new ArrayList<XMLSecNamespace>(namespaces);
+ this.namespaces = new ArrayList<>(namespaces);
}
}
@@ -100,7 +100,7 @@ public class XMLSecStartElementImpl exte
@Override
public void addAttribute(XMLSecAttribute xmlSecAttribute) {
if (this.attributes == Collections.<XMLSecAttribute>emptyList()) {
- this.attributes = new ArrayList<XMLSecAttribute>(1);
+ this.attributes = new ArrayList<>(1);
}
this.attributes.add(xmlSecAttribute);
}
@@ -152,7 +152,7 @@ public class XMLSecStartElementImpl exte
@Override
public void addNamespace(XMLSecNamespace xmlSecNamespace) {
if (this.namespaces == Collections.<XMLSecNamespace>emptyList()) {
- this.namespaces = new ArrayList<XMLSecNamespace>(1);
+ this.namespaces = new ArrayList<>(1);
}
this.namespaces.add(xmlSecNamespace);
}
@@ -203,9 +203,9 @@ public class XMLSecStartElementImpl exte
@Override
public Iterator getPrefixes(String namespaceURI) {
- Set<String> prefixes = new HashSet<String>();
+ Set<String> prefixes = new HashSet<>();
- List<XMLSecNamespace> xmlSecNamespaces = new ArrayList<XMLSecNamespace>();
+ List<XMLSecNamespace> xmlSecNamespaces = new ArrayList<>();
getNamespacesFromCurrentScope(xmlSecNamespaces);
for (int i = 0; i < xmlSecNamespaces.size(); i++) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11.java Fri Feb 10 14:18:16 2017
@@ -40,7 +40,7 @@ public class Canonicalizer11 extends Can
List<XMLSecAttribute> utilizedAttributes = Collections.emptyList();
- List<XMLSecAttribute> visibleAttributes = new ArrayList<XMLSecAttribute>();
+ List<XMLSecAttribute> visibleAttributes = new ArrayList<>();
xmlSecStartElement.getAttributesFromCurrentScope(visibleAttributes);
for (int i = 0; i < visibleAttributes.size(); i++) {
XMLSecAttribute comparableAttribute = visibleAttributes.get(i);
@@ -57,7 +57,7 @@ public class Canonicalizer11 extends Can
continue;
}
if (utilizedAttributes == Collections.<XMLSecAttribute>emptyList()) {
- utilizedAttributes = new ArrayList<XMLSecAttribute>(2);
+ utilizedAttributes = new ArrayList<>(2);
}
utilizedAttributes.add(comparableAttribute);
outputStack.peek().add(comparableAttribute);
@@ -73,7 +73,7 @@ public class Canonicalizer11 extends Can
continue;
}
if (utilizedAttributes == Collections.<XMLSecAttribute>emptyList()) {
- utilizedAttributes = new ArrayList<XMLSecAttribute>(2);
+ utilizedAttributes = new ArrayList<>(2);
}
utilizedAttributes.add(comparableAttribute);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java Fri Feb 10 14:18:16 2017
@@ -55,7 +55,7 @@ public abstract class Canonicalizer20010
return null;
}
- final List<String> prefixes = new ArrayList<String>(inclusiveNamespaces.size());
+ final List<String> prefixes = new ArrayList<>(inclusiveNamespaces.size());
for (int i = 0; i < inclusiveNamespaces.size(); i++) {
final String s = inclusiveNamespaces.get(i).intern();
@@ -77,7 +77,7 @@ public abstract class Canonicalizer20010
final XMLSecNamespace found = (XMLSecNamespace) outputStack.containsOnStack(elementNamespace);
//found means the prefix matched. so check the ns further
if (found == null || found.getNamespaceURI() == null || !found.getNamespaceURI().equals(elementNamespace.getNamespaceURI())) {
- utilizedNamespaces = new ArrayList<XMLSecNamespace>(2);
+ utilizedNamespaces = new ArrayList<>(2);
utilizedNamespaces.add(elementNamespace);
outputStack.peek().add(elementNamespace);
}
@@ -98,7 +98,7 @@ public abstract class Canonicalizer20010
|| !resultNamespace.getNamespaceURI().equals(attributeNamespace.getNamespaceURI())) {
if (utilizedNamespaces == Collections.<XMLSecNamespace>emptyList()) {
- utilizedNamespaces = new ArrayList<XMLSecNamespace>(2);
+ utilizedNamespaces = new ArrayList<>(2);
}
utilizedNamespaces.add(attributeNamespace);
outputStack.peek().add(attributeNamespace);
@@ -124,7 +124,7 @@ public abstract class Canonicalizer20010
|| firstCall && propagateDefaultNamespace && !utilizedNamespaces.contains(comparableNamespace)) {
if (utilizedNamespaces == Collections.<XMLSecNamespace>emptyList()) {
- utilizedNamespaces = new ArrayList<XMLSecNamespace>(2);
+ utilizedNamespaces = new ArrayList<>(2);
}
utilizedNamespaces.add(comparableNamespace);
outputStack.peek().add(comparableNamespace);
@@ -149,7 +149,7 @@ public abstract class Canonicalizer20010
for (int i = 0; i < comparableAttributes.size(); i++) {
XMLSecAttribute comparableAttribute = comparableAttributes.get(i);
if (utilizedAttributes == Collections.<XMLSecAttribute>emptyList()) {
- utilizedAttributes = new ArrayList<XMLSecAttribute>(2);
+ utilizedAttributes = new ArrayList<>(2);
}
utilizedAttributes.add(comparableAttribute);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java Fri Feb 10 14:18:16 2017
@@ -99,7 +99,7 @@ public abstract class CanonicalizerBase
if (found == null || found.getNamespaceURI() == null
|| !found.getNamespaceURI().equals(elementNamespace.getNamespaceURI())) {
- utilizedNamespaces = new ArrayList<XMLSecNamespace>(2);
+ utilizedNamespaces = new ArrayList<>(2);
utilizedNamespaces.add(elementNamespace);
outputStack.peek().add(elementNamespace);
}
@@ -115,7 +115,7 @@ public abstract class CanonicalizerBase
}
if (utilizedNamespaces == Collections.<XMLSecNamespace>emptyList()) {
- utilizedNamespaces = new ArrayList<XMLSecNamespace>(2);
+ utilizedNamespaces = new ArrayList<>(2);
}
utilizedNamespaces.add(comparableNamespace);
outputStack.peek().add(comparableNamespace);
@@ -137,7 +137,7 @@ public abstract class CanonicalizerBase
|| !resultNamespace.getNamespaceURI().equals(attributeNamespace.getNamespaceURI())) {
if (utilizedNamespaces == Collections.<XMLSecNamespace>emptyList()) {
- utilizedNamespaces = new ArrayList<XMLSecNamespace>(2);
+ utilizedNamespaces = new ArrayList<>(2);
}
utilizedNamespaces.add(attributeNamespace);
outputStack.peek().add(attributeNamespace);
@@ -154,14 +154,14 @@ public abstract class CanonicalizerBase
return Collections.emptyList();
}
- return new ArrayList<XMLSecAttribute>(comparableAttributes);
+ return new ArrayList<>(comparableAttributes);
}
protected List<XMLSecNamespace> getInitialUtilizedNamespaces(final XMLSecStartElement xmlSecStartElement,
final C14NStack<XMLSecEvent> outputStack) {
- final List<XMLSecNamespace> utilizedNamespaces = new ArrayList<XMLSecNamespace>();
- List<XMLSecNamespace> visibleNamespaces = new ArrayList<XMLSecNamespace>();
+ final List<XMLSecNamespace> utilizedNamespaces = new ArrayList<>();
+ List<XMLSecNamespace> visibleNamespaces = new ArrayList<>();
xmlSecStartElement.getNamespacesFromCurrentScope(visibleNamespaces);
for (int i = 0; i < visibleNamespaces.size(); i++) {
XMLSecNamespace comparableNamespace = visibleNamespaces.get(i);
@@ -190,7 +190,7 @@ public abstract class CanonicalizerBase
List<XMLSecAttribute> utilizedAttributes = Collections.emptyList();
- List<XMLSecAttribute> comparableAttributes = new ArrayList<XMLSecAttribute>();
+ List<XMLSecAttribute> comparableAttributes = new ArrayList<>();
xmlSecStartElement.getAttributesFromCurrentScope(comparableAttributes);
for (int i = 0; i < comparableAttributes.size(); i++) {
XMLSecAttribute comparableAttribute = comparableAttributes.get(i);
@@ -201,7 +201,7 @@ public abstract class CanonicalizerBase
continue;
}
if (utilizedAttributes == Collections.<XMLSecAttribute>emptyList()) {
- utilizedAttributes = new ArrayList<XMLSecAttribute>(2);
+ utilizedAttributes = new ArrayList<>(2);
}
utilizedAttributes.add(comparableAttribute);
outputStack.peek().add(comparableAttribute);
@@ -217,7 +217,7 @@ public abstract class CanonicalizerBase
continue;
}
if (utilizedAttributes == Collections.<XMLSecAttribute>emptyList()) {
- utilizedAttributes = new ArrayList<XMLSecAttribute>(2);
+ utilizedAttributes = new ArrayList<>(2);
}
utilizedAttributes.add(comparableAttribute);
}
@@ -253,8 +253,8 @@ public abstract class CanonicalizerBase
final List<XMLSecAttribute> utilizedAttributes;
if (firstCall) {
- utilizedNamespaces = new ArrayList<XMLSecNamespace>();
- utilizedAttributes = new ArrayList<XMLSecAttribute>();
+ utilizedNamespaces = new ArrayList<>();
+ utilizedAttributes = new ArrayList<>();
outputStack.peek().add(XMLSecEventFactory.createXMLSecNamespace(null, ""));
outputStack.push(Collections.<Comparable>emptyList());
@@ -663,7 +663,7 @@ public abstract class CanonicalizerBase
List<Comparable> list = super.peekFirst();
if (list == Collections.<Comparable>emptyList()) {
super.removeFirst();
- list = new ArrayList<Comparable>();
+ list = new ArrayList<>();
super.addFirst(list);
}
return list;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityEvent/AbstractElementSecurityEvent.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityEvent/AbstractElementSecurityEvent.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityEvent/AbstractElementSecurityEvent.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityEvent/AbstractElementSecurityEvent.java Fri Feb 10 14:18:16 2017
@@ -42,7 +42,7 @@ public abstract class AbstractElementSec
}
public void setElementPath(List<QName> elementPath) {
- this.elementPath = new ArrayList<QName>(elementPath);
+ this.elementPath = new ArrayList<>(elementPath);
}
public XMLSecEvent getXmlSecEvent() {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java Fri Feb 10 14:18:16 2017
@@ -79,9 +79,9 @@ public class TransformXPath2Filter exten
XMLSignatureInput input, OutputStream os, Transform transformObject
) throws TransformationException {
try {
- List<NodeList> unionNodes = new ArrayList<NodeList>();
- List<NodeList> subtractNodes = new ArrayList<NodeList>();
- List<NodeList> intersectNodes = new ArrayList<NodeList>();
+ List<NodeList> unionNodes = new ArrayList<>();
+ List<NodeList> subtractNodes = new ArrayList<>();
+ List<NodeList> intersectNodes = new ArrayList<>();
Element[] xpathElements =
XMLUtils.selectNodes(
@@ -278,7 +278,7 @@ class XPath2NodeFilter implements NodeFi
}
private static Set<Node> convertNodeListToSet(List<NodeList> l) {
- Set<Node> result = new HashSet<Node>();
+ Set<Node> result = new HashSet<>();
for (NodeList rootNodes : l) {
int length = rootNodes.getLength();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java Fri Feb 10 14:18:16 2017
@@ -106,7 +106,7 @@ public final class ClassLoaderUtils {
* @param callingClass The Class object of the calling object
*/
public static List<URL> getResources(String resourceName, Class<?> callingClass) {
- List<URL> ret = new ArrayList<URL>();
+ List<URL> ret = new ArrayList<>();
Enumeration<URL> urls = new Enumeration<URL>() {
public boolean hasMoreElements() {
return false;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/HelperNodeList.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/HelperNodeList.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/HelperNodeList.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/HelperNodeList.java Fri Feb 10 14:18:16 2017
@@ -31,7 +31,7 @@ import org.w3c.dom.NodeList;
public class HelperNodeList implements NodeList {
/** Field nodes */
- List<Node> nodes = new ArrayList<Node>();
+ List<Node> nodes = new ArrayList<>();
boolean allNodesMustHaveSameParent = false;
/**
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java Fri Feb 10 14:18:16 2017
@@ -558,11 +558,11 @@ public final class XMLUtils {
*/
public static Set<Node> convertNodelistToSet(NodeList xpathNodeSet) {
if (xpathNodeSet == null) {
- return new HashSet<Node>();
+ return new HashSet<>();
}
int length = xpathNodeSet.getLength();
- Set<Node> set = new HashSet<Node>(length);
+ Set<Node> set = new HashSet<>(length);
for (int i = 0; i < length; i++) {
set.add(xpathNodeSet.item(i));
@@ -825,7 +825,7 @@ public final class XMLUtils {
* @return nodes with the constraint
*/
public static Element[] selectNodes(Node sibling, String uri, String nodeName) {
- List<Element> list = new ArrayList<Element>();
+ List<Element> list = new ArrayList<>();
while (sibling != null) {
if (sibling.getNamespaceURI() != null && sibling.getNamespaceURI().equals(uri)
&& sibling.getLocalName().equals(nodeName)) {
@@ -842,7 +842,7 @@ public final class XMLUtils {
* @return nodes with the constrain
*/
public static Set<Node> excludeNodeFromSet(Node signatureElement, Set<Node> inputSet) {
- Set<Node> resultSet = new HashSet<Node>();
+ Set<Node> resultSet = new HashSet<>();
Iterator<Node> iterator = inputSet.iterator();
while (iterator.hasNext()) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java Fri Feb 10 14:18:16 2017
@@ -43,7 +43,7 @@ public class ResourceResolver {
org.slf4j.LoggerFactory.getLogger(ResourceResolver.class);
/** these are the system-wide resolvers */
- private static final List<ResourceResolver> resolverList = new ArrayList<ResourceResolver>();
+ private static final List<ResourceResolver> resolverList = new ArrayList<>();
/** Field resolverSpi */
private final ResourceResolverSpi resolverSpi;
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java Fri Feb 10 14:18:16 2017
@@ -173,7 +173,7 @@ public class KeySelectors {
public static class CollectionKeySelector extends KeySelector {
private final CertificateFactory certFac;
private final File certDir;
- private final List<X509Certificate> certs = new ArrayList<X509Certificate>();
+ private final List<X509Certificate> certs = new ArrayList<>();
private static final int MATCH_SUBJECT = 0;
private static final int MATCH_ISSUER = 1;
private static final int MATCH_SERIAL = 2;
@@ -211,7 +211,7 @@ public class KeySelectors {
public List<X509Certificate> match(
int matchType, Object value, List<X509Certificate> pool
) {
- List<X509Certificate> matchResult = new ArrayList<X509Certificate>();
+ List<X509Certificate> matchResult = new ArrayList<>();
for (X509Certificate c : pool) {
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java Fri Feb 10 14:18:16 2017
@@ -232,7 +232,7 @@ public class CreateBaltimore23Test exten
return;
}
- List<Object> xds = new ArrayList<Object>();
+ List<Object> xds = new ArrayList<>();
CertificateFactory cf = CertificateFactory.getInstance("X.509");
xds.add(signingCert);
String fs = System.getProperty("file.separator");
@@ -327,7 +327,7 @@ public class CreateBaltimore23Test exten
(TransformParameterSpec) null);
// create references
- List<Reference> refs = new ArrayList<Reference>();
+ List<Reference> refs = new ArrayList<>();
// Reference 1
refs.add(fac.newReference("http://www.w3.org/TR/xml-stylesheet", sha1));
@@ -377,7 +377,7 @@ public class CreateBaltimore23Test exten
SignatureProperties.TYPE, null));
// Reference 8
- List<Transform> transforms = new ArrayList<Transform>();
+ List<Transform> transforms = new ArrayList<>();
transforms.add(env);
refs.add(fac.newReference("", sha1, transforms, null, null));
@@ -435,7 +435,7 @@ public class CreateBaltimore23Test exten
Document doc = db.newDocument();
// create objects
- List<XMLObject> objs = new ArrayList<XMLObject>();
+ List<XMLObject> objs = new ArrayList<>();
// Object 1
objs.add(fac.newXMLObject(Collections.singletonList
@@ -455,7 +455,7 @@ public class CreateBaltimore23Test exten
(new DOMStructure(nc)), "object-3", null, null));
// Manifest
- List<Reference> manRefs = new ArrayList<Reference>();
+ List<Reference> manRefs = new ArrayList<>();
// Manifest Reference 1
manRefs.add(fac.newReference("http://www.w3.org/TR/xml-stylesheet",
@@ -465,7 +465,7 @@ public class CreateBaltimore23Test exten
manRefs.add(fac.newReference("#reference-1", sha1));
// Manifest Reference 3
- List<Transform> manTrans = new ArrayList<Transform>();
+ List<Transform> manTrans = new ArrayList<>();
String xslt = ""
+ "<xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform'\n"
+ " xmlns='http://www.w3.org/TR/xhtml1/strict' \n"
@@ -525,7 +525,7 @@ public class CreateBaltimore23Test exten
null, null));
// Object 4
- List<Object> xds = new ArrayList<Object>();
+ List<Object> xds = new ArrayList<>();
xds.add("CN=Sean Mullan,DC=sun,DC=com");
xds.add(kifac.newX509IssuerSerial
("CN=Sean Mullan,DC=sun,DC=com",
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java Fri Feb 10 14:18:16 2017
@@ -79,7 +79,7 @@ public class CreateInteropExcC14NTest ex
@org.junit.Test
public void test_create_Y1() throws Exception {
- List<Reference> refs = new ArrayList<Reference>(4);
+ List<Reference> refs = new ArrayList<>(4);
// create reference 1
refs.add(fac.newReference
@@ -91,7 +91,7 @@ public class CreateInteropExcC14NTest ex
null, null));
// create reference 2
- List<String> prefixList = new ArrayList<String>(2);
+ List<String> prefixList = new ArrayList<>(2);
prefixList.add("bar");
prefixList.add("#default");
ExcC14NParameterSpec params = new ExcC14NParameterSpec(prefixList);
@@ -112,7 +112,7 @@ public class CreateInteropExcC14NTest ex
null, null));
// create reference 4
- prefixList = new ArrayList<String>(2);
+ prefixList = new ArrayList<>(2);
prefixList.add("bar");
prefixList.add("#default");
params = new ExcC14NParameterSpec(prefixList);
@@ -132,7 +132,7 @@ public class CreateInteropExcC14NTest ex
fac.newSignatureMethod(SignatureMethod.DSA_SHA1, null), refs);
// create KeyInfo
- List<KeyValue> kits = new ArrayList<KeyValue>(2);
+ List<KeyValue> kits = new ArrayList<>(2);
kits.add(kifac.newKeyValue(validatingKey));
KeyInfo ki = kifac.newKeyInfo(kits);
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java Fri Feb 10 14:18:16 2017
@@ -83,10 +83,10 @@ public class CreateInteropXFilter2Test e
})
@org.junit.Test
public void test_create_sign_spec() throws Exception {
- List<Reference> refs = new ArrayList<Reference>(2);
+ List<Reference> refs = new ArrayList<>(2);
// create reference 1
- List<XPathType> types = new ArrayList<XPathType>(3);
+ List<XPathType> types = new ArrayList<>(3);
types.add(new XPathType(" //ToBeSigned ", XPathType.Filter.INTERSECT));
types.add(new XPathType(" //NotToBeSigned ", XPathType.Filter.SUBTRACT));
types.add(new XPathType(" //ReallyToBeSigned ", XPathType.Filter.UNION));
@@ -97,7 +97,7 @@ public class CreateInteropXFilter2Test e
null, null));
// create reference 2
- List<Transform> trans2 = new ArrayList<Transform>(2);
+ List<Transform> trans2 = new ArrayList<>(2);
trans2.add(fac.newTransform(Transform.ENVELOPED,
(TransformParameterSpec) null));
XPathFilter2ParameterSpec xp2 = new XPathFilter2ParameterSpec
@@ -115,7 +115,7 @@ public class CreateInteropXFilter2Test e
fac.newSignatureMethod(SignatureMethod.DSA_SHA1, null), refs);
// create KeyInfo
- List<XMLStructure> kits = new ArrayList<XMLStructure>(2);
+ List<XMLStructure> kits = new ArrayList<>(2);
kits.add(kifac.newKeyValue(validatingKey));
List xds = new ArrayList(2);
xds.add("CN=Sean Mullan, DC=sun, DC=com");
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java Fri Feb 10 14:18:16 2017
@@ -48,7 +48,7 @@ public class ManifestTest extends org.ju
public void testConstructor() throws Exception {
Manifest man = null;
String id = "manifest_id";
- List<Reference> refs = new ArrayList<Reference>();
+ List<Reference> refs = new ArrayList<>();
// test XMLSignatureFactory.newManifest(List references)
// and XMLSignatureFactory.newManifest(List references,
// String id)
@@ -138,7 +138,7 @@ public class ManifestTest extends org.ju
@org.junit.Test
public void testisFeatureSupported() throws Exception {
- List<Reference> refs = new ArrayList<Reference>();
+ List<Reference> refs = new ArrayList<>();
refs.add(VALID_REF);
Manifest man = fac.newManifest(refs);
@@ -153,7 +153,7 @@ public class ManifestTest extends org.ju
@org.junit.Test
public void testgetReferences() throws Exception {
- List<Reference> refs = new ArrayList<Reference>();
+ List<Reference> refs = new ArrayList<>();
refs.add(VALID_REF);
Manifest man = fac.newManifest(refs);
@SuppressWarnings("unchecked")
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java Fri Feb 10 14:18:16 2017
@@ -124,7 +124,7 @@ public class ReferenceTest extends org.j
fail("Unexpected Exception: " + ex);
}
- List<Transform> transforms = new ArrayList<Transform>();
+ List<Transform> transforms = new ArrayList<>();
try {
// try empty transforms list
ref = fac.newReference(uri, dmSHA1, transforms,
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java Fri Feb 10 14:18:16 2017
@@ -57,7 +57,7 @@ public class SignaturePropertiesTest ext
fail("Should raise a NPE for null content instead of " + ex);
}
- List<SignatureProperty> list = new ArrayList<SignatureProperty>();
+ List<SignatureProperty> list = new ArrayList<>();
try {
props = factory.newSignatureProperties(list, id);
fail("Should raise an IAE for empty content");
@@ -98,7 +98,7 @@ public class SignaturePropertiesTest ext
@org.junit.Test
public void testisFeatureSupported() {
- List<SignatureProperty> list = new ArrayList<SignatureProperty>();
+ List<SignatureProperty> list = new ArrayList<>();
list.add(prop);
SignatureProperties props = factory.newSignatureProperties(list, id);
try {
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertyTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertyTest.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertyTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertyTest.java Fri Feb 10 14:18:16 2017
@@ -54,7 +54,7 @@ public class SignaturePropertyTest exten
} catch (Exception ex) {
fail("Should raise a NPE for null content instead of " + ex);
}
- List<XMLStructure> list = new ArrayList<XMLStructure>();
+ List<XMLStructure> list = new ArrayList<>();
try {
prop = factory.newSignatureProperty(list, target, id);
fail("Should raise an IAE for empty content");
@@ -101,7 +101,7 @@ public class SignaturePropertyTest exten
@org.junit.Test
public void testisFeatureSupported() {
- List<XMLStructure> list = new ArrayList<XMLStructure>();
+ List<XMLStructure> list = new ArrayList<>();
list.add(new TestUtils.MyOwnXMLStructure());
SignatureProperty prop = factory.newSignatureProperty
(list, target, id);
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignedInfoTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignedInfoTest.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignedInfoTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignedInfoTest.java Fri Feb 10 14:18:16 2017
@@ -49,7 +49,7 @@ public class SignedInfoTest extends org.
(CanonicalizationMethod.INCLUSIVE_WITH_COMMENTS,
(C14NMethodParameterSpec) null);
sm = fac.newSignatureMethod(SignatureMethod.DSA_SHA1, null);
- references = new ArrayList<Reference>();
+ references = new ArrayList<>();
references.add(fac.newReference
("http://www.sun.com/index.html",
fac.newDigestMethod(DigestMethod.SHA1, null)));
@@ -84,7 +84,7 @@ public class SignedInfoTest extends org.
}
}
- List<Reference> empty = new ArrayList<Reference>();
+ List<Reference> empty = new ArrayList<>();
try {
si = fac.newSignedInfo(cm, sm, empty);
fail("Should throw an IAE for empty references");
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/X509KeySelector.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/X509KeySelector.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/X509KeySelector.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/X509KeySelector.java Fri Feb 10 14:18:16 2017
@@ -304,7 +304,7 @@ public class X509KeySelector extends Key
} catch (IOException ioe) {
throw new KeySelectorException(ioe);
}
- Collection<X509Certificate> certs = new ArrayList<X509Certificate>();
+ Collection<X509Certificate> certs = new ArrayList<>();
@SuppressWarnings("unchecked")
Iterator<Object> xi = xd.getContent().iterator();
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLObjectTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLObjectTest.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLObjectTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLObjectTest.java Fri Feb 10 14:18:16 2017
@@ -52,7 +52,7 @@ public class XMLObjectTest extends org.j
obj = factory.newXMLObject(null, null, null, null);
assertNotNull(obj);
- List<XMLStructure> list = new ArrayList<XMLStructure>();
+ List<XMLStructure> list = new ArrayList<>();
obj = factory.newXMLObject(list, null, null, null);
assertNotNull(obj);
@@ -89,7 +89,7 @@ public class XMLObjectTest extends org.j
@org.junit.Test
public void testisFeatureSupported() {
- List<XMLStructure> list = new ArrayList<XMLStructure>();
+ List<XMLStructure> list = new ArrayList<>();
list.add(new TestUtils.MyOwnXMLStructure());
XMLObject obj = factory.newXMLObject(list, id, mimeType, encoding);
try {
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java Fri Feb 10 14:18:16 2017
@@ -257,7 +257,7 @@ public class XMLSignatureTest extends or
SignedInfo si = fac.newSignedInfo(cm, SIG_METHODS[1], refs);
// create objects
- List<XMLObject> objs = new ArrayList<XMLObject>();
+ List<XMLObject> objs = new ArrayList<>();
// Object 1
List<Reference> manRefs = Collections.singletonList
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java Fri Feb 10 14:18:16 2017
@@ -93,7 +93,7 @@ public class HMACSignatureAlgorithmTest
byte[] hmacKey = "secret".getBytes("ASCII");
SecretKey key = new SecretKeySpec(hmacKey, "http://www.w3.org/2000/09/xmldsig#hmac-sha1");
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign("http://www.w3.org/2000/09/xmldsig#hmac-sha1", document, localNames, key);
@@ -114,7 +114,7 @@ public class HMACSignatureAlgorithmTest
byte[] hmacKey = "secret".getBytes("ASCII");
SecretKey key = new SecretKeySpec(hmacKey, "http://www.w3.org/2001/04/xmldsig-more#hmac-md5");
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign("http://www.w3.org/2001/04/xmldsig-more#hmac-md5", document, localNames, key);
@@ -135,7 +135,7 @@ public class HMACSignatureAlgorithmTest
byte[] hmacKey = "secret".getBytes("ASCII");
SecretKey key = new SecretKeySpec(hmacKey, "http://www.w3.org/2001/04/xmldsig-more#hmac-sha224");
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign("http://www.w3.org/2001/04/xmldsig-more#hmac-sha224", document, localNames, key);
@@ -156,7 +156,7 @@ public class HMACSignatureAlgorithmTest
byte[] hmacKey = "secret".getBytes("ASCII");
SecretKey key = new SecretKeySpec(hmacKey, "http://www.w3.org/2001/04/xmldsig-more#hmac-sha256");
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign("http://www.w3.org/2001/04/xmldsig-more#hmac-sha256", document, localNames, key);
@@ -177,7 +177,7 @@ public class HMACSignatureAlgorithmTest
byte[] hmacKey = "secret".getBytes("ASCII");
SecretKey key = new SecretKeySpec(hmacKey, "http://www.w3.org/2001/04/xmldsig-more#hmac-sha384");
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign("http://www.w3.org/2001/04/xmldsig-more#hmac-sha384", document, localNames, key);
@@ -198,7 +198,7 @@ public class HMACSignatureAlgorithmTest
byte[] hmacKey = "secret".getBytes("ASCII");
SecretKey key = new SecretKeySpec(hmacKey, "http://www.w3.org/2001/04/xmldsig-more#hmac-sha512");
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign("http://www.w3.org/2001/04/xmldsig-more#hmac-sha512", document, localNames, key);
@@ -222,7 +222,7 @@ public class HMACSignatureAlgorithmTest
byte[] hmacKey = "secret".getBytes("ASCII");
SecretKey key = new SecretKeySpec(hmacKey, "http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160");
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign("http://www.w3.org/2001/04/xmldsig-more#hmac-ripemd160", document, localNames, key);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java Fri Feb 10 14:18:16 2017
@@ -109,7 +109,7 @@ public class KeyWrapEncryptionAlgorithmT
cipher.init(XMLCipher.WRAP_MODE, keyWrappingKey);
EncryptedKey encryptedKey = cipher.encryptKey(document, key);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
String encryptionAlgorithm = XMLCipher.AES_128;
@@ -150,7 +150,7 @@ public class KeyWrapEncryptionAlgorithmT
cipher.init(XMLCipher.WRAP_MODE, keyWrappingKey);
EncryptedKey encryptedKey = cipher.encryptKey(document, key);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
String encryptionAlgorithm = XMLCipher.AES_192;
@@ -191,7 +191,7 @@ public class KeyWrapEncryptionAlgorithmT
cipher.init(XMLCipher.WRAP_MODE, keyWrappingKey);
EncryptedKey encryptedKey = cipher.encryptKey(document, key);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
String encryptionAlgorithm = XMLCipher.AES_256;
@@ -230,7 +230,7 @@ public class KeyWrapEncryptionAlgorithmT
cipher.init(XMLCipher.WRAP_MODE, keyWrappingKey);
EncryptedKey encryptedKey = cipher.encryptKey(document, key);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
String encryptionAlgorithm = XMLCipher.TRIPLEDES;
@@ -267,7 +267,7 @@ public class KeyWrapEncryptionAlgorithmT
cipher.init(XMLCipher.WRAP_MODE, rsaKeyPair.getPublic());
EncryptedKey encryptedKey = cipher.encryptKey(document, key);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
String encryptionAlgorithm = XMLCipher.TRIPLEDES;
@@ -304,7 +304,7 @@ public class KeyWrapEncryptionAlgorithmT
cipher.init(XMLCipher.WRAP_MODE, rsaKeyPair.getPublic());
EncryptedKey encryptedKey = cipher.encryptKey(document, key);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
String encryptionAlgorithm = XMLCipher.TRIPLEDES;
@@ -341,7 +341,7 @@ public class KeyWrapEncryptionAlgorithmT
cipher.init(XMLCipher.WRAP_MODE, rsaKeyPair.getPublic());
EncryptedKey encryptedKey = cipher.encryptKey(document, key);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
String encryptionAlgorithm = XMLCipher.TRIPLEDES;
@@ -385,7 +385,7 @@ public class KeyWrapEncryptionAlgorithmT
cipher.init(XMLCipher.WRAP_MODE, keyWrappingKey);
EncryptedKey encryptedKey = cipher.encryptKey(document, key);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
String encryptionAlgorithm = XMLCipher.CAMELLIA_128;
@@ -429,7 +429,7 @@ public class KeyWrapEncryptionAlgorithmT
cipher.init(XMLCipher.WRAP_MODE, keyWrappingKey);
EncryptedKey encryptedKey = cipher.encryptKey(document, key);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
String encryptionAlgorithm = XMLCipher.CAMELLIA_192;
@@ -473,7 +473,7 @@ public class KeyWrapEncryptionAlgorithmT
cipher.init(XMLCipher.WRAP_MODE, keyWrappingKey);
EncryptedKey encryptedKey = cipher.encryptKey(document, key);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
String encryptionAlgorithm = XMLCipher.CAMELLIA_256;
@@ -517,7 +517,7 @@ public class KeyWrapEncryptionAlgorithmT
cipher.init(XMLCipher.WRAP_MODE, keyWrappingKey);
EncryptedKey encryptedKey = cipher.encryptKey(document, key);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
String encryptionAlgorithm = XMLCipher.SEED_128;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java Fri Feb 10 14:18:16 2017
@@ -96,7 +96,7 @@ public class PKSignatureAlgorithmTest ex
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign(XMLSignature.ALGO_ID_SIGNATURE_NOT_RECOMMENDED_RSA_MD5, document, localNames, rsaKeyPair.getPrivate());
@@ -113,7 +113,7 @@ public class PKSignatureAlgorithmTest ex
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign(XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA1, document, localNames, rsaKeyPair.getPrivate());
@@ -130,7 +130,7 @@ public class PKSignatureAlgorithmTest ex
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign(XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA224, document, localNames, rsaKeyPair.getPrivate());
@@ -147,7 +147,7 @@ public class PKSignatureAlgorithmTest ex
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign(XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA256, document, localNames, rsaKeyPair.getPrivate());
@@ -164,7 +164,7 @@ public class PKSignatureAlgorithmTest ex
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign(XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA384, document, localNames, rsaKeyPair.getPrivate());
@@ -181,7 +181,7 @@ public class PKSignatureAlgorithmTest ex
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign(XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA512, document, localNames, rsaKeyPair.getPrivate());
@@ -201,7 +201,7 @@ public class PKSignatureAlgorithmTest ex
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign(XMLSignature.ALGO_ID_SIGNATURE_RSA_RIPEMD160, document, localNames, rsaKeyPair.getPrivate());
@@ -221,7 +221,7 @@ public class PKSignatureAlgorithmTest ex
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign(XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA1_MGF1, document, localNames, rsaKeyPair.getPrivate());
@@ -241,7 +241,7 @@ public class PKSignatureAlgorithmTest ex
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign(XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA224_MGF1, document, localNames, rsaKeyPair.getPrivate());
@@ -261,7 +261,7 @@ public class PKSignatureAlgorithmTest ex
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign(XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA256_MGF1, document, localNames, rsaKeyPair.getPrivate());
@@ -281,7 +281,7 @@ public class PKSignatureAlgorithmTest ex
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign(XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA384_MGF1, document, localNames, rsaKeyPair.getPrivate());
@@ -301,7 +301,7 @@ public class PKSignatureAlgorithmTest ex
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign(XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA512_MGF1, document, localNames, rsaKeyPair.getPrivate());
@@ -318,7 +318,7 @@ public class PKSignatureAlgorithmTest ex
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign(XMLSignature.ALGO_ID_SIGNATURE_ECDSA_SHA1, document, localNames, ecKeyPair.getPrivate());
@@ -335,7 +335,7 @@ public class PKSignatureAlgorithmTest ex
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign(XMLSignature.ALGO_ID_SIGNATURE_ECDSA_SHA224, document, localNames, ecKeyPair.getPrivate());
@@ -352,7 +352,7 @@ public class PKSignatureAlgorithmTest ex
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign(XMLSignature.ALGO_ID_SIGNATURE_ECDSA_SHA256, document, localNames, ecKeyPair.getPrivate());
@@ -369,7 +369,7 @@ public class PKSignatureAlgorithmTest ex
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign(XMLSignature.ALGO_ID_SIGNATURE_ECDSA_SHA384, document, localNames, ecKeyPair.getPrivate());
@@ -386,7 +386,7 @@ public class PKSignatureAlgorithmTest ex
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign(XMLSignature.ALGO_ID_SIGNATURE_ECDSA_SHA512, document, localNames, ecKeyPair.getPrivate());
@@ -406,7 +406,7 @@ public class PKSignatureAlgorithmTest ex
DocumentBuilder builder = XMLUtils.createDocumentBuilder(false);
Document document = builder.parse(sourceDocument);
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
sign(XMLSignature.ALGO_ID_SIGNATURE_ECDSA_RIPEMD160, document, localNames, ecKeyPair.getPrivate());
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java Fri Feb 10 14:18:16 2017
@@ -92,7 +92,7 @@ public class SymmetricEncryptionAlgorith
keygen.init(128);
SecretKey key = keygen.generateKey();
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
String encryptionAlgorithm = XMLCipher.AES_128;
@@ -125,7 +125,7 @@ public class SymmetricEncryptionAlgorith
keygen.init(128);
SecretKey key = keygen.generateKey();
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
String encryptionAlgorithm = XMLCipher.AES_128_GCM;
@@ -158,7 +158,7 @@ public class SymmetricEncryptionAlgorith
keygen.init(192);
SecretKey key = keygen.generateKey();
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
String encryptionAlgorithm = XMLCipher.AES_192;
@@ -191,7 +191,7 @@ public class SymmetricEncryptionAlgorith
keygen.init(192);
SecretKey key = keygen.generateKey();
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
String encryptionAlgorithm = XMLCipher.AES_192_GCM;
@@ -224,7 +224,7 @@ public class SymmetricEncryptionAlgorith
keygen.init(256);
SecretKey key = keygen.generateKey();
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
String encryptionAlgorithm = XMLCipher.AES_256;
@@ -257,7 +257,7 @@ public class SymmetricEncryptionAlgorith
keygen.init(256);
SecretKey key = keygen.generateKey();
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
String encryptionAlgorithm = XMLCipher.AES_256_GCM;
@@ -289,7 +289,7 @@ public class SymmetricEncryptionAlgorith
KeyGenerator keygen = KeyGenerator.getInstance("DESede");
SecretKey key = keygen.generateKey();
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
String encryptionAlgorithm = XMLCipher.TRIPLEDES;
@@ -325,7 +325,7 @@ public class SymmetricEncryptionAlgorith
keygen.init(128);
SecretKey key = keygen.generateKey();
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
String encryptionAlgorithm = XMLCipher.SEED_128;
@@ -361,7 +361,7 @@ public class SymmetricEncryptionAlgorith
keygen.init(128);
SecretKey key = keygen.generateKey();
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
String encryptionAlgorithm = XMLCipher.CAMELLIA_128;
@@ -397,7 +397,7 @@ public class SymmetricEncryptionAlgorith
keygen.init(192);
SecretKey key = keygen.generateKey();
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
String encryptionAlgorithm = XMLCipher.CAMELLIA_192;
@@ -433,7 +433,7 @@ public class SymmetricEncryptionAlgorith
keygen.init(256);
SecretKey key = keygen.generateKey();
- List<String> localNames = new ArrayList<String>();
+ List<String> localNames = new ArrayList<>();
localNames.add("PaymentInfo");
String encryptionAlgorithm = XMLCipher.CAMELLIA_256;
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java Fri Feb 10 14:18:16 2017
@@ -338,7 +338,7 @@ public class Canonicalizer20010315Exclus
Document doc = this.db.parse(new InputSource(new StringReader(XML)));
Canonicalizer20010315ExclOmitComments c14n =
new Canonicalizer20010315ExclOmitComments();
- Set<Node> nodeSet = new HashSet<Node>();
+ Set<Node> nodeSet = new HashSet<>();
XMLUtils.getSet(doc.getDocumentElement().getFirstChild(), nodeSet, null, false);
XMLSignatureInput input = new XMLSignatureInput(nodeSet);
byte[] bytes = c14n.engineCanonicalize(input, "env ns0 xsi wsu");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.java Fri Feb 10 14:18:16 2017
@@ -143,7 +143,7 @@ public class NameSpaceSymbTableTest exte
public void testGetUnrenderedNodes() {
NameSpaceSymbTable ns = new NameSpaceSymbTable();
ns.push();
- List<Attr> l = new ArrayList<Attr>();
+ List<Attr> l = new ArrayList<>();
ns.addMapping("xmlns", "http://a", node1);
ns.push();
ns.getUnrenderedNodes(l);
@@ -157,7 +157,7 @@ public class NameSpaceSymbTableTest exte
public void testUnrederedNodes() {
NameSpaceSymbTable ns = new NameSpaceSymbTable();
ns.push();
- List<Attr> l = new ArrayList<Attr>();
+ List<Attr> l = new ArrayList<>();
ns.getUnrenderedNodes(l);
assertTrue(l.isEmpty());
l.clear();
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=1782475&r1=1782474&r2=1782475&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 Fri Feb 10 14:18:16 2017
@@ -184,7 +184,7 @@ public class XPointerResourceResolver ex
if (node != null) {
result = new XMLSignatureInput(node);
} else if (nodes != null) {
- Set<Node> nodeSet = new HashSet<Node>(nodes.getLength());
+ Set<Node> nodeSet = new HashSet<>(nodes.getLength());
for (int j = 0; j < nodes.getLength(); ++j) {
nodeSet.add(nodes.item(j));
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/InputProcessorChainTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/InputProcessorChainTest.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/InputProcessorChainTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/InputProcessorChainTest.java Fri Feb 10 14:18:16 2017
@@ -50,8 +50,8 @@ public class InputProcessorChainTest ext
abstract class AbstractInputProcessor implements InputProcessor {
private XMLSecurityConstants.Phase phase = XMLSecurityConstants.Phase.PROCESSING;
- private Set<Object> beforeProcessors = new HashSet<Object>();
- private Set<Object> afterProcessors = new HashSet<Object>();
+ private Set<Object> beforeProcessors = new HashSet<>();
+ private Set<Object> afterProcessors = new HashSet<>();
@Override
public void addBeforeProcessor(Object processor) {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/OutputProcessorChainTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/OutputProcessorChainTest.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/OutputProcessorChainTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/OutputProcessorChainTest.java Fri Feb 10 14:18:16 2017
@@ -48,8 +48,8 @@ public class OutputProcessorChainTest ex
abstract class AbstractOutputProcessor implements OutputProcessor {
private XMLSecurityConstants.Phase phase = XMLSecurityConstants.Phase.PROCESSING;
- private Set<Object> beforeProcessors = new HashSet<Object>();
- private Set<Object> afterProcessors = new HashSet<Object>();
+ private Set<Object> beforeProcessors = new HashSet<>();
+ private Set<Object> afterProcessors = new HashSet<>();
@Override
public void setXMLSecurityProperties(XMLSecurityProperties xmlSecurityProperties) {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java Fri Feb 10 14:18:16 2017
@@ -281,7 +281,7 @@ public class XMLSecurityStreamReaderTest
@Override
public Set<Object> getBeforeProcessors() {
- return new HashSet<Object>();
+ return new HashSet<>();
}
@Override
@@ -290,7 +290,7 @@ public class XMLSecurityStreamReaderTest
@Override
public Set<Object> getAfterProcessors() {
- return new HashSet<Object>();
+ return new HashSet<>();
}
@Override
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamWriterTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamWriterTest.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamWriterTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamWriterTest.java Fri Feb 10 14:18:16 2017
@@ -84,7 +84,7 @@ public class XMLSecurityStreamWriterTest
@Override
public Iterator<?> getPrefixes(String namespaceURI) {
- List<String> ns = new ArrayList<String>();
+ List<String> ns = new ArrayList<>();
ns.add(getPrefix(namespaceURI));
return ns.iterator();
}
@@ -225,7 +225,7 @@ public class XMLSecurityStreamWriterTest
@Override
public Set<Object> getBeforeProcessors() {
- return new HashSet<Object>();
+ return new HashSet<>();
}
@Override
@@ -234,7 +234,7 @@ public class XMLSecurityStreamWriterTest
@Override
public Set<Object> getAfterProcessors() {
- return new HashSet<Object>();
+ return new HashSet<>();
}
@Override