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 [1/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...
Author: coheigea
Date: Fri Feb 10 14:18:16 2017
New Revision: 1782475
URL: http://svn.apache.org/viewvc?rev=1782475&view=rev
Log:
Removing redundant type information
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java
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/Utils.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/ECDSAUtils.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/c14n/implementations/NameSpaceSymbTable.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/KeyInfo.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.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/signature/Reference.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/reference/ReferenceSubTreeData.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ResourceResolverMapper.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractInputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractInputSecurityHeaderHandler.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractOutputProcessor.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/ext/XMLSecurityUtils.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/stax/XMLSecEventFactory.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/InputProcessorChainImpl.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/OutputProcessorChainImpl.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.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/AbstractSignatureReferenceVerifyInputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.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/stax/impl/processor/output/XMLEncryptOutputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureEndingOutputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureOutputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractInboundSecurityToken.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/securityToken/GenericOutboundSecurityToken.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEventBaseImpl.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartElementImpl.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer20010315_Excl.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/securityEvent/AbstractElementSecurityEvent.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/HelperNodeList.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/XMLUtils.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/KeySelectors.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropExcC14NTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ManifestTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertiesTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignaturePropertyTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignedInfoTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/X509KeySelector.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLObjectTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/Canonicalizer20010315ExclusiveTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/NameSpaceSymbTableTest.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/stax/InputProcessorChainTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/OutputProcessorChainTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamReaderTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/XMLSecurityStreamWriterTest.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/DecryptionTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationReferenceURIResolverTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/TestSecurityEventListener.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformBase64DecodeTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformEnvelopedSignatureTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/transformer/TransformIdentityTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/utils/HttpRequestRedirectorProxy.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java Fri Feb 10 14:18:16 2017
@@ -79,7 +79,7 @@ public final class DOMExcC14NMethod exte
this.inclusiveNamespaces = prefixListAttr;
int begin = 0;
int end = prefixListAttr.indexOf(' ');
- List<String> prefixList = new ArrayList<String>();
+ List<String> prefixList = new ArrayList<>();
while (end != -1) {
prefixList.add(prefixListAttr.substring(begin, end));
begin = end + 1;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java Fri Feb 10 14:18:16 2017
@@ -76,7 +76,7 @@ public final class DOMKeyInfo extends Ba
throw new NullPointerException("content cannot be null");
}
this.keyInfoTypes =
- Collections.unmodifiableList(new ArrayList<XMLStructure>(content));
+ Collections.unmodifiableList(new ArrayList<>(content));
if (this.keyInfoTypes.isEmpty()) {
throw new IllegalArgumentException("content cannot be empty");
}
@@ -101,7 +101,7 @@ public final class DOMKeyInfo extends Ba
id = DOMUtils.getIdAttributeValue(kiElem, "Id");
// get all children nodes
- List<XMLStructure> content = new ArrayList<XMLStructure>();
+ List<XMLStructure> content = new ArrayList<>();
Node firstChild = kiElem.getFirstChild();
if (firstChild == null) {
throw new MarshalException("KeyInfo must contain at least one type");
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java Fri Feb 10 14:18:16 2017
@@ -60,7 +60,7 @@ public final class DOMManifest extends B
throw new NullPointerException("references cannot be null");
}
this.references =
- Collections.unmodifiableList(new ArrayList<Reference>(references));
+ Collections.unmodifiableList(new ArrayList<>(references));
if (this.references.isEmpty()) {
throw new IllegalArgumentException("list of references must " +
"contain at least one entry");
@@ -88,7 +88,7 @@ public final class DOMManifest extends B
boolean secVal = Utils.secureValidation(context);
Element refElem = DOMUtils.getFirstChildElement(manElem, "Reference", XMLSignature.XMLNS);
- List<Reference> refs = new ArrayList<Reference>();
+ List<Reference> refs = new ArrayList<>();
refs.add(new DOMReference(refElem, context, provider));
refElem = DOMUtils.getNextSiblingElement(refElem);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java Fri Feb 10 14:18:16 2017
@@ -71,7 +71,7 @@ public final class DOMPGPData extends Ba
this.externalElements = Collections.emptyList();
} else {
this.externalElements =
- Collections.unmodifiableList(new ArrayList<XMLStructure>(other));
+ Collections.unmodifiableList(new ArrayList<>(other));
for (int i = 0, size = this.externalElements.size(); i < size; i++) {
if (!(this.externalElements.get(i) instanceof XMLStructure)) {
throw new ClassCastException
@@ -118,7 +118,7 @@ public final class DOMPGPData extends Ba
this.externalElements = Collections.emptyList();
} else {
this.externalElements =
- Collections.unmodifiableList(new ArrayList<XMLStructure>(other));
+ Collections.unmodifiableList(new ArrayList<>(other));
for (int i = 0, size = this.externalElements.size(); i < size; i++) {
if (!(this.externalElements.get(i) instanceof XMLStructure)) {
throw new ClassCastException
@@ -144,7 +144,7 @@ public final class DOMPGPData extends Ba
byte[] pgpKeyId = null;
byte[] pgpKeyPacket = null;
- List<XMLStructure> other = new ArrayList<XMLStructure>();
+ List<XMLStructure> other = new ArrayList<>();
Node firstChild = pdElem.getFirstChild();
while (firstChild != null) {
if (firstChild.getNodeType() == Node.ELEMENT_NODE) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java Fri Feb 10 14:18:16 2017
@@ -143,9 +143,9 @@ public final class DOMReference extends
throw new NullPointerException("DigestMethod must be non-null");
}
if (appliedTransforms == null) {
- this.allTransforms = new ArrayList<Transform>();
+ this.allTransforms = new ArrayList<>();
} else {
- this.allTransforms = new ArrayList<Transform>(appliedTransforms);
+ this.allTransforms = new ArrayList<>(appliedTransforms);
for (int i = 0, size = this.allTransforms.size(); i < size; i++) {
if (!(this.allTransforms.get(i) instanceof Transform)) {
throw new ClassCastException
@@ -156,7 +156,7 @@ public final class DOMReference extends
if (transforms == null) {
this.transforms = Collections.emptyList();
} else {
- this.transforms = new ArrayList<Transform>(transforms);
+ this.transforms = new ArrayList<>(transforms);
for (int i = 0, size = this.transforms.size(); i < size; i++) {
if (!(this.transforms.get(i) instanceof Transform)) {
throw new ClassCastException
@@ -197,7 +197,7 @@ public final class DOMReference extends
// unmarshal Transforms, if specified
Element nextSibling = DOMUtils.getFirstChildElement(refElem);
- List<Transform> newTransforms = new ArrayList<Transform>(MAXIMUM_TRANSFORM_COUNT);
+ List<Transform> newTransforms = new ArrayList<>(MAXIMUM_TRANSFORM_COUNT);
if (nextSibling.getLocalName().equals("Transforms")
&& XMLSignature.XMLNS.equals(nextSibling.getNamespaceURI())) {
Element transformElem = DOMUtils.getFirstChildElement(nextSibling,
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java Fri Feb 10 14:18:16 2017
@@ -101,7 +101,7 @@ public final class DOMRetrievalMethod ex
this.transforms = Collections.emptyList();
} else {
this.transforms = Collections.unmodifiableList(
- new ArrayList<Transform>(transforms));
+ new ArrayList<>(transforms));
for (int i = 0, size = this.transforms.size(); i < size; i++) {
if (!(this.transforms.get(i) instanceof Transform)) {
throw new ClassCastException
@@ -140,7 +140,7 @@ public final class DOMRetrievalMethod ex
boolean secVal = Utils.secureValidation(context);
// get Transforms, if specified
- List<Transform> newTransforms = new ArrayList<Transform>();
+ List<Transform> newTransforms = new ArrayList<>();
Element transformsElem = DOMUtils.getFirstChildElement(rmElem);
if (transformsElem != null) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java Fri Feb 10 14:18:16 2017
@@ -64,7 +64,7 @@ public final class DOMSignaturePropertie
throw new IllegalArgumentException("properties cannot be empty");
} else {
this.properties = Collections.unmodifiableList(
- new ArrayList<SignatureProperty>(properties));
+ new ArrayList<>(properties));
for (int i = 0, size = this.properties.size(); i < size; i++) {
if (!(this.properties.get(i) instanceof SignatureProperty)) {
throw new ClassCastException
@@ -87,7 +87,7 @@ public final class DOMSignaturePropertie
// unmarshal attributes
id = DOMUtils.getIdAttributeValue(propsElem, "Id");
- List<SignatureProperty> newProperties = new ArrayList<SignatureProperty>();
+ List<SignatureProperty> newProperties = new ArrayList<>();
Node firstChild = propsElem.getFirstChild();
while (firstChild != null) {
if (firstChild.getNodeType() == Node.ELEMENT_NODE) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java Fri Feb 10 14:18:16 2017
@@ -68,7 +68,7 @@ public final class DOMSignatureProperty
throw new IllegalArgumentException("content cannot be empty");
} else {
this.content = Collections.unmodifiableList(
- new ArrayList<XMLStructure>(content));
+ new ArrayList<>(content));
for (int i = 0, size = this.content.size(); i < size; i++) {
if (!(this.content.get(i) instanceof XMLStructure)) {
throw new ClassCastException
@@ -95,7 +95,7 @@ public final class DOMSignatureProperty
}
id = DOMUtils.getIdAttributeValue(propElem, "Id");
- List<XMLStructure> newContent = new ArrayList<XMLStructure>();
+ List<XMLStructure> newContent = new ArrayList<>();
Node firstChild = propElem.getFirstChild();
while (firstChild != null) {
newContent.add(new javax.xml.crypto.dom.DOMStructure(firstChild));
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java Fri Feb 10 14:18:16 2017
@@ -91,7 +91,7 @@ public final class DOMSignedInfo extends
this.canonicalizationMethod = cm;
this.signatureMethod = sm;
this.references = Collections.unmodifiableList(
- new ArrayList<Reference>(references));
+ new ArrayList<>(references));
if (this.references.isEmpty()) {
throw new IllegalArgumentException("list of references must " +
"contain at least one entry");
@@ -162,7 +162,7 @@ public final class DOMSignedInfo extends
}
// unmarshal References
- ArrayList<Reference> refList = new ArrayList<Reference>(5);
+ ArrayList<Reference> refList = new ArrayList<>(5);
Element refElem = DOMUtils.getNextSiblingElement(smElem, "Reference", XMLSignature.XMLNS);
refList.add(new DOMReference(refElem, context, provider));
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java Fri Feb 10 14:18:16 2017
@@ -113,7 +113,7 @@ public class DOMSubTreeData implements N
* @return a set of nodes (minus any comment nodes)
*/
private List<Node> dereferenceSameDocumentURI(Node node) {
- List<Node> nodes = new ArrayList<Node>();
+ List<Node> nodes = new ArrayList<>();
if (node != null) {
nodeSetMinusCommentNodes(node, nodes, null);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java Fri Feb 10 14:18:16 2017
@@ -68,7 +68,7 @@ public final class DOMX509Data extends B
if (content == null) {
throw new NullPointerException("content cannot be null");
}
- List<Object> contentCopy = new ArrayList<Object>(content);
+ List<Object> contentCopy = new ArrayList<>(content);
if (contentCopy.isEmpty()) {
throw new IllegalArgumentException("content cannot be empty");
}
@@ -95,7 +95,7 @@ public final class DOMX509Data extends B
*/
public DOMX509Data(Element xdElem) throws MarshalException {
// get all children nodes
- List<Object> newContent = new ArrayList<Object>();
+ List<Object> newContent = new ArrayList<>();
Node firstChild = xdElem.getFirstChild();
while (firstChild != null) {
if (firstChild.getNodeType() == Node.ELEMENT_NODE) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java Fri Feb 10 14:18:16 2017
@@ -66,7 +66,7 @@ public final class DOMXMLObject extends
this.content = Collections.emptyList();
} else {
this.content = Collections.unmodifiableList(
- new ArrayList<XMLStructure>(content));
+ new ArrayList<>(content));
for (int i = 0, size = this.content.size(); i < size; i++) {
if (!(this.content.get(i) instanceof XMLStructure)) {
throw new ClassCastException
@@ -101,7 +101,7 @@ public final class DOMXMLObject extends
}
this.mimeType = DOMUtils.getAttributeValue(objElem, "MimeType");
- List<XMLStructure> newContent = new ArrayList<XMLStructure>();
+ List<XMLStructure> newContent = new ArrayList<>();
Node firstChild = objElem.getFirstChild();
while (firstChild != null) {
if (firstChild.getNodeType() == Node.ELEMENT_NODE) {
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=1782475&r1=1782474&r2=1782475&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 Fri Feb 10 14:18:16 2017
@@ -104,7 +104,7 @@ public final class DOMXMLSignature exten
this.objects = Collections.emptyList();
} else {
this.objects =
- Collections.unmodifiableList(new ArrayList<XMLObject>(objs));
+ Collections.unmodifiableList(new ArrayList<>(objs));
for (int i = 0, size = this.objects.size(); i < size; i++) {
if (!(this.objects.get(i) instanceof XMLObject)) {
throw new ClassCastException
@@ -153,7 +153,7 @@ public final class DOMXMLSignature exten
if (nextSibling == null) {
objects = Collections.emptyList();
} else {
- List<XMLObject> tempObjects = new ArrayList<XMLObject>();
+ List<XMLObject> tempObjects = new ArrayList<>();
while (nextSibling != null) {
String name = nextSibling.getLocalName();
String namespace = nextSibling.getNamespaceURI();
@@ -334,7 +334,7 @@ public final class DOMXMLSignature exten
Element sigElem = xwriter.getCreatedElement();
// generate references and signature value
- List<Reference> allReferences = new ArrayList<Reference>();
+ List<Reference> allReferences = new ArrayList<>();
// traverse the Signature and register all objects with IDs that
// may contain References
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=1782475&r1=1782474&r2=1782475&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 Fri Feb 10 14:18:16 2017
@@ -81,7 +81,7 @@ public final class DOMXPathFilter2Transf
private void unmarshalParams(Element curXPathElem) throws MarshalException
{
- List<XPathType> list = new ArrayList<XPathType>();
+ List<XPathType> list = new ArrayList<>();
Element currentElement = curXPathElem;
while (currentElement != null) {
String xPath = currentElement.getFirstChild().getNodeValue();
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Utils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Utils.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Utils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Utils.java Fri Feb 10 14:18:16 2017
@@ -68,7 +68,7 @@ public final class Utils {
* @return the Set of Nodes
*/
static Set<Node> toNodeSet(Iterator<Node> i) {
- Set<Node> nodeSet = new HashSet<Node>();
+ Set<Node> nodeSet = new HashSet<>();
while (i.hasNext()) {
Node n = i.next();
nodeSet.add(n);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java Fri Feb 10 14:18:16 2017
@@ -317,7 +317,7 @@ public class Init {
if (tag.equals("KeyResolver")){
Element[] resolverElem =
XMLUtils.selectNodes(el.getFirstChild(), CONF_NS, "Resolver");
- List<String> classNames = new ArrayList<String>(resolverElem.length);
+ List<String> classNames = new ArrayList<>(resolverElem.length);
for (Element element : resolverElem) {
String javaClass =
element.getAttributeNS(null, "JAVACLASS");
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/ECDSAUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/ECDSAUtils.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/ECDSAUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/algorithms/implementations/ECDSAUtils.java Fri Feb 10 14:18:16 2017
@@ -152,7 +152,7 @@ public final class ECDSAUtils {
return asn1Bytes;
}
- private static final List<ECCurveDefinition> ecCurveDefinitions = new ArrayList<ECCurveDefinition>();
+ private static final List<ECCurveDefinition> ecCurveDefinitions = new ArrayList<>();
static {
ecCurveDefinitions.add(
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=1782475&r1=1782474&r2=1782475&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 Fri Feb 10 14:18:16 2017
@@ -66,13 +66,13 @@ public abstract class Canonicalizer11 ex
static class XmlsStackElement {
int level;
boolean rendered = false;
- List<Attr> nodes = new ArrayList<Attr>();
+ List<Attr> nodes = new ArrayList<>();
}
int currentLevel = 0;
int lastlevel = 0;
XmlsStackElement cur;
- List<XmlsStackElement> levels = new ArrayList<XmlsStackElement>();
+ List<XmlsStackElement> levels = new ArrayList<>();
void push(int level) {
currentLevel = level;
@@ -126,7 +126,7 @@ public abstract class Canonicalizer11 ex
}
Map<String, Attr> loa = new HashMap<String, Attr>();
- List<Attr> baseAttrs = new ArrayList<Attr>();
+ List<Attr> baseAttrs = new ArrayList<>();
boolean successiveOmitted = true;
for (; size >= 0; size--) {
e = levels.get(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=1782475&r1=1782474&r2=1782475&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 Fri Feb 10 14:18:16 2017
@@ -60,13 +60,13 @@ public abstract class Canonicalizer20010
static class XmlsStackElement {
int level;
boolean rendered = false;
- List<Attr> nodes = new ArrayList<Attr>();
+ List<Attr> nodes = new ArrayList<>();
}
int currentLevel = 0;
int lastlevel = 0;
XmlsStackElement cur;
- List<XmlsStackElement> levels = new ArrayList<XmlsStackElement>();
+ List<XmlsStackElement> levels = new ArrayList<>();
void push(int level) {
currentLevel = level;
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=1782475&r1=1782474&r2=1782475&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 Fri Feb 10 14:18:16 2017
@@ -617,7 +617,7 @@ public abstract class CanonicalizerBase
return;
}
//Obtain all the parents of the element
- List<Element> parents = new ArrayList<Element>();
+ List<Element> parents = new ArrayList<>();
Node parent = n1;
while (parent != null && Node.ELEMENT_NODE == parent.getNodeType()) {
parents.add((Element)parent);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java Fri Feb 10 14:18:16 2017
@@ -55,7 +55,7 @@ public class NameSpaceSymbTable {
* Default constractor
**/
public NameSpaceSymbTable() {
- level = new ArrayList<SymbMap>();
+ level = new ArrayList<>();
//Insert the default binding for xmlns.
symb = (SymbMap) initialMap.clone();
}
@@ -333,7 +333,7 @@ class SymbMap implements Cloneable {
}
List<NameSpaceSymbEntry> entrySet() {
- List<NameSpaceSymbEntry> a = new ArrayList<NameSpaceSymbEntry>();
+ List<NameSpaceSymbEntry> a = new ArrayList<>();
for (int i = 0;i < entries.length;i++) {
if (entries[i] != null && !"".equals(entries[i].uri)) {
a.add(entries[i]);
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=1782475&r1=1782474&r2=1782475&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 Fri Feb 10 14:18:16 2017
@@ -681,7 +681,7 @@ public class XMLCipher {
*/
public void registerInternalKeyResolver(KeyResolverSpi keyResolver) {
if (internalKeyResolvers == null) {
- internalKeyResolvers = new ArrayList<KeyResolverSpi>();
+ internalKeyResolvers = new ArrayList<>();
}
internalKeyResolvers.add(keyResolver);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/KeyInfo.java Fri Feb 10 14:18:16 2017
@@ -102,7 +102,7 @@ public class KeyInfo extends SignatureEl
private static final List<StorageResolver> nullList;
static {
- List<StorageResolver> list = new ArrayList<StorageResolver>(1);
+ List<StorageResolver> list = new ArrayList<>(1);
list.add(null);
nullList = java.util.Collections.unmodifiableList(list);
}
@@ -113,7 +113,7 @@ public class KeyInfo extends SignatureEl
/**
* Stores the individual (per-KeyInfo) {@link KeyResolverSpi}s
*/
- private List<KeyResolverSpi> internalKeyResolvers = new ArrayList<KeyResolverSpi>();
+ private List<KeyResolverSpi> internalKeyResolvers = new ArrayList<>();
private boolean secureValidation;
@@ -317,7 +317,7 @@ public class KeyInfo extends SignatureEl
*/
public void add(X509Data x509data) {
if (x509Datas == null) {
- x509Datas = new ArrayList<X509Data>();
+ x509Datas = new ArrayList<>();
}
x509Datas.add(x509data);
appendSelf(x509data);
@@ -333,7 +333,7 @@ public class KeyInfo extends SignatureEl
public void add(EncryptedKey encryptedKey) throws XMLEncryptionException {
if (encryptedKeys == null) {
- encryptedKeys = new ArrayList<EncryptedKey>();
+ encryptedKeys = new ArrayList<>();
}
encryptedKeys.add(encryptedKey);
XMLCipher cipher = XMLCipher.getInstance();
@@ -1270,7 +1270,7 @@ public class KeyInfo extends SignatureEl
public void addStorageResolver(StorageResolver storageResolver) {
if (storageResolvers == nullList) {
// Replace the default null StorageResolver
- storageResolvers = new ArrayList<StorageResolver>();
+ storageResolvers = new ArrayList<>();
}
this.storageResolvers.add(storageResolver);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java Fri Feb 10 14:18:16 2017
@@ -266,7 +266,7 @@ public class KeyResolver {
public static void registerClassNames(List<String> classNames)
throws ClassNotFoundException, IllegalAccessException, InstantiationException {
JavaUtils.checkRegisterPermission();
- List<KeyResolver> keyResolverList = new ArrayList<KeyResolver>(classNames.size());
+ List<KeyResolver> keyResolverList = new ArrayList<>(classNames.size());
for (String className : classNames) {
KeyResolverSpi keyResolverSpi =
(KeyResolverSpi)ClassLoaderUtils.loadClass(className, KeyResolver.class).newInstance();
@@ -281,7 +281,7 @@ public class KeyResolver {
*/
public static void registerDefaultResolvers() {
- List<KeyResolver> keyResolverList = new ArrayList<KeyResolver>();
+ List<KeyResolver> keyResolverList = new ArrayList<>();
keyResolverList.add(new KeyResolver(new RSAKeyValueResolver()));
keyResolverList.add(new KeyResolver(new DSAKeyValueResolver()));
keyResolverList.add(new KeyResolver(new X509CertificateResolver()));
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/EncryptedKeyResolver.java Fri Feb 10 14:18:16 2017
@@ -84,7 +84,7 @@ public class EncryptedKeyResolver extend
*/
public void registerInternalKeyResolver(KeyResolverSpi realKeyResolver) {
if (internalKeyResolvers == null) {
- internalKeyResolvers = new ArrayList<KeyResolverSpi>();
+ internalKeyResolvers = new ArrayList<>();
}
internalKeyResolvers.add(realKeyResolver);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java Fri Feb 10 14:18:16 2017
@@ -334,7 +334,7 @@ public class RetrievalMethodResolver ext
break;
}
}
- List<Node> parents = new ArrayList<Node>();
+ List<Node> parents = new ArrayList<>();
// Obtain all the parents of the elemnt
while (e != null) {
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java Fri Feb 10 14:18:16 2017
@@ -62,7 +62,7 @@ public class StorageResolver {
*/
public void add(StorageResolverSpi resolver) {
if (storageResolvers == null) {
- storageResolvers = new ArrayList<StorageResolverSpi>();
+ storageResolvers = new ArrayList<>();
}
this.storageResolvers.add(resolver);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java Fri Feb 10 14:18:16 2017
@@ -52,7 +52,7 @@ public class CertsInFilesystemDirectoryR
private String merlinsCertificatesDir = null;
/** Field certs */
- private List<X509Certificate> certs = new ArrayList<X509Certificate>();
+ private List<X509Certificate> certs = new ArrayList<>();
/**
* @param directoryName
@@ -73,7 +73,7 @@ public class CertsInFilesystemDirectoryR
private void readCertsFromHarddrive() throws StorageResolverException {
File certDir = new File(this.merlinsCertificatesDir);
- List<String> al = new ArrayList<String>();
+ List<String> al = new ArrayList<>();
String[] names = certDir.list();
if (names != null) {
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=1782475&r1=1782474&r2=1782475&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 Fri Feb 10 14:18:16 2017
@@ -84,7 +84,7 @@ public class Manifest extends SignatureE
addReturnToSelf();
- this.references = new ArrayList<Reference>();
+ this.references = new ArrayList<>();
}
/**
@@ -138,7 +138,7 @@ public class Manifest extends SignatureE
}
// create List
- this.references = new ArrayList<Reference>(le);
+ this.references = new ArrayList<>(le);
for (int i = 0; i < le; i++) {
Element refElem = referencesEl[i];
@@ -476,7 +476,7 @@ public class Manifest extends SignatureE
return;
}
if (perManifestResolvers == null) {
- perManifestResolvers = new ArrayList<ResourceResolver>();
+ perManifestResolvers = new ArrayList<>();
}
this.perManifestResolvers.add(resolver);
}
@@ -493,7 +493,7 @@ public class Manifest extends SignatureE
return;
}
if (perManifestResolvers == null) {
- perManifestResolvers = new ArrayList<ResourceResolver>();
+ perManifestResolvers = new ArrayList<>();
}
perManifestResolvers.add(new ResourceResolver(resolverSpi));
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/Reference.java Fri Feb 10 14:18:16 2017
@@ -546,7 +546,7 @@ public class Reference extends Signature
}
}
- Set<String> inclusiveNamespaces = new HashSet<String>();
+ Set<String> inclusiveNamespaces = new HashSet<>();
if (c14nTransform != null
&& c14nTransform.length(
InclusiveNamespaces.ExclusiveCanonicalizationNamespace,
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java Fri Feb 10 14:18:16 2017
@@ -106,7 +106,7 @@ public class XMLSignatureInput {
/**
* Node Filter list.
*/
- private List<NodeFilter> nodeFilters = new ArrayList<NodeFilter>();
+ private List<NodeFilter> nodeFilters = new ArrayList<>();
private boolean needsToBeExpanded = false;
private OutputStream outputStream = null;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/reference/ReferenceSubTreeData.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/reference/ReferenceSubTreeData.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/reference/ReferenceSubTreeData.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/reference/ReferenceSubTreeData.java Fri Feb 10 14:18:16 2017
@@ -109,7 +109,7 @@ public class ReferenceSubTreeData implem
* @return a set of nodes (minus any comment nodes)
*/
private List<Node> dereferenceSameDocumentURI(Node node) {
- List<Node> nodeSet = new ArrayList<Node>();
+ List<Node> nodeSet = new ArrayList<>();
if (node != null) {
nodeSetMinusCommentNodes(node, nodeSet, null);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ResourceResolverMapper.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ResourceResolverMapper.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ResourceResolverMapper.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/config/ResourceResolverMapper.java Fri Feb 10 14:18:16 2017
@@ -42,7 +42,7 @@ public class ResourceResolverMapper {
protected static synchronized void init(ResourceResolversType resourceResolversType,
Class<?> callingClass) throws Exception {
List<ResolverType> handlerList = resourceResolversType.getResolver();
- resourceResolvers = new ArrayList<ResourceResolverLookup>(handlerList.size() + 1);
+ resourceResolvers = new ArrayList<>(handlerList.size() + 1);
for (int i = 0; i < handlerList.size(); i++) {
ResolverType uriResolverType = handlerList.get(i);
resourceResolvers.add((ResourceResolverLookup)
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractInputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractInputProcessor.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractInputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractInputProcessor.java Fri Feb 10 14:18:16 2017
@@ -57,7 +57,7 @@ public abstract class AbstractInputProce
@Override
public void addBeforeProcessor(Object processor) {
- this.beforeProcessors = new HashSet<Object>();
+ this.beforeProcessors = new HashSet<>();
this.beforeProcessors.add(processor);
}
@@ -71,7 +71,7 @@ public abstract class AbstractInputProce
@Override
public void addAfterProcessor(Object processor) {
- this.afterProcessors = new HashSet<Object>();
+ this.afterProcessors = new HashSet<>();
this.afterProcessors.add(processor);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractInputSecurityHeaderHandler.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractInputSecurityHeaderHandler.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractInputSecurityHeaderHandler.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractInputSecurityHeaderHandler.java Fri Feb 10 14:18:16 2017
@@ -68,7 +68,7 @@ public abstract class AbstractInputSecur
}
protected List<XMLSecEvent> getResponsibleXMLSecEvents(Deque<XMLSecEvent> xmlSecEvents, int index) {
- List<XMLSecEvent> xmlSecEventList = new ArrayList<XMLSecEvent>();
+ List<XMLSecEvent> xmlSecEventList = new ArrayList<>();
Iterator<XMLSecEvent> xmlSecEventIterator = xmlSecEvents.descendingIterator();
int curIdx = 0;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractOutputProcessor.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/AbstractOutputProcessor.java Fri Feb 10 14:18:16 2017
@@ -89,7 +89,7 @@ public abstract class AbstractOutputProc
@Override
public void addBeforeProcessor(Object processor) {
if (this.beforeProcessors == null) {
- this.beforeProcessors = new HashSet<Object>();
+ this.beforeProcessors = new HashSet<>();
}
this.beforeProcessors.add(processor);
}
@@ -105,7 +105,7 @@ public abstract class AbstractOutputProc
@Override
public void addAfterProcessor(Object processor) {
if (this.afterProcessors == null) {
- this.afterProcessors = new HashSet<Object>();
+ this.afterProcessors = new HashSet<>();
}
this.afterProcessors.add(processor);
}
@@ -172,7 +172,7 @@ public abstract class AbstractOutputProc
List<XMLSecNamespace> comparableNamespaces = Collections.emptyList();
if (outputLocalNs) {
- comparableNamespaces = new ArrayList<XMLSecNamespace>(2);
+ comparableNamespaces = new ArrayList<>(2);
comparableNamespaces.add(XMLSecEventFactory.createXMLSecNamespace(element.getPrefix(), element.getNamespaceURI()));
}
@@ -188,7 +188,7 @@ public abstract class AbstractOutputProc
if (!comparableNamespaces.contains(xmlSecAttribute.getAttributeNamespace())) {
if (comparableNamespaces == Collections.<XMLSecNamespace>emptyList()) {
- comparableNamespaces = new ArrayList<XMLSecNamespace>(1);
+ comparableNamespaces = new ArrayList<>(1);
}
comparableNamespaces.add(xmlSecAttribute.getAttributeNamespace());
}
@@ -265,8 +265,8 @@ public abstract class AbstractOutputProc
throws XMLStreamException, XMLSecurityException {
NamedNodeMap namedNodeMap = element.getAttributes();
- List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(namedNodeMap.getLength());
- List<XMLSecNamespace> namespaces = new ArrayList<XMLSecNamespace>(namedNodeMap.getLength());
+ List<XMLSecAttribute> attributes = new ArrayList<>(namedNodeMap.getLength());
+ List<XMLSecNamespace> namespaces = new ArrayList<>(namedNodeMap.getLength());
for (int i = 0; i < namedNodeMap.getLength(); i++) {
Attr attribute = (Attr) namedNodeMap.item(i);
if (attribute.getPrefix() == null) {
Modified: 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=1782475&r1=1782474&r2=1782475&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 Fri Feb 10 14:18:16 2017
@@ -36,7 +36,7 @@ import javax.xml.namespace.QName;
*/
public class XMLSecurityProperties {
- private final List<InputProcessor> inputProcessorList = new ArrayList<InputProcessor>();
+ private final List<InputProcessor> inputProcessorList = new ArrayList<>();
private boolean skipDocumentEvents = false;
private boolean disableSchemaValidation = false;
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java Fri Feb 10 14:18:16 2017
@@ -236,7 +236,7 @@ public class XMLSecurityUtils {
} else if ("EC".equals(algorithm)) {
ECPublicKey ecPublicKey = (ECPublicKey) publicKey;
- List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(1);
+ List<XMLSecAttribute> attributes = new ArrayList<>(1);
attributes.add(abstractOutputProcessor.createAttribute(XMLSecurityConstants.ATT_NULL_URI, "urn:oid:" + ECDSAUtils.getOIDFromPublicKey(ecPublicKey)));
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig11_ECKeyValue, true, null);
abstractOutputProcessor.createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_dsig11_NamedCurve, false, attributes);
@@ -372,12 +372,12 @@ public class XMLSecurityUtils {
if (xmlSecStartElement == null) {
return Collections.emptySet();
}
- Set<String> prefixes = new HashSet<String>();
+ Set<String> prefixes = new HashSet<>();
XMLSecStartElement parentXMXmlSecStartElement = xmlSecStartElement.getParentXMLSecStartElement();
if (parentXMXmlSecStartElement != null) {
List<XMLSecNamespace> onElementDeclaredNamespaces = parentXMXmlSecStartElement.getOnElementDeclaredNamespaces();
- List<XMLSecNamespace> xmlSecNamespaces = new ArrayList<XMLSecNamespace>();
+ List<XMLSecNamespace> xmlSecNamespaces = new ArrayList<>();
parentXMXmlSecStartElement.getNamespacesFromCurrentScope(xmlSecNamespaces);
xmlSecNamespaces = xmlSecNamespaces.subList(0, xmlSecNamespaces.size() - onElementDeclaredNamespaces.size());
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/stax/XMLSecEventFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/stax/XMLSecEventFactory.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/stax/XMLSecEventFactory.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/ext/stax/XMLSecEventFactory.java Fri Feb 10 14:18:16 2017
@@ -45,7 +45,7 @@ public class XMLSecEventFactory {
List<XMLSecAttribute> comparableAttributes = null;
final int attributeCount = xmlStreamReader.getAttributeCount();
if (attributeCount > 0) {
- comparableAttributes = new ArrayList<XMLSecAttribute>(attributeCount);
+ comparableAttributes = new ArrayList<>(attributeCount);
for (int i = 0; i < attributeCount; i++) {
comparableAttributes.add(XMLSecEventFactory.createXMLSecAttribute(xmlStreamReader.getAttributeName(i), xmlStreamReader.getAttributeValue(i)));
}
@@ -54,7 +54,7 @@ public class XMLSecEventFactory {
List<XMLSecNamespace> comparableNamespaces = null;
final int namespaceCount = xmlStreamReader.getNamespaceCount();
if (namespaceCount > 0) {
- comparableNamespaces = new ArrayList<XMLSecNamespace>(namespaceCount);
+ comparableNamespaces = new ArrayList<>(namespaceCount);
for (int i = 0; i < namespaceCount; i++) {
comparableNamespaces.add(XMLSecNamespaceImpl.getInstance(xmlStreamReader.getNamespacePrefix(i), xmlStreamReader.getNamespaceURI(i)));
}
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=1782475&r1=1782474&r2=1782475&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 Fri Feb 10 14:18:16 2017
@@ -31,7 +31,7 @@ import java.util.*;
public class AbstractSecurityContextImpl {
@SuppressWarnings("unchecked")
private final Map content = Collections.synchronizedMap(new HashMap());
- private final List<SecurityEventListener> securityEventListeners = new ArrayList<SecurityEventListener>(2);
+ private final List<SecurityEventListener> securityEventListeners = new ArrayList<>(2);
public void addSecurityEventListener(SecurityEventListener securityEventListener) {
if (securityEventListener != null) {
@@ -72,7 +72,7 @@ public class AbstractSecurityContextImpl
}
List<T> entry = (List<T>) content.get(key);
if (entry == null) {
- entry = new ArrayList<T>();
+ entry = new ArrayList<>();
content.put(key, entry);
}
entry.addAll(value);
@@ -82,7 +82,7 @@ public class AbstractSecurityContextImpl
public <T> void putAsList(Object key, T value) {
List<T> entry = (List<T>) content.get(key);
if (entry == null) {
- entry = new ArrayList<T>();
+ entry = new ArrayList<>();
content.put(key, entry);
}
entry.add(value);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/InputProcessorChainImpl.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/InputProcessorChainImpl.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/InputProcessorChainImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/InputProcessorChainImpl.java Fri Feb 10 14:18:16 2017
@@ -51,11 +51,11 @@ public class InputProcessorChainImpl imp
}
public InputProcessorChainImpl(InboundSecurityContext inboundSecurityContext, int startPos) {
- this(inboundSecurityContext, new DocumentContextImpl(), startPos, new ArrayList<InputProcessor>(20));
+ this(inboundSecurityContext, new DocumentContextImpl(), startPos, new ArrayList<>(20));
}
public InputProcessorChainImpl(InboundSecurityContext inboundSecurityContext, DocumentContextImpl documentContext) {
- this(inboundSecurityContext, documentContext, 0, new ArrayList<InputProcessor>(20));
+ this(inboundSecurityContext, documentContext, 0, new ArrayList<>(20));
}
protected InputProcessorChainImpl(InboundSecurityContext inboundSecurityContext, DocumentContextImpl documentContextImpl,
@@ -209,7 +209,7 @@ public class InputProcessorChainImpl imp
try {
final DocumentContextImpl docContext = clone ? documentContext.clone() : documentContext;
inputProcessorChain = new InputProcessorChainImpl(inboundSecurityContext, docContext,
- inputProcessors.indexOf(inputProcessor) + 1, new ArrayList<InputProcessor>(this.inputProcessors));
+ inputProcessors.indexOf(inputProcessor) + 1, new ArrayList<>(this.inputProcessors));
} catch (CloneNotSupportedException e) {
throw new XMLSecurityException(e);
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/OutputProcessorChainImpl.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/OutputProcessorChainImpl.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/OutputProcessorChainImpl.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/OutputProcessorChainImpl.java Fri Feb 10 14:18:16 2017
@@ -54,11 +54,11 @@ public class OutputProcessorChainImpl im
}
public OutputProcessorChainImpl(OutboundSecurityContext outboundSecurityContext, int startPos) {
- this(outboundSecurityContext, new DocumentContextImpl(), startPos, new ArrayList<OutputProcessor>(20));
+ this(outboundSecurityContext, new DocumentContextImpl(), startPos, new ArrayList<>(20));
}
public OutputProcessorChainImpl(OutboundSecurityContext outboundSecurityContext, DocumentContextImpl documentContext) {
- this(outboundSecurityContext, documentContext, 0, new ArrayList<OutputProcessor>(20));
+ this(outboundSecurityContext, documentContext, 0, new ArrayList<>(20));
}
protected OutputProcessorChainImpl(OutboundSecurityContext outboundSecurityContext, DocumentContextImpl documentContextImpl,
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java?rev=1782475&r1=1782474&r2=1782475&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java Fri Feb 10 14:18:16 2017
@@ -443,7 +443,7 @@ public class XMLSecurityStreamWriter imp
private void addNamespace(XMLSecNamespace namespace) {
if (this.namespaces == Collections.<XMLSecNamespace>emptyList()) {
- this.namespaces = new ArrayList<XMLSecNamespace>(1);
+ this.namespaces = new ArrayList<>(1);
}
this.namespaces.add(namespace);
@@ -457,7 +457,7 @@ public class XMLSecurityStreamWriter imp
private void addAttribute(XMLSecAttribute attribute) {
if (this.attributes == Collections.<XMLSecAttribute>emptyList()) {
- this.attributes = new ArrayList<XMLSecAttribute>(1);
+ this.attributes = new ArrayList<>(1);
}
this.attributes.add(attribute);
}
@@ -525,7 +525,7 @@ public class XMLSecurityStreamWriter imp
@SuppressWarnings("rawtypes")
@Override
public Iterator getPrefixes(String namespaceURI) {
- List<String> prefixes = new ArrayList<String>(1);
+ List<String> prefixes = new ArrayList<>(1);
for (int i = 1; i < prefixNsList.size(); i += 2) {
String s = prefixNsList.get(i);
if (s.equals(namespaceURI)) {
@@ -545,7 +545,7 @@ public class XMLSecurityStreamWriter imp
private void add(String prefix, String namespace) {
if (this.prefixNsList == Collections.<String>emptyList()) {
- this.prefixNsList = new ArrayList<String>(1);
+ this.prefixNsList = new ArrayList<>(1);
}
this.prefixNsList.add(prefix);
this.prefixNsList.add(namespace);
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=1782475&r1=1782474&r2=1782475&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 Fri Feb 10 14:18:16 2017
@@ -97,7 +97,7 @@ public abstract class AbstractDecryptInp
final List<JAXBElement<ReferenceType>> dataReferenceOrKeyReference = referenceList.getDataReferenceOrKeyReference();
references = new HashMap<String, ReferenceType>(dataReferenceOrKeyReference.size() + 1); //+1 because the HashMap will resize otherwise
- processedReferences = new ArrayList<ReferenceType>(dataReferenceOrKeyReference.size());
+ processedReferences = new ArrayList<>(dataReferenceOrKeyReference.size());
Iterator<JAXBElement<ReferenceType>> referenceTypeIterator = dataReferenceOrKeyReference.iterator();
while (referenceTypeIterator.hasNext()) {
@@ -321,8 +321,8 @@ public abstract class AbstractDecryptInp
stringBuilder.append('\"');
//apply all namespaces from current scope to get a valid documentfragment:
- List<XMLSecNamespace> comparableNamespacesToApply = new ArrayList<XMLSecNamespace>();
- List<XMLSecNamespace> comparableNamespaceList = new ArrayList<XMLSecNamespace>();
+ List<XMLSecNamespace> comparableNamespacesToApply = new ArrayList<>();
+ List<XMLSecNamespace> comparableNamespaceList = new ArrayList<>();
xmlSecStartElement.getNamespacesFromCurrentScope(comparableNamespaceList);
//reverse iteration -> From current element namespaces to parent namespaces
for (int i = comparableNamespaceList.size() - 1; i >= 0; i--) {
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=1782475&r1=1782474&r2=1782475&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 Fri Feb 10 14:18:16 2017
@@ -92,7 +92,7 @@ public abstract class AbstractSignatureR
}
sameDocumentReferences = new ArrayList<KeyValue<ResourceResolver, ReferenceType>>(referencesTypeList.size());
externalReferences = new ArrayList<KeyValue<ResourceResolver, ReferenceType>>(referencesTypeList.size());
- processedReferences = new ArrayList<ReferenceType>(referencesTypeList.size());
+ processedReferences = new ArrayList<>(referencesTypeList.size());
Iterator<ReferenceType> referenceTypeIterator = referencesTypeList.iterator();
while (referenceTypeIterator.hasNext()) {
@@ -198,7 +198,7 @@ public abstract class AbstractSignatureR
if (m != null
&& (Boolean)m.invoke(resolver, xmlSecStartElement, getSecurityProperties().getIdAttributeNS())) {
if (referenceTypes == Collections.<ReferenceType>emptyList()) {
- referenceTypes = new ArrayList<ReferenceType>();
+ referenceTypes = new ArrayList<>();
}
referenceTypes.add(keyValue.getValue());
resourceMatches = true;
@@ -213,7 +213,7 @@ public abstract class AbstractSignatureR
if (!resourceMatches && keyValue.getKey().matches(xmlSecStartElement)) {
if (referenceTypes == Collections.<ReferenceType>emptyList()) {
- referenceTypes = new ArrayList<ReferenceType>();
+ referenceTypes = new ArrayList<>();
}
referenceTypes.add(keyValue.getValue());
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.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/AbstractEncryptOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractEncryptOutputProcessor.java Fri Feb 10 14:18:16 2017
@@ -281,12 +281,12 @@ public abstract class AbstractEncryptOut
*/
protected void processEventInternal(XMLSecStartElement xmlSecStartElement, OutputProcessorChain outputProcessorChain)
throws XMLStreamException, XMLSecurityException {
- List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(2);
+ List<XMLSecAttribute> attributes = new ArrayList<>(2);
attributes.add(createAttribute(XMLSecurityConstants.ATT_NULL_Id, getEncryptionPartDef().getEncRefId()));
attributes.add(createAttribute(XMLSecurityConstants.ATT_NULL_Type, getEncryptionPartDef().getModifier().getModifier()));
createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_xenc_EncryptedData, true, attributes);
- attributes = new ArrayList<XMLSecAttribute>(1);
+ attributes = new ArrayList<>(1);
attributes.add(createAttribute(XMLSecurityConstants.ATT_NULL_Algorithm, securityProperties.getEncryptionSymAlgorithm()));
createStartElementAndOutputAsEvent(outputProcessorChain, XMLSecurityConstants.TAG_xenc_EncryptionMethod, false, attributes);
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=1782475&r1=1782474&r2=1782475&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 Fri Feb 10 14:18:16 2017
@@ -103,9 +103,9 @@ public abstract class AbstractSignatureE
OutputProcessorChain subOutputProcessorChain = outputProcessorChain.createSubChain(this);
- List<XMLSecAttribute> attributes = new ArrayList<XMLSecAttribute>(1);
+ List<XMLSecAttribute> attributes = new ArrayList<>(1);
if (securityProperties.isSignatureGenerateIds()) {
- attributes = new ArrayList<XMLSecAttribute>(1);
+ attributes = new ArrayList<>(1);
attributes.add(createAttribute(XMLSecurityConstants.ATT_NULL_Id, IDGenerator.generateID(null)));
} else {
attributes = Collections.emptyList();
@@ -149,13 +149,13 @@ public abstract class AbstractSignatureE
SignedInfoProcessor signedInfoProcessor = newSignedInfoProcessor(signatureAlgorithm, signatureElement, subOutputProcessorChain);
createStartElementAndOutputAsEvent(subOutputProcessorChain, XMLSecurityConstants.TAG_dsig_SignedInfo, false, null);
- attributes = new ArrayList<XMLSecAttribute>(1);
+ attributes = new ArrayList<>(1);
final String signatureCanonicalizationAlgorithm = getSecurityProperties().getSignatureCanonicalizationAlgorithm();
attributes.add(createAttribute(XMLSecurityConstants.ATT_NULL_Algorithm, signatureCanonicalizationAlgorithm));
createStartElementAndOutputAsEvent(subOutputProcessorChain, XMLSecurityConstants.TAG_dsig_CanonicalizationMethod, false, attributes);
if (getSecurityProperties().isAddExcC14NInclusivePrefixes() && XMLSecurityConstants.NS_C14N_EXCL.equals(signatureCanonicalizationAlgorithm)) {
- attributes = new ArrayList<XMLSecAttribute>(1);
+ attributes = new ArrayList<>(1);
attributes.add(createAttribute(XMLSecurityConstants.ATT_NULL_PrefixList, signedInfoProcessor.getInclusiveNamespacePrefixes()));
createStartElementAndOutputAsEvent(subOutputProcessorChain, XMLSecurityConstants.TAG_c14nExcl_InclusiveNamespaces, true, attributes);
createEndElementAndOutputAsEvent(subOutputProcessorChain, XMLSecurityConstants.TAG_c14nExcl_InclusiveNamespaces);
@@ -163,7 +163,7 @@ public abstract class AbstractSignatureE
createEndElementAndOutputAsEvent(subOutputProcessorChain, XMLSecurityConstants.TAG_dsig_CanonicalizationMethod);
- attributes = new ArrayList<XMLSecAttribute>(1);
+ attributes = new ArrayList<>(1);
attributes.add(createAttribute(XMLSecurityConstants.ATT_NULL_Algorithm, getSecurityProperties().getSignatureAlgorithm()));
createStartElementAndOutputAsEvent(subOutputProcessorChain, XMLSecurityConstants.TAG_dsig_SignatureMethod, false, attributes);
createEndElementAndOutputAsEvent(subOutputProcessorChain, XMLSecurityConstants.TAG_dsig_SignatureMethod);
@@ -183,12 +183,12 @@ public abstract class AbstractSignatureE
} else {
uriString = "";
}
- attributes = new ArrayList<XMLSecAttribute>(1);
+ attributes = new ArrayList<>(1);
attributes.add(createAttribute(XMLSecurityConstants.ATT_NULL_URI, uriString));
createStartElementAndOutputAsEvent(subOutputProcessorChain, XMLSecurityConstants.TAG_dsig_Reference, false, attributes);
createTransformsStructureForSignature(subOutputProcessorChain, signaturePartDef);
- attributes = new ArrayList<XMLSecAttribute>(1);
+ attributes = new ArrayList<>(1);
attributes.add(createAttribute(XMLSecurityConstants.ATT_NULL_Algorithm, signaturePartDef.getDigestAlgo()));
createStartElementAndOutputAsEvent(subOutputProcessorChain, XMLSecurityConstants.TAG_dsig_DigestMethod, false, attributes);
createEndElementAndOutputAsEvent(subOutputProcessorChain, XMLSecurityConstants.TAG_dsig_DigestMethod);
@@ -207,7 +207,7 @@ public abstract class AbstractSignatureE
createEndElementAndOutputAsEvent(subOutputProcessorChain, XMLSecurityConstants.TAG_dsig_SignatureValue);
if (securityProperties.isSignatureGenerateIds()) {
- attributes = new ArrayList<XMLSecAttribute>(1);
+ attributes = new ArrayList<>(1);
attributes.add(createAttribute(XMLSecurityConstants.ATT_NULL_Id, IDGenerator.generateID(null)));
} else {
attributes = Collections.emptyList();
@@ -278,7 +278,7 @@ public abstract class AbstractSignatureE
transformerProperties = new HashMap<String, Object>(2);
transformerProperties.put(
- Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST, new ArrayList<String>(prefixSet));
+ Canonicalizer20010315_Excl.INCLUSIVE_NAMESPACES_PREFIX_LIST, new ArrayList<>(prefixSet));
}
this.transformer = XMLSecurityUtils.getTransformer(null, this.bufferedSignerOutputStream,