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 2023/06/21 10:38:13 UTC
[santuario-xml-security-java] branch main updated: Eclipse IDE Sources Cleanup (#180)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/santuario-xml-security-java.git
The following commit(s) were added to refs/heads/main by this push:
new 3a8be1e8 Eclipse IDE Sources Cleanup (#180)
3a8be1e8 is described below
commit 3a8be1e8dea35b1bc79ed2a2950ee5516e6df553
Author: David Matějček <da...@omnifish.ee>
AuthorDate: Wed Jun 21 12:38:08 2023 +0200
Eclipse IDE Sources Cleanup (#180)
* Eclipse IDE - Organize Imports
Signed-off-by: David Matějček <da...@omnifish.ee>
* Eclipse IDE Source Cleanup
- Removed trailing spaces
- Using diamond operator
- Added missing Overrides
- Removed redundant class casts
Signed-off-by: David Matějček <da...@omnifish.ee>
---------
Signed-off-by: David Matějček <da...@omnifish.ee>
---
.../xml/dsig/internal/DigesterOutputStream.java | 1 +
.../jcp/xml/dsig/internal/MacOutputStream.java | 1 +
.../internal/dom/AbstractDOMSignatureMethod.java | 6 +-
.../xml/dsig/internal/dom/ApacheCanonicalizer.java | 14 ++++-
.../jcp/xml/dsig/internal/dom/ApacheData.java | 1 +
.../xml/dsig/internal/dom/ApacheNodeSetData.java | 7 ++-
.../dsig/internal/dom/ApacheOctetStreamData.java | 3 +
.../jcp/xml/dsig/internal/dom/ApacheTransform.java | 27 ++++++---
.../internal/dom/DOMCanonicalXMLC14N11Method.java | 11 ++--
.../internal/dom/DOMCanonicalXMLC14NMethod.java | 12 ++--
.../internal/dom/DOMCanonicalizationMethod.java | 10 +++-
.../jcp/xml/dsig/internal/dom/DOMCryptoBinary.java | 3 +-
.../jcp/xml/dsig/internal/dom/DOMDigestMethod.java | 19 ++++--
.../dsig/internal/dom/DOMEnvelopedTransform.java | 2 +
.../xml/dsig/internal/dom/DOMExcC14NMethod.java | 22 ++++---
.../dsig/internal/dom/DOMHMACSignatureMethod.java | 38 +++++++++---
.../jcp/xml/dsig/internal/dom/DOMKeyInfo.java | 3 +
.../xml/dsig/internal/dom/DOMKeyInfoFactory.java | 14 ++++-
.../jcp/xml/dsig/internal/dom/DOMKeyName.java | 1 +
.../jcp/xml/dsig/internal/dom/DOMKeyValue.java | 2 +
.../jcp/xml/dsig/internal/dom/DOMManifest.java | 16 +++--
.../jcp/xml/dsig/internal/dom/DOMPGPData.java | 13 ++--
.../internal/dom/DOMRSAPSSSignatureMethod.java | 35 ++++++++---
.../jcp/xml/dsig/internal/dom/DOMReference.java | 66 +++++++++++++++-----
.../xml/dsig/internal/dom/DOMRetrievalMethod.java | 5 ++
.../xml/dsig/internal/dom/DOMSignatureMethod.java | 67 ++++++++++++++++++---
.../dsig/internal/dom/DOMSignatureProperties.java | 14 +++--
.../dsig/internal/dom/DOMSignatureProperty.java | 15 +++--
.../jcp/xml/dsig/internal/dom/DOMSignedInfo.java | 32 +++++++---
.../jcp/xml/dsig/internal/dom/DOMStructure.java | 8 ++-
.../jcp/xml/dsig/internal/dom/DOMSubTreeData.java | 7 ++-
.../jcp/xml/dsig/internal/dom/DOMTransform.java | 4 ++
.../xml/dsig/internal/dom/DOMURIDereferencer.java | 19 +++---
.../jcp/xml/dsig/internal/dom/DOMX509Data.java | 4 +-
.../xml/dsig/internal/dom/DOMX509IssuerSerial.java | 8 ++-
.../jcp/xml/dsig/internal/dom/DOMXMLObject.java | 19 ++++--
.../jcp/xml/dsig/internal/dom/DOMXMLSignature.java | 42 +++++++++----
.../dsig/internal/dom/DOMXMLSignatureFactory.java | 56 ++++++++++++++---
.../internal/dom/DOMXPathFilter2Transform.java | 3 +
.../xml/dsig/internal/dom/DOMXPathTransform.java | 2 +
.../xml/dsig/internal/dom/DOMXSLTTransform.java | 11 +++-
.../apache/jcp/xml/dsig/internal/dom/Utils.java | 8 ++-
.../jcp/xml/dsig/internal/dom/XMLDSigRI.java | 17 ++++--
.../algorithms/MessageDigestAlgorithm.java | 2 +
.../security/algorithms/SignatureAlgorithm.java | 8 ++-
.../security/algorithms/SignatureAlgorithmSpi.java | 7 ++-
.../algorithms/implementations/ECDSAUtils.java | 7 ++-
.../algorithms/implementations/IntegrityHmac.java | 12 ++++
.../implementations/SignatureBaseRSA.java | 18 +++++-
.../algorithms/implementations/SignatureDSA.java | 14 +++++
.../algorithms/implementations/SignatureECDSA.java | 22 ++++++-
.../algorithms/implementations/SignatureEDDSA.java | 27 +++++++--
.../apache/xml/security/c14n/Canonicalizer.java | 2 +-
.../xml/security/c14n/helper/AttrCompare.java | 6 +-
.../Canonicalizer11_OmitComments.java | 1 +
.../Canonicalizer11_WithComments.java | 1 +
.../implementations/Canonicalizer20010315.java | 4 ++
.../implementations/Canonicalizer20010315Excl.java | 5 ++
.../Canonicalizer20010315ExclOmitComments.java | 1 +
.../Canonicalizer20010315ExclWithComments.java | 1 +
.../Canonicalizer20010315OmitComments.java | 1 +
.../Canonicalizer20010315WithComments.java | 1 +
.../c14n/implementations/CanonicalizerBase.java | 2 +
.../implementations/CanonicalizerPhysical.java | 4 ++
.../c14n/implementations/NameSpaceSymbTable.java | 2 +-
.../security/encryption/AbstractSerializer.java | 2 +
.../xml/security/encryption/AgreementMethod.java | 1 +
.../security/encryption/DocumentSerializer.java | 1 +
.../xml/security/encryption/EncryptionMethod.java | 1 +
.../security/encryption/EncryptionProperty.java | 1 +
.../apache/xml/security/encryption/Reference.java | 1 +
.../security/encryption/TransformSerializer.java | 1 +
.../apache/xml/security/encryption/XMLCipher.java | 70 ++++++++++++++++++++++
.../xml/security/encryption/XMLCipherInput.java | 4 +-
.../security/exceptions/XMLSecurityException.java | 2 +
.../java/org/apache/xml/security/keys/KeyInfo.java | 1 +
.../security/keys/content/DEREncodedKeyValue.java | 1 +
.../security/keys/content/KeyInfoReference.java | 1 +
.../apache/xml/security/keys/content/KeyName.java | 1 +
.../apache/xml/security/keys/content/KeyValue.java | 1 +
.../apache/xml/security/keys/content/MgmtData.java | 1 +
.../apache/xml/security/keys/content/PGPData.java | 1 +
.../xml/security/keys/content/RetrievalMethod.java | 1 +
.../apache/xml/security/keys/content/SPKIData.java | 1 +
.../apache/xml/security/keys/content/X509Data.java | 1 +
.../keys/content/keyvalues/DSAKeyValue.java | 2 +
.../keys/content/keyvalues/ECKeyValue.java | 11 ++--
.../keys/content/keyvalues/RSAKeyValue.java | 2 +
.../xml/security/keys/content/x509/XMLX509CRL.java | 1 +
.../keys/content/x509/XMLX509Certificate.java | 3 +
.../security/keys/content/x509/XMLX509Digest.java | 1 +
.../keys/content/x509/XMLX509IssuerSerial.java | 3 +
.../xml/security/keys/content/x509/XMLX509SKI.java | 3 +
.../keys/content/x509/XMLX509SubjectName.java | 3 +
.../xml/security/keys/keyresolver/KeyResolver.java | 8 ++-
.../implementations/PrivateKeyResolver.java | 2 +
.../implementations/RSAKeyValueResolver.java | 1 -
.../implementations/SecretKeyResolver.java | 2 +
.../implementations/SingleKeyResolver.java | 2 +
.../implementations/X509SKIResolver.java | 1 -
.../implementations/X509SubjectNameResolver.java | 1 -
.../xml/security/keys/storage/StorageResolver.java | 3 +
.../storage/implementations/KeyStoreResolver.java | 4 ++
.../implementations/SingleCertificateResolver.java | 4 ++
.../apache/xml/security/parser/XMLParserImpl.java | 6 +-
.../apache/xml/security/signature/Manifest.java | 1 +
.../xml/security/signature/ObjectContainer.java | 1 +
.../apache/xml/security/signature/Reference.java | 4 ++
.../security/signature/SignatureProperties.java | 1 +
.../xml/security/signature/SignatureProperty.java | 1 +
.../apache/xml/security/signature/SignedInfo.java | 3 +-
.../xml/security/signature/XMLSignature.java | 1 +
.../xml/security/signature/XMLSignatureInput.java | 1 +
.../signature/reference/ReferenceSubTreeData.java | 5 ++
.../stax/config/ConfigurationProperties.java | 6 +-
.../org/apache/xml/security/stax/config/Init.java | 21 +++----
.../stax/config/ResourceResolverMapper.java | 10 ++--
.../stax/config/SecurityHeaderHandlerMapper.java | 12 ++--
.../stax/config/TransformerAlgorithmMapper.java | 12 ++--
.../xml/security/stax/config/XIncludeHandler.java | 39 ++++++------
.../stax/ext/AbstractBufferingOutputProcessor.java | 8 ++-
.../security/stax/ext/AbstractInputProcessor.java | 11 ++--
.../ext/AbstractInputSecurityHeaderHandler.java | 12 ++--
.../xml/security/stax/ext/InboundXMLSec.java | 22 +++----
.../xml/security/stax/ext/InputProcessor.java | 7 ++-
.../xml/security/stax/ext/InputProcessorChain.java | 7 ++-
.../security/stax/ext/OutboundSecurityContext.java | 6 +-
.../xml/security/stax/ext/OutputProcessor.java | 7 ++-
.../security/stax/ext/OutputProcessorChain.java | 7 ++-
.../xml/security/stax/ext/ProcessorChain.java | 4 +-
.../xml/security/stax/ext/ResourceResolver.java | 5 +-
.../apache/xml/security/stax/ext/SecurePart.java | 3 +-
.../xml/security/stax/ext/SecurityContext.java | 4 +-
.../apache/xml/security/stax/ext/Transformer.java | 9 +--
.../org/apache/xml/security/stax/ext/XMLSec.java | 7 ++-
.../security/stax/ext/XMLSecurityConstants.java | 7 ++-
.../stax/ext/XMLSecurityHeaderHandler.java | 4 +-
.../security/stax/ext/XMLSecurityProperties.java | 11 +++-
.../xml/security/stax/ext/XMLSecurityUtils.java | 10 ++--
.../xml/security/stax/ext/stax/XMLSecEvent.java | 3 +-
.../security/stax/ext/stax/XMLSecStartElement.java | 3 +-
.../stax/impl/AbstractSecurityContextImpl.java | 8 ++-
.../security/stax/impl/DocumentContextImpl.java | 11 +++-
.../xml/security/stax/impl/EncryptionPartDef.java | 4 +-
.../stax/impl/InboundSecurityContextImpl.java | 13 ++--
.../stax/impl/OutboundSecurityContextImpl.java | 10 ++--
.../security/stax/impl/XMLSecurityEventReader.java | 9 +--
.../stax/impl/XMLSecurityStreamWriter.java | 21 +++----
.../impl/algorithms/HMACSignatureAlgorithm.java | 13 +++-
.../impl/algorithms/PKISignatureAlgorithm.java | 19 ++++--
.../stax/impl/algorithms/SignatureAlgorithm.java | 4 +-
.../impl/algorithms/SignatureAlgorithmFactory.java | 6 +-
.../input/AbstractDecryptInputProcessor.java | 7 ++-
.../input/AbstractSignatureInputHandler.java | 68 +++++++++++----------
...ractSignatureReferenceVerifyInputProcessor.java | 4 +-
.../input/XMLEncryptedKeyInputHandler.java | 3 +-
.../processor/input/XMLSecurityInputProcessor.java | 9 +--
.../XMLSignatureReferenceVerifyInputProcessor.java | 2 +-
.../AbstractSignatureEndingOutputProcessor.java | 7 ++-
.../output/AbstractSignatureOutputProcessor.java | 1 -
.../processor/output/FinalOutputProcessor.java | 11 ++--
.../output/XMLSignatureEndingOutputProcessor.java | 2 +-
.../output/XMLSignatureOutputProcessor.java | 4 +-
.../impl/resourceResolvers/ResolverFilesystem.java | 6 +-
.../stax/impl/resourceResolvers/ResolverHttp.java | 14 +++--
.../impl/resourceResolvers/ResolverXPointer.java | 13 ++--
.../AbstractInboundSecurityToken.java | 1 +
.../impl/securityToken/AbstractSecurityToken.java | 1 +
.../securityToken/DsaKeyValueSecurityToken.java | 12 ++--
.../securityToken/ECKeyValueSecurityToken.java | 17 ++++--
.../GenericOutboundSecurityToken.java | 5 +-
.../securityToken/RsaKeyValueSecurityToken.java | 12 ++--
.../X509IssuerSerialSecurityToken.java | 4 +-
.../stax/impl/stax/XMLSecAttributeImpl.java | 9 +--
.../stax/impl/stax/XMLSecCharactersImpl.java | 9 +--
.../security/stax/impl/stax/XMLSecCommentImpl.java | 9 +--
.../xml/security/stax/impl/stax/XMLSecDTDImpl.java | 11 ++--
.../stax/impl/stax/XMLSecEndDocumentImpl.java | 5 +-
.../stax/impl/stax/XMLSecEndElementImpl.java | 11 ++--
.../impl/stax/XMLSecEntityDeclarationImpl.java | 7 ++-
.../stax/impl/stax/XMLSecEntityReferenceImpl.java | 9 +--
.../stax/impl/stax/XMLSecEventBaseImpl.java | 19 +++---
.../stax/impl/stax/XMLSecNamespaceImpl.java | 15 ++---
.../impl/stax/XMLSecProcessingInstructionImpl.java | 9 +--
.../stax/impl/stax/XMLSecStartDocumentImpl.java | 7 ++-
.../stax/impl/stax/XMLSecStartElementImpl.java | 18 ++++--
.../impl/transformer/TransformBase64Decode.java | 12 ++--
.../transformer/TransformEnvelopedSignature.java | 9 +--
.../stax/impl/transformer/TransformIdentity.java | 16 +++--
.../transformer/canonicalizer/Canonicalizer11.java | 9 ++-
.../canonicalizer/CanonicalizerBase.java | 2 +-
.../security/stax/impl/util/ConcreteLSInput.java | 4 +-
.../stax/impl/util/IVSplittingOutputStream.java | 8 +--
.../AbstractElementSecurityEvent.java | 7 ++-
.../AbstractSecuredElementSecurityEvent.java | 6 +-
.../ContentEncryptedElementSecurityEvent.java | 6 +-
.../EncryptedElementSecurityEvent.java | 6 +-
.../securityEvent/SignedElementSecurityEvent.java | 6 +-
.../stax/securityEvent/TokenSecurityEvent.java | 2 +-
.../stax/securityToken/OutboundSecurityToken.java | 3 +-
.../apache/xml/security/transforms/Transform.java | 4 +-
.../xml/security/transforms/TransformSpi.java | 1 +
.../apache/xml/security/transforms/Transforms.java | 1 +
.../implementations/TransformBase64Decode.java | 3 +-
.../TransformEnvelopedSignature.java | 2 +
.../transforms/implementations/TransformXPath.java | 8 ++-
.../implementations/TransformXPath2Filter.java | 2 +
.../transforms/params/InclusiveNamespaces.java | 2 +
.../transforms/params/XPath2FilterContainer.java | 6 +-
.../security/transforms/params/XPathContainer.java | 1 +
.../java/org/apache/xml/security/utils/Base64.java | 44 +++++++-------
.../xml/security/utils/ClassLoaderUtils.java | 2 +
.../xml/security/utils/DOMNamespaceContext.java | 3 +
.../xml/security/utils/DigesterOutputStream.java | 3 +
.../apache/xml/security/utils/ElementProxy.java | 2 +-
.../apache/xml/security/utils/HelperNodeList.java | 2 +
.../org/apache/xml/security/utils/JDKXPathAPI.java | 3 +
.../apache/xml/security/utils/JDKXPathFactory.java | 1 +
.../security/utils/Signature11ElementProxy.java | 1 +
.../xml/security/utils/SignatureElementProxy.java | 1 +
.../xml/security/utils/SignerOutputStream.java | 3 +
.../utils/UnsyncByteArrayOutputStream.java | 3 +
.../implementations/ResolverDirectHTTP.java | 3 +-
.../resolver/implementations/ResolverFragment.java | 1 +
.../implementations/ResolverLocalFilesystem.java | 1 +
.../resolver/implementations/ResolverXPointer.java | 1 +
.../SecurityTokenFactoryImplTest.java | 4 +-
.../xml/security/test/dom/DSNamespaceContext.java | 3 +
.../MockCanonicalizationMethod.java | 7 ++-
.../test/dom/encryption/BobKeyResolver.java | 3 +-
.../test/dom/encryption/SignedEncryptedTest.java | 33 +++++-----
.../dom/utils/resolver/ResolverDirectHTTPTest.java | 6 +-
.../xml/security/test/dom/xalan/FuncHere.java | 6 +-
.../security/test/dom/xalan/TransformXPath.java | 1 +
.../test/dom/xalan/TransformXPath2Filter.java | 1 +
.../xml/security/test/dom/xalan/XalanXPathAPI.java | 15 ++---
.../security/test/dom/xalan/XalanXPathFactory.java | 1 +
.../test/javax/xml/crypto/KeySelectors.java | 42 +++++++++++--
.../security/test/javax/xml/crypto/dsig/AppB.java | 1 +
.../test/javax/xml/crypto/dsig/TestUtils.java | 19 ++++++
.../test/stax/IVSplittingOutputStreamTest.java | 10 ++--
.../test/stax/InputProcessorChainTest.java | 16 ++---
.../test/stax/OutputProcessorChainTest.java | 1 -
.../test/stax/TrimmerOutputStreamTest.java | 5 +-
.../xml/security/test/stax/UncategorizedTest.java | 10 ++--
.../xml/security/test/stax/XMLSecEventTest.java | 1 -
.../test/stax/XMLSecurityEventReaderTest.java | 14 ++---
.../test/stax/XMLSecurityEventWriterTest.java | 17 ++++--
.../test/stax/encryption/BaltimoreEncTest.java | 1 -
.../test/stax/encryption/DecryptionTest.java | 5 +-
.../stax/performance/AbstractPerformanceTest.java | 8 +--
.../stax/performance/PerformanceMemoryTest.java | 12 ++--
.../stax/performance/PerformanceTimingTest.java | 10 ++--
.../signature/BaltimoreRemoteReferenceTest.java | 3 +-
.../test/stax/signature/BaltimoreTest.java | 3 +-
.../stax/signature/IAIKRemoteReferenceTest.java | 2 +-
.../signature/PhaosExceptionForManifestTest.java | 3 +-
.../stax/signature/PhaosRemoteReferenceTest.java | 3 +-
.../security/test/stax/signature/PhaosTest.java | 28 ++++-----
.../SignatureCreationReferenceURIResolverTest.java | 2 -
.../signature/SignatureDigestCreationTest.java | 7 +--
.../signature/SignatureVerificationMaxRefTest.java | 2 +-
.../SignatureVerificationMaxTransTest.java | 2 +
...natureVerificationReferenceURIResolverTest.java | 3 +-
.../stax/signature/SignatureVerificationTest.java | 6 +-
.../stax/signature/TestSecurityEventListener.java | 6 +-
.../transformer/TransformBase64DecodeTest.java | 26 ++++----
.../transformer/TransformCanonicalizerTest.java | 20 +++----
.../TransformEnvelopedSignatureTest.java | 24 ++++----
.../stax/transformer/TransformIdentityTest.java | 26 ++++----
.../stax/utils/HttpRequestRedirectorProxy.java | 21 +++----
.../xml/security/test/stax/utils/StAX2DOM.java | 8 ++-
.../test/stax/utils/XMLSecEventAllocator.java | 8 +--
.../test/stax/utils/XmlReaderToWriter.java | 1 -
.../security/utils/DOMNamespaceContextTest.java | 11 ++--
275 files changed, 1615 insertions(+), 759 deletions(-)
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/DigesterOutputStream.java b/src/main/java/org/apache/jcp/xml/dsig/internal/DigesterOutputStream.java
index 37230fc0..d536aefd 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/DigesterOutputStream.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/DigesterOutputStream.java
@@ -67,6 +67,7 @@ public class DigesterOutputStream extends OutputStream {
}
}
+ @Override
public void write(int input) {
if (buffer) {
bos.write(input);
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/MacOutputStream.java b/src/main/java/org/apache/jcp/xml/dsig/internal/MacOutputStream.java
index 90a3659c..dd7ffef1 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/MacOutputStream.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/MacOutputStream.java
@@ -19,6 +19,7 @@
package org.apache.jcp.xml.dsig.internal;
import java.io.ByteArrayOutputStream;
+
import javax.crypto.Mac;
/**
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java
index b81cb99a..9728d20a 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/AbstractDOMSignatureMethod.java
@@ -19,20 +19,22 @@
package org.apache.jcp.xml.dsig.internal.dom;
-import java.security.Key;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
+import java.security.Key;
import java.security.SignatureException;
import java.security.spec.AlgorithmParameterSpec;
+
import javax.xml.crypto.MarshalException;
import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.SignatureMethod;
import javax.xml.crypto.dsig.SignedInfo;
+import javax.xml.crypto.dsig.XMLSignContext;
import javax.xml.crypto.dsig.XMLSignature;
import javax.xml.crypto.dsig.XMLSignatureException;
-import javax.xml.crypto.dsig.XMLSignContext;
import javax.xml.crypto.dsig.XMLValidateContext;
import javax.xml.crypto.dsig.spec.SignatureMethodParameterSpec;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
index 61fbe42e..03d903d9 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java
@@ -24,11 +24,16 @@ package org.apache.jcp.xml.dsig.internal.dom;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
-import java.security.spec.AlgorithmParameterSpec;
import java.security.InvalidAlgorithmParameterException;
+import java.security.spec.AlgorithmParameterSpec;
import java.util.Set;
-import javax.xml.crypto.*;
+import javax.xml.crypto.Data;
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.NodeSetData;
+import javax.xml.crypto.OctetStreamData;
+import javax.xml.crypto.XMLCryptoContext;
+import javax.xml.crypto.XMLStructure;
import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.TransformException;
import javax.xml.crypto.dsig.TransformService;
@@ -57,11 +62,13 @@ public abstract class ApacheCanonicalizer extends TransformService {
protected Document ownerDoc;
protected Element transformElem;
+ @Override
public final AlgorithmParameterSpec getParameterSpec()
{
return params;
}
+ @Override
public void init(XMLStructure parent, XMLCryptoContext context)
throws InvalidAlgorithmParameterException
{
@@ -80,6 +87,7 @@ public abstract class ApacheCanonicalizer extends TransformService {
ownerDoc = DOMUtils.getOwnerDocument(transformElem);
}
+ @Override
public void marshalParams(XMLStructure parent, XMLCryptoContext context)
throws MarshalException
{
@@ -180,6 +188,7 @@ public abstract class ApacheCanonicalizer extends TransformService {
return null;
}
+ @Override
public Data transform(Data data, XMLCryptoContext xc, OutputStream os)
throws TransformException
{
@@ -247,6 +256,7 @@ public abstract class ApacheCanonicalizer extends TransformService {
}
}
+ @Override
public final boolean isFeatureSupported(String feature) {
if (feature == null) {
throw new NullPointerException();
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheData.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheData.java
index acc6f070..3661e51a 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheData.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheData.java
@@ -22,6 +22,7 @@
package org.apache.jcp.xml.dsig.internal.dom;
import javax.xml.crypto.Data;
+
import org.apache.xml.security.signature.XMLSignatureInput;
/**
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java
index 6c4f8a69..4a47f530 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java
@@ -26,13 +26,14 @@ import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
+
import javax.xml.crypto.NodeSetData;
-import org.apache.xml.security.transforms.TransformationException;
-import org.w3c.dom.Node;
import org.apache.xml.security.signature.NodeFilter;
import org.apache.xml.security.signature.XMLSignatureInput;
+import org.apache.xml.security.transforms.TransformationException;
import org.apache.xml.security.utils.XMLUtils;
+import org.w3c.dom.Node;
public class ApacheNodeSetData implements ApacheData, NodeSetData {
@@ -42,6 +43,7 @@ public class ApacheNodeSetData implements ApacheData, NodeSetData {
this.xi = xi;
}
+ @Override
public Iterator<Node> iterator() {
// If nodefilters are set, must execute them first to create node-set
try {
@@ -58,6 +60,7 @@ public class ApacheNodeSetData implements ApacheData, NodeSetData {
}
}
+ @Override
public XMLSignatureInput getXMLSignatureInput() {
return xi;
}
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java
index f03ab813..834bad77 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java
@@ -22,7 +22,9 @@
package org.apache.jcp.xml.dsig.internal.dom;
import java.io.IOException;
+
import javax.xml.crypto.OctetStreamData;
+
import org.apache.xml.security.signature.XMLSignatureInput;
public class ApacheOctetStreamData extends OctetStreamData
@@ -37,6 +39,7 @@ public class ApacheOctetStreamData extends OctetStreamData
this.xi = xi;
}
+ @Override
public XMLSignatureInput getXMLSignatureInput() {
return xi;
}
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java
index 00d180dd..e4df8da7 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/ApacheTransform.java
@@ -26,17 +26,23 @@ import java.security.InvalidAlgorithmParameterException;
import java.security.spec.AlgorithmParameterSpec;
import java.util.Set;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
+import javax.xml.crypto.Data;
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.NodeSetData;
+import javax.xml.crypto.OctetStreamData;
+import javax.xml.crypto.XMLCryptoContext;
+import javax.xml.crypto.XMLStructure;
+import javax.xml.crypto.dom.DOMCryptoContext;
+import javax.xml.crypto.dsig.TransformException;
+import javax.xml.crypto.dsig.TransformService;
+import javax.xml.crypto.dsig.spec.TransformParameterSpec;
+
import org.apache.xml.security.signature.XMLSignatureInput;
import org.apache.xml.security.transforms.Transform;
import org.apache.xml.security.transforms.Transforms;
-
-import javax.xml.crypto.*;
-import javax.xml.crypto.dom.DOMCryptoContext;
-import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dsig.spec.TransformParameterSpec;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
* This is a wrapper/glue class which invokes the Apache XML-Security
@@ -61,6 +67,7 @@ public abstract class ApacheTransform extends TransformService {
return params;
}
+ @Override
public void init(XMLStructure parent, XMLCryptoContext context)
throws InvalidAlgorithmParameterException
{
@@ -79,6 +86,7 @@ public abstract class ApacheTransform extends TransformService {
ownerDoc = DOMUtils.getOwnerDocument(transformElem);
}
+ @Override
public void marshalParams(XMLStructure parent, XMLCryptoContext context)
throws MarshalException
{
@@ -97,6 +105,7 @@ public abstract class ApacheTransform extends TransformService {
ownerDoc = DOMUtils.getOwnerDocument(transformElem);
}
+ @Override
public Data transform(Data data, XMLCryptoContext xc)
throws TransformException
{
@@ -106,6 +115,7 @@ public abstract class ApacheTransform extends TransformService {
return transformIt(data, xc, null);
}
+ @Override
public Data transform(Data data, XMLCryptoContext xc, OutputStream os)
throws TransformException
{
@@ -194,6 +204,7 @@ public abstract class ApacheTransform extends TransformService {
}
}
+ @Override
public final boolean isFeatureSupported(String feature) {
if (feature == null) {
throw new NullPointerException();
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java
index 08f06f11..d1cce69d 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java
@@ -21,12 +21,13 @@
*/
package org.apache.jcp.xml.dsig.internal.dom;
-import javax.xml.crypto.*;
-import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dsig.spec.TransformParameterSpec;
-
import java.security.InvalidAlgorithmParameterException;
+import javax.xml.crypto.Data;
+import javax.xml.crypto.XMLCryptoContext;
+import javax.xml.crypto.dsig.TransformException;
+import javax.xml.crypto.dsig.spec.TransformParameterSpec;
+
import org.apache.xml.security.c14n.Canonicalizer;
import org.apache.xml.security.c14n.InvalidCanonicalizerException;
@@ -41,6 +42,7 @@ public final class DOMCanonicalXMLC14N11Method extends ApacheCanonicalizer {
public static final String C14N_11_WITH_COMMENTS
= "http://www.w3.org/2006/12/xml-c14n11#WithComments";
+ @Override
public void init(TransformParameterSpec params)
throws InvalidAlgorithmParameterException {
if (params != null) {
@@ -49,6 +51,7 @@ public final class DOMCanonicalXMLC14N11Method extends ApacheCanonicalizer {
}
}
+ @Override
public Data transform(Data data, XMLCryptoContext xc)
throws TransformException {
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java
index 37617a36..4fafaf92 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java
@@ -21,12 +21,14 @@
*/
package org.apache.jcp.xml.dsig.internal.dom;
-import javax.xml.crypto.*;
-import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dsig.spec.TransformParameterSpec;
-
import java.security.InvalidAlgorithmParameterException;
+import javax.xml.crypto.Data;
+import javax.xml.crypto.XMLCryptoContext;
+import javax.xml.crypto.dsig.CanonicalizationMethod;
+import javax.xml.crypto.dsig.TransformException;
+import javax.xml.crypto.dsig.spec.TransformParameterSpec;
+
import org.apache.xml.security.c14n.Canonicalizer;
import org.apache.xml.security.c14n.InvalidCanonicalizerException;
@@ -37,6 +39,7 @@ import org.apache.xml.security.c14n.InvalidCanonicalizerException;
*/
public final class DOMCanonicalXMLC14NMethod extends ApacheCanonicalizer {
+ @Override
public void init(TransformParameterSpec params)
throws InvalidAlgorithmParameterException {
if (params != null) {
@@ -45,6 +48,7 @@ public final class DOMCanonicalXMLC14NMethod extends ApacheCanonicalizer {
}
}
+ @Override
public Data transform(Data data, XMLCryptoContext xc)
throws TransformException {
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java
index a54b6115..404c452a 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java
@@ -29,10 +29,14 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import org.w3c.dom.Element;
+import javax.xml.crypto.Data;
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.XMLCryptoContext;
+import javax.xml.crypto.dsig.CanonicalizationMethod;
+import javax.xml.crypto.dsig.TransformException;
+import javax.xml.crypto.dsig.TransformService;
-import javax.xml.crypto.*;
-import javax.xml.crypto.dsig.*;
+import org.w3c.dom.Element;
/**
* DOM-based abstract implementation of CanonicalizationMethod.
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java
index 375398e6..0ce8164c 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java
@@ -22,7 +22,8 @@
package org.apache.jcp.xml.dsig.internal.dom;
import java.math.BigInteger;
-import javax.xml.crypto.*;
+
+import javax.xml.crypto.MarshalException;
import javax.xml.crypto.dom.DOMCryptoContext;
import org.apache.xml.security.utils.XMLUtils;
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java
index 31d734fb..ccebbaa5 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java
@@ -21,13 +21,15 @@
*/
package org.apache.jcp.xml.dsig.internal.dom;
-import javax.xml.crypto.*;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.spec.AlgorithmParameterSpec;
+
+import javax.xml.crypto.MarshalException;
import javax.xml.crypto.dom.DOMCryptoContext;
-import javax.xml.crypto.dsig.*;
+import javax.xml.crypto.dsig.DigestMethod;
+import javax.xml.crypto.dsig.XMLSignature;
import javax.xml.crypto.dsig.spec.DigestMethodParameterSpec;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.spec.AlgorithmParameterSpec;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -143,6 +145,7 @@ public abstract class DOMDigestMethod extends DOMStructure
}
}
+ @Override
public final AlgorithmParameterSpec getParameterSpec() {
return params;
}
@@ -247,9 +250,11 @@ public abstract class DOMDigestMethod extends DOMStructure
SHA1(Element dmElem) throws MarshalException {
super(dmElem);
}
+ @Override
public String getAlgorithm() {
return DigestMethod.SHA1;
}
+ @Override
String getMessageDigestAlgorithm() {
return "SHA-1";
}
@@ -281,9 +286,11 @@ public abstract class DOMDigestMethod extends DOMStructure
SHA256(Element dmElem) throws MarshalException {
super(dmElem);
}
+ @Override
public String getAlgorithm() {
return DigestMethod.SHA256;
}
+ @Override
String getMessageDigestAlgorithm() {
return "SHA-256";
}
@@ -297,9 +304,11 @@ public abstract class DOMDigestMethod extends DOMStructure
SHA384(Element dmElem) throws MarshalException {
super(dmElem);
}
+ @Override
public String getAlgorithm() {
return SHA384;
}
+ @Override
String getMessageDigestAlgorithm() {
return "SHA-384";
}
@@ -313,9 +322,11 @@ public abstract class DOMDigestMethod extends DOMStructure
SHA512(Element dmElem) throws MarshalException {
super(dmElem);
}
+ @Override
public String getAlgorithm() {
return DigestMethod.SHA512;
}
+ @Override
String getMessageDigestAlgorithm() {
return "SHA-512";
}
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java
index 723361a1..6e6a49c2 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java
@@ -22,6 +22,7 @@
package org.apache.jcp.xml.dsig.internal.dom;
import java.security.InvalidAlgorithmParameterException;
+
import javax.xml.crypto.dsig.spec.TransformParameterSpec;
/**
@@ -31,6 +32,7 @@ import javax.xml.crypto.dsig.spec.TransformParameterSpec;
*/
public final class DOMEnvelopedTransform extends ApacheTransform {
+ @Override
public void init(TransformParameterSpec params)
throws InvalidAlgorithmParameterException {
if (params != null) {
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java
index 33ff33d9..173cf94e 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java
@@ -21,19 +21,24 @@
*/
package org.apache.jcp.xml.dsig.internal.dom;
-import javax.xml.crypto.*;
-import javax.xml.crypto.dsig.*;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.spec.AlgorithmParameterSpec;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.crypto.Data;
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.XMLCryptoContext;
+import javax.xml.crypto.XMLStructure;
+import javax.xml.crypto.dsig.CanonicalizationMethod;
+import javax.xml.crypto.dsig.TransformException;
import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec;
import javax.xml.crypto.dsig.spec.ExcC14NParameterSpec;
import javax.xml.crypto.dsig.spec.TransformParameterSpec;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.spec.AlgorithmParameterSpec;
-import java.util.*;
-
-import org.w3c.dom.Element;
import org.apache.xml.security.c14n.Canonicalizer;
import org.apache.xml.security.c14n.InvalidCanonicalizerException;
+import org.w3c.dom.Element;
/**
* DOM-based implementation of CanonicalizationMethod for Exclusive
@@ -43,6 +48,7 @@ import org.apache.xml.security.c14n.InvalidCanonicalizerException;
*/
public final class DOMExcC14NMethod extends ApacheCanonicalizer {
+ @Override
public void init(TransformParameterSpec params)
throws InvalidAlgorithmParameterException
{
@@ -55,6 +61,7 @@ public final class DOMExcC14NMethod extends ApacheCanonicalizer {
}
}
+ @Override
public void init(XMLStructure parent, XMLCryptoContext context)
throws InvalidAlgorithmParameterException
{
@@ -133,6 +140,7 @@ public final class DOMExcC14NMethod extends ApacheCanonicalizer {
return CanonicalizationMethod.EXCLUSIVE;
}
+ @Override
public Data transform(Data data, XMLCryptoContext xc)
throws TransformException
{
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java
index 601e35bc..865acd9a 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java
@@ -21,11 +21,6 @@
*/
package org.apache.jcp.xml.dsig.internal.dom;
-import javax.xml.crypto.*;
-import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dsig.spec.HMACParameterSpec;
-import javax.xml.crypto.dsig.spec.SignatureMethodParameterSpec;
-
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.Key;
@@ -34,12 +29,22 @@ import java.security.NoSuchAlgorithmException;
import java.security.Provider;
import java.security.SignatureException;
import java.security.spec.AlgorithmParameterSpec;
+
import javax.crypto.Mac;
import javax.crypto.SecretKey;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.dsig.SignatureMethod;
+import javax.xml.crypto.dsig.SignedInfo;
+import javax.xml.crypto.dsig.XMLSignContext;
+import javax.xml.crypto.dsig.XMLSignature;
+import javax.xml.crypto.dsig.XMLSignatureException;
+import javax.xml.crypto.dsig.XMLValidateContext;
+import javax.xml.crypto.dsig.spec.HMACParameterSpec;
+import javax.xml.crypto.dsig.spec.SignatureMethodParameterSpec;
import org.apache.jcp.xml.dsig.internal.MacOutputStream;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
/**
* DOM-based implementation of HMAC SignatureMethod.
@@ -114,10 +119,12 @@ public abstract class DOMHMACSignatureMethod extends AbstractDOMSignatureMethod
}
}
+ @Override
public final AlgorithmParameterSpec getParameterSpec() {
return params;
}
+ @Override
SignatureMethodParameterSpec unmarshalParams(Element paramsElem)
throws MarshalException
{
@@ -131,6 +138,7 @@ public abstract class DOMHMACSignatureMethod extends AbstractDOMSignatureMethod
return new HMACParameterSpec(outputLength);
}
+ @Override
void marshalParams(Element parent, String prefix)
throws MarshalException
{
@@ -143,6 +151,7 @@ public abstract class DOMHMACSignatureMethod extends AbstractDOMSignatureMethod
parent.appendChild(hmacElem);
}
+ @Override
boolean verify(Key key, SignedInfo si, byte[] sig,
XMLValidateContext context)
throws InvalidKeyException, SignatureException, XMLSignatureException
@@ -174,6 +183,7 @@ public abstract class DOMHMACSignatureMethod extends AbstractDOMSignatureMethod
return MessageDigest.isEqual(sig, result);
}
+ @Override
byte[] sign(Key key, SignedInfo si, XMLSignContext context)
throws InvalidKeyException, XMLSignatureException
{
@@ -202,6 +212,7 @@ public abstract class DOMHMACSignatureMethod extends AbstractDOMSignatureMethod
return hmac.doFinal();
}
+ @Override
boolean paramsEqual(AlgorithmParameterSpec spec) {
if (getParameterSpec() == spec) {
return true;
@@ -214,6 +225,7 @@ public abstract class DOMHMACSignatureMethod extends AbstractDOMSignatureMethod
return outputLength == ospec.getOutputLength();
}
+ @Override
Type getAlgorithmType() {
return Type.HMAC;
}
@@ -231,12 +243,15 @@ public abstract class DOMHMACSignatureMethod extends AbstractDOMSignatureMethod
SHA1(Element dmElem) throws MarshalException {
super(dmElem);
}
+ @Override
public String getAlgorithm() {
return SignatureMethod.HMAC_SHA1;
}
+ @Override
String getJCAAlgorithm() {
return "HmacSHA1";
}
+ @Override
int getDigestLength() {
return 160;
}
@@ -272,12 +287,15 @@ public abstract class DOMHMACSignatureMethod extends AbstractDOMSignatureMethod
SHA256(Element dmElem) throws MarshalException {
super(dmElem);
}
+ @Override
public String getAlgorithm() {
return HMAC_SHA256;
}
+ @Override
String getJCAAlgorithm() {
return "HmacSHA256";
}
+ @Override
int getDigestLength() {
return 256;
}
@@ -291,12 +309,15 @@ public abstract class DOMHMACSignatureMethod extends AbstractDOMSignatureMethod
SHA384(Element dmElem) throws MarshalException {
super(dmElem);
}
+ @Override
public String getAlgorithm() {
return HMAC_SHA384;
}
+ @Override
String getJCAAlgorithm() {
return "HmacSHA384";
}
+ @Override
int getDigestLength() {
return 384;
}
@@ -310,12 +331,15 @@ public abstract class DOMHMACSignatureMethod extends AbstractDOMSignatureMethod
SHA512(Element dmElem) throws MarshalException {
super(dmElem);
}
+ @Override
public String getAlgorithm() {
return HMAC_SHA512;
}
+ @Override
String getJCAAlgorithm() {
return "HmacSHA512";
}
+ @Override
int getDigestLength() {
return 512;
}
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java
index 3b2cbf42..146776e6 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfo.java
@@ -137,14 +137,17 @@ public final class DOMKeyInfo extends DOMStructure implements KeyInfo {
keyInfoTypes = Collections.unmodifiableList(content);
}
+ @Override
public String getId() {
return id;
}
+ @Override
public List<XMLStructure> getContent() {
return keyInfoTypes;
}
+ @Override
public void marshal(XMLStructure parent, XMLCryptoContext context)
throws MarshalException
{
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java
index 05883ee3..efe01b8b 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java
@@ -24,8 +24,8 @@ package org.apache.jcp.xml.dsig.internal.dom;
import java.math.BigInteger;
import java.security.KeyException;
import java.security.PublicKey;
-import java.security.interfaces.ECPublicKey;
import java.security.interfaces.DSAPublicKey;
+import java.security.interfaces.ECPublicKey;
import java.security.interfaces.RSAPublicKey;
import java.util.List;
@@ -55,20 +55,24 @@ public final class DOMKeyInfoFactory extends KeyInfoFactory {
public DOMKeyInfoFactory() { }
+ @Override
@SuppressWarnings("rawtypes")
public KeyInfo newKeyInfo(List content) {
return newKeyInfo(content, null);
}
+ @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public KeyInfo newKeyInfo(List content, String id) {
return new DOMKeyInfo(content, id);
}
+ @Override
public KeyName newKeyName(String name) {
return new DOMKeyName(name);
}
+ @Override
public KeyValue newKeyValue(PublicKey key) throws KeyException {
String algorithm = key.getAlgorithm();
if ("DSA".equals(algorithm)) {
@@ -82,24 +86,29 @@ public final class DOMKeyInfoFactory extends KeyInfoFactory {
}
}
+ @Override
public PGPData newPGPData(byte[] keyId) {
return newPGPData(keyId, null, null);
}
+ @Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public PGPData newPGPData(byte[] keyId, byte[] keyPacket, List other) {
return new DOMPGPData(keyId, keyPacket, other);
}
+ @Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public PGPData newPGPData(byte[] keyPacket, List other) {
return new DOMPGPData(keyPacket, other);
}
+ @Override
public RetrievalMethod newRetrievalMethod(String uri) {
return newRetrievalMethod(uri, null, null);
}
+ @Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public RetrievalMethod newRetrievalMethod(String uri, String type,
List transforms) {
@@ -109,6 +118,7 @@ public final class DOMKeyInfoFactory extends KeyInfoFactory {
return new DOMRetrievalMethod(uri, type, transforms);
}
+ @Override
@SuppressWarnings({ "rawtypes" })
public X509Data newX509Data(List content) {
return new DOMX509Data(content);
@@ -120,6 +130,7 @@ public final class DOMKeyInfoFactory extends KeyInfoFactory {
return new DOMX509IssuerSerial(issuerName, serialNumber);
}
+ @Override
public boolean isFeatureSupported(String feature) {
if (feature == null) {
throw new NullPointerException();
@@ -128,6 +139,7 @@ public final class DOMKeyInfoFactory extends KeyInfoFactory {
}
}
+ @Override
public URIDereferencer getURIDereferencer() {
return DOMURIDereferencer.INSTANCE;
}
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyName.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyName.java
index 01b76d80..9c106013 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyName.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyName.java
@@ -60,6 +60,7 @@ public final class DOMKeyName extends DOMStructure implements KeyName {
name = knElem.getFirstChild().getNodeValue();
}
+ @Override
public String getName() {
return name;
}
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyValue.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyValue.java
index f53b3c0f..8a911ef7 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyValue.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyValue.java
@@ -97,6 +97,7 @@ public abstract class DOMKeyValue<K extends PublicKey> extends DOMStructure impl
}
}
+ @Override
public PublicKey getPublicKey() throws KeyException {
if (publicKey == null) {
throw new KeyException("can't convert KeyValue to PublicKey");
@@ -194,6 +195,7 @@ public abstract class DOMKeyValue<K extends PublicKey> extends DOMStructure impl
super(elem);
}
+ @Override
void marshalPublicKey(Node parent, Document doc, String dsPrefix,
DOMCryptoContext context) throws MarshalException {
Element rsaElem = DOMUtils.createElement(doc, "RSAKeyValue",
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java
index f0a683c9..5e83b2e8 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMManifest.java
@@ -21,12 +21,17 @@
*/
package org.apache.jcp.xml.dsig.internal.dom;
-import javax.xml.crypto.*;
-import javax.xml.crypto.dom.DOMCryptoContext;
-import javax.xml.crypto.dsig.*;
-
import java.security.Provider;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.XMLCryptoContext;
+import javax.xml.crypto.dom.DOMCryptoContext;
+import javax.xml.crypto.dsig.Manifest;
+import javax.xml.crypto.dsig.Reference;
+import javax.xml.crypto.dsig.XMLSignature;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -109,6 +114,7 @@ public final class DOMManifest extends DOMStructure implements Manifest {
this.references = Collections.unmodifiableList(refs);
}
+ @Override
public String getId() {
return id;
}
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java
index f437247f..51df5b78 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMPGPData.java
@@ -21,19 +21,21 @@
*/
package org.apache.jcp.xml.dsig.internal.dom;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
-import javax.xml.crypto.*;
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.XMLStructure;
import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.XMLSignature;
import javax.xml.crypto.dsig.keyinfo.PGPData;
+import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.apache.xml.security.utils.XMLUtils;
-
/**
* DOM-based implementation of PGPData.
*
@@ -167,14 +169,17 @@ public final class DOMPGPData extends DOMStructure implements PGPData {
this.externalElements = Collections.unmodifiableList(other);
}
+ @Override
public byte[] getKeyId() {
return keyId == null ? null : keyId.clone();
}
+ @Override
public byte[] getKeyPacket() {
return keyPacket == null ? null : keyPacket.clone();
}
+ @Override
public List<XMLStructure> getExternalElements() {
return externalElements;
}
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRSAPSSSignatureMethod.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRSAPSSSignatureMethod.java
index 6d464a1c..159cefed 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRSAPSSSignatureMethod.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRSAPSSSignatureMethod.java
@@ -21,24 +21,36 @@
*/
package org.apache.jcp.xml.dsig.internal.dom;
-import javax.xml.crypto.*;
-import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dsig.spec.SignatureMethodParameterSpec;
-
import java.io.IOException;
-import java.security.*;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.Key;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.Provider;
+import java.security.PublicKey;
+import java.security.Signature;
+import java.security.SignatureException;
import java.security.spec.AlgorithmParameterSpec;
import java.security.spec.MGF1ParameterSpec;
import java.security.spec.PSSParameterSpec;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.dsig.SignedInfo;
+import javax.xml.crypto.dsig.XMLSignContext;
+import javax.xml.crypto.dsig.XMLSignature;
+import javax.xml.crypto.dsig.XMLSignatureException;
+import javax.xml.crypto.dsig.XMLValidateContext;
+import javax.xml.crypto.dsig.spec.SignatureMethodParameterSpec;
+
import org.apache.jcp.xml.dsig.internal.SignerOutputStream;
import org.apache.xml.security.algorithms.implementations.SignatureBaseRSA.SignatureRSASSAPSS.DigestAlgorithm;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Text;
/**
* DOM-based abstract implementation of SignatureMethod for RSA-PSS.
@@ -130,10 +142,12 @@ public abstract class DOMRSAPSSSignatureMethod extends AbstractDOMSignatureMetho
}
}
+ @Override
public final AlgorithmParameterSpec getParameterSpec() {
return params;
}
+ @Override
void marshalParams(Element parent, String prefix)
throws MarshalException
{
@@ -166,6 +180,7 @@ public abstract class DOMRSAPSSSignatureMethod extends AbstractDOMSignatureMetho
parent.appendChild(rsaPssParamsElement);
}
+ @Override
SignatureMethodParameterSpec unmarshalParams(Element paramsElem)
throws MarshalException
{
@@ -203,6 +218,7 @@ public abstract class DOMRSAPSSSignatureMethod extends AbstractDOMSignatureMetho
return getDefaultParameterSpec();
}
+ @Override
boolean verify(Key key, SignedInfo si, byte[] sig,
XMLValidateContext context)
throws InvalidKeyException, SignatureException, XMLSignatureException
@@ -244,6 +260,7 @@ public abstract class DOMRSAPSSSignatureMethod extends AbstractDOMSignatureMetho
}
}
+ @Override
byte[] sign(Key key, SignedInfo si, XMLSignContext context)
throws InvalidKeyException, XMLSignatureException
{
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
index 8086b58e..91303719 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMReference.java
@@ -28,28 +28,52 @@
*/
package org.apache.jcp.xml.dsig.internal.dom;
-import javax.xml.crypto.*;
-import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dom.DOMCryptoContext;
-import javax.xml.crypto.dom.DOMURIReference;
-
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.net.URI;
import java.net.URISyntaxException;
-import java.security.*;
-import java.util.*;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import org.apache.xml.security.utils.XMLUtils;
+import java.security.AccessController;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivilegedAction;
+import java.security.Provider;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import javax.xml.crypto.Data;
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.NodeSetData;
+import javax.xml.crypto.OctetStreamData;
+import javax.xml.crypto.URIDereferencer;
+import javax.xml.crypto.URIReferenceException;
+import javax.xml.crypto.XMLCryptoContext;
+import javax.xml.crypto.dom.DOMCryptoContext;
+import javax.xml.crypto.dom.DOMURIReference;
+import javax.xml.crypto.dsig.CanonicalizationMethod;
+import javax.xml.crypto.dsig.DigestMethod;
+import javax.xml.crypto.dsig.Reference;
+import javax.xml.crypto.dsig.Transform;
+import javax.xml.crypto.dsig.TransformException;
+import javax.xml.crypto.dsig.TransformService;
+import javax.xml.crypto.dsig.XMLSignContext;
+import javax.xml.crypto.dsig.XMLSignature;
+import javax.xml.crypto.dsig.XMLSignatureException;
+import javax.xml.crypto.dsig.XMLValidateContext;
import org.apache.jcp.xml.dsig.internal.DigesterOutputStream;
import org.apache.xml.security.algorithms.MessageDigestAlgorithm;
import org.apache.xml.security.signature.XMLSignatureInput;
import org.apache.xml.security.utils.UnsyncBufferedOutputStream;
+import org.apache.xml.security.utils.XMLUtils;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
* DOM-based implementation of Reference.
@@ -265,30 +289,37 @@ public final class DOMReference extends DOMStructure
this.provider = provider;
}
+ @Override
public DigestMethod getDigestMethod() {
return digestMethod;
}
+ @Override
public String getId() {
return id;
}
+ @Override
public String getURI() {
return uri;
}
+ @Override
public String getType() {
return type;
}
+ @Override
public List<Transform> getTransforms() {
return Collections.unmodifiableList(allTransforms);
}
+ @Override
public byte[] getDigestValue() {
return digestValue == null ? null : digestValue.clone();
}
+ @Override
public byte[] getCalculatedDigestValue() {
return calcDigestValue == null ? null
: calcDigestValue.clone();
@@ -367,6 +398,7 @@ public final class DOMReference extends DOMStructure
LOG.debug("Reference digesting completed");
}
+ @Override
public boolean validate(XMLValidateContext validateContext)
throws XMLSignatureException
{
@@ -389,10 +421,12 @@ public final class DOMReference extends DOMStructure
return validationStatus;
}
+ @Override
public Data getDereferencedData() {
return derefData;
}
+ @Override
public InputStream getDigestInputStream() {
return dis;
}
@@ -557,6 +591,7 @@ public final class DOMReference extends DOMStructure
}
}
+ @Override
public Node getHere() {
return here;
}
@@ -620,6 +655,7 @@ public final class DOMReference extends DOMStructure
try {
final Set<Node> s = xsi.getNodeSet();
return new NodeSetData() {
+ @Override
public Iterator<Node> iterator() { return s.iterator(); }
};
} catch (Exception e) {
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
index 169524a1..7d6fe58b 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java
@@ -171,14 +171,17 @@ public final class DOMRetrievalMethod extends DOMStructure
}
}
+ @Override
public String getURI() {
return uri;
}
+ @Override
public String getType() {
return type;
}
+ @Override
public List<Transform> getTransforms() {
return transforms;
}
@@ -214,10 +217,12 @@ public final class DOMRetrievalMethod extends DOMStructure
here = rmElem.getAttributeNodeNS(null, "URI");
}
+ @Override
public Node getHere() {
return here;
}
+ @Override
public Data dereference(XMLCryptoContext context)
throws URIReferenceException
{
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java
index b92b10b3..298fe1be 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java
@@ -21,20 +21,32 @@
*/
package org.apache.jcp.xml.dsig.internal.dom;
-import javax.xml.crypto.*;
-import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dsig.spec.SignatureMethodParameterSpec;
-
import java.io.IOException;
-import java.security.*;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.Key;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.Provider;
+import java.security.PublicKey;
+import java.security.Signature;
+import java.security.SignatureException;
import java.security.interfaces.DSAKey;
import java.security.interfaces.ECPrivateKey;
import java.security.spec.AlgorithmParameterSpec;
-import org.w3c.dom.Element;
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.dsig.SignatureMethod;
+import javax.xml.crypto.dsig.SignedInfo;
+import javax.xml.crypto.dsig.XMLSignContext;
+import javax.xml.crypto.dsig.XMLSignatureException;
+import javax.xml.crypto.dsig.XMLValidateContext;
+import javax.xml.crypto.dsig.spec.SignatureMethodParameterSpec;
+
+import org.apache.jcp.xml.dsig.internal.SignerOutputStream;
import org.apache.xml.security.algorithms.implementations.SignatureECDSA;
import org.apache.xml.security.utils.JavaUtils;
-import org.apache.jcp.xml.dsig.internal.SignerOutputStream;
+import org.w3c.dom.Element;
/**
* DOM-based abstract implementation of SignatureMethod.
@@ -228,6 +240,7 @@ public abstract class DOMSignatureMethod extends AbstractDOMSignatureMethod {
}
}
+ @Override
public final AlgorithmParameterSpec getParameterSpec() {
return params;
}
@@ -249,6 +262,7 @@ public abstract class DOMSignatureMethod extends AbstractDOMSignatureMethod {
: Signature.getInstance(getJCAAlgorithm(), p);
}
+ @Override
boolean verify(Key key, SignedInfo si, byte[] sig,
XMLValidateContext context)
throws InvalidKeyException, SignatureException, XMLSignatureException
@@ -285,6 +299,7 @@ public abstract class DOMSignatureMethod extends AbstractDOMSignatureMethod {
return signature.verify(s);
}
+ @Override
byte[] sign(Key key, SignedInfo si, XMLSignContext context)
throws InvalidKeyException, XMLSignatureException
{
@@ -542,12 +557,15 @@ public abstract class DOMSignatureMethod extends AbstractDOMSignatureMethod {
SHA224withRSA(Element dmElem) throws MarshalException {
super(dmElem);
}
+ @Override
public String getAlgorithm() {
return RSA_SHA224;
}
+ @Override
String getJCAAlgorithm() {
return "SHA224withRSA";
}
+ @Override
Type getAlgorithmType() {
return Type.RSA;
}
@@ -561,12 +579,15 @@ public abstract class DOMSignatureMethod extends AbstractDOMSignatureMethod {
SHA256withRSA(Element dmElem) throws MarshalException {
super(dmElem);
}
+ @Override
public String getAlgorithm() {
return RSA_SHA256;
}
+ @Override
String getJCAAlgorithm() {
return "SHA256withRSA";
}
+ @Override
Type getAlgorithmType() {
return Type.RSA;
}
@@ -580,12 +601,15 @@ public abstract class DOMSignatureMethod extends AbstractDOMSignatureMethod {
SHA384withRSA(Element dmElem) throws MarshalException {
super(dmElem);
}
+ @Override
public String getAlgorithm() {
return RSA_SHA384;
}
+ @Override
String getJCAAlgorithm() {
return "SHA384withRSA";
}
+ @Override
Type getAlgorithmType() {
return Type.RSA;
}
@@ -599,12 +623,15 @@ public abstract class DOMSignatureMethod extends AbstractDOMSignatureMethod {
SHA512withRSA(Element dmElem) throws MarshalException {
super(dmElem);
}
+ @Override
public String getAlgorithm() {
return RSA_SHA512;
}
+ @Override
String getJCAAlgorithm() {
return "SHA512withRSA";
}
+ @Override
Type getAlgorithmType() {
return Type.RSA;
}
@@ -772,15 +799,19 @@ public abstract class DOMSignatureMethod extends AbstractDOMSignatureMethod {
SHA1withDSA(Element dmElem) throws MarshalException {
super(dmElem);
}
+ @Override
public String getAlgorithm() {
return SignatureMethod.DSA_SHA1;
}
+ @Override
String getJCAAlgorithm() {
return "SHA1withDSAinP1363Format";
}
+ @Override
String getJCAFallbackAlgorithm() {
return "SHA1withDSA";
}
+ @Override
Type getAlgorithmType() {
return Type.DSA;
}
@@ -794,15 +825,19 @@ public abstract class DOMSignatureMethod extends AbstractDOMSignatureMethod {
SHA256withDSA(Element dmElem) throws MarshalException {
super(dmElem);
}
+ @Override
public String getAlgorithm() {
return DSA_SHA256;
}
+ @Override
String getJCAAlgorithm() {
return "SHA256withDSAinP1363Format";
}
+ @Override
String getJCAFallbackAlgorithm() {
return "SHA256withDSA";
}
+ @Override
Type getAlgorithmType() {
return Type.DSA;
}
@@ -816,15 +851,19 @@ public abstract class DOMSignatureMethod extends AbstractDOMSignatureMethod {
SHA1withECDSA(Element dmElem) throws MarshalException {
super(dmElem);
}
+ @Override
public String getAlgorithm() {
return ECDSA_SHA1;
}
+ @Override
String getJCAAlgorithm() {
return "SHA1withECDSAinP1363Format";
}
+ @Override
String getJCAFallbackAlgorithm() {
return "SHA1withECDSA";
}
+ @Override
Type getAlgorithmType() {
return Type.ECDSA;
}
@@ -846,6 +885,7 @@ public abstract class DOMSignatureMethod extends AbstractDOMSignatureMethod {
String getJCAAlgorithm() {
return "SHA224withECDSAinP1363Format";
}
+ @Override
String getJCAFallbackAlgorithm() {
return "SHA224withECDSA";
}
@@ -863,15 +903,19 @@ public abstract class DOMSignatureMethod extends AbstractDOMSignatureMethod {
SHA256withECDSA(Element dmElem) throws MarshalException {
super(dmElem);
}
+ @Override
public String getAlgorithm() {
return ECDSA_SHA256;
}
+ @Override
String getJCAAlgorithm() {
return "SHA256withECDSAinP1363Format";
}
+ @Override
String getJCAFallbackAlgorithm() {
return "SHA256withECDSA";
}
+ @Override
Type getAlgorithmType() {
return Type.ECDSA;
}
@@ -885,15 +929,19 @@ public abstract class DOMSignatureMethod extends AbstractDOMSignatureMethod {
SHA384withECDSA(Element dmElem) throws MarshalException {
super(dmElem);
}
+ @Override
public String getAlgorithm() {
return ECDSA_SHA384;
}
+ @Override
String getJCAAlgorithm() {
return "SHA384withECDSAinP1363Format";
}
+ @Override
String getJCAFallbackAlgorithm() {
return "SHA384withECDSA";
}
+ @Override
Type getAlgorithmType() {
return Type.ECDSA;
}
@@ -907,15 +955,19 @@ public abstract class DOMSignatureMethod extends AbstractDOMSignatureMethod {
SHA512withECDSA(Element dmElem) throws MarshalException {
super(dmElem);
}
+ @Override
public String getAlgorithm() {
return ECDSA_SHA512;
}
+ @Override
String getJCAAlgorithm() {
return "SHA512withECDSAinP1363Format";
}
+ @Override
String getJCAFallbackAlgorithm() {
return "SHA512withECDSA";
}
+ @Override
Type getAlgorithmType() {
return Type.ECDSA;
}
@@ -937,6 +989,7 @@ public abstract class DOMSignatureMethod extends AbstractDOMSignatureMethod {
String getJCAAlgorithm() {
return "RIPEMD160withECDSAinP1363Format"; // Is this real?
}
+ @Override
String getJCAFallbackAlgorithm() {
return "RIPEMD160withECDSA";
}
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java
index 9e9abeb9..b5f2ac16 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java
@@ -21,11 +21,15 @@
*/
package org.apache.jcp.xml.dsig.internal.dom;
-import javax.xml.crypto.*;
-import javax.xml.crypto.dom.DOMCryptoContext;
-import javax.xml.crypto.dsig.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
-import java.util.*;
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.dom.DOMCryptoContext;
+import javax.xml.crypto.dsig.SignatureProperties;
+import javax.xml.crypto.dsig.SignatureProperty;
+import javax.xml.crypto.dsig.XMLSignature;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
@@ -113,10 +117,12 @@ public final class DOMSignatureProperties extends DOMStructure
}
}
+ @Override
public List<SignatureProperty> getProperties() {
return properties;
}
+ @Override
public String getId() {
return id;
}
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java
index 0bfd243f..9e8bcfbc 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java
@@ -21,11 +21,15 @@
*/
package org.apache.jcp.xml.dsig.internal.dom;
-import javax.xml.crypto.*;
-import javax.xml.crypto.dom.DOMCryptoContext;
-import javax.xml.crypto.dsig.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
-import java.util.*;
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.XMLStructure;
+import javax.xml.crypto.dom.DOMCryptoContext;
+import javax.xml.crypto.dsig.SignatureProperty;
+import javax.xml.crypto.dsig.XMLSignature;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
@@ -113,14 +117,17 @@ public final class DOMSignatureProperty extends DOMStructure
}
}
+ @Override
public List<XMLStructure> getContent() {
return content;
}
+ @Override
public String getId() {
return id;
}
+ @Override
public String getTarget() {
return target;
}
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
index df7c5762..0410b9be 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
@@ -21,24 +21,33 @@
*/
package org.apache.jcp.xml.dsig.internal.dom;
-import javax.xml.crypto.*;
-import javax.xml.crypto.dom.DOMCryptoContext;
-import javax.xml.crypto.dsig.*;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.IOException;
import java.security.Provider;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.XMLCryptoContext;
+import javax.xml.crypto.dom.DOMCryptoContext;
+import javax.xml.crypto.dsig.CanonicalizationMethod;
+import javax.xml.crypto.dsig.Reference;
+import javax.xml.crypto.dsig.SignatureMethod;
+import javax.xml.crypto.dsig.SignedInfo;
+import javax.xml.crypto.dsig.TransformException;
+import javax.xml.crypto.dsig.XMLSignature;
+import javax.xml.crypto.dsig.XMLSignatureException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.UnsyncBufferedOutputStream;
import org.apache.xml.security.utils.XMLUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
* DOM-based implementation of SignedInfo.
@@ -187,22 +196,27 @@ public final class DOMSignedInfo extends DOMStructure implements SignedInfo {
references = Collections.unmodifiableList(refList);
}
+ @Override
public CanonicalizationMethod getCanonicalizationMethod() {
return canonicalizationMethod;
}
+ @Override
public SignatureMethod getSignatureMethod() {
return signatureMethod;
}
+ @Override
public String getId() {
return id;
}
+ @Override
public List<Reference> getReferences() {
return references;
}
+ @Override
public InputStream getCanonicalizedData() {
return canonData;
}
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMStructure.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMStructure.java
index dd1e0d84..a4a54551 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMStructure.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMStructure.java
@@ -21,12 +21,13 @@
*/
package org.apache.jcp.xml.dsig.internal.dom;
+import java.util.List;
+
import javax.xml.crypto.MarshalException;
import javax.xml.crypto.XMLStructure;
import javax.xml.crypto.dom.DOMCryptoContext;
-import org.w3c.dom.Node;
-import java.util.List;
+import org.w3c.dom.Node;
/**
* DOM-based abstract implementation of XMLStructure.
@@ -34,6 +35,7 @@ import java.util.List;
*/
public abstract class DOMStructure implements XMLStructure {
+ @Override
public final boolean isFeatureSupported(String feature) {
if (feature == null) {
throw new NullPointerException();
@@ -42,7 +44,7 @@ public abstract class DOMStructure implements XMLStructure {
}
}
- public abstract void marshal(Node parent, String dsPrefix,
+ public abstract void marshal(Node parent, String dsPrefix,
DOMCryptoContext context) throws MarshalException;
protected boolean equalsContent(List<XMLStructure> content, List<XMLStructure> otherContent) {
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java
index f617d9b5..84f1fbb7 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java
@@ -21,12 +21,14 @@
*/
package org.apache.jcp.xml.dsig.internal.dom;
-import javax.xml.crypto.NodeSetData;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.NoSuchElementException;
+
+import javax.xml.crypto.NodeSetData;
+
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -75,6 +77,7 @@ public class DOMSubTreeData implements NodeSetData {
this.withComments = !excludeComments;
}
+ @Override
public boolean hasNext() {
if (nodeSet == null) {
nodeSet = dereferenceSameDocumentURI(root);
@@ -83,6 +86,7 @@ public class DOMSubTreeData implements NodeSetData {
return li.hasNext();
}
+ @Override
public Node next() {
if (nodeSet == null) {
nodeSet = dereferenceSameDocumentURI(root);
@@ -95,6 +99,7 @@ public class DOMSubTreeData implements NodeSetData {
}
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java
index 578cc2ef..97a41363 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java
@@ -94,10 +94,12 @@ public class DOMTransform extends DOMStructure implements Transform {
}
}
+ @Override
public final AlgorithmParameterSpec getParameterSpec() {
return spi.getParameterSpec();
}
+ @Override
public final String getAlgorithm() {
return spi.getAlgorithm();
}
@@ -141,6 +143,7 @@ public class DOMTransform extends DOMStructure implements Transform {
* @throws XMLSignatureException if an unexpected error occurs while
* executing the transform
*/
+ @Override
public Data transform(Data data, XMLCryptoContext xc)
throws TransformException
{
@@ -160,6 +163,7 @@ public class DOMTransform extends DOMStructure implements Transform {
* @throws XMLSignatureException if an unexpected error occurs while
* executing the transform
*/
+ @Override
public Data transform(Data data, XMLCryptoContext xc, OutputStream os)
throws TransformException
{
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java
index 40503531..a2f45e74 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java
@@ -21,18 +21,22 @@
*/
package org.apache.jcp.xml.dsig.internal.dom;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
+import javax.xml.crypto.Data;
+import javax.xml.crypto.URIDereferencer;
+import javax.xml.crypto.URIReference;
+import javax.xml.crypto.URIReferenceException;
+import javax.xml.crypto.XMLCryptoContext;
+import javax.xml.crypto.dom.DOMCryptoContext;
+import javax.xml.crypto.dom.DOMURIReference;
import org.apache.xml.security.Init;
+import org.apache.xml.security.signature.XMLSignatureInput;
import org.apache.xml.security.utils.XMLUtils;
import org.apache.xml.security.utils.resolver.ResourceResolver;
import org.apache.xml.security.utils.resolver.ResourceResolverContext;
-import org.apache.xml.security.signature.XMLSignatureInput;
-
-import javax.xml.crypto.*;
-import javax.xml.crypto.dom.*;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
* DOM-based implementation of URIDereferencer.
@@ -48,6 +52,7 @@ public final class DOMURIDereferencer implements URIDereferencer {
Init.init();
}
+ @Override
public Data dereference(URIReference uriRef, XMLCryptoContext context)
throws URIReferenceException {
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java
index a0b6028f..eb12484f 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java
@@ -42,12 +42,11 @@ import javax.xml.crypto.dsig.XMLSignature;
import javax.xml.crypto.dsig.keyinfo.X509Data;
import javax.xml.crypto.dsig.keyinfo.X509IssuerSerial;
+import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.apache.xml.security.utils.XMLUtils;
-
/**
* DOM-based implementation of X509Data.
*
@@ -130,6 +129,7 @@ public final class DOMX509Data extends DOMStructure implements X509Data {
this.content = Collections.unmodifiableList(newContent);
}
+ @Override
public List<Object> getContent() {
return content;
}
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java
index 50f831f5..a11a8710 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java
@@ -21,14 +21,14 @@
*/
package org.apache.jcp.xml.dsig.internal.dom;
+import java.math.BigInteger;
+
+import javax.security.auth.x500.X500Principal;
import javax.xml.crypto.MarshalException;
import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.XMLSignature;
import javax.xml.crypto.dsig.keyinfo.X509IssuerSerial;
-import java.math.BigInteger;
-
-import javax.security.auth.x500.X500Principal;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -84,10 +84,12 @@ public final class DOMX509IssuerSerial extends DOMStructure
serialNumber = new BigInteger(sNElem.getFirstChild().getNodeValue());
}
+ @Override
public String getIssuerName() {
return issuerName;
}
+ @Override
public BigInteger getSerialNumber() {
return serialNumber;
}
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java
index c95d5685..a4508f9c 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java
@@ -21,12 +21,17 @@
*/
package org.apache.jcp.xml.dsig.internal.dom;
-import javax.xml.crypto.*;
-import javax.xml.crypto.dom.DOMCryptoContext;
-import javax.xml.crypto.dsig.*;
-
import java.security.Provider;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.XMLCryptoContext;
+import javax.xml.crypto.XMLStructure;
+import javax.xml.crypto.dom.DOMCryptoContext;
+import javax.xml.crypto.dsig.XMLObject;
+import javax.xml.crypto.dsig.XMLSignature;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
@@ -141,18 +146,22 @@ public final class DOMXMLObject extends DOMStructure implements XMLObject {
this.objectElem = objElem;
}
+ @Override
public List<XMLStructure> getContent() {
return content;
}
+ @Override
public String getId() {
return id;
}
+ @Override
public String getMimeType() {
return mimeType;
}
+ @Override
public String getEncoding() {
return encoding;
}
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
index 18e1d044..b4ee8c9c 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
@@ -28,29 +28,42 @@
*/
package org.apache.jcp.xml.dsig.internal.dom;
-import javax.xml.crypto.*;
-import javax.xml.crypto.dom.*;
-import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dsig.dom.DOMSignContext;
-import javax.xml.crypto.dsig.dom.DOMValidateContext;
-import javax.xml.crypto.dsig.keyinfo.KeyInfo;
-
import java.security.InvalidKeyException;
import java.security.Key;
import java.security.Provider;
-import java.util.Collections;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.xml.crypto.KeySelector;
+import javax.xml.crypto.KeySelectorException;
+import javax.xml.crypto.KeySelectorResult;
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.XMLCryptoContext;
+import javax.xml.crypto.XMLStructure;
+import javax.xml.crypto.dom.DOMCryptoContext;
+import javax.xml.crypto.dsig.Manifest;
+import javax.xml.crypto.dsig.Reference;
+import javax.xml.crypto.dsig.SignatureMethod;
+import javax.xml.crypto.dsig.SignedInfo;
+import javax.xml.crypto.dsig.Transform;
+import javax.xml.crypto.dsig.XMLObject;
+import javax.xml.crypto.dsig.XMLSignContext;
+import javax.xml.crypto.dsig.XMLSignature;
+import javax.xml.crypto.dsig.XMLSignatureException;
+import javax.xml.crypto.dsig.XMLValidateContext;
+import javax.xml.crypto.dsig.dom.DOMSignContext;
+import javax.xml.crypto.dsig.dom.DOMValidateContext;
+import javax.xml.crypto.dsig.keyinfo.KeyInfo;
+
+import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.apache.xml.security.utils.XMLUtils;
-
/**
* DOM-based implementation of XMLSignature.
*
@@ -170,26 +183,32 @@ public final class DOMXMLSignature extends DOMStructure
}
}
+ @Override
public String getId() {
return id;
}
+ @Override
public KeyInfo getKeyInfo() {
return ki;
}
+ @Override
public SignedInfo getSignedInfo() {
return si;
}
+ @Override
public List<XMLObject> getObjects() {
return objects;
}
+ @Override
public SignatureValue getSignatureValue() {
return sv;
}
+ @Override
public KeySelectorResult getKeySelectorResult() {
return ksr;
}
@@ -514,10 +533,12 @@ public final class DOMXMLSignature extends DOMStructure
this.sigValueElem = sigValueElem;
}
+ @Override
public String getId() {
return id;
}
+ @Override
public byte[] getValue() {
return (value == null) ? null : value.clone();
}
@@ -601,6 +622,7 @@ public final class DOMXMLSignature extends DOMStructure
return result;
}
+ @Override
public void marshal(Node parent, String dsPrefix,
DOMCryptoContext context)
throws MarshalException
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java
index 1f8b7e56..ce4cd02a 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java
@@ -21,17 +21,37 @@
*/
package org.apache.jcp.xml.dsig.internal.dom;
-import javax.xml.crypto.*;
-import javax.xml.crypto.dom.DOMCryptoContext;
-import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dsig.dom.DOMValidateContext;
-import javax.xml.crypto.dsig.keyinfo.*;
-import javax.xml.crypto.dsig.spec.*;
-
import java.security.InvalidAlgorithmParameterException;
import java.security.NoSuchAlgorithmException;
import java.util.List;
+import javax.xml.crypto.Data;
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.URIDereferencer;
+import javax.xml.crypto.XMLCryptoContext;
+import javax.xml.crypto.XMLStructure;
+import javax.xml.crypto.dom.DOMCryptoContext;
+import javax.xml.crypto.dsig.CanonicalizationMethod;
+import javax.xml.crypto.dsig.DigestMethod;
+import javax.xml.crypto.dsig.Manifest;
+import javax.xml.crypto.dsig.Reference;
+import javax.xml.crypto.dsig.SignatureMethod;
+import javax.xml.crypto.dsig.SignatureProperties;
+import javax.xml.crypto.dsig.SignatureProperty;
+import javax.xml.crypto.dsig.SignedInfo;
+import javax.xml.crypto.dsig.Transform;
+import javax.xml.crypto.dsig.TransformService;
+import javax.xml.crypto.dsig.XMLObject;
+import javax.xml.crypto.dsig.XMLSignature;
+import javax.xml.crypto.dsig.XMLSignatureFactory;
+import javax.xml.crypto.dsig.XMLValidateContext;
+import javax.xml.crypto.dsig.dom.DOMValidateContext;
+import javax.xml.crypto.dsig.keyinfo.KeyInfo;
+import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec;
+import javax.xml.crypto.dsig.spec.DigestMethodParameterSpec;
+import javax.xml.crypto.dsig.spec.SignatureMethodParameterSpec;
+import javax.xml.crypto.dsig.spec.TransformParameterSpec;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -47,20 +67,24 @@ public final class DOMXMLSignatureFactory extends XMLSignatureFactory {
*/
public DOMXMLSignatureFactory() {}
+ @Override
public XMLSignature newXMLSignature(SignedInfo si, KeyInfo ki) {
return new DOMXMLSignature(si, ki, null, null, null);
}
+ @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public XMLSignature newXMLSignature(SignedInfo si, KeyInfo ki,
List objects, String id, String signatureValueId) {
return new DOMXMLSignature(si, ki, objects, id, signatureValueId);
}
+ @Override
public Reference newReference(String uri, DigestMethod dm) {
return newReference(uri, dm, null, null, null);
}
+ @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public Reference newReference(String uri, DigestMethod dm, List transforms,
String type, String id) {
@@ -85,6 +109,7 @@ public final class DOMXMLSignatureFactory extends XMLSignatureFactory {
(uri, type, dm, appliedTransforms, result, transforms, id, getProvider());
}
+ @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public Reference newReference(String uri, DigestMethod dm, List transforms,
String type, String id, byte[] digestValue) {
@@ -95,12 +120,14 @@ public final class DOMXMLSignatureFactory extends XMLSignatureFactory {
(uri, type, dm, null, null, transforms, id, digestValue, getProvider());
}
+ @Override
@SuppressWarnings({ "rawtypes" })
public SignedInfo newSignedInfo(CanonicalizationMethod cm,
SignatureMethod sm, List references) {
return newSignedInfo(cm, sm, references, null);
}
+ @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public SignedInfo newSignedInfo(CanonicalizationMethod cm,
SignatureMethod sm, List references, String id) {
@@ -108,33 +135,39 @@ public final class DOMXMLSignatureFactory extends XMLSignatureFactory {
}
// Object factory methods
+ @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public XMLObject newXMLObject(List content, String id, String mimeType,
String encoding) {
return new DOMXMLObject(content, id, mimeType, encoding);
}
+ @Override
@SuppressWarnings({ "rawtypes" })
public Manifest newManifest(List references) {
return newManifest(references, null);
}
+ @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public Manifest newManifest(List references, String id) {
return new DOMManifest(references, id);
}
+ @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public SignatureProperties newSignatureProperties(List props, String id) {
return new DOMSignatureProperties(props, id);
}
+ @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public SignatureProperty newSignatureProperty
(List info, String target, String id) {
return new DOMSignatureProperty(info, target, id);
}
+ @Override
public XMLSignature unmarshalXMLSignature(XMLValidateContext context)
throws MarshalException {
@@ -144,6 +177,7 @@ public final class DOMXMLSignatureFactory extends XMLSignatureFactory {
return unmarshal(((DOMValidateContext) context).getNode(), context);
}
+ @Override
public XMLSignature unmarshalXMLSignature(XMLStructure xmlStructure)
throws MarshalException {
@@ -197,6 +231,7 @@ public final class DOMXMLSignatureFactory extends XMLSignatureFactory {
}
}
+ @Override
public boolean isFeatureSupported(String feature) {
if (feature == null) {
throw new NullPointerException();
@@ -205,6 +240,7 @@ public final class DOMXMLSignatureFactory extends XMLSignatureFactory {
}
}
+ @Override
public DigestMethod newDigestMethod(String algorithm,
DigestMethodParameterSpec params) throws NoSuchAlgorithmException,
InvalidAlgorithmParameterException {
@@ -238,6 +274,7 @@ public final class DOMXMLSignatureFactory extends XMLSignatureFactory {
}
}
+ @Override
public SignatureMethod newSignatureMethod(String algorithm,
SignatureMethodParameterSpec params) throws NoSuchAlgorithmException,
InvalidAlgorithmParameterException {
@@ -307,6 +344,7 @@ public final class DOMXMLSignatureFactory extends XMLSignatureFactory {
}
}
+ @Override
public Transform newTransform(String algorithm,
TransformParameterSpec params) throws NoSuchAlgorithmException,
InvalidAlgorithmParameterException {
@@ -326,6 +364,7 @@ public final class DOMXMLSignatureFactory extends XMLSignatureFactory {
return new DOMTransform(spi);
}
+ @Override
public Transform newTransform(String algorithm,
XMLStructure params) throws NoSuchAlgorithmException,
InvalidAlgorithmParameterException {
@@ -348,6 +387,7 @@ public final class DOMXMLSignatureFactory extends XMLSignatureFactory {
return new DOMTransform(spi);
}
+ @Override
public CanonicalizationMethod newCanonicalizationMethod(String algorithm,
C14NMethodParameterSpec params) throws NoSuchAlgorithmException,
InvalidAlgorithmParameterException {
@@ -366,6 +406,7 @@ public final class DOMXMLSignatureFactory extends XMLSignatureFactory {
return new DOMCanonicalizationMethod(spi);
}
+ @Override
public CanonicalizationMethod newCanonicalizationMethod(String algorithm,
XMLStructure params) throws NoSuchAlgorithmException,
InvalidAlgorithmParameterException {
@@ -388,6 +429,7 @@ public final class DOMXMLSignatureFactory extends XMLSignatureFactory {
return new DOMCanonicalizationMethod(spi);
}
+ @Override
public URIDereferencer getURIDereferencer() {
return DOMURIDereferencer.INSTANCE;
}
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java
index fae051b8..5f7a13bc 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java
@@ -54,6 +54,7 @@ import org.w3c.dom.NamedNodeMap;
*/
public final class DOMXPathFilter2Transform extends ApacheTransform {
+ @Override
public void init(TransformParameterSpec params)
throws InvalidAlgorithmParameterException
{
@@ -66,6 +67,7 @@ public final class DOMXPathFilter2Transform extends ApacheTransform {
this.params = params;
}
+ @Override
public void init(XMLStructure parent, XMLCryptoContext context)
throws InvalidAlgorithmParameterException
{
@@ -121,6 +123,7 @@ public final class DOMXPathFilter2Transform extends ApacheTransform {
this.params = new XPathFilter2ParameterSpec(list);
}
+ @Override
public void marshalParams(XMLStructure parent, XMLCryptoContext context)
throws MarshalException
{
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java
index fec9ae67..30764a11 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java
@@ -57,6 +57,7 @@ public final class DOMXPathTransform extends ApacheTransform {
this.params = params;
}
+ @Override
public void init(XMLStructure parent, XMLCryptoContext context)
throws InvalidAlgorithmParameterException
{
@@ -85,6 +86,7 @@ public final class DOMXPathTransform extends ApacheTransform {
}
}
+ @Override
public void marshalParams(XMLStructure parent, XMLCryptoContext context)
throws MarshalException
{
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java
index f8524d0f..6498c298 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java
@@ -22,13 +22,16 @@
package org.apache.jcp.xml.dsig.internal.dom;
import java.security.InvalidAlgorithmParameterException;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import javax.xml.crypto.*;
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.XMLCryptoContext;
+import javax.xml.crypto.XMLStructure;
import javax.xml.crypto.dsig.spec.TransformParameterSpec;
import javax.xml.crypto.dsig.spec.XSLTTransformParameterSpec;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
/**
* DOM-based implementation of XSLT Transform.
* (Uses Apache XML-Sec Transform implementation)
@@ -48,6 +51,7 @@ public final class DOMXSLTTransform extends ApacheTransform {
this.params = params;
}
+ @Override
public void init(XMLStructure parent, XMLCryptoContext context)
throws InvalidAlgorithmParameterException {
@@ -60,6 +64,7 @@ public final class DOMXSLTTransform extends ApacheTransform {
(new javax.xml.crypto.dom.DOMStructure(sheet));
}
+ @Override
public void marshalParams(XMLStructure parent, XMLCryptoContext context)
throws MarshalException {
super.marshalParams(parent, context);
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Utils.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Utils.java
index b40b9504..9bbbedce 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Utils.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/Utils.java
@@ -22,10 +22,14 @@
package org.apache.jcp.xml.dsig.internal.dom;
import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
import java.io.IOException;
-import java.util.*;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
import javax.xml.crypto.XMLCryptoContext;
+
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java
index 1cdd405c..600c4cde 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/XMLDSigRI.java
@@ -28,10 +28,18 @@
*/
package org.apache.jcp.xml.dsig.internal.dom;
-import java.util.*;
-import java.security.*;
-
-import javax.xml.crypto.dsig.*;
+import java.security.AccessController;
+import java.security.InvalidParameterException;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivilegedAction;
+import java.security.Provider;
+import java.security.ProviderException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.crypto.dsig.CanonicalizationMethod;
+import javax.xml.crypto.dsig.Transform;
/**
* The XMLDSig RI Provider.
@@ -125,6 +133,7 @@ public final class XMLDSigRI extends Provider {
final Provider p = this;
AccessController.doPrivileged(new PrivilegedAction<Void>() {
+ @Override
public Void run() {
Map<String, String> MECH_TYPE = new HashMap<>();
MECH_TYPE.put("MechanismType", "DOM");
diff --git a/src/main/java/org/apache/xml/security/algorithms/MessageDigestAlgorithm.java b/src/main/java/org/apache/xml/security/algorithms/MessageDigestAlgorithm.java
index cdd443e2..884a8abc 100644
--- a/src/main/java/org/apache/xml/security/algorithms/MessageDigestAlgorithm.java
+++ b/src/main/java/org/apache/xml/security/algorithms/MessageDigestAlgorithm.java
@@ -252,11 +252,13 @@ public final class MessageDigestAlgorithm extends Algorithm {
}
/** {@inheritDoc} */
+ @Override
public String getBaseNamespace() {
return Constants.SignatureSpecNS;
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_DIGESTMETHOD;
}
diff --git a/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java b/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java
index 7db398ef..cb493beb 100644
--- a/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java
+++ b/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithm.java
@@ -27,7 +27,11 @@ import java.security.spec.AlgorithmParameterSpec;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.xml.security.algorithms.implementations.*;
+import org.apache.xml.security.algorithms.implementations.IntegrityHmac;
+import org.apache.xml.security.algorithms.implementations.SignatureBaseRSA;
+import org.apache.xml.security.algorithms.implementations.SignatureDSA;
+import org.apache.xml.security.algorithms.implementations.SignatureECDSA;
+import org.apache.xml.security.algorithms.implementations.SignatureEDDSA;
import org.apache.xml.security.exceptions.AlgorithmAlreadyRegisteredException;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.signature.XMLSignature;
@@ -521,6 +525,7 @@ public class SignatureAlgorithm extends Algorithm {
*
* @return URI of this element
*/
+ @Override
public String getBaseNamespace() {
return Constants.SignatureSpecNS;
}
@@ -530,6 +535,7 @@ public class SignatureAlgorithm extends Algorithm {
*
* @return Local name
*/
+ @Override
public String getBaseLocalName() {
return Constants._TAG_SIGNATUREMETHOD;
}
diff --git a/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithmSpi.java b/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithmSpi.java
index 955050f8..4e56ada5 100644
--- a/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithmSpi.java
+++ b/src/main/java/org/apache/xml/security/algorithms/SignatureAlgorithmSpi.java
@@ -18,7 +18,12 @@
*/
package org.apache.xml.security.algorithms;
-import java.security.*;
+import java.security.InvalidKeyException;
+import java.security.Key;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.SecureRandom;
+import java.security.Signature;
import java.security.spec.AlgorithmParameterSpec;
import org.apache.xml.security.signature.XMLSignatureException;
diff --git a/src/main/java/org/apache/xml/security/algorithms/implementations/ECDSAUtils.java b/src/main/java/org/apache/xml/security/algorithms/implementations/ECDSAUtils.java
index 2cb5bd00..f821950b 100644
--- a/src/main/java/org/apache/xml/security/algorithms/implementations/ECDSAUtils.java
+++ b/src/main/java/org/apache/xml/security/algorithms/implementations/ECDSAUtils.java
@@ -21,7 +21,12 @@ package org.apache.xml.security.algorithms.implementations;
import java.io.IOException;
import java.math.BigInteger;
import java.security.interfaces.ECPublicKey;
-import java.security.spec.*;
+import java.security.spec.ECField;
+import java.security.spec.ECFieldF2m;
+import java.security.spec.ECFieldFp;
+import java.security.spec.ECParameterSpec;
+import java.security.spec.ECPoint;
+import java.security.spec.EllipticCurve;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java b/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java
index 7a5dda4b..08efe08e 100644
--- a/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java
+++ b/src/main/java/org/apache/xml/security/algorithms/implementations/IntegrityHmac.java
@@ -86,6 +86,7 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
* @param params
* @throws XMLSignatureException
*/
+ @Override
protected void engineSetParameter(AlgorithmParameterSpec params) throws XMLSignatureException {
throw new XMLSignatureException("empty", new Object[]{"Incorrect method call"});
}
@@ -98,6 +99,7 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
* @return true if the signature is correct
* @throws XMLSignatureException
*/
+ @Override
protected boolean engineVerify(byte[] signature) throws XMLSignatureException {
try {
if (hmacOutputLength != null && hmacOutputLength.length < getDigestLength()) {
@@ -120,6 +122,7 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
* @param secretKey
* @throws XMLSignatureException
*/
+ @Override
protected void engineInitVerify(Key secretKey) throws XMLSignatureException {
if (!(secretKey instanceof SecretKey)) {
String supplied = null;
@@ -146,6 +149,7 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
* @return the result of the {@link java.security.Signature#sign()} method
* @throws XMLSignatureException
*/
+ @Override
protected byte[] engineSign() throws XMLSignatureException {
try {
if (hmacOutputLength != null && hmacOutputLength.length < getDigestLength()) {
@@ -166,6 +170,7 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
* @param secretKey
* @throws XMLSignatureException
*/
+ @Override
protected void engineInitSign(Key secretKey) throws XMLSignatureException {
engineInitSign(secretKey, (AlgorithmParameterSpec)null);
}
@@ -177,6 +182,7 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
* @param algorithmParameterSpec
* @throws XMLSignatureException
*/
+ @Override
protected void engineInitSign(
Key secretKey, AlgorithmParameterSpec algorithmParameterSpec
) throws XMLSignatureException {
@@ -209,6 +215,7 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
* @param secureRandom
* @throws XMLSignatureException
*/
+ @Override
protected void engineInitSign(Key secretKey, SecureRandom secureRandom)
throws XMLSignatureException {
throw new XMLSignatureException("algorithms.CannotUseSecureRandomOnMAC");
@@ -221,6 +228,7 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
* @param input
* @throws XMLSignatureException
*/
+ @Override
protected void engineUpdate(byte[] input) throws XMLSignatureException {
try {
this.macAlgorithm.update(input);
@@ -236,6 +244,7 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
* @param input
* @throws XMLSignatureException
*/
+ @Override
protected void engineUpdate(byte input) throws XMLSignatureException {
try {
this.macAlgorithm.update(input);
@@ -253,6 +262,7 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
* @param len
* @throws XMLSignatureException
*/
+ @Override
protected void engineUpdate(byte[] buf, int offset, int len) throws XMLSignatureException {
try {
this.macAlgorithm.update(buf, offset, len);
@@ -266,6 +276,7 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
* {@inheritDoc}
*
*/
+ @Override
protected String engineGetJCEAlgorithmString() {
return this.macAlgorithm.getAlgorithm();
}
@@ -275,6 +286,7 @@ public abstract class IntegrityHmac extends SignatureAlgorithmSpi {
*
* {@inheritDoc}
*/
+ @Override
protected String engineGetJCEProviderName() {
return this.macAlgorithm.getProvider().getName();
}
diff --git a/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java b/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java
index 964d9c59..851f65ba 100644
--- a/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java
+++ b/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureBaseRSA.java
@@ -27,6 +27,8 @@ import java.security.SecureRandom;
import java.security.Signature;
import java.security.SignatureException;
import java.security.spec.AlgorithmParameterSpec;
+import java.security.spec.MGF1ParameterSpec;
+import java.security.spec.PSSParameterSpec;
import org.apache.xml.security.algorithms.JCEMapper;
import org.apache.xml.security.algorithms.SignatureAlgorithmSpi;
@@ -38,9 +40,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
-import java.security.spec.MGF1ParameterSpec;
-import java.security.spec.PSSParameterSpec;
-
public abstract class SignatureBaseRSA extends SignatureAlgorithmSpi {
private static final org.slf4j.Logger LOG =
@@ -83,6 +82,7 @@ public abstract class SignatureBaseRSA extends SignatureAlgorithmSpi {
}
/** {@inheritDoc} */
+ @Override
protected void engineSetParameter(AlgorithmParameterSpec params)
throws XMLSignatureException {
try {
@@ -93,6 +93,7 @@ public abstract class SignatureBaseRSA extends SignatureAlgorithmSpi {
}
/** {@inheritDoc} */
+ @Override
protected boolean engineVerify(byte[] signature) throws XMLSignatureException {
try {
return this.signatureAlgorithm.verify(signature);
@@ -102,11 +103,13 @@ public abstract class SignatureBaseRSA extends SignatureAlgorithmSpi {
}
/** {@inheritDoc} */
+ @Override
protected void engineInitVerify(Key publicKey) throws XMLSignatureException {
engineInitVerify(publicKey, this.signatureAlgorithm);
}
/** {@inheritDoc} */
+ @Override
protected byte[] engineSign() throws XMLSignatureException {
try {
return this.signatureAlgorithm.sign();
@@ -116,17 +119,20 @@ public abstract class SignatureBaseRSA extends SignatureAlgorithmSpi {
}
/** {@inheritDoc} */
+ @Override
protected void engineInitSign(Key privateKey, SecureRandom secureRandom)
throws XMLSignatureException {
engineInitSign(privateKey, secureRandom, this.signatureAlgorithm);
}
/** {@inheritDoc} */
+ @Override
protected void engineInitSign(Key privateKey) throws XMLSignatureException {
engineInitSign(privateKey, (SecureRandom)null);
}
/** {@inheritDoc} */
+ @Override
protected void engineUpdate(byte[] input) throws XMLSignatureException {
try {
this.signatureAlgorithm.update(input);
@@ -136,6 +142,7 @@ public abstract class SignatureBaseRSA extends SignatureAlgorithmSpi {
}
/** {@inheritDoc} */
+ @Override
protected void engineUpdate(byte input) throws XMLSignatureException {
try {
this.signatureAlgorithm.update(input);
@@ -145,6 +152,7 @@ public abstract class SignatureBaseRSA extends SignatureAlgorithmSpi {
}
/** {@inheritDoc} */
+ @Override
protected void engineUpdate(byte[] buf, int offset, int len) throws XMLSignatureException {
try {
this.signatureAlgorithm.update(buf, offset, len);
@@ -154,22 +162,26 @@ public abstract class SignatureBaseRSA extends SignatureAlgorithmSpi {
}
/** {@inheritDoc} */
+ @Override
protected String engineGetJCEAlgorithmString() {
return this.signatureAlgorithm.getAlgorithm();
}
/** {@inheritDoc} */
+ @Override
protected String engineGetJCEProviderName() {
return this.signatureAlgorithm.getProvider().getName();
}
/** {@inheritDoc} */
+ @Override
protected void engineSetHMACOutputLength(int HMACOutputLength)
throws XMLSignatureException {
throw new XMLSignatureException("algorithms.HMACOutputLengthOnlyForHMAC");
}
/** {@inheritDoc} */
+ @Override
protected void engineInitSign(
Key signingKey, AlgorithmParameterSpec algorithmParameterSpec
) throws XMLSignatureException {
diff --git a/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java b/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java
index b1a9766e..f25fda09 100644
--- a/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java
+++ b/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureDSA.java
@@ -56,6 +56,7 @@ public class SignatureDSA extends SignatureAlgorithmSpi {
*
* {@inheritDoc}
*/
+ @Override
protected String engineGetURI() {
return XMLSignature.ALGO_ID_SIGNATURE_DSA;
}
@@ -96,6 +97,7 @@ public class SignatureDSA extends SignatureAlgorithmSpi {
/**
* {@inheritDoc}
*/
+ @Override
protected void engineSetParameter(AlgorithmParameterSpec params)
throws XMLSignatureException {
try {
@@ -108,6 +110,7 @@ public class SignatureDSA extends SignatureAlgorithmSpi {
/**
* {@inheritDoc}
*/
+ @Override
protected boolean engineVerify(byte[] signature)
throws XMLSignatureException {
try {
@@ -126,6 +129,7 @@ public class SignatureDSA extends SignatureAlgorithmSpi {
/**
* {@inheritDoc}
*/
+ @Override
protected void engineInitVerify(Key publicKey) throws XMLSignatureException {
engineInitVerify(publicKey, this.signatureAlgorithm);
size = ((DSAKey)publicKey).getParams().getQ().bitLength();
@@ -134,6 +138,7 @@ public class SignatureDSA extends SignatureAlgorithmSpi {
/**
* {@inheritDoc}
*/
+ @Override
protected byte[] engineSign() throws XMLSignatureException {
try {
byte[] jcebytes = this.signatureAlgorithm.sign();
@@ -147,6 +152,7 @@ public class SignatureDSA extends SignatureAlgorithmSpi {
/**
* {@inheritDoc}
*/
+ @Override
protected void engineInitSign(Key privateKey, SecureRandom secureRandom)
throws XMLSignatureException {
engineInitSign(privateKey, secureRandom, this.signatureAlgorithm);
@@ -156,6 +162,7 @@ public class SignatureDSA extends SignatureAlgorithmSpi {
/**
* {@inheritDoc}
*/
+ @Override
protected void engineInitSign(Key privateKey) throws XMLSignatureException {
engineInitSign(privateKey, (SecureRandom)null);
}
@@ -163,6 +170,7 @@ public class SignatureDSA extends SignatureAlgorithmSpi {
/**
* {@inheritDoc}
*/
+ @Override
protected void engineUpdate(byte[] input) throws XMLSignatureException {
try {
this.signatureAlgorithm.update(input);
@@ -174,6 +182,7 @@ public class SignatureDSA extends SignatureAlgorithmSpi {
/**
* {@inheritDoc}
*/
+ @Override
protected void engineUpdate(byte input) throws XMLSignatureException {
try {
this.signatureAlgorithm.update(input);
@@ -185,6 +194,7 @@ public class SignatureDSA extends SignatureAlgorithmSpi {
/**
* {@inheritDoc}
*/
+ @Override
protected void engineUpdate(byte[] buf, int offset, int len) throws XMLSignatureException {
try {
this.signatureAlgorithm.update(buf, offset, len);
@@ -198,6 +208,7 @@ public class SignatureDSA extends SignatureAlgorithmSpi {
*
* {@inheritDoc}
*/
+ @Override
protected String engineGetJCEAlgorithmString() {
return this.signatureAlgorithm.getAlgorithm();
}
@@ -207,6 +218,7 @@ public class SignatureDSA extends SignatureAlgorithmSpi {
*
* {@inheritDoc}
*/
+ @Override
protected String engineGetJCEProviderName() {
return this.signatureAlgorithm.getProvider().getName();
}
@@ -217,6 +229,7 @@ public class SignatureDSA extends SignatureAlgorithmSpi {
* @param HMACOutputLength
* @throws XMLSignatureException
*/
+ @Override
protected void engineSetHMACOutputLength(int HMACOutputLength) throws XMLSignatureException {
throw new XMLSignatureException("algorithms.HMACOutputLengthOnlyForHMAC");
}
@@ -228,6 +241,7 @@ public class SignatureDSA extends SignatureAlgorithmSpi {
* @param algorithmParameterSpec
* @throws XMLSignatureException
*/
+ @Override
protected void engineInitSign(
Key signingKey, AlgorithmParameterSpec algorithmParameterSpec
) throws XMLSignatureException {
diff --git a/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java b/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java
index b7799b2a..01e26572 100644
--- a/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java
+++ b/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureECDSA.java
@@ -19,7 +19,14 @@
package org.apache.xml.security.algorithms.implementations;
import java.io.IOException;
-import java.security.*;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.Key;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.Provider;
+import java.security.SecureRandom;
+import java.security.Signature;
+import java.security.SignatureException;
import java.security.interfaces.ECPrivateKey;
import java.security.spec.AlgorithmParameterSpec;
@@ -111,6 +118,7 @@ public abstract class SignatureECDSA extends SignatureAlgorithmSpi {
}
/** {@inheritDoc} */
+ @Override
protected void engineSetParameter(AlgorithmParameterSpec params)
throws XMLSignatureException {
try {
@@ -121,6 +129,7 @@ public abstract class SignatureECDSA extends SignatureAlgorithmSpi {
}
/** {@inheritDoc} */
+ @Override
protected boolean engineVerify(byte[] signature) throws XMLSignatureException {
try {
byte[] jcebytes = SignatureECDSA.convertXMLDSIGtoASN1(signature);
@@ -136,11 +145,13 @@ public abstract class SignatureECDSA extends SignatureAlgorithmSpi {
}
/** {@inheritDoc} */
+ @Override
protected void engineInitVerify(Key publicKey) throws XMLSignatureException {
engineInitVerify(publicKey, signatureAlgorithm);
}
/** {@inheritDoc} */
+ @Override
protected byte[] engineSign() throws XMLSignatureException {
try {
byte[] jcebytes = this.signatureAlgorithm.sign();
@@ -152,6 +163,7 @@ public abstract class SignatureECDSA extends SignatureAlgorithmSpi {
}
/** {@inheritDoc} */
+ @Override
protected void engineInitSign(Key privateKey, SecureRandom secureRandom)
throws XMLSignatureException {
if (privateKey instanceof ECPrivateKey) {
@@ -163,11 +175,13 @@ public abstract class SignatureECDSA extends SignatureAlgorithmSpi {
}
/** {@inheritDoc} */
+ @Override
protected void engineInitSign(Key privateKey) throws XMLSignatureException {
engineInitSign(privateKey, (SecureRandom)null);
}
/** {@inheritDoc} */
+ @Override
protected void engineUpdate(byte[] input) throws XMLSignatureException {
try {
this.signatureAlgorithm.update(input);
@@ -177,6 +191,7 @@ public abstract class SignatureECDSA extends SignatureAlgorithmSpi {
}
/** {@inheritDoc} */
+ @Override
protected void engineUpdate(byte input) throws XMLSignatureException {
try {
this.signatureAlgorithm.update(input);
@@ -186,6 +201,7 @@ public abstract class SignatureECDSA extends SignatureAlgorithmSpi {
}
/** {@inheritDoc} */
+ @Override
protected void engineUpdate(byte[] buf, int offset, int len) throws XMLSignatureException {
try {
this.signatureAlgorithm.update(buf, offset, len);
@@ -195,22 +211,26 @@ public abstract class SignatureECDSA extends SignatureAlgorithmSpi {
}
/** {@inheritDoc} */
+ @Override
protected String engineGetJCEAlgorithmString() {
return this.signatureAlgorithm.getAlgorithm();
}
/** {@inheritDoc} */
+ @Override
protected String engineGetJCEProviderName() {
return this.signatureAlgorithm.getProvider().getName();
}
/** {@inheritDoc} */
+ @Override
protected void engineSetHMACOutputLength(int HMACOutputLength)
throws XMLSignatureException {
throw new XMLSignatureException("algorithms.HMACOutputLengthOnlyForHMAC");
}
/** {@inheritDoc} */
+ @Override
protected void engineInitSign(
Key signingKey, AlgorithmParameterSpec algorithmParameterSpec
) throws XMLSignatureException {
diff --git a/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureEDDSA.java b/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureEDDSA.java
index b8921343..f43a9956 100644
--- a/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureEDDSA.java
+++ b/src/main/java/org/apache/xml/security/algorithms/implementations/SignatureEDDSA.java
@@ -18,16 +18,22 @@
*/
package org.apache.xml.security.algorithms.implementations;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.Key;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.Provider;
+import java.security.SecureRandom;
+import java.security.Signature;
+import java.security.SignatureException;
+import java.security.spec.AlgorithmParameterSpec;
+
import org.apache.xml.security.algorithms.JCEMapper;
import org.apache.xml.security.algorithms.SignatureAlgorithmSpi;
import org.apache.xml.security.signature.XMLSignature;
import org.apache.xml.security.signature.XMLSignatureException;
import org.apache.xml.security.utils.XMLUtils;
-import java.io.IOException;
-import java.security.*;
-import java.security.spec.AlgorithmParameterSpec;
-
/**
*
*/
@@ -73,6 +79,7 @@ public abstract class SignatureEDDSA extends SignatureAlgorithmSpi {
}
/** {@inheritDoc} */
+ @Override
protected void engineSetParameter(AlgorithmParameterSpec params)
throws XMLSignatureException {
try {
@@ -83,6 +90,7 @@ public abstract class SignatureEDDSA extends SignatureAlgorithmSpi {
}
/** {@inheritDoc} */
+ @Override
protected boolean engineVerify(byte[] signature) throws XMLSignatureException {
try {
@@ -97,11 +105,13 @@ public abstract class SignatureEDDSA extends SignatureAlgorithmSpi {
}
/** {@inheritDoc} */
+ @Override
protected void engineInitVerify(Key publicKey) throws XMLSignatureException {
engineInitVerify(publicKey, signatureAlgorithm);
}
/** {@inheritDoc} */
+ @Override
protected byte[] engineSign() throws XMLSignatureException {
try {
return this.signatureAlgorithm.sign();
@@ -111,6 +121,7 @@ public abstract class SignatureEDDSA extends SignatureAlgorithmSpi {
}
/** {@inheritDoc} */
+ @Override
protected void engineInitSign(Key privateKey, SecureRandom secureRandom)
throws XMLSignatureException {
@@ -118,11 +129,13 @@ public abstract class SignatureEDDSA extends SignatureAlgorithmSpi {
}
/** {@inheritDoc} */
+ @Override
protected void engineInitSign(Key privateKey) throws XMLSignatureException {
engineInitSign(privateKey, (SecureRandom)null);
}
/** {@inheritDoc} */
+ @Override
protected void engineUpdate(byte[] input) throws XMLSignatureException {
try {
this.signatureAlgorithm.update(input);
@@ -132,6 +145,7 @@ public abstract class SignatureEDDSA extends SignatureAlgorithmSpi {
}
/** {@inheritDoc} */
+ @Override
protected void engineUpdate(byte input) throws XMLSignatureException {
try {
this.signatureAlgorithm.update(input);
@@ -141,6 +155,7 @@ public abstract class SignatureEDDSA extends SignatureAlgorithmSpi {
}
/** {@inheritDoc} */
+ @Override
protected void engineUpdate(byte[] buf, int offset, int len) throws XMLSignatureException {
try {
this.signatureAlgorithm.update(buf, offset, len);
@@ -150,22 +165,26 @@ public abstract class SignatureEDDSA extends SignatureAlgorithmSpi {
}
/** {@inheritDoc} */
+ @Override
protected String engineGetJCEAlgorithmString() {
return this.signatureAlgorithm.getAlgorithm();
}
/** {@inheritDoc} */
+ @Override
protected String engineGetJCEProviderName() {
return this.signatureAlgorithm.getProvider().getName();
}
/** {@inheritDoc} */
+ @Override
protected void engineSetHMACOutputLength(int HMACOutputLength)
throws XMLSignatureException {
throw new XMLSignatureException("algorithms.HMACOutputLengthOnlyForHMAC");
}
/** {@inheritDoc} */
+ @Override
protected void engineInitSign(
Key signingKey, AlgorithmParameterSpec algorithmParameterSpec
) throws XMLSignatureException {
diff --git a/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java b/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java
index d02a91c0..7c6edc99 100644
--- a/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java
+++ b/src/main/java/org/apache/xml/security/c14n/Canonicalizer.java
@@ -120,7 +120,7 @@ public final class Canonicalizer {
* @return a Canonicalizer instance ready for the job
* @throws InvalidCanonicalizerException
*/
- public static final Canonicalizer getInstance(String algorithmURI)
+ public static Canonicalizer getInstance(String algorithmURI)
throws InvalidCanonicalizerException {
return new Canonicalizer(algorithmURI);
}
diff --git a/src/main/java/org/apache/xml/security/c14n/helper/AttrCompare.java b/src/main/java/org/apache/xml/security/c14n/helper/AttrCompare.java
index 8b9b1491..4478a9c5 100644
--- a/src/main/java/org/apache/xml/security/c14n/helper/AttrCompare.java
+++ b/src/main/java/org/apache/xml/security/c14n/helper/AttrCompare.java
@@ -18,11 +18,12 @@
*/
package org.apache.xml.security.c14n.helper;
-import org.apache.xml.security.utils.Constants;
-import org.w3c.dom.Attr;
import java.io.Serializable;
import java.util.Comparator;
+import org.apache.xml.security.utils.Constants;
+import org.w3c.dom.Attr;
+
/**
* Compares two attributes based on the C14n specification.
*
@@ -65,6 +66,7 @@ public class AttrCompare implements Comparator<Attr>, Serializable {
* obj0 is less than, equal to, or greater than obj1
*
*/
+ @Override
public int compare(Attr attr0, Attr attr1) {
String namespaceURI0 = attr0.getNamespaceURI();
String namespaceURI1 = attr1.getNamespaceURI();
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_OmitComments.java b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_OmitComments.java
index 14fcf982..769d352b 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_OmitComments.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_OmitComments.java
@@ -28,6 +28,7 @@ public class Canonicalizer11_OmitComments extends Canonicalizer20010315 {
super(false, true);
}
+ @Override
public final String engineGetURI() {
return Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS;
}
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_WithComments.java b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_WithComments.java
index 7420fc58..ea4fb48d 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_WithComments.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_WithComments.java
@@ -28,6 +28,7 @@ public class Canonicalizer11_WithComments extends Canonicalizer20010315 {
super(true, true);
}
+ @Override
public final String engineGetURI() {
return Canonicalizer.ALGO_ID_C14N11_WITH_COMMENTS;
}
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java
index e68a624a..1a7ef5f1 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315.java
@@ -79,6 +79,7 @@ public abstract class Canonicalizer20010315 extends CanonicalizerBase {
* @param writer OutputStream to write the canonicalization result
* @throws CanonicalizationException always
*/
+ @Override
public void engineCanonicalizeXPathNodeSet(Set<Node> xpathNodeSet, String inclusiveNamespaces, OutputStream writer)
throws CanonicalizationException {
@@ -94,6 +95,7 @@ public abstract class Canonicalizer20010315 extends CanonicalizerBase {
* @param writer OutputStream to write the canonicalization result
* @throws CanonicalizationException
*/
+ @Override
public void engineCanonicalizeSubTree(Node rootNode, String inclusiveNamespaces, OutputStream writer)
throws CanonicalizationException {
@@ -109,6 +111,7 @@ public abstract class Canonicalizer20010315 extends CanonicalizerBase {
* @param writer OutputStream to write the canonicalization result
* @throws CanonicalizationException
*/
+ @Override
public void engineCanonicalizeSubTree(
Node rootNode, String inclusiveNamespaces, boolean propagateDefaultNamespace, OutputStream writer)
throws CanonicalizationException {
@@ -293,6 +296,7 @@ public abstract class Canonicalizer20010315 extends CanonicalizerBase {
}
}
+ @Override
protected void circumventBugIfNeeded(XMLSignatureInput input)
throws XMLParserException, IOException {
if (!input.isNeedsToBeExpanded()) {
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315Excl.java b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315Excl.java
index fe575e2f..c3b71810 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315Excl.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315Excl.java
@@ -78,6 +78,7 @@ public abstract class Canonicalizer20010315Excl extends CanonicalizerBase {
* @param writer OutputStream to write the canonicalization result
* @throws CanonicalizationException
*/
+ @Override
public void engineCanonicalizeSubTree(Node rootNode, OutputStream writer)
throws CanonicalizationException {
engineCanonicalizeSubTree(rootNode, "", null, writer);
@@ -91,6 +92,7 @@ public abstract class Canonicalizer20010315Excl extends CanonicalizerBase {
* @param writer OutputStream to write the canonicalization result
* @throws CanonicalizationException
*/
+ @Override
public void engineCanonicalizeSubTree(
Node rootNode, String inclusiveNamespaces, OutputStream writer
) throws CanonicalizationException {
@@ -106,6 +108,7 @@ public abstract class Canonicalizer20010315Excl extends CanonicalizerBase {
* @param writer OutputStream to write the canonicalization result
* @throws CanonicalizationException
*/
+ @Override
public void engineCanonicalizeSubTree(
Node rootNode, String inclusiveNamespaces, boolean propagateDefaultNamespace, OutputStream writer
) throws CanonicalizationException {
@@ -151,6 +154,7 @@ public abstract class Canonicalizer20010315Excl extends CanonicalizerBase {
* @param writer OutputStream to write the canonicalization result
* @throws CanonicalizationException
*/
+ @Override
public void engineCanonicalizeXPathNodeSet(
Set<Node> xpathNodeSet, String inclusiveNamespaces, OutputStream writer
) throws CanonicalizationException {
@@ -332,6 +336,7 @@ public abstract class Canonicalizer20010315Excl extends CanonicalizerBase {
}
}
+ @Override
protected void circumventBugIfNeeded(XMLSignatureInput input)
throws XMLParserException, IOException {
if (!input.isNeedsToBeExpanded() || inclusiveNSSet.isEmpty()) {
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java
index c95b835f..4372af65 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java
@@ -30,6 +30,7 @@ public class Canonicalizer20010315ExclOmitComments extends Canonicalizer20010315
}
/** {@inheritDoc} */
+ @Override
public final String engineGetURI() {
return Canonicalizer.ALGO_ID_C14N_EXCL_OMIT_COMMENTS;
}
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java
index ccb25f8a..4c963083 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java
@@ -34,6 +34,7 @@ public class Canonicalizer20010315ExclWithComments extends Canonicalizer20010315
}
/** {@inheritDoc} */
+ @Override
public final String engineGetURI() {
return Canonicalizer.ALGO_ID_C14N_EXCL_WITH_COMMENTS;
}
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315OmitComments.java b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315OmitComments.java
index 1398c438..c10a7e12 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315OmitComments.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315OmitComments.java
@@ -33,6 +33,7 @@ public class Canonicalizer20010315OmitComments extends Canonicalizer20010315 {
}
/** {@inheritDoc} */
+ @Override
public final String engineGetURI() {
return Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
}
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315WithComments.java b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315WithComments.java
index 1a1e89e2..87052989 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315WithComments.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315WithComments.java
@@ -32,6 +32,7 @@ public class Canonicalizer20010315WithComments extends Canonicalizer20010315 {
}
/** {@inheritDoc} */
+ @Override
public final String engineGetURI() {
return Canonicalizer.ALGO_ID_C14N_WITH_COMMENTS;
}
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java b/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
index 72ff27a9..aadd7662 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
@@ -103,6 +103,7 @@ public abstract class CanonicalizerBase extends CanonicalizerSpi {
* @param writer OutputStream to write the canonicalization result
* @throws CanonicalizationException
*/
+ @Override
public void engineCanonicalizeSubTree(Node rootNode, OutputStream writer)
throws CanonicalizationException {
engineCanonicalizeSubTree(rootNode, (Node)null, writer);
@@ -115,6 +116,7 @@ public abstract class CanonicalizerBase extends CanonicalizerSpi {
* @param writer OutputStream to write the canonicalization result
* @throws CanonicalizationException
*/
+ @Override
public void engineCanonicalizeXPathNodeSet(Set<Node> xpathNodeSet, OutputStream writer)
throws CanonicalizationException {
this.xpathNodeSet = xpathNodeSet;
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerPhysical.java b/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerPhysical.java
index 1f37ed7a..e5c6409a 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerPhysical.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerPhysical.java
@@ -64,6 +64,7 @@ public class CanonicalizerPhysical extends CanonicalizerBase {
* @param writer OutputStream to write the canonicalization result
* @throws CanonicalizationException always
*/
+ @Override
public void engineCanonicalizeXPathNodeSet(Set<Node> xpathNodeSet, String inclusiveNamespaces, OutputStream writer)
throws CanonicalizationException {
@@ -79,6 +80,7 @@ public class CanonicalizerPhysical extends CanonicalizerBase {
* @param writer OutputStream to write the canonicalization result
* @throws CanonicalizationException
*/
+ @Override
public void engineCanonicalizeSubTree(Node rootNode, String inclusiveNamespaces, OutputStream writer)
throws CanonicalizationException {
@@ -94,6 +96,7 @@ public class CanonicalizerPhysical extends CanonicalizerBase {
* @param writer OutputStream to write the canonicalization result
* @throws CanonicalizationException
*/
+ @Override
public void engineCanonicalizeSubTree(
Node rootNode, String inclusiveNamespaces, boolean propagateDefaultNamespace, OutputStream writer)
throws CanonicalizationException {
@@ -161,6 +164,7 @@ public class CanonicalizerPhysical extends CanonicalizerBase {
}
/** {@inheritDoc} */
+ @Override
public final String engineGetURI() {
return Canonicalizer.ALGO_ID_C14N_PHYSICAL;
}
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java b/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
index 51722af5..d91deb66 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/NameSpaceSymbTable.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-
import org.w3c.dom.Attr;
import org.w3c.dom.Node;
@@ -307,6 +306,7 @@ class NameSpaceSymbEntry implements Cloneable {
}
/** {@inheritDoc} */
+ @Override
public NameSpaceSymbEntry clone() { //NOPMD
try {
return (NameSpaceSymbEntry)super.clone();
diff --git a/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java b/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java
index 38142e54..98056b87 100644
--- a/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java
+++ b/src/main/java/org/apache/xml/security/encryption/AbstractSerializer.java
@@ -56,6 +56,7 @@ public abstract class AbstractSerializer implements Serializer {
* <code>Element</code>.
* @throws Exception
*/
+ @Override
public byte[] serializeToByteArray(Element element) throws Exception {
try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
canon.canonicalizeSubtree(element, baos);
@@ -72,6 +73,7 @@ public abstract class AbstractSerializer implements Serializer {
* <code>NodeList</code>.
* @throws Exception
*/
+ @Override
public byte[] serializeToByteArray(NodeList content) throws Exception {
try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
for (int i = 0; i < content.getLength(); i++) {
diff --git a/src/main/java/org/apache/xml/security/encryption/AgreementMethod.java b/src/main/java/org/apache/xml/security/encryption/AgreementMethod.java
index 52d71b09..532f1a46 100644
--- a/src/main/java/org/apache/xml/security/encryption/AgreementMethod.java
+++ b/src/main/java/org/apache/xml/security/encryption/AgreementMethod.java
@@ -19,6 +19,7 @@
package org.apache.xml.security.encryption;
import java.util.Iterator;
+
import org.apache.xml.security.keys.KeyInfo;
import org.w3c.dom.Element;
diff --git a/src/main/java/org/apache/xml/security/encryption/DocumentSerializer.java b/src/main/java/org/apache/xml/security/encryption/DocumentSerializer.java
index c2a24769..2355c09f 100644
--- a/src/main/java/org/apache/xml/security/encryption/DocumentSerializer.java
+++ b/src/main/java/org/apache/xml/security/encryption/DocumentSerializer.java
@@ -50,6 +50,7 @@ public class DocumentSerializer extends AbstractSerializer {
* @return the Node resulting from the parse of the source
* @throws XMLEncryptionException
*/
+ @Override
public Node deserialize(byte[] source, Node ctx) throws XMLEncryptionException, IOException {
byte[] fragment = createContext(source, ctx);
try (InputStream is = new ByteArrayInputStream(fragment)) {
diff --git a/src/main/java/org/apache/xml/security/encryption/EncryptionMethod.java b/src/main/java/org/apache/xml/security/encryption/EncryptionMethod.java
index f243184d..4b512e7d 100644
--- a/src/main/java/org/apache/xml/security/encryption/EncryptionMethod.java
+++ b/src/main/java/org/apache/xml/security/encryption/EncryptionMethod.java
@@ -19,6 +19,7 @@
package org.apache.xml.security.encryption;
import java.util.Iterator;
+
import org.w3c.dom.Element;
/**
diff --git a/src/main/java/org/apache/xml/security/encryption/EncryptionProperty.java b/src/main/java/org/apache/xml/security/encryption/EncryptionProperty.java
index df3aa4bb..b8f76e18 100644
--- a/src/main/java/org/apache/xml/security/encryption/EncryptionProperty.java
+++ b/src/main/java/org/apache/xml/security/encryption/EncryptionProperty.java
@@ -19,6 +19,7 @@
package org.apache.xml.security.encryption;
import java.util.Iterator;
+
import org.w3c.dom.Element;
/**
diff --git a/src/main/java/org/apache/xml/security/encryption/Reference.java b/src/main/java/org/apache/xml/security/encryption/Reference.java
index dee1386b..4a358797 100644
--- a/src/main/java/org/apache/xml/security/encryption/Reference.java
+++ b/src/main/java/org/apache/xml/security/encryption/Reference.java
@@ -19,6 +19,7 @@
package org.apache.xml.security.encryption;
import java.util.Iterator;
+
import org.w3c.dom.Element;
/**
diff --git a/src/main/java/org/apache/xml/security/encryption/TransformSerializer.java b/src/main/java/org/apache/xml/security/encryption/TransformSerializer.java
index eba4da1e..77786bcb 100644
--- a/src/main/java/org/apache/xml/security/encryption/TransformSerializer.java
+++ b/src/main/java/org/apache/xml/security/encryption/TransformSerializer.java
@@ -69,6 +69,7 @@ public class TransformSerializer extends AbstractSerializer {
* @return the Node resulting from the parse of the source
* @throws XMLEncryptionException
*/
+ @Override
public Node deserialize(byte[] source, Node ctx) throws XMLEncryptionException, IOException {
byte[] fragment = createContext(source, ctx);
try (InputStream is = new ByteArrayInputStream(fragment)) {
diff --git a/src/main/java/org/apache/xml/security/encryption/XMLCipher.java b/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
index 7cc1da69..c3a8d312 100644
--- a/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
+++ b/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
@@ -2532,51 +2532,61 @@ public class XMLCipher {
}
/** {@inheritDoc} */
+ @Override
public byte[] getKANonce() {
return kaNonce;
}
/** {@inheritDoc} */
+ @Override
public void setKANonce(byte[] kanonce) {
kaNonce = kanonce;
}
/** {@inheritDoc} */
+ @Override
public Iterator<Element> getAgreementMethodInformation() {
return agreementMethodInformation.iterator();
}
/** {@inheritDoc} */
+ @Override
public void addAgreementMethodInformation(Element info) {
agreementMethodInformation.add(info);
}
/** {@inheritDoc} */
+ @Override
public void revoveAgreementMethodInformation(Element info) {
agreementMethodInformation.remove(info);
}
/** {@inheritDoc} */
+ @Override
public KeyInfo getOriginatorKeyInfo() {
return originatorKeyInfo;
}
/** {@inheritDoc} */
+ @Override
public void setOriginatorKeyInfo(KeyInfo keyInfo) {
originatorKeyInfo = keyInfo;
}
/** {@inheritDoc} */
+ @Override
public KeyInfo getRecipientKeyInfo() {
return recipientKeyInfo;
}
/** {@inheritDoc} */
+ @Override
public void setRecipientKeyInfo(KeyInfo keyInfo) {
recipientKeyInfo = keyInfo;
}
/** {@inheritDoc} */
+ @Override
public String getAlgorithm() {
return algorithmURI;
}
@@ -2599,11 +2609,13 @@ public class XMLCipher {
}
/** {@inheritDoc} */
+ @Override
public CipherValue getCipherValue() {
return cipherValue;
}
/** {@inheritDoc} */
+ @Override
public void setCipherValue(CipherValue value) throws XMLEncryptionException {
if (cipherType == REFERENCE_TYPE) {
@@ -2614,11 +2626,13 @@ public class XMLCipher {
}
/** {@inheritDoc} */
+ @Override
public CipherReference getCipherReference() {
return cipherReference;
}
/** {@inheritDoc} */
+ @Override
public void setCipherReference(CipherReference reference) throws
XMLEncryptionException {
if (cipherType == VALUE_TYPE) {
@@ -2631,6 +2645,7 @@ public class XMLCipher {
}
/** {@inheritDoc} */
+ @Override
public int getDataType() {
return cipherType;
}
@@ -2673,21 +2688,25 @@ public class XMLCipher {
}
/** {@inheritDoc} */
+ @Override
public String getURI() {
return referenceURI;
}
/** {@inheritDoc} */
+ @Override
public Attr getURIAsAttr() {
return referenceNode;
}
/** {@inheritDoc} */
+ @Override
public Transforms getTransforms() {
return referenceTransforms;
}
/** {@inheritDoc} */
+ @Override
public void setTransforms(Transforms transforms) {
referenceTransforms = transforms;
}
@@ -2717,11 +2736,13 @@ public class XMLCipher {
}
/** {@inheritDoc} */
+ @Override
public String getValue() {
return cipherValue;
}
/** {@inheritDoc} */
+ @Override
public void setValue(String value) {
cipherValue = value;
}
@@ -2801,31 +2822,37 @@ public class XMLCipher {
}
/** {@inheritDoc} */
+ @Override
public String getRecipient() {
return keyRecipient;
}
/** {@inheritDoc} */
+ @Override
public void setRecipient(String recipient) {
keyRecipient = recipient;
}
/** {@inheritDoc} */
+ @Override
public ReferenceList getReferenceList() {
return referenceList;
}
/** {@inheritDoc} */
+ @Override
public void setReferenceList(ReferenceList list) {
referenceList = list;
}
/** {@inheritDoc} */
+ @Override
public String getCarriedName() {
return carriedName;
}
/** {@inheritDoc} */
+ @Override
public void setCarriedName(String name) {
carriedName = name;
}
@@ -3072,61 +3099,73 @@ public class XMLCipher {
}
/** {@inheritDoc} */
+ @Override
public String getAlgorithm() {
return algorithm;
}
/** {@inheritDoc} */
+ @Override
public int getKeySize() {
return keySize;
}
/** {@inheritDoc} */
+ @Override
public void setKeySize(int size) {
keySize = size;
}
/** {@inheritDoc} */
+ @Override
public byte[] getOAEPparams() {
return oaepParams;
}
/** {@inheritDoc} */
+ @Override
public void setOAEPparams(byte[] params) {
oaepParams = params;
}
/** {@inheritDoc} */
+ @Override
public void setDigestAlgorithm(String digestAlgorithm) {
this.digestAlgorithm = digestAlgorithm;
}
/** {@inheritDoc} */
+ @Override
public String getDigestAlgorithm() {
return digestAlgorithm;
}
/** {@inheritDoc} */
+ @Override
public void setMGFAlgorithm(String mgfAlgorithm) {
this.mgfAlgorithm = mgfAlgorithm;
}
/** {@inheritDoc} */
+ @Override
public String getMGFAlgorithm() {
return mgfAlgorithm;
}
/** {@inheritDoc} */
+ @Override
public Iterator<Element> getEncryptionMethodInformation() {
return encryptionMethodInformation.iterator();
}
/** {@inheritDoc} */
+ @Override
public void addEncryptionMethodInformation(Element info) {
encryptionMethodInformation.add(info);
}
/** {@inheritDoc} */
+ @Override
public void removeEncryptionMethodInformation(Element info) {
encryptionMethodInformation.remove(info);
}
@@ -3196,26 +3235,31 @@ public class XMLCipher {
}
/** {@inheritDoc} */
+ @Override
public String getId() {
return id;
}
/** {@inheritDoc} */
+ @Override
public void setId(String id) {
this.id = id;
}
/** {@inheritDoc} */
+ @Override
public Iterator<EncryptionProperty> getEncryptionProperties() {
return encryptionProperties.iterator();
}
/** {@inheritDoc} */
+ @Override
public void addEncryptionProperty(EncryptionProperty property) {
encryptionProperties.add(property);
}
/** {@inheritDoc} */
+ @Override
public void removeEncryptionProperty(EncryptionProperty property) {
encryptionProperties.remove(property);
}
@@ -3251,11 +3295,13 @@ public class XMLCipher {
}
/** {@inheritDoc} */
+ @Override
public String getTarget() {
return target;
}
/** {@inheritDoc} */
+ @Override
public void setTarget(String target) {
if (target == null || target.length() == 0) {
this.target = null;
@@ -3278,36 +3324,43 @@ public class XMLCipher {
}
/** {@inheritDoc} */
+ @Override
public String getId() {
return id;
}
/** {@inheritDoc} */
+ @Override
public void setId(String id) {
this.id = id;
}
/** {@inheritDoc} */
+ @Override
public String getAttribute(String attribute) {
return attributeMap.get(attribute);
}
/** {@inheritDoc} */
+ @Override
public void setAttribute(String attribute, String value) {
attributeMap.put(attribute, value);
}
/** {@inheritDoc} */
+ @Override
public Iterator<Element> getEncryptionInformation() {
return encryptionInformation.iterator();
}
/** {@inheritDoc} */
+ @Override
public void addEncryptionInformation(Element info) {
encryptionInformation.add(info);
}
/** {@inheritDoc} */
+ @Override
public void removeEncryptionInformation(Element info) {
encryptionInformation.remove(info);
}
@@ -3394,12 +3447,14 @@ public class XMLCipher {
}
/** {@inheritDoc} */
+ @Override
public org.apache.xml.security.transforms.Transforms getDSTransforms() {
return this;
}
// Over-ride the namespace
/** {@inheritDoc} */
+ @Override
public String getBaseNamespace() {
return EncryptionConstants.EncryptionSpecNS;
}
@@ -3425,6 +3480,7 @@ public class XMLCipher {
}
/** {@inheritDoc} */
+ @Override
public void add(Reference reference) {
if (!reference.getClass().equals(sentry)) {
throw new IllegalArgumentException();
@@ -3433,6 +3489,7 @@ public class XMLCipher {
}
/** {@inheritDoc} */
+ @Override
public void remove(Reference reference) {
if (!reference.getClass().equals(sentry)) {
throw new IllegalArgumentException();
@@ -3441,16 +3498,19 @@ public class XMLCipher {
}
/** {@inheritDoc} */
+ @Override
public int size() {
return references.size();
}
/** {@inheritDoc} */
+ @Override
public boolean isEmpty() {
return references.isEmpty();
}
/** {@inheritDoc} */
+ @Override
public Iterator<Reference> getReferences() {
return references.iterator();
}
@@ -3469,11 +3529,13 @@ public class XMLCipher {
}
/** {@inheritDoc} */
+ @Override
public Reference newDataReference(String uri) {
return new DataReference(uri);
}
/** {@inheritDoc} */
+ @Override
public Reference newKeyReference(String uri) {
return new KeyReference(uri);
}
@@ -3494,29 +3556,35 @@ public class XMLCipher {
}
/** {@inheritDoc} */
+ @Override
public abstract String getType();
/** {@inheritDoc} */
+ @Override
public String getURI() {
return uri;
}
/** {@inheritDoc} */
+ @Override
public Iterator<Element> getElementRetrievalInformation() {
return referenceInformation.iterator();
}
/** {@inheritDoc} */
+ @Override
public void setURI(String uri) {
this.uri = uri;
}
/** {@inheritDoc} */
+ @Override
public void removeElementRetrievalInformation(Element node) {
referenceInformation.remove(node);
}
/** {@inheritDoc} */
+ @Override
public void addElementRetrievalInformation(Element node) {
referenceInformation.add(node);
}
@@ -3549,6 +3617,7 @@ public class XMLCipher {
}
/** {@inheritDoc} */
+ @Override
public String getType() {
return EncryptionConstants._TAG_DATAREFERENCE;
}
@@ -3561,6 +3630,7 @@ public class XMLCipher {
}
/** {@inheritDoc} */
+ @Override
public String getType() {
return EncryptionConstants._TAG_KEYREFERENCE;
}
diff --git a/src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java b/src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java
index df748b1f..0d7052d8 100644
--- a/src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java
+++ b/src/main/java/org/apache/xml/security/encryption/XMLCipherInput.java
@@ -21,12 +21,12 @@ package org.apache.xml.security.encryption;
import java.io.IOException;
import org.apache.xml.security.c14n.CanonicalizationException;
+import org.apache.xml.security.signature.XMLSignatureInput;
+import org.apache.xml.security.transforms.TransformationException;
import org.apache.xml.security.utils.XMLUtils;
import org.apache.xml.security.utils.resolver.ResourceResolver;
import org.apache.xml.security.utils.resolver.ResourceResolverContext;
import org.apache.xml.security.utils.resolver.ResourceResolverException;
-import org.apache.xml.security.signature.XMLSignatureInput;
-import org.apache.xml.security.transforms.TransformationException;
import org.w3c.dom.Attr;
/**
diff --git a/src/main/java/org/apache/xml/security/exceptions/XMLSecurityException.java b/src/main/java/org/apache/xml/security/exceptions/XMLSecurityException.java
index 013c1a4f..8fd9e436 100644
--- a/src/main/java/org/apache/xml/security/exceptions/XMLSecurityException.java
+++ b/src/main/java/org/apache/xml/security/exceptions/XMLSecurityException.java
@@ -156,6 +156,7 @@ public class XMLSecurityException extends Exception {
}
/** {@inheritDoc} */
+ @Override
public String toString() {
String s = this.getClass().getName();
String message = super.getLocalizedMessage();
@@ -177,6 +178,7 @@ public class XMLSecurityException extends Exception {
* Method printStackTrace
*
*/
+ @Override
public void printStackTrace() {
synchronized (System.err) {
super.printStackTrace(System.err);
diff --git a/src/main/java/org/apache/xml/security/keys/KeyInfo.java b/src/main/java/org/apache/xml/security/keys/KeyInfo.java
index b1c2b99b..f65a25ab 100644
--- a/src/main/java/org/apache/xml/security/keys/KeyInfo.java
+++ b/src/main/java/org/apache/xml/security/keys/KeyInfo.java
@@ -1224,6 +1224,7 @@ public class KeyInfo extends SignatureElementProxy {
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_KEYINFO;
}
diff --git a/src/main/java/org/apache/xml/security/keys/content/DEREncodedKeyValue.java b/src/main/java/org/apache/xml/security/keys/content/DEREncodedKeyValue.java
index ce2f74e5..f1e8faf0 100644
--- a/src/main/java/org/apache/xml/security/keys/content/DEREncodedKeyValue.java
+++ b/src/main/java/org/apache/xml/security/keys/content/DEREncodedKeyValue.java
@@ -94,6 +94,7 @@ public class DEREncodedKeyValue extends Signature11ElementProxy implements KeyIn
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_DERENCODEDKEYVALUE;
}
diff --git a/src/main/java/org/apache/xml/security/keys/content/KeyInfoReference.java b/src/main/java/org/apache/xml/security/keys/content/KeyInfoReference.java
index dca40139..517d2a0c 100644
--- a/src/main/java/org/apache/xml/security/keys/content/KeyInfoReference.java
+++ b/src/main/java/org/apache/xml/security/keys/content/KeyInfoReference.java
@@ -91,6 +91,7 @@ public class KeyInfoReference extends Signature11ElementProxy implements KeyInfo
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_KEYINFOREFERENCE;
}
diff --git a/src/main/java/org/apache/xml/security/keys/content/KeyName.java b/src/main/java/org/apache/xml/security/keys/content/KeyName.java
index 66324b90..baf7ce46 100644
--- a/src/main/java/org/apache/xml/security/keys/content/KeyName.java
+++ b/src/main/java/org/apache/xml/security/keys/content/KeyName.java
@@ -61,6 +61,7 @@ public class KeyName extends SignatureElementProxy implements KeyInfoContent {
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_KEYNAME;
}
diff --git a/src/main/java/org/apache/xml/security/keys/content/KeyValue.java b/src/main/java/org/apache/xml/security/keys/content/KeyValue.java
index 49f17020..ab8b79b9 100644
--- a/src/main/java/org/apache/xml/security/keys/content/KeyValue.java
+++ b/src/main/java/org/apache/xml/security/keys/content/KeyValue.java
@@ -156,6 +156,7 @@ public class KeyValue extends SignatureElementProxy implements KeyInfoContent {
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_KEYVALUE;
}
diff --git a/src/main/java/org/apache/xml/security/keys/content/MgmtData.java b/src/main/java/org/apache/xml/security/keys/content/MgmtData.java
index bb72d668..af0023e3 100644
--- a/src/main/java/org/apache/xml/security/keys/content/MgmtData.java
+++ b/src/main/java/org/apache/xml/security/keys/content/MgmtData.java
@@ -62,6 +62,7 @@ public class MgmtData extends SignatureElementProxy implements KeyInfoContent {
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_MGMTDATA;
}
diff --git a/src/main/java/org/apache/xml/security/keys/content/PGPData.java b/src/main/java/org/apache/xml/security/keys/content/PGPData.java
index 3ff26aa2..ed84cbff 100644
--- a/src/main/java/org/apache/xml/security/keys/content/PGPData.java
+++ b/src/main/java/org/apache/xml/security/keys/content/PGPData.java
@@ -40,6 +40,7 @@ public class PGPData extends SignatureElementProxy implements KeyInfoContent {
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_PGPDATA;
}
diff --git a/src/main/java/org/apache/xml/security/keys/content/RetrievalMethod.java b/src/main/java/org/apache/xml/security/keys/content/RetrievalMethod.java
index d78c7a6d..89d3b384 100644
--- a/src/main/java/org/apache/xml/security/keys/content/RetrievalMethod.java
+++ b/src/main/java/org/apache/xml/security/keys/content/RetrievalMethod.java
@@ -125,6 +125,7 @@ public class RetrievalMethod extends SignatureElementProxy implements KeyInfoCon
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_RETRIEVALMETHOD;
}
diff --git a/src/main/java/org/apache/xml/security/keys/content/SPKIData.java b/src/main/java/org/apache/xml/security/keys/content/SPKIData.java
index 4a8a02ee..7af352d7 100644
--- a/src/main/java/org/apache/xml/security/keys/content/SPKIData.java
+++ b/src/main/java/org/apache/xml/security/keys/content/SPKIData.java
@@ -41,6 +41,7 @@ public class SPKIData extends SignatureElementProxy implements KeyInfoContent {
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_SPKIDATA;
}
diff --git a/src/main/java/org/apache/xml/security/keys/content/X509Data.java b/src/main/java/org/apache/xml/security/keys/content/X509Data.java
index bbeff119..f7231e7e 100644
--- a/src/main/java/org/apache/xml/security/keys/content/X509Data.java
+++ b/src/main/java/org/apache/xml/security/keys/content/X509Data.java
@@ -524,6 +524,7 @@ public class X509Data extends SignatureElementProxy implements KeyInfoContent {
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_X509DATA;
}
diff --git a/src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java b/src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java
index 12ecb03c..b5f1c2b4 100644
--- a/src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java
+++ b/src/main/java/org/apache/xml/security/keys/content/keyvalues/DSAKeyValue.java
@@ -93,6 +93,7 @@ public class DSAKeyValue extends SignatureElementProxy implements KeyValueConten
}
/** {@inheritDoc} */
+ @Override
public PublicKey getPublicKey() throws XMLSecurityException {
try {
DSAPublicKeySpec pkspec =
@@ -119,6 +120,7 @@ public class DSAKeyValue extends SignatureElementProxy implements KeyValueConten
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_DSAKEYVALUE;
}
diff --git a/src/main/java/org/apache/xml/security/keys/content/keyvalues/ECKeyValue.java b/src/main/java/org/apache/xml/security/keys/content/keyvalues/ECKeyValue.java
index 11f1c914..1ef4f7fb 100644
--- a/src/main/java/org/apache/xml/security/keys/content/keyvalues/ECKeyValue.java
+++ b/src/main/java/org/apache/xml/security/keys/content/keyvalues/ECKeyValue.java
@@ -36,16 +36,15 @@ import java.util.Arrays;
import javax.xml.crypto.MarshalException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.I18n;
import org.apache.xml.security.utils.Signature11ElementProxy;
import org.apache.xml.security.utils.XMLUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.Text;
public class ECKeyValue extends Signature11ElementProxy implements KeyValueContent {
@@ -157,6 +156,7 @@ public class ECKeyValue extends Signature11ElementProxy implements KeyValueConte
}
/** {@inheritDoc} */
+ @Override
public PublicKey getPublicKey() throws XMLSecurityException {
try {
ECParameterSpec ecParams = null;
@@ -206,6 +206,7 @@ public class ECKeyValue extends Signature11ElementProxy implements KeyValueConte
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_ECKEYVALUE;
}
diff --git a/src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java b/src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java
index a83b145e..412c0459 100644
--- a/src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java
+++ b/src/main/java/org/apache/xml/security/keys/content/keyvalues/RSAKeyValue.java
@@ -89,6 +89,7 @@ public class RSAKeyValue extends SignatureElementProxy implements KeyValueConten
}
/** {@inheritDoc} */
+ @Override
public PublicKey getPublicKey() throws XMLSecurityException {
try {
KeyFactory rsaFactory = KeyFactory.getInstance("RSA");
@@ -111,6 +112,7 @@ public class RSAKeyValue extends SignatureElementProxy implements KeyValueConten
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_RSAKEYVALUE;
}
diff --git a/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509CRL.java b/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509CRL.java
index 0dc853fc..1eefddc2 100644
--- a/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509CRL.java
+++ b/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509CRL.java
@@ -60,6 +60,7 @@ public class XMLX509CRL extends SignatureElementProxy implements XMLX509DataCont
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_X509CRL;
}
diff --git a/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java b/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java
index 315c1236..4a4a9334 100644
--- a/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java
+++ b/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Certificate.java
@@ -123,6 +123,7 @@ public class XMLX509Certificate extends SignatureElementProxy implements XMLX509
}
/** {@inheritDoc} */
+ @Override
public boolean equals(Object obj) {
if (!(obj instanceof XMLX509Certificate)) {
return false;
@@ -135,6 +136,7 @@ public class XMLX509Certificate extends SignatureElementProxy implements XMLX509
}
}
+ @Override
public int hashCode() {
int result = 17;
try {
@@ -149,6 +151,7 @@ public class XMLX509Certificate extends SignatureElementProxy implements XMLX509
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_X509CERTIFICATE;
}
diff --git a/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Digest.java b/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Digest.java
index 90cf3b2b..9775b34c 100644
--- a/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Digest.java
+++ b/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509Digest.java
@@ -128,6 +128,7 @@ public class XMLX509Digest extends Signature11ElementProxy implements XMLX509Dat
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_X509DIGEST;
}
diff --git a/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java b/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java
index 6f8968fe..537edd87 100644
--- a/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java
+++ b/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509IssuerSerial.java
@@ -128,6 +128,7 @@ public class XMLX509IssuerSerial extends SignatureElementProxy implements XMLX50
}
/** {@inheritDoc} */
+ @Override
public boolean equals(Object obj) {
if (!(obj instanceof XMLX509IssuerSerial)) {
return false;
@@ -139,6 +140,7 @@ public class XMLX509IssuerSerial extends SignatureElementProxy implements XMLX50
&& this.getIssuerName().equals(other.getIssuerName());
}
+ @Override
public int hashCode() {
int result = 17;
result = 31 * result + getSerialNumber().hashCode();
@@ -147,6 +149,7 @@ public class XMLX509IssuerSerial extends SignatureElementProxy implements XMLX50
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_X509ISSUERSERIAL;
}
diff --git a/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java b/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java
index c18922b5..5410d329 100644
--- a/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java
+++ b/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SKI.java
@@ -141,6 +141,7 @@ public class XMLX509SKI extends SignatureElementProxy implements XMLX509DataCont
}
/** {@inheritDoc} */
+ @Override
public boolean equals(Object obj) {
if (!(obj instanceof XMLX509SKI)) {
return false;
@@ -155,6 +156,7 @@ public class XMLX509SKI extends SignatureElementProxy implements XMLX509DataCont
}
}
+ @Override
public int hashCode() {
int result = 17;
try {
@@ -170,6 +172,7 @@ public class XMLX509SKI extends SignatureElementProxy implements XMLX509DataCont
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_X509SKI;
}
diff --git a/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SubjectName.java b/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SubjectName.java
index ac5a2434..4fba8ceb 100644
--- a/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SubjectName.java
+++ b/src/main/java/org/apache/xml/security/keys/content/x509/XMLX509SubjectName.java
@@ -76,6 +76,7 @@ public class XMLX509SubjectName extends SignatureElementProxy implements XMLX509
}
/** {@inheritDoc} */
+ @Override
public boolean equals(Object obj) {
if (!(obj instanceof XMLX509SubjectName)) {
return false;
@@ -88,6 +89,7 @@ public class XMLX509SubjectName extends SignatureElementProxy implements XMLX509
return thisSubject.equals(otherSubject);
}
+ @Override
public int hashCode() {
int result = 17;
result = 31 * result + this.getSubjectName().hashCode();
@@ -95,6 +97,7 @@ public class XMLX509SubjectName extends SignatureElementProxy implements XMLX509
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_X509SUBJECTNAME;
}
diff --git a/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java b/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java
index a17b4da6..8772a2cd 100644
--- a/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java
+++ b/src/main/java/org/apache/xml/security/keys/keyresolver/KeyResolver.java
@@ -26,9 +26,6 @@ import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
import org.apache.xml.security.keys.keyresolver.implementations.DEREncodedKeyValueResolver;
import org.apache.xml.security.keys.keyresolver.implementations.DSAKeyValueResolver;
import org.apache.xml.security.keys.keyresolver.implementations.ECKeyValueResolver;
@@ -43,6 +40,8 @@ import org.apache.xml.security.keys.keyresolver.implementations.X509SubjectNameR
import org.apache.xml.security.keys.storage.StorageResolver;
import org.apache.xml.security.utils.ClassLoaderUtils;
import org.apache.xml.security.utils.JavaUtils;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
* KeyResolver is factory class for subclass of KeyResolverSpi that
@@ -290,10 +289,12 @@ public class KeyResolver {
it = res.iterator();
}
+ @Override
public boolean hasNext() {
return it.hasNext();
}
+ @Override
public KeyResolverSpi next() {
KeyResolverSpi resolver = it.next();
if (resolver == null) {
@@ -303,6 +304,7 @@ public class KeyResolver {
return resolver;
}
+ @Override
public void remove() {
throw new UnsupportedOperationException("Can't remove resolvers using the iterator");
}
diff --git a/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/PrivateKeyResolver.java b/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/PrivateKeyResolver.java
index e903824e..ebd44bb4 100644
--- a/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/PrivateKeyResolver.java
+++ b/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/PrivateKeyResolver.java
@@ -28,7 +28,9 @@ import java.security.cert.CertificateEncodingException;
import java.security.cert.X509Certificate;
import java.util.Arrays;
import java.util.Enumeration;
+
import javax.crypto.SecretKey;
+
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.keys.content.X509Data;
import org.apache.xml.security.keys.content.x509.XMLX509Certificate;
diff --git a/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java b/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java
index 270a2d69..c63c1606 100644
--- a/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java
+++ b/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RSAKeyValueResolver.java
@@ -22,7 +22,6 @@ import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.cert.X509Certificate;
-
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.keys.content.keyvalues.RSAKeyValue;
import org.apache.xml.security.keys.keyresolver.KeyResolverSpi;
diff --git a/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SecretKeyResolver.java b/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SecretKeyResolver.java
index 88c287b9..71d96c27 100644
--- a/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SecretKeyResolver.java
+++ b/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SecretKeyResolver.java
@@ -23,7 +23,9 @@ import java.security.KeyStore;
import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.cert.X509Certificate;
+
import javax.crypto.SecretKey;
+
import org.apache.xml.security.keys.keyresolver.KeyResolverException;
import org.apache.xml.security.keys.keyresolver.KeyResolverSpi;
import org.apache.xml.security.keys.storage.StorageResolver;
diff --git a/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SingleKeyResolver.java b/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SingleKeyResolver.java
index aa7aa38b..7a5e6c28 100644
--- a/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SingleKeyResolver.java
+++ b/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/SingleKeyResolver.java
@@ -21,7 +21,9 @@ package org.apache.xml.security.keys.keyresolver.implementations;
import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.cert.X509Certificate;
+
import javax.crypto.SecretKey;
+
import org.apache.xml.security.keys.keyresolver.KeyResolverException;
import org.apache.xml.security.keys.keyresolver.KeyResolverSpi;
import org.apache.xml.security.keys.storage.StorageResolver;
diff --git a/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java b/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java
index cbc59d8c..b646468e 100644
--- a/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java
+++ b/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SKIResolver.java
@@ -24,7 +24,6 @@ import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
import java.util.Iterator;
-
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.keys.content.x509.XMLX509SKI;
import org.apache.xml.security.keys.keyresolver.KeyResolverException;
diff --git a/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java b/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java
index 82e3ccba..7d65dec8 100644
--- a/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java
+++ b/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/X509SubjectNameResolver.java
@@ -24,7 +24,6 @@ import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
import java.util.Iterator;
-
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.keys.content.x509.XMLX509SubjectName;
import org.apache.xml.security.keys.keyresolver.KeyResolverException;
diff --git a/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java b/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java
index 79c96b91..08f42d64 100644
--- a/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java
+++ b/src/main/java/org/apache/xml/security/keys/storage/StorageResolver.java
@@ -129,6 +129,7 @@ public class StorageResolver {
}
/** {@inheritDoc} */
+ @Override
public boolean hasNext() {
if (currentResolver == null) {
return false;
@@ -143,6 +144,7 @@ public class StorageResolver {
}
/** {@inheritDoc} */
+ @Override
public Certificate next() {
if (hasNext()) {
return currentResolver.next();
@@ -154,6 +156,7 @@ public class StorageResolver {
/**
* Method remove
*/
+ @Override
public void remove() {
throw new UnsupportedOperationException("Can't remove keys from KeyStore");
}
diff --git a/src/main/java/org/apache/xml/security/keys/storage/implementations/KeyStoreResolver.java b/src/main/java/org/apache/xml/security/keys/storage/implementations/KeyStoreResolver.java
index 2b6b7845..776d13c7 100644
--- a/src/main/java/org/apache/xml/security/keys/storage/implementations/KeyStoreResolver.java
+++ b/src/main/java/org/apache/xml/security/keys/storage/implementations/KeyStoreResolver.java
@@ -60,6 +60,7 @@ public class KeyStoreResolver extends StorageResolverSpi {
}
/** {@inheritDoc} */
+ @Override
public Iterator<Certificate> getIterator() {
return new KeyStoreIterator(this.keyStore);
}
@@ -99,11 +100,13 @@ public class KeyStoreResolver extends StorageResolverSpi {
}
/** {@inheritDoc} */
+ @Override
public boolean hasNext() {
return this.i < this.certs.size();
}
/** {@inheritDoc} */
+ @Override
public Certificate next() {
if (hasNext()) {
return this.certs.get(this.i++);
@@ -115,6 +118,7 @@ public class KeyStoreResolver extends StorageResolverSpi {
/**
* Method remove
*/
+ @Override
public void remove() {
throw new UnsupportedOperationException("Can't remove keys from KeyStore");
}
diff --git a/src/main/java/org/apache/xml/security/keys/storage/implementations/SingleCertificateResolver.java b/src/main/java/org/apache/xml/security/keys/storage/implementations/SingleCertificateResolver.java
index 34f6b503..16e95e7e 100644
--- a/src/main/java/org/apache/xml/security/keys/storage/implementations/SingleCertificateResolver.java
+++ b/src/main/java/org/apache/xml/security/keys/storage/implementations/SingleCertificateResolver.java
@@ -42,6 +42,7 @@ public class SingleCertificateResolver extends StorageResolverSpi {
}
/** {@inheritDoc} */
+ @Override
public Iterator<Certificate> getIterator() {
return new InternalIterator(this.certificate);
}
@@ -67,11 +68,13 @@ public class SingleCertificateResolver extends StorageResolverSpi {
}
/** {@inheritDoc} */
+ @Override
public boolean hasNext() {
return !this.alreadyReturned;
}
/** {@inheritDoc} */
+ @Override
public Certificate next() {
if (this.alreadyReturned) {
throw new NoSuchElementException();
@@ -83,6 +86,7 @@ public class SingleCertificateResolver extends StorageResolverSpi {
/**
* Method remove
*/
+ @Override
public void remove() {
throw new UnsupportedOperationException("Can't remove keys from KeyStore");
}
diff --git a/src/main/java/org/apache/xml/security/parser/XMLParserImpl.java b/src/main/java/org/apache/xml/security/parser/XMLParserImpl.java
index 4cb4aa52..8c9b0aa1 100644
--- a/src/main/java/org/apache/xml/security/parser/XMLParserImpl.java
+++ b/src/main/java/org/apache/xml/security/parser/XMLParserImpl.java
@@ -46,10 +46,10 @@ public class XMLParserImpl implements XMLParser {
(PrivilegedAction<Integer>) () -> Integer.getInteger("org.apache.xml.security.parser.pool-size", 20));
private static final Map<ClassLoader, Queue<DocumentBuilder>> DOCUMENT_BUILDERS =
- Collections.synchronizedMap(new WeakHashMap<ClassLoader, Queue<DocumentBuilder>>());
+ Collections.synchronizedMap(new WeakHashMap<>());
private static final Map<ClassLoader, Queue<DocumentBuilder>> DOCUMENT_BUILDERS_DISALLOW_DOCTYPE =
- Collections.synchronizedMap(new WeakHashMap<ClassLoader, Queue<DocumentBuilder>>());
+ Collections.synchronizedMap(new WeakHashMap<>());
@Override
public Document parse(InputStream inputStream, boolean disallowDocTypeDeclarations) throws XMLParserException {
@@ -113,6 +113,7 @@ public class XMLParserImpl implements XMLParser {
final SecurityManager sm = System.getSecurityManager();
if (sm != null) {
return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+ @Override
public ClassLoader run() {
return Thread.currentThread().getContextClassLoader();
}
@@ -125,6 +126,7 @@ public class XMLParserImpl implements XMLParser {
final SecurityManager sm = System.getSecurityManager();
if (sm != null) {
return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
+ @Override
public ClassLoader run() {
return clazz.getClassLoader();
}
diff --git a/src/main/java/org/apache/xml/security/signature/Manifest.java b/src/main/java/org/apache/xml/security/signature/Manifest.java
index bbba3b98..e1b2aa5a 100644
--- a/src/main/java/org/apache/xml/security/signature/Manifest.java
+++ b/src/main/java/org/apache/xml/security/signature/Manifest.java
@@ -570,6 +570,7 @@ public class Manifest extends SignatureElementProxy {
*
* {@inheritDoc}
*/
+ @Override
public String getBaseLocalName() {
return Constants._TAG_MANIFEST;
}
diff --git a/src/main/java/org/apache/xml/security/signature/ObjectContainer.java b/src/main/java/org/apache/xml/security/signature/ObjectContainer.java
index 2d56f808..d07d83de 100644
--- a/src/main/java/org/apache/xml/security/signature/ObjectContainer.java
+++ b/src/main/java/org/apache/xml/security/signature/ObjectContainer.java
@@ -126,6 +126,7 @@ public class ObjectContainer extends SignatureElementProxy {
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_OBJECT;
}
diff --git a/src/main/java/org/apache/xml/security/signature/Reference.java b/src/main/java/org/apache/xml/security/signature/Reference.java
index 5a6297a0..4ede2838 100644
--- a/src/main/java/org/apache/xml/security/signature/Reference.java
+++ b/src/main/java/org/apache/xml/security/signature/Reference.java
@@ -188,10 +188,12 @@ public class Reference extends SignatureElementProxy {
// Create DigestMethod Element without actually instantiating a MessageDigest Object
Algorithm digestAlgorithm = new Algorithm(getDocument(), messageDigestAlgorithm) {
+ @Override
public String getBaseNamespace() {
return Constants.SignatureSpecNS;
}
+ @Override
public String getBaseLocalName() {
return Constants._TAG_DIGESTMETHOD;
}
@@ -607,6 +609,7 @@ public class Reference extends SignatureElementProxy {
try {
final Set<Node> s = input.getNodeSet();
referenceData = new ReferenceNodeSetData() {
+ @Override
public Iterator<Node> iterator() {
return new Iterator<Node>() {
@@ -803,6 +806,7 @@ public class Reference extends SignatureElementProxy {
* Method getBaseLocalName
* {@inheritDoc}
*/
+ @Override
public String getBaseLocalName() {
return Constants._TAG_REFERENCE;
}
diff --git a/src/main/java/org/apache/xml/security/signature/SignatureProperties.java b/src/main/java/org/apache/xml/security/signature/SignatureProperties.java
index f2904a08..252b6926 100644
--- a/src/main/java/org/apache/xml/security/signature/SignatureProperties.java
+++ b/src/main/java/org/apache/xml/security/signature/SignatureProperties.java
@@ -135,6 +135,7 @@ public class SignatureProperties extends SignatureElementProxy {
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_SIGNATUREPROPERTIES;
}
diff --git a/src/main/java/org/apache/xml/security/signature/SignatureProperty.java b/src/main/java/org/apache/xml/security/signature/SignatureProperty.java
index 42bdac35..a70db27a 100644
--- a/src/main/java/org/apache/xml/security/signature/SignatureProperty.java
+++ b/src/main/java/org/apache/xml/security/signature/SignatureProperty.java
@@ -122,6 +122,7 @@ public class SignatureProperty extends SignatureElementProxy {
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_SIGNATUREPROPERTY;
}
diff --git a/src/main/java/org/apache/xml/security/signature/SignedInfo.java b/src/main/java/org/apache/xml/security/signature/SignedInfo.java
index f200ddbf..b08ba54b 100644
--- a/src/main/java/org/apache/xml/security/signature/SignedInfo.java
+++ b/src/main/java/org/apache/xml/security/signature/SignedInfo.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.security.Provider;
import java.security.spec.AlgorithmParameterSpec;
+
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
@@ -34,7 +35,6 @@ import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.transforms.params.InclusiveNamespaces;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.XMLUtils;
-
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -397,6 +397,7 @@ public class SignedInfo extends Manifest {
* {@inheritDoc}
*
*/
+ @Override
public String getBaseLocalName() {
return Constants._TAG_SIGNEDINFO;
}
diff --git a/src/main/java/org/apache/xml/security/signature/XMLSignature.java b/src/main/java/org/apache/xml/security/signature/XMLSignature.java
index 19801c04..1d38b286 100644
--- a/src/main/java/org/apache/xml/security/signature/XMLSignature.java
+++ b/src/main/java/org/apache/xml/security/signature/XMLSignature.java
@@ -1027,6 +1027,7 @@ public final class XMLSignature extends SignatureElementProxy {
*
* @return Constants._TAG_SIGNATURE
*/
+ @Override
public String getBaseLocalName() {
return Constants._TAG_SIGNATURE;
}
diff --git a/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java b/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java
index ddffcaf2..0b19e198 100644
--- a/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java
+++ b/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java
@@ -387,6 +387,7 @@ public class XMLSignatureInput {
* Method toString
* {@inheritDoc}
*/
+ @Override
public String toString() {
if (isNodeSet()) {
return "XMLSignatureInput/NodeSet/" + inputNodeSet.size()
diff --git a/src/main/java/org/apache/xml/security/signature/reference/ReferenceSubTreeData.java b/src/main/java/org/apache/xml/security/signature/reference/ReferenceSubTreeData.java
index 55be5a61..afb25046 100644
--- a/src/main/java/org/apache/xml/security/signature/reference/ReferenceSubTreeData.java
+++ b/src/main/java/org/apache/xml/security/signature/reference/ReferenceSubTreeData.java
@@ -26,6 +26,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.NoSuchElementException;
+
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -47,6 +48,7 @@ public class ReferenceSubTreeData implements ReferenceNodeSetData {
this.excludeComments = excludeComments;
}
+ @Override
public Iterator<Node> iterator() {
return new DelayedNodeIterator(root, excludeComments);
}
@@ -74,6 +76,7 @@ public class ReferenceSubTreeData implements ReferenceNodeSetData {
this.withComments = !excludeComments;
}
+ @Override
public boolean hasNext() {
if (nodeSet == null) {
nodeSet = dereferenceSameDocumentURI(root);
@@ -82,6 +85,7 @@ public class ReferenceSubTreeData implements ReferenceNodeSetData {
return li.hasNext();
}
+ @Override
public Node next() {
if (nodeSet == null) {
nodeSet = dereferenceSameDocumentURI(root);
@@ -94,6 +98,7 @@ public class ReferenceSubTreeData implements ReferenceNodeSetData {
}
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
diff --git a/src/main/java/org/apache/xml/security/stax/config/ConfigurationProperties.java b/src/main/java/org/apache/xml/security/stax/config/ConfigurationProperties.java
index 78f1f3c3..83807348 100644
--- a/src/main/java/org/apache/xml/security/stax/config/ConfigurationProperties.java
+++ b/src/main/java/org/apache/xml/security/stax/config/ConfigurationProperties.java
@@ -18,12 +18,12 @@
*/
package org.apache.xml.security.stax.config;
-import org.apache.xml.security.configuration.PropertiesType;
-import org.apache.xml.security.configuration.PropertyType;
-
import java.util.List;
import java.util.Properties;
+import org.apache.xml.security.configuration.PropertiesType;
+import org.apache.xml.security.configuration.PropertyType;
+
/**
* Configuration Properties
*
diff --git a/src/main/java/org/apache/xml/security/stax/config/Init.java b/src/main/java/org/apache/xml/security/stax/config/Init.java
index 1f523c7a..68b2e138 100644
--- a/src/main/java/org/apache/xml/security/stax/config/Init.java
+++ b/src/main/java/org/apache/xml/security/stax/config/Init.java
@@ -18,25 +18,26 @@
*/
package org.apache.xml.security.stax.config;
-import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.apache.xml.security.stax.ext.XMLSecurityConfigurationException;
-import org.apache.xml.security.utils.ClassLoaderUtils;
-import org.apache.xml.security.utils.I18n;
-import org.apache.xml.security.configuration.ConfigurationType;
-import org.apache.xml.security.configuration.ObjectFactory;
-
-import javax.xml.XMLConstants;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBElement;
import jakarta.xml.bind.Unmarshaller;
import jakarta.xml.bind.UnmarshallerHandler;
+
+import java.net.URI;
+import java.net.URL;
+
+import javax.xml.XMLConstants;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
-import java.net.URI;
-import java.net.URL;
+import org.apache.xml.security.configuration.ConfigurationType;
+import org.apache.xml.security.configuration.ObjectFactory;
+import org.apache.xml.security.exceptions.XMLSecurityException;
+import org.apache.xml.security.stax.ext.XMLSecurityConfigurationException;
+import org.apache.xml.security.utils.ClassLoaderUtils;
+import org.apache.xml.security.utils.I18n;
/**
* Class to load the algorithms-mappings from a configuration file.
diff --git a/src/main/java/org/apache/xml/security/stax/config/ResourceResolverMapper.java b/src/main/java/org/apache/xml/security/stax/config/ResourceResolverMapper.java
index 5b54ca70..6d2b2b4f 100644
--- a/src/main/java/org/apache/xml/security/stax/config/ResourceResolverMapper.java
+++ b/src/main/java/org/apache/xml/security/stax/config/ResourceResolverMapper.java
@@ -18,16 +18,16 @@
*/
package org.apache.xml.security.stax.config;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.xml.security.configuration.ResolverType;
+import org.apache.xml.security.configuration.ResourceResolversType;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.ResourceResolver;
import org.apache.xml.security.stax.ext.ResourceResolverLookup;
import org.apache.xml.security.utils.ClassLoaderUtils;
import org.apache.xml.security.utils.JavaUtils;
-import org.apache.xml.security.configuration.ResolverType;
-import org.apache.xml.security.configuration.ResourceResolversType;
-
-import java.util.ArrayList;
-import java.util.List;
/**
*/
diff --git a/src/main/java/org/apache/xml/security/stax/config/SecurityHeaderHandlerMapper.java b/src/main/java/org/apache/xml/security/stax/config/SecurityHeaderHandlerMapper.java
index b1c2c5c2..d24d766a 100644
--- a/src/main/java/org/apache/xml/security/stax/config/SecurityHeaderHandlerMapper.java
+++ b/src/main/java/org/apache/xml/security/stax/config/SecurityHeaderHandlerMapper.java
@@ -18,16 +18,16 @@
*/
package org.apache.xml.security.stax.config;
-import org.apache.xml.security.utils.ClassLoaderUtils;
-import org.apache.xml.security.configuration.HandlerType;
-import org.apache.xml.security.configuration.SecurityHeaderHandlersType;
-
-import javax.xml.namespace.QName;
-
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.xml.namespace.QName;
+
+import org.apache.xml.security.configuration.HandlerType;
+import org.apache.xml.security.configuration.SecurityHeaderHandlersType;
+import org.apache.xml.security.utils.ClassLoaderUtils;
+
/**
* Security-header handler mapper
*
diff --git a/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java b/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java
index f4810968..22fb62ae 100644
--- a/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java
+++ b/src/main/java/org/apache/xml/security/stax/config/TransformerAlgorithmMapper.java
@@ -18,16 +18,16 @@
*/
package org.apache.xml.security.stax.config;
-import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.apache.xml.security.stax.ext.XMLSecurityConstants;
-import org.apache.xml.security.utils.ClassLoaderUtils;
-import org.apache.xml.security.configuration.TransformAlgorithmType;
-import org.apache.xml.security.configuration.TransformAlgorithmsType;
-
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.xml.security.configuration.TransformAlgorithmType;
+import org.apache.xml.security.configuration.TransformAlgorithmsType;
+import org.apache.xml.security.exceptions.XMLSecurityException;
+import org.apache.xml.security.stax.ext.XMLSecurityConstants;
+import org.apache.xml.security.utils.ClassLoaderUtils;
+
/**
* Mapping between JCE id and xmlsec uri's for algorithms
*
diff --git a/src/main/java/org/apache/xml/security/stax/config/XIncludeHandler.java b/src/main/java/org/apache/xml/security/stax/config/XIncludeHandler.java
index 719a824e..7c6fdbe2 100644
--- a/src/main/java/org/apache/xml/security/stax/config/XIncludeHandler.java
+++ b/src/main/java/org/apache/xml/security/stax/config/XIncludeHandler.java
@@ -18,15 +18,14 @@
*/
package org.apache.xml.security.stax.config;
-import org.apache.xml.security.utils.ClassLoaderUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.*;
-import org.xml.sax.helpers.DefaultHandler;
-import org.xml.sax.helpers.XMLReaderFactory;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
import javax.xml.XMLConstants;
import javax.xml.namespace.NamespaceContext;
@@ -45,14 +44,20 @@ import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
import javax.xml.xpath.XPathFactoryConfigurationException;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import org.apache.xml.security.utils.ClassLoaderUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.DefaultHandler;
+import org.xml.sax.helpers.XMLReaderFactory;
/**
* Absolutely primitive XInclude#xpointer scheme handling
diff --git a/src/main/java/org/apache/xml/security/stax/ext/AbstractBufferingOutputProcessor.java b/src/main/java/org/apache/xml/security/stax/ext/AbstractBufferingOutputProcessor.java
index bf9de8e9..5fe61e87 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/AbstractBufferingOutputProcessor.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/AbstractBufferingOutputProcessor.java
@@ -18,11 +18,13 @@
*/
package org.apache.xml.security.stax.ext;
-import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import java.util.ArrayDeque;
+import java.util.Deque;
import javax.xml.stream.XMLStreamException;
-import java.util.*;
+
+import org.apache.xml.security.exceptions.XMLSecurityException;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
/**
* An abstract OutputProcessor class for reusabilty
diff --git a/src/main/java/org/apache/xml/security/stax/ext/AbstractInputProcessor.java b/src/main/java/org/apache/xml/security/stax/ext/AbstractInputProcessor.java
index 0283025a..1fe44c41 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/AbstractInputProcessor.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/AbstractInputProcessor.java
@@ -18,15 +18,16 @@
*/
package org.apache.xml.security.stax.ext;
-import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
-
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.events.Attribute;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.events.Attribute;
+
+import org.apache.xml.security.exceptions.XMLSecurityException;
+import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
+
/**
* An abstract InputProcessor class for reusabilty
*
diff --git a/src/main/java/org/apache/xml/security/stax/ext/AbstractInputSecurityHeaderHandler.java b/src/main/java/org/apache/xml/security/stax/ext/AbstractInputSecurityHeaderHandler.java
index d0b7bab3..731e061a 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/AbstractInputSecurityHeaderHandler.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/AbstractInputSecurityHeaderHandler.java
@@ -18,18 +18,20 @@
*/
package org.apache.xml.security.stax.ext;
-import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
-import org.apache.xml.security.stax.impl.XMLSecurityEventReader;
-
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Unmarshaller;
-import javax.xml.namespace.QName;
+
import java.util.ArrayList;
import java.util.Deque;
import java.util.Iterator;
import java.util.List;
+import javax.xml.namespace.QName;
+
+import org.apache.xml.security.exceptions.XMLSecurityException;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import org.apache.xml.security.stax.impl.XMLSecurityEventReader;
+
/**
* Abstract class for SecurityHeaderHandlers with parse LOGic for the xml structures
*
diff --git a/src/main/java/org/apache/xml/security/stax/ext/InboundXMLSec.java b/src/main/java/org/apache/xml/security/stax/ext/InboundXMLSec.java
index 6b38dedf..5e42512b 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/InboundXMLSec.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/InboundXMLSec.java
@@ -18,25 +18,25 @@
*/
package org.apache.xml.security.stax.ext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.Collections;
+import java.util.List;
+
+import javax.xml.stream.Location;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
import org.apache.xml.security.stax.impl.DocumentContextImpl;
-import org.apache.xml.security.stax.impl.InputProcessorChainImpl;
import org.apache.xml.security.stax.impl.InboundSecurityContextImpl;
+import org.apache.xml.security.stax.impl.InputProcessorChainImpl;
import org.apache.xml.security.stax.impl.XMLSecurityStreamReader;
import org.apache.xml.security.stax.impl.processor.input.LogInputProcessor;
import org.apache.xml.security.stax.impl.processor.input.XMLEventReaderInputProcessor;
import org.apache.xml.security.stax.impl.processor.input.XMLSecurityInputProcessor;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventListener;
-
-import javax.xml.stream.Location;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import java.util.Collections;
-import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Inbound Streaming-XML-Security
diff --git a/src/main/java/org/apache/xml/security/stax/ext/InputProcessor.java b/src/main/java/org/apache/xml/security/stax/ext/InputProcessor.java
index 7539e7fb..9c24a21f 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/InputProcessor.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/InputProcessor.java
@@ -18,11 +18,12 @@
*/
package org.apache.xml.security.stax.ext;
-import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import java.util.Set;
import javax.xml.stream.XMLStreamException;
-import java.util.Set;
+
+import org.apache.xml.security.exceptions.XMLSecurityException;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
/**
* This is the Interface which every InputProcessor must implement.
diff --git a/src/main/java/org/apache/xml/security/stax/ext/InputProcessorChain.java b/src/main/java/org/apache/xml/security/stax/ext/InputProcessorChain.java
index 64137d2f..d9429cb3 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/InputProcessorChain.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/InputProcessorChain.java
@@ -18,11 +18,12 @@
*/
package org.apache.xml.security.stax.ext;
-import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import java.util.List;
import javax.xml.stream.XMLStreamException;
-import java.util.List;
+
+import org.apache.xml.security.exceptions.XMLSecurityException;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
/**
* The InputProcessorChain manages the InputProcessors and controls the XMLEvent flow
diff --git a/src/main/java/org/apache/xml/security/stax/ext/OutboundSecurityContext.java b/src/main/java/org/apache/xml/security/stax/ext/OutboundSecurityContext.java
index 1e1b0791..f7bf5597 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/OutboundSecurityContext.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/OutboundSecurityContext.java
@@ -18,11 +18,11 @@
*/
package org.apache.xml.security.stax.ext;
-import org.apache.xml.security.stax.securityToken.SecurityTokenProvider;
-import org.apache.xml.security.stax.securityToken.OutboundSecurityToken;
-
import java.util.List;
+import org.apache.xml.security.stax.securityToken.OutboundSecurityToken;
+import org.apache.xml.security.stax.securityToken.SecurityTokenProvider;
+
/**
* The document security context
*
diff --git a/src/main/java/org/apache/xml/security/stax/ext/OutputProcessor.java b/src/main/java/org/apache/xml/security/stax/ext/OutputProcessor.java
index 08c2b125..dde27c1a 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/OutputProcessor.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/OutputProcessor.java
@@ -18,11 +18,12 @@
*/
package org.apache.xml.security.stax.ext;
-import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import java.util.Set;
import javax.xml.stream.XMLStreamException;
-import java.util.Set;
+
+import org.apache.xml.security.exceptions.XMLSecurityException;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
/**
* This is the Interface which every OutputProcessor must implement.
diff --git a/src/main/java/org/apache/xml/security/stax/ext/OutputProcessorChain.java b/src/main/java/org/apache/xml/security/stax/ext/OutputProcessorChain.java
index d3c3a2ec..5b89b9c0 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/OutputProcessorChain.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/OutputProcessorChain.java
@@ -18,13 +18,14 @@
*/
package org.apache.xml.security.stax.ext;
+import java.util.List;
+
+import javax.xml.stream.XMLStreamException;
+
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
-import javax.xml.stream.XMLStreamException;
-import java.util.List;
-
/**
* The OutputProcessorChain manages the OutputProcessors and controls the XMLEvent flow
*
diff --git a/src/main/java/org/apache/xml/security/stax/ext/ProcessorChain.java b/src/main/java/org/apache/xml/security/stax/ext/ProcessorChain.java
index aa7679ac..bc71b23e 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/ProcessorChain.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/ProcessorChain.java
@@ -18,10 +18,10 @@
*/
package org.apache.xml.security.stax.ext;
-import org.apache.xml.security.exceptions.XMLSecurityException;
-
import javax.xml.stream.XMLStreamException;
+import org.apache.xml.security.exceptions.XMLSecurityException;
+
/**
* Basic interface for Output- and Input-Processor chains
*
diff --git a/src/main/java/org/apache/xml/security/stax/ext/ResourceResolver.java b/src/main/java/org/apache/xml/security/stax/ext/ResourceResolver.java
index 9d59b2bb..26993f1f 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/ResourceResolver.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/ResourceResolver.java
@@ -18,12 +18,11 @@
*/
package org.apache.xml.security.stax.ext;
-import org.apache.xml.security.exceptions.XMLSecurityException;
+import java.io.InputStream;
+import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
-import java.io.InputStream;
-
/**
*/
public interface ResourceResolver {
diff --git a/src/main/java/org/apache/xml/security/stax/ext/SecurePart.java b/src/main/java/org/apache/xml/security/stax/ext/SecurePart.java
index 42586b32..c3d093a2 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/SecurePart.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/SecurePart.java
@@ -18,11 +18,12 @@
*/
package org.apache.xml.security.stax.ext;
-import javax.xml.namespace.QName;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Map;
+import javax.xml.namespace.QName;
+
/**
* Class to describe which and how an element must be secured
*
diff --git a/src/main/java/org/apache/xml/security/stax/ext/SecurityContext.java b/src/main/java/org/apache/xml/security/stax/ext/SecurityContext.java
index 1d303bb3..aa6c4bb8 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/SecurityContext.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/SecurityContext.java
@@ -18,11 +18,11 @@
*/
package org.apache.xml.security.stax.ext;
-import org.apache.xml.security.stax.securityEvent.SecurityEventListener;
-
import java.util.List;
import java.util.Map;
+import org.apache.xml.security.stax.securityEvent.SecurityEventListener;
+
/**
*/
public interface SecurityContext extends SecurityEventListener {
diff --git a/src/main/java/org/apache/xml/security/stax/ext/Transformer.java b/src/main/java/org/apache/xml/security/stax/ext/Transformer.java
index 17ba0139..b08b8360 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/Transformer.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/Transformer.java
@@ -18,14 +18,15 @@
*/
package org.apache.xml.security.stax.ext;
-import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
-
-import javax.xml.stream.XMLStreamException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Map;
+import javax.xml.stream.XMLStreamException;
+
+import org.apache.xml.security.exceptions.XMLSecurityException;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+
/**
*/
public interface Transformer {
diff --git a/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java b/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java
index c23b14b0..2ca93383 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/XMLSec.java
@@ -18,6 +18,9 @@
*/
package org.apache.xml.security.stax.ext;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+
import java.net.URISyntaxException;
import java.net.URL;
import java.security.interfaces.DSAPrivateKey;
@@ -25,8 +28,6 @@ import java.security.interfaces.RSAPrivateKey;
import java.util.HashSet;
import javax.crypto.SecretKey;
-import jakarta.xml.bind.JAXBContext;
-import jakarta.xml.bind.JAXBException;
import javax.xml.validation.Schema;
import org.apache.xml.security.exceptions.XMLSecurityException;
@@ -128,7 +129,7 @@ public class XMLSec {
}
// Check for duplicate actions
- if (new HashSet<XMLSecurityConstants.Action>(securityProperties.getActions()).size()
+ if (new HashSet<>(securityProperties.getActions()).size()
!= securityProperties.getActions().size()) {
throw new XMLSecurityConfigurationException("stax.duplicateActions");
}
diff --git a/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConstants.java b/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConstants.java
index aa472555..0c752da7 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConstants.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityConstants.java
@@ -18,12 +18,13 @@
*/
package org.apache.xml.security.stax.ext;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Unmarshaller;
+
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+
import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeFactory;
import javax.xml.namespace.QName;
diff --git a/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityHeaderHandler.java b/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityHeaderHandler.java
index 12aa8628..7ddf9e16 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityHeaderHandler.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityHeaderHandler.java
@@ -18,11 +18,11 @@
*/
package org.apache.xml.security.stax.ext;
+import java.util.Deque;
+
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
-import java.util.Deque;
-
/**
*/
public interface XMLSecurityHeaderHandler {
diff --git a/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityProperties.java b/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityProperties.java
index 8ee89f44..f04ac09a 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityProperties.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityProperties.java
@@ -18,15 +18,20 @@
*/
package org.apache.xml.security.stax.ext;
-import org.apache.xml.security.stax.securityToken.SecurityTokenConstants;
-
import java.security.Key;
import java.security.cert.X509Certificate;
import java.security.spec.AlgorithmParameterSpec;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
import javax.xml.namespace.QName;
+import org.apache.xml.security.stax.securityToken.SecurityTokenConstants;
+
/**
* Main configuration class to supply keys etc.
diff --git a/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java b/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java
index b258fbd2..74d54b19 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/XMLSecurityUtils.java
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.stax.ext;
+import jakarta.xml.bind.JAXBElement;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -38,7 +40,6 @@ import java.util.TreeSet;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
import javax.xml.XMLConstants;
-import jakarta.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.transform.Source;
@@ -46,10 +47,6 @@ import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
-import org.w3c.dom.ls.LSInput;
-import org.w3c.dom.ls.LSResourceResolver;
-import org.xml.sax.SAXException;
-
import org.apache.xml.security.algorithms.JCEMapper;
import org.apache.xml.security.algorithms.implementations.ECDSAUtils;
import org.apache.xml.security.exceptions.XMLSecurityException;
@@ -71,6 +68,9 @@ import org.apache.xml.security.stax.securityToken.SecurityTokenConstants;
import org.apache.xml.security.utils.ClassLoaderUtils;
import org.apache.xml.security.utils.JavaUtils;
import org.apache.xml.security.utils.XMLUtils;
+import org.w3c.dom.ls.LSInput;
+import org.w3c.dom.ls.LSResourceResolver;
+import org.xml.sax.SAXException;
/**
*/
diff --git a/src/main/java/org/apache/xml/security/stax/ext/stax/XMLSecEvent.java b/src/main/java/org/apache/xml/security/stax/ext/stax/XMLSecEvent.java
index 31f29b69..35d56568 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/stax/XMLSecEvent.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/stax/XMLSecEvent.java
@@ -18,9 +18,10 @@
*/
package org.apache.xml.security.stax.ext.stax;
+import java.util.List;
+
import javax.xml.namespace.QName;
import javax.xml.stream.events.XMLEvent;
-import java.util.List;
/**
*/
diff --git a/src/main/java/org/apache/xml/security/stax/ext/stax/XMLSecStartElement.java b/src/main/java/org/apache/xml/security/stax/ext/stax/XMLSecStartElement.java
index cdcd04be..80fd0d51 100644
--- a/src/main/java/org/apache/xml/security/stax/ext/stax/XMLSecStartElement.java
+++ b/src/main/java/org/apache/xml/security/stax/ext/stax/XMLSecStartElement.java
@@ -18,9 +18,10 @@
*/
package org.apache.xml.security.stax.ext.stax;
-import javax.xml.stream.events.StartElement;
import java.util.List;
+import javax.xml.stream.events.StartElement;
+
/**
*/
public interface XMLSecStartElement extends XMLSecEvent, StartElement {
diff --git a/src/main/java/org/apache/xml/security/stax/impl/AbstractSecurityContextImpl.java b/src/main/java/org/apache/xml/security/stax/impl/AbstractSecurityContextImpl.java
index 1b581642..94bf4f23 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/AbstractSecurityContextImpl.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/AbstractSecurityContextImpl.java
@@ -18,12 +18,16 @@
*/
package org.apache.xml.security.stax.impl;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventListener;
-import java.util.*;
-
/**
*/
public class AbstractSecurityContextImpl {
diff --git a/src/main/java/org/apache/xml/security/stax/impl/DocumentContextImpl.java b/src/main/java/org/apache/xml/security/stax/impl/DocumentContextImpl.java
index 319cce61..3283b6d9 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/DocumentContextImpl.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/DocumentContextImpl.java
@@ -18,11 +18,16 @@
*/
package org.apache.xml.security.stax.impl;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
import org.apache.xml.security.stax.ext.DocumentContext;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
-import java.util.*;
-
/**
* A concrete DocumentContext Implementation
*
@@ -88,7 +93,7 @@ public class DocumentContextImpl implements DocumentContext, Cloneable {
@Override
public List<XMLSecurityConstants.ContentType> getProtectionOrder() {
- return new ArrayList<XMLSecurityConstants.ContentType>(contentTypeMap.values());
+ return new ArrayList<>(contentTypeMap.values());
}
@Override
diff --git a/src/main/java/org/apache/xml/security/stax/impl/EncryptionPartDef.java b/src/main/java/org/apache/xml/security/stax/impl/EncryptionPartDef.java
index d23cb949..04c86beb 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/EncryptionPartDef.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/EncryptionPartDef.java
@@ -18,10 +18,10 @@
*/
package org.apache.xml.security.stax.impl;
-import org.apache.xml.security.stax.ext.SecurePart;
-
import java.security.Key;
+import org.apache.xml.security.stax.ext.SecurePart;
+
/**
* EncryptionPartDef holds information about parts to be encrypt
*
diff --git a/src/main/java/org/apache/xml/security/stax/impl/InboundSecurityContextImpl.java b/src/main/java/org/apache/xml/security/stax/impl/InboundSecurityContextImpl.java
index 40c87115..13854ee5 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/InboundSecurityContextImpl.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/InboundSecurityContextImpl.java
@@ -18,16 +18,19 @@
*/
package org.apache.xml.security.stax.impl;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.config.ConfigurationProperties;
import org.apache.xml.security.stax.ext.InboundSecurityContext;
-import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
-import org.apache.xml.security.stax.securityToken.SecurityTokenProvider;
import org.apache.xml.security.stax.securityEvent.AlgorithmSuiteSecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
-
-import java.util.*;
+import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
+import org.apache.xml.security.stax.securityToken.SecurityTokenProvider;
/**
* Concrete security context implementation
@@ -66,6 +69,6 @@ public class InboundSecurityContextImpl extends AbstractSecurityContextImpl impl
@Override
public List<SecurityTokenProvider<? extends InboundSecurityToken>> getRegisteredSecurityTokenProviders() {
- return new ArrayList<SecurityTokenProvider<? extends InboundSecurityToken>>(securityTokenProviders.values());
+ return new ArrayList<>(securityTokenProviders.values());
}
}
diff --git a/src/main/java/org/apache/xml/security/stax/impl/OutboundSecurityContextImpl.java b/src/main/java/org/apache/xml/security/stax/impl/OutboundSecurityContextImpl.java
index e87cde87..3e0b97ee 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/OutboundSecurityContextImpl.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/OutboundSecurityContextImpl.java
@@ -18,15 +18,15 @@
*/
package org.apache.xml.security.stax.impl;
-import org.apache.xml.security.stax.ext.OutboundSecurityContext;
-import org.apache.xml.security.stax.securityToken.SecurityTokenProvider;
-import org.apache.xml.security.stax.securityToken.OutboundSecurityToken;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.xml.security.stax.ext.OutboundSecurityContext;
+import org.apache.xml.security.stax.securityToken.OutboundSecurityToken;
+import org.apache.xml.security.stax.securityToken.SecurityTokenProvider;
+
/**
* Concrete security context implementation
*
@@ -51,6 +51,6 @@ public class OutboundSecurityContextImpl extends AbstractSecurityContextImpl imp
@Override
public List<SecurityTokenProvider<OutboundSecurityToken>> getRegisteredSecurityTokenProviders() {
- return new ArrayList<SecurityTokenProvider<OutboundSecurityToken>>(securityTokenProviders.values());
+ return new ArrayList<>(securityTokenProviders.values());
}
}
diff --git a/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityEventReader.java b/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityEventReader.java
index a12628e6..1b30f3a7 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityEventReader.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityEventReader.java
@@ -19,14 +19,15 @@
package org.apache.xml.security.stax.impl;
-import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import java.util.Deque;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.events.XMLEvent;
-import java.util.Deque;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
+
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
/**
*/
diff --git a/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java b/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java
index d4b5b44e..4059cb17 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/XMLSecurityStreamWriter.java
@@ -18,6 +18,17 @@
*/
package org.apache.xml.security.stax.impl;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.XMLConstants;
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.OutputProcessorChain;
import org.apache.xml.security.stax.ext.SecurePart;
@@ -27,16 +38,6 @@ import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.ext.stax.XMLSecEventFactory;
import org.apache.xml.security.stax.ext.stax.XMLSecNamespace;
-import javax.xml.XMLConstants;
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
/**
* Custom XMLStreamWriter to map XMLStreamWriter method calls into XMLEvent's
*
diff --git a/src/main/java/org/apache/xml/security/stax/impl/algorithms/HMACSignatureAlgorithm.java b/src/main/java/org/apache/xml/security/stax/impl/algorithms/HMACSignatureAlgorithm.java
index dc109f2d..16981b95 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/algorithms/HMACSignatureAlgorithm.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/algorithms/HMACSignatureAlgorithm.java
@@ -18,11 +18,18 @@
*/
package org.apache.xml.security.stax.impl.algorithms;
-import org.apache.xml.security.exceptions.XMLSecurityException;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.Key;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.SecureRandom;
+import java.security.spec.AlgorithmParameterSpec;
import javax.crypto.Mac;
-import java.security.*;
-import java.security.spec.AlgorithmParameterSpec;
+
+import org.apache.xml.security.exceptions.XMLSecurityException;
/**
*/
diff --git a/src/main/java/org/apache/xml/security/stax/impl/algorithms/PKISignatureAlgorithm.java b/src/main/java/org/apache/xml/security/stax/impl/algorithms/PKISignatureAlgorithm.java
index f636b84d..5cc5ddbd 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/algorithms/PKISignatureAlgorithm.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/algorithms/PKISignatureAlgorithm.java
@@ -18,15 +18,24 @@
*/
package org.apache.xml.security.stax.impl.algorithms;
-import org.apache.xml.security.algorithms.implementations.ECDSAUtils;
-import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.apache.xml.security.utils.JavaUtils;
-
import java.io.IOException;
-import java.security.*;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.Key;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.SecureRandom;
+import java.security.Signature;
+import java.security.SignatureException;
import java.security.interfaces.ECPrivateKey;
import java.security.spec.AlgorithmParameterSpec;
+import org.apache.xml.security.algorithms.implementations.ECDSAUtils;
+import org.apache.xml.security.exceptions.XMLSecurityException;
+import org.apache.xml.security.utils.JavaUtils;
+
/**
*/
public class PKISignatureAlgorithm implements SignatureAlgorithm {
diff --git a/src/main/java/org/apache/xml/security/stax/impl/algorithms/SignatureAlgorithm.java b/src/main/java/org/apache/xml/security/stax/impl/algorithms/SignatureAlgorithm.java
index bb975bc8..851ba7e8 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/algorithms/SignatureAlgorithm.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/algorithms/SignatureAlgorithm.java
@@ -18,12 +18,12 @@
*/
package org.apache.xml.security.stax.impl.algorithms;
-import org.apache.xml.security.exceptions.XMLSecurityException;
-
import java.security.Key;
import java.security.SecureRandom;
import java.security.spec.AlgorithmParameterSpec;
+import org.apache.xml.security.exceptions.XMLSecurityException;
+
/**
*/
public interface SignatureAlgorithm {
diff --git a/src/main/java/org/apache/xml/security/stax/impl/algorithms/SignatureAlgorithmFactory.java b/src/main/java/org/apache/xml/security/stax/impl/algorithms/SignatureAlgorithmFactory.java
index a3570d36..e48aafca 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/algorithms/SignatureAlgorithmFactory.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/algorithms/SignatureAlgorithmFactory.java
@@ -18,12 +18,12 @@
*/
package org.apache.xml.security.stax.impl.algorithms;
-import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.apache.xml.security.stax.config.JCEAlgorithmMapper;
-
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
+import org.apache.xml.security.exceptions.XMLSecurityException;
+import org.apache.xml.security.stax.config.JCEAlgorithmMapper;
+
/**
*/
public final class SignatureAlgorithmFactory {
diff --git a/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java b/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
index 0e8e45be..13d8dbeb 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractDecryptInputProcessor.java
@@ -18,6 +18,10 @@
*/
package org.apache.xml.security.stax.impl.processor.input;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -43,9 +47,6 @@ import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import javax.security.auth.DestroyFailedException;
import javax.security.auth.Destroyable;
-import jakarta.xml.bind.JAXBElement;
-import jakarta.xml.bind.JAXBException;
-import jakarta.xml.bind.Unmarshaller;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
diff --git a/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureInputHandler.java b/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureInputHandler.java
index 71c75198..68dc7686 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureInputHandler.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureInputHandler.java
@@ -18,6 +18,32 @@
*/
package org.apache.xml.security.stax.impl.processor.input;
+import jakarta.xml.bind.JAXBElement;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.security.Key;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.spec.MGF1ParameterSpec;
+import java.security.spec.PSSParameterSpec;
+import java.util.ArrayDeque;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import javax.security.auth.DestroyFailedException;
+import javax.security.auth.Destroyable;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
import org.apache.xml.security.algorithms.implementations.SignatureBaseRSA.SignatureRSASSAPSS.DigestAlgorithm;
import org.apache.xml.security.binding.excc14n.InclusiveNamespaces;
import org.apache.xml.security.binding.xmldsig.CanonicalizationMethodType;
@@ -27,15 +53,6 @@ import org.apache.xml.security.binding.xmldsig.SignedInfoType;
import org.apache.xml.security.binding.xmldsig.pss.RSAPSSParams;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.signature.XMLSignature;
-import org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer20010315_Excl;
-import org.apache.xml.security.stax.impl.util.IDGenerator;
-import org.apache.xml.security.stax.impl.util.SignerOutputStream;
-import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
-import org.apache.xml.security.utils.UnsyncBufferedOutputStream;
-import org.apache.xml.security.utils.UnsyncByteArrayInputStream;
-import org.apache.xml.security.utils.UnsyncByteArrayOutputStream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.xml.security.stax.ext.AbstractInputSecurityHeaderHandler;
import org.apache.xml.security.stax.ext.InboundSecurityContext;
import org.apache.xml.security.stax.ext.InputProcessorChain;
@@ -47,30 +64,15 @@ import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.ext.stax.XMLSecEventFactory;
import org.apache.xml.security.stax.impl.algorithms.SignatureAlgorithm;
import org.apache.xml.security.stax.impl.algorithms.SignatureAlgorithmFactory;
-
-import javax.security.auth.DestroyFailedException;
-import javax.security.auth.Destroyable;
-import jakarta.xml.bind.JAXBElement;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.Key;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.spec.MGF1ParameterSpec;
-import java.security.spec.PSSParameterSpec;
-import java.util.ArrayDeque;
-import java.util.Collections;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
+import org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer20010315_Excl;
+import org.apache.xml.security.stax.impl.util.IDGenerator;
+import org.apache.xml.security.stax.impl.util.SignerOutputStream;
+import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
+import org.apache.xml.security.utils.UnsyncBufferedOutputStream;
+import org.apache.xml.security.utils.UnsyncByteArrayInputStream;
+import org.apache.xml.security.utils.UnsyncByteArrayOutputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.xml.security.algorithms.implementations.SignatureBaseRSA.SignatureRSASSAPSS.DigestAlgorithm.SHA256;
import static org.apache.xml.security.algorithms.implementations.SignatureBaseRSA.SignatureRSASSAPSS.DigestAlgorithm.fromXmlDigestAlgorithm;
diff --git a/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java b/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java
index ab7a31d8..3088ceb2 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/processor/input/AbstractSignatureReferenceVerifyInputProcessor.java
@@ -124,14 +124,14 @@ public abstract class AbstractSignatureReferenceVerifyInputProcessor extends Abs
referenceType.getURI(), inputProcessorChain.getDocumentContext().getBaseURI());
if (resourceResolver.isSameDocumentReference()) {
- sameDocumentReferences.add(new KeyValue<ResourceResolver, ReferenceType>(resourceResolver, referenceType));
+ sameDocumentReferences.add(new KeyValue<>(resourceResolver, referenceType));
} else {
if (!allowNotSameDocumentReferences) {
throw new XMLSecurityException(
"secureProcessing.AllowNotSameDocumentReferences"
);
}
- externalReferences.add(new KeyValue<ResourceResolver, ReferenceType>(resourceResolver, referenceType));
+ externalReferences.add(new KeyValue<>(resourceResolver, referenceType));
}
}
}
diff --git a/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java b/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java
index 664b5704..f2482b53 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLEncryptedKeyInputHandler.java
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.stax.impl.processor.input;
+import jakarta.xml.bind.JAXBElement;
+
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.Key;
@@ -33,7 +35,6 @@ import javax.crypto.NoSuchPaddingException;
import javax.crypto.spec.OAEPParameterSpec;
import javax.crypto.spec.PSource;
import javax.crypto.spec.SecretKeySpec;
-import jakarta.xml.bind.JAXBElement;
import org.apache.xml.security.binding.xmldsig.DigestMethodType;
import org.apache.xml.security.binding.xmldsig.KeyInfoType;
diff --git a/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSecurityInputProcessor.java b/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSecurityInputProcessor.java
index 5435399f..8aaa38d2 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSecurityInputProcessor.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSecurityInputProcessor.java
@@ -18,6 +18,11 @@
*/
package org.apache.xml.security.stax.impl.processor.input;
+import java.util.ArrayDeque;
+
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.AbstractInputProcessor;
import org.apache.xml.security.stax.ext.InputProcessorChain;
@@ -27,10 +32,6 @@ import org.apache.xml.security.stax.ext.stax.XMLSecEndElement;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import java.util.ArrayDeque;
-
/**
* Processor for XML Security.
*
diff --git a/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSignatureReferenceVerifyInputProcessor.java b/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSignatureReferenceVerifyInputProcessor.java
index e240a9b6..712b4d8e 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSignatureReferenceVerifyInputProcessor.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/processor/input/XMLSignatureReferenceVerifyInputProcessor.java
@@ -26,11 +26,11 @@ import org.apache.xml.security.binding.xmldsig.ReferenceType;
import org.apache.xml.security.binding.xmldsig.SignatureType;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.DocumentContext;
-import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
import org.apache.xml.security.stax.ext.InputProcessorChain;
import org.apache.xml.security.stax.ext.XMLSecurityProperties;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.securityEvent.SignedElementSecurityEvent;
+import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
/**
* A processor to verify XML Signature references.
diff --git a/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java b/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java
index f98b58a0..6792d281 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureEndingOutputProcessor.java
@@ -24,7 +24,12 @@ import java.security.Key;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.security.spec.PSSParameterSpec;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import javax.security.auth.DestroyFailedException;
import javax.security.auth.Destroyable;
diff --git a/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java b/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java
index 0e4a9aba..ec5497f3 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/processor/output/AbstractSignatureOutputProcessor.java
@@ -52,7 +52,6 @@ import org.apache.xml.security.stax.impl.transformer.canonicalizer.Canonicalizer
import org.apache.xml.security.stax.impl.util.DigestOutputStream;
import org.apache.xml.security.utils.UnsyncBufferedOutputStream;
import org.apache.xml.security.utils.XMLUtils;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/xml/security/stax/impl/processor/output/FinalOutputProcessor.java b/src/main/java/org/apache/xml/security/stax/impl/processor/output/FinalOutputProcessor.java
index 98a610ee..4be67603 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/processor/output/FinalOutputProcessor.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/processor/output/FinalOutputProcessor.java
@@ -18,6 +18,12 @@
*/
package org.apache.xml.security.stax.impl.processor.output;
+import java.io.OutputStream;
+
+import javax.xml.stream.XMLEventWriter;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.AbstractOutputProcessor;
import org.apache.xml.security.stax.ext.OutputProcessorChain;
@@ -25,11 +31,6 @@ import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.impl.XMLSecurityEventWriter;
-import javax.xml.stream.XMLEventWriter;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-import java.io.OutputStream;
-
/**
* Processor which outputs the XMLEvents to an outputStream
* This Processor can be extended to allow to write to a StAX writer instead of directly to an output stream
diff --git a/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureEndingOutputProcessor.java b/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureEndingOutputProcessor.java
index a2c98bda..497f3da8 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureEndingOutputProcessor.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureEndingOutputProcessor.java
@@ -35,8 +35,8 @@ import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
import org.apache.xml.security.stax.impl.SignaturePartDef;
import org.apache.xml.security.stax.impl.algorithms.SignatureAlgorithm;
-import org.apache.xml.security.stax.securityToken.OutboundSecurityToken;
import org.apache.xml.security.stax.securityEvent.SignatureValueSecurityEvent;
+import org.apache.xml.security.stax.securityToken.OutboundSecurityToken;
import org.apache.xml.security.stax.securityToken.SecurityTokenConstants;
import static org.apache.xml.security.stax.ext.XMLSecurityConstants.NS_XMLDSIG_ENVELOPED_SIGNATURE;
diff --git a/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureOutputProcessor.java b/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureOutputProcessor.java
index 33d65200..49c0ac4e 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureOutputProcessor.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/processor/output/XMLSignatureOutputProcessor.java
@@ -25,8 +25,6 @@ import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.events.Attribute;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.OutputProcessorChain;
import org.apache.xml.security.stax.ext.SecurePart;
@@ -36,6 +34,8 @@ import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
import org.apache.xml.security.stax.impl.SignaturePartDef;
import org.apache.xml.security.stax.impl.util.IDGenerator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An OutputProcessor for XML Signature.
diff --git a/src/main/java/org/apache/xml/security/stax/impl/resourceResolvers/ResolverFilesystem.java b/src/main/java/org/apache/xml/security/stax/impl/resourceResolvers/ResolverFilesystem.java
index 1e550800..039d7e07 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/resourceResolvers/ResolverFilesystem.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/resourceResolvers/ResolverFilesystem.java
@@ -18,14 +18,14 @@
*/
package org.apache.xml.security.stax.impl.resourceResolvers;
+import java.io.InputStream;
+import java.net.URI;
+
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.ResourceResolver;
import org.apache.xml.security.stax.ext.ResourceResolverLookup;
import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
-import java.io.InputStream;
-import java.net.URI;
-
/**
* Resolver for local filesystem resources. Use the standard java security-manager to
* restrict filesystem accesses.
diff --git a/src/main/java/org/apache/xml/security/stax/impl/resourceResolvers/ResolverHttp.java b/src/main/java/org/apache/xml/security/stax/impl/resourceResolvers/ResolverHttp.java
index 20b9ad54..0ad30aff 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/resourceResolvers/ResolverHttp.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/resourceResolvers/ResolverHttp.java
@@ -18,16 +18,20 @@
*/
package org.apache.xml.security.stax.impl.resourceResolvers;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.Proxy;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.regex.Pattern;
+
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.ResourceResolver;
import org.apache.xml.security.stax.ext.ResourceResolverLookup;
import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.*;
-import java.util.regex.Pattern;
-
/**
* Resolver for external http[s] resources.
*
diff --git a/src/main/java/org/apache/xml/security/stax/impl/resourceResolvers/ResolverXPointer.java b/src/main/java/org/apache/xml/security/stax/impl/resourceResolvers/ResolverXPointer.java
index be2c4cae..349cb7c2 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/resourceResolvers/ResolverXPointer.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/resourceResolvers/ResolverXPointer.java
@@ -18,18 +18,19 @@
*/
package org.apache.xml.security.stax.impl.resourceResolvers;
+import java.io.InputStream;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.events.Attribute;
+
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.ResourceResolver;
import org.apache.xml.security.stax.ext.ResourceResolverLookup;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
-import javax.xml.namespace.QName;
-import javax.xml.stream.events.Attribute;
-import java.io.InputStream;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
/**
* Resolver for xpointer references in the same document.
* Supported xpointers are '#xpointer(/)' and '#xpointer(id('ID'))'
diff --git a/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractInboundSecurityToken.java b/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractInboundSecurityToken.java
index 50535d9e..9aacd281 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractInboundSecurityToken.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractInboundSecurityToken.java
@@ -78,6 +78,7 @@ public abstract class AbstractInboundSecurityToken extends AbstractSecurityToken
invoked = false;
}
+ @Override
public SecurityTokenConstants.KeyIdentifier getKeyIdentifier() {
return keyIdentifier;
}
diff --git a/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractSecurityToken.java b/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractSecurityToken.java
index 8da41530..76466a5d 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractSecurityToken.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/securityToken/AbstractSecurityToken.java
@@ -122,6 +122,7 @@ public abstract class AbstractSecurityToken implements SecurityToken {
return tokenUsages;
}
+ @Override
public String getSha1Identifier() {
return sha1Identifier;
}
diff --git a/src/main/java/org/apache/xml/security/stax/impl/securityToken/DsaKeyValueSecurityToken.java b/src/main/java/org/apache/xml/security/stax/impl/securityToken/DsaKeyValueSecurityToken.java
index 85a39f62..a93edc49 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/securityToken/DsaKeyValueSecurityToken.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/securityToken/DsaKeyValueSecurityToken.java
@@ -18,12 +18,6 @@
*/
package org.apache.xml.security.stax.impl.securityToken;
-import org.apache.xml.security.binding.xmldsig.DSAKeyValueType;
-import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.apache.xml.security.stax.ext.InboundSecurityContext;
-import org.apache.xml.security.stax.impl.util.IDGenerator;
-import org.apache.xml.security.stax.securityToken.SecurityTokenConstants;
-
import java.math.BigInteger;
import java.security.KeyFactory;
import java.security.NoSuchAlgorithmException;
@@ -31,6 +25,12 @@ import java.security.PublicKey;
import java.security.spec.DSAPublicKeySpec;
import java.security.spec.InvalidKeySpecException;
+import org.apache.xml.security.binding.xmldsig.DSAKeyValueType;
+import org.apache.xml.security.exceptions.XMLSecurityException;
+import org.apache.xml.security.stax.ext.InboundSecurityContext;
+import org.apache.xml.security.stax.impl.util.IDGenerator;
+import org.apache.xml.security.stax.securityToken.SecurityTokenConstants;
+
/**
*/
public class DsaKeyValueSecurityToken extends AbstractInboundSecurityToken {
diff --git a/src/main/java/org/apache/xml/security/stax/impl/securityToken/ECKeyValueSecurityToken.java b/src/main/java/org/apache/xml/security/stax/impl/securityToken/ECKeyValueSecurityToken.java
index f081ed34..26ada6cb 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/securityToken/ECKeyValueSecurityToken.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/securityToken/ECKeyValueSecurityToken.java
@@ -18,6 +18,17 @@
*/
package org.apache.xml.security.stax.impl.securityToken;
+import java.math.BigInteger;
+import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
+import java.security.PublicKey;
+import java.security.spec.ECFieldFp;
+import java.security.spec.ECParameterSpec;
+import java.security.spec.ECPoint;
+import java.security.spec.ECPublicKeySpec;
+import java.security.spec.EllipticCurve;
+import java.security.spec.InvalidKeySpecException;
+
import org.apache.xml.security.algorithms.implementations.ECDSAUtils;
import org.apache.xml.security.binding.xmldsig11.ECKeyValueType;
import org.apache.xml.security.exceptions.XMLSecurityException;
@@ -25,12 +36,6 @@ import org.apache.xml.security.stax.ext.InboundSecurityContext;
import org.apache.xml.security.stax.impl.util.IDGenerator;
import org.apache.xml.security.stax.securityToken.SecurityTokenConstants;
-import java.math.BigInteger;
-import java.security.KeyFactory;
-import java.security.NoSuchAlgorithmException;
-import java.security.PublicKey;
-import java.security.spec.*;
-
/**
*/
public class ECKeyValueSecurityToken extends AbstractInboundSecurityToken {
diff --git a/src/main/java/org/apache/xml/security/stax/impl/securityToken/GenericOutboundSecurityToken.java b/src/main/java/org/apache/xml/security/stax/impl/securityToken/GenericOutboundSecurityToken.java
index 4d368797..fd1e461a 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/securityToken/GenericOutboundSecurityToken.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/securityToken/GenericOutboundSecurityToken.java
@@ -25,12 +25,12 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.xml.security.stax.ext.OutputProcessor;
-import org.w3c.dom.Element;
import org.apache.xml.security.exceptions.XMLSecurityException;
+import org.apache.xml.security.stax.ext.OutputProcessor;
import org.apache.xml.security.stax.securityToken.OutboundSecurityToken;
import org.apache.xml.security.stax.securityToken.SecurityTokenConstants;
import org.apache.xml.security.stax.securityToken.SecurityTokenConstants.KeyIdentifier;
+import org.w3c.dom.Element;
/**
*/
@@ -116,6 +116,7 @@ public class GenericOutboundSecurityToken extends AbstractSecurityToken implemen
return null;
}
+ @Override
public Element getCustomTokenReference() {
return customTokenReference;
}
diff --git a/src/main/java/org/apache/xml/security/stax/impl/securityToken/RsaKeyValueSecurityToken.java b/src/main/java/org/apache/xml/security/stax/impl/securityToken/RsaKeyValueSecurityToken.java
index cfd4c16a..3e34eff6 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/securityToken/RsaKeyValueSecurityToken.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/securityToken/RsaKeyValueSecurityToken.java
@@ -18,12 +18,6 @@
*/
package org.apache.xml.security.stax.impl.securityToken;
-import org.apache.xml.security.binding.xmldsig.RSAKeyValueType;
-import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.apache.xml.security.stax.ext.InboundSecurityContext;
-import org.apache.xml.security.stax.impl.util.IDGenerator;
-import org.apache.xml.security.stax.securityToken.SecurityTokenConstants;
-
import java.math.BigInteger;
import java.security.KeyFactory;
import java.security.NoSuchAlgorithmException;
@@ -31,6 +25,12 @@ import java.security.PublicKey;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.RSAPublicKeySpec;
+import org.apache.xml.security.binding.xmldsig.RSAKeyValueType;
+import org.apache.xml.security.exceptions.XMLSecurityException;
+import org.apache.xml.security.stax.ext.InboundSecurityContext;
+import org.apache.xml.security.stax.impl.util.IDGenerator;
+import org.apache.xml.security.stax.securityToken.SecurityTokenConstants;
+
/**
*/
public class RsaKeyValueSecurityToken extends AbstractInboundSecurityToken {
diff --git a/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509IssuerSerialSecurityToken.java b/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509IssuerSerialSecurityToken.java
index 1a897ce3..7e462967 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509IssuerSerialSecurityToken.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/securityToken/X509IssuerSerialSecurityToken.java
@@ -18,11 +18,11 @@
*/
package org.apache.xml.security.stax.impl.securityToken;
+import java.math.BigInteger;
+
import org.apache.xml.security.stax.ext.InboundSecurityContext;
import org.apache.xml.security.stax.securityToken.SecurityTokenConstants;
-import java.math.BigInteger;
-
/**
*/
public class X509IssuerSerialSecurityToken extends X509SecurityToken {
diff --git a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecAttributeImpl.java b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecAttributeImpl.java
index cf145304..ce0e1958 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecAttributeImpl.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecAttributeImpl.java
@@ -18,14 +18,15 @@
*/
package org.apache.xml.security.stax.impl.stax;
-import org.apache.xml.security.stax.ext.stax.XMLSecAttribute;
-import org.apache.xml.security.stax.ext.stax.XMLSecNamespace;
+import java.io.IOException;
+import java.io.Writer;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
-import java.io.IOException;
-import java.io.Writer;
+
+import org.apache.xml.security.stax.ext.stax.XMLSecAttribute;
+import org.apache.xml.security.stax.ext.stax.XMLSecNamespace;
/**
* Class to let XML-Attributes be comparable how it is requested by C14N
diff --git a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecCharactersImpl.java b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecCharactersImpl.java
index f53b97d6..d9fe6f57 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecCharactersImpl.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecCharactersImpl.java
@@ -18,13 +18,14 @@
*/
package org.apache.xml.security.stax.impl.stax;
-import org.apache.xml.security.stax.ext.stax.XMLSecCharacters;
-import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
+import java.io.IOException;
+import java.io.Writer;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
-import java.io.IOException;
-import java.io.Writer;
+
+import org.apache.xml.security.stax.ext.stax.XMLSecCharacters;
+import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
/**
*/
diff --git a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecCommentImpl.java b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecCommentImpl.java
index 9aed1b77..d0c28356 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecCommentImpl.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecCommentImpl.java
@@ -18,13 +18,14 @@
*/
package org.apache.xml.security.stax.impl.stax;
-import org.apache.xml.security.stax.ext.stax.XMLSecComment;
-import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
+import java.io.IOException;
+import java.io.Writer;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
-import java.io.IOException;
-import java.io.Writer;
+
+import org.apache.xml.security.stax.ext.stax.XMLSecComment;
+import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
/**
*/
diff --git a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecDTDImpl.java b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecDTDImpl.java
index 78c2990c..a1ef1fc9 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecDTDImpl.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecDTDImpl.java
@@ -18,16 +18,17 @@
*/
package org.apache.xml.security.stax.impl.stax;
-import org.apache.xml.security.stax.ext.stax.XMLSecDTD;
-import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
-
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
import java.io.IOException;
import java.io.Writer;
import java.util.Collections;
import java.util.List;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+
+import org.apache.xml.security.stax.ext.stax.XMLSecDTD;
+import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
+
/**
*/
public class XMLSecDTDImpl extends XMLSecEventBaseImpl implements XMLSecDTD {
diff --git a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEndDocumentImpl.java b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEndDocumentImpl.java
index ca9a4038..1cfdbd2f 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEndDocumentImpl.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEndDocumentImpl.java
@@ -18,11 +18,12 @@
*/
package org.apache.xml.security.stax.impl.stax;
-import org.apache.xml.security.stax.ext.stax.XMLSecEndDocument;
+import java.io.Writer;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
-import java.io.Writer;
+
+import org.apache.xml.security.stax.ext.stax.XMLSecEndDocument;
/**
*/
diff --git a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEndElementImpl.java b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEndElementImpl.java
index d772cc85..3499f1a3 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEndElementImpl.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEndElementImpl.java
@@ -18,15 +18,16 @@
*/
package org.apache.xml.security.stax.impl.stax;
-import org.apache.xml.security.stax.ext.stax.XMLSecEndElement;
-import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Iterator;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Iterator;
+
+import org.apache.xml.security.stax.ext.stax.XMLSecEndElement;
+import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
/**
*/
diff --git a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEntityDeclarationImpl.java b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEntityDeclarationImpl.java
index 95dacd96..f6250b35 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEntityDeclarationImpl.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEntityDeclarationImpl.java
@@ -18,12 +18,13 @@
*/
package org.apache.xml.security.stax.impl.stax;
-import org.apache.xml.security.stax.ext.stax.XMLSecEntityDeclaration;
+import java.io.IOException;
+import java.io.Writer;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
-import java.io.IOException;
-import java.io.Writer;
+
+import org.apache.xml.security.stax.ext.stax.XMLSecEntityDeclaration;
/**
*/
diff --git a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEntityReferenceImpl.java b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEntityReferenceImpl.java
index d17f3dcb..1cebf38e 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEntityReferenceImpl.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEntityReferenceImpl.java
@@ -18,14 +18,15 @@
*/
package org.apache.xml.security.stax.impl.stax;
-import org.apache.xml.security.stax.ext.stax.XMLSecEntityReference;
-import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
+import java.io.IOException;
+import java.io.Writer;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.events.EntityDeclaration;
-import java.io.IOException;
-import java.io.Writer;
+
+import org.apache.xml.security.stax.ext.stax.XMLSecEntityReference;
+import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
/**
*/
diff --git a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEventBaseImpl.java b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEventBaseImpl.java
index 4763c58f..7b59ab91 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEventBaseImpl.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecEventBaseImpl.java
@@ -18,20 +18,21 @@
*/
package org.apache.xml.security.stax.impl.stax;
-import org.apache.xml.security.stax.ext.stax.XMLSecCharacters;
-import org.apache.xml.security.stax.ext.stax.XMLSecEndElement;
-import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
-import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.Location;
-import javax.xml.stream.XMLStreamException;
import java.io.Writer;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
+import javax.xml.namespace.QName;
+import javax.xml.stream.Location;
+import javax.xml.stream.XMLStreamException;
+
+import org.apache.xml.security.stax.ext.stax.XMLSecCharacters;
+import org.apache.xml.security.stax.ext.stax.XMLSecEndElement;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
+
/**
*/
public abstract class XMLSecEventBaseImpl implements XMLSecEvent {
@@ -41,7 +42,7 @@ public abstract class XMLSecEventBaseImpl implements XMLSecEvent {
@SuppressWarnings("unchecked")
protected static <T> EmptyIterator<T> getEmptyIterator() {
- return (EmptyIterator<T>)EMPTY_ITERATOR;
+ return EMPTY_ITERATOR;
}
@Override
diff --git a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecNamespaceImpl.java b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecNamespaceImpl.java
index 1673eed2..cd9effb9 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecNamespaceImpl.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecNamespaceImpl.java
@@ -18,18 +18,19 @@
*/
package org.apache.xml.security.stax.impl.stax;
-import org.apache.xml.security.stax.ext.stax.XMLSecNamespace;
-
-import javax.xml.XMLConstants;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
import java.io.IOException;
import java.io.Writer;
import java.util.Collections;
import java.util.Map;
import java.util.WeakHashMap;
+import javax.xml.XMLConstants;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+
+import org.apache.xml.security.stax.ext.stax.XMLSecNamespace;
+
/**
* Class to let XML-Namespaces be comparable how it is requested by C14N
*
@@ -37,7 +38,7 @@ import java.util.WeakHashMap;
public final class XMLSecNamespaceImpl extends XMLSecEventBaseImpl implements XMLSecNamespace {
private static final Map<String, Map<String, XMLSecNamespace>> XMLSEC_NS_MAP =
- Collections.synchronizedMap(new WeakHashMap<String, Map<String, XMLSecNamespace>>());
+ Collections.synchronizedMap(new WeakHashMap<>());
private String prefix;
private final String uri;
diff --git a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecProcessingInstructionImpl.java b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecProcessingInstructionImpl.java
index 76f01c8f..b3e47ac7 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecProcessingInstructionImpl.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecProcessingInstructionImpl.java
@@ -18,13 +18,14 @@
*/
package org.apache.xml.security.stax.impl.stax;
-import org.apache.xml.security.stax.ext.stax.XMLSecProcessingInstruction;
-import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
+import java.io.IOException;
+import java.io.Writer;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
-import java.io.IOException;
-import java.io.Writer;
+
+import org.apache.xml.security.stax.ext.stax.XMLSecProcessingInstruction;
+import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
/**
*/
diff --git a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartDocumentImpl.java b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartDocumentImpl.java
index 343c94d5..52aaa7a9 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartDocumentImpl.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartDocumentImpl.java
@@ -18,12 +18,13 @@
*/
package org.apache.xml.security.stax.impl.stax;
-import org.apache.xml.security.stax.ext.stax.XMLSecStartDocument;
+import java.io.IOException;
+import java.io.Writer;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
-import java.io.IOException;
-import java.io.Writer;
+
+import org.apache.xml.security.stax.ext.stax.XMLSecStartDocument;
/**
*/
diff --git a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartElementImpl.java b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartElementImpl.java
index 5d02871a..b4add21d 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartElementImpl.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/stax/XMLSecStartElementImpl.java
@@ -18,9 +18,15 @@
*/
package org.apache.xml.security.stax.impl.stax;
-import org.apache.xml.security.stax.ext.stax.XMLSecAttribute;
-import org.apache.xml.security.stax.ext.stax.XMLSecNamespace;
-import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
import javax.xml.namespace.NamespaceContext;
import javax.xml.namespace.QName;
@@ -29,9 +35,9 @@ import javax.xml.stream.XMLStreamException;
import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.Namespace;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.*;
+import org.apache.xml.security.stax.ext.stax.XMLSecAttribute;
+import org.apache.xml.security.stax.ext.stax.XMLSecNamespace;
+import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
/**
*/
diff --git a/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformBase64Decode.java b/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformBase64Decode.java
index 79734949..8f72f5a9 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformBase64Decode.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformBase64Decode.java
@@ -18,6 +18,14 @@
*/
package org.apache.xml.security.stax.impl.transformer;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+
import org.apache.commons.codec.binary.Base64InputStream;
import org.apache.commons.codec.binary.Base64OutputStream;
import org.apache.xml.security.exceptions.XMLSecurityException;
@@ -27,10 +35,6 @@ import org.apache.xml.security.stax.impl.processor.input.XMLEventReaderInputProc
import org.apache.xml.security.utils.UnsyncByteArrayInputStream;
import org.apache.xml.security.utils.UnsyncByteArrayOutputStream;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import java.io.*;
-
/**
*/
public class TransformBase64Decode extends TransformIdentity {
diff --git a/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformEnvelopedSignature.java b/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformEnvelopedSignature.java
index b39c8bc1..82da252a 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformEnvelopedSignature.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformEnvelopedSignature.java
@@ -18,15 +18,16 @@
*/
package org.apache.xml.security.stax.impl.transformer;
+import java.io.InputStream;
+
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.ext.stax.XMLSecEndElement;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import java.io.InputStream;
-
/**
*/
public class TransformEnvelopedSignature extends TransformIdentity {
diff --git a/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformIdentity.java b/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformIdentity.java
index c77f5315..68e60b7f 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformIdentity.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/transformer/TransformIdentity.java
@@ -18,6 +18,18 @@
*/
package org.apache.xml.security.stax.impl.transformer;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Map;
+
+import javax.xml.stream.XMLEventWriter;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.Transformer;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
@@ -27,10 +39,6 @@ import org.apache.xml.security.stax.impl.processor.input.XMLEventReaderInputProc
import org.apache.xml.security.utils.UnsyncByteArrayInputStream;
import org.apache.xml.security.utils.UnsyncByteArrayOutputStream;
-import javax.xml.stream.*;
-import java.io.*;
-import java.util.Map;
-
/**
*/
public class TransformIdentity implements Transformer {
diff --git a/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11.java b/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11.java
index 8f2570ee..8e28eae4 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/Canonicalizer11.java
@@ -18,13 +18,16 @@
*/
package org.apache.xml.security.stax.impl.transformer.canonicalizer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
import org.apache.xml.security.stax.ext.stax.XMLSecAttribute;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
-import javax.xml.namespace.QName;
-import java.util.*;
-
/**
*/
public class Canonicalizer11 extends CanonicalizerBase {
diff --git a/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java b/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java
index 441761f3..0ce94ea2 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/transformer/canonicalizer/CanonicalizerBase.java
@@ -80,7 +80,7 @@ public abstract class CanonicalizerBase extends TransformIdentity {
NODE_AFTER_DOCUMENT_ELEMENT
}
- private static final Map<String, byte[]> CACHE = Collections.synchronizedMap(new WeakHashMap<String, byte[]>());
+ private static final Map<String, byte[]> CACHE = Collections.synchronizedMap(new WeakHashMap<>());
private final C14NStack<XMLSecEvent> outputStack = new C14NStack<>();
private boolean includeComments = false;
private DocumentLevel currentDocumentLevel = DocumentLevel.NODE_BEFORE_DOCUMENT_ELEMENT;
diff --git a/src/main/java/org/apache/xml/security/stax/impl/util/ConcreteLSInput.java b/src/main/java/org/apache/xml/security/stax/impl/util/ConcreteLSInput.java
index f6900fa0..e2edeced 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/util/ConcreteLSInput.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/util/ConcreteLSInput.java
@@ -18,11 +18,11 @@
*/
package org.apache.xml.security.stax.impl.util;
-import org.w3c.dom.ls.LSInput;
-
import java.io.InputStream;
import java.io.Reader;
+import org.w3c.dom.ls.LSInput;
+
/**
*/
public class ConcreteLSInput implements LSInput {
diff --git a/src/main/java/org/apache/xml/security/stax/impl/util/IVSplittingOutputStream.java b/src/main/java/org/apache/xml/security/stax/impl/util/IVSplittingOutputStream.java
index b9e3af01..8c7661aa 100644
--- a/src/main/java/org/apache/xml/security/stax/impl/util/IVSplittingOutputStream.java
+++ b/src/main/java/org/apache/xml/security/stax/impl/util/IVSplittingOutputStream.java
@@ -18,10 +18,6 @@
*/
package org.apache.xml.security.stax.impl.util;
-import javax.crypto.Cipher;
-
-import org.apache.xml.security.encryption.XMLCipherUtil;
-
import java.io.FilterOutputStream;
import java.io.IOException;
import java.io.OutputStream;
@@ -30,6 +26,10 @@ import java.security.InvalidKeyException;
import java.security.Key;
import java.security.spec.AlgorithmParameterSpec;
+import javax.crypto.Cipher;
+
+import org.apache.xml.security.encryption.XMLCipherUtil;
+
/**
* IV splitting from the first few bytes in the stream.
* When the iv is completely received the cipher will be initialized
diff --git a/src/main/java/org/apache/xml/security/stax/securityEvent/AbstractElementSecurityEvent.java b/src/main/java/org/apache/xml/security/stax/securityEvent/AbstractElementSecurityEvent.java
index f1e168d4..33a53fdc 100644
--- a/src/main/java/org/apache/xml/security/stax/securityEvent/AbstractElementSecurityEvent.java
+++ b/src/main/java/org/apache/xml/security/stax/securityEvent/AbstractElementSecurityEvent.java
@@ -18,12 +18,13 @@
*/
package org.apache.xml.security.stax.securityEvent;
-import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
-
-import javax.xml.namespace.QName;
import java.util.ArrayList;
import java.util.List;
+import javax.xml.namespace.QName;
+
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+
/**
*/
public abstract class AbstractElementSecurityEvent extends SecurityEvent {
diff --git a/src/main/java/org/apache/xml/security/stax/securityEvent/AbstractSecuredElementSecurityEvent.java b/src/main/java/org/apache/xml/security/stax/securityEvent/AbstractSecuredElementSecurityEvent.java
index 81505d41..4c60d98f 100644
--- a/src/main/java/org/apache/xml/security/stax/securityEvent/AbstractSecuredElementSecurityEvent.java
+++ b/src/main/java/org/apache/xml/security/stax/securityEvent/AbstractSecuredElementSecurityEvent.java
@@ -18,12 +18,12 @@
*/
package org.apache.xml.security.stax.securityEvent;
-import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
+import java.util.List;
+
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
+import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
import org.apache.xml.security.stax.securityToken.SecurityToken;
-import java.util.List;
-
/**
*/
public abstract class AbstractSecuredElementSecurityEvent extends AbstractElementSecurityEvent {
diff --git a/src/main/java/org/apache/xml/security/stax/securityEvent/ContentEncryptedElementSecurityEvent.java b/src/main/java/org/apache/xml/security/stax/securityEvent/ContentEncryptedElementSecurityEvent.java
index a9c42692..2bef116f 100644
--- a/src/main/java/org/apache/xml/security/stax/securityEvent/ContentEncryptedElementSecurityEvent.java
+++ b/src/main/java/org/apache/xml/security/stax/securityEvent/ContentEncryptedElementSecurityEvent.java
@@ -18,11 +18,11 @@
*/
package org.apache.xml.security.stax.securityEvent;
-import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
-import org.apache.xml.security.stax.ext.XMLSecurityConstants;
-
import java.util.List;
+import org.apache.xml.security.stax.ext.XMLSecurityConstants;
+import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
+
/**
*/
public class ContentEncryptedElementSecurityEvent extends AbstractSecuredElementSecurityEvent {
diff --git a/src/main/java/org/apache/xml/security/stax/securityEvent/EncryptedElementSecurityEvent.java b/src/main/java/org/apache/xml/security/stax/securityEvent/EncryptedElementSecurityEvent.java
index 350fad80..3cc7276f 100644
--- a/src/main/java/org/apache/xml/security/stax/securityEvent/EncryptedElementSecurityEvent.java
+++ b/src/main/java/org/apache/xml/security/stax/securityEvent/EncryptedElementSecurityEvent.java
@@ -18,11 +18,11 @@
*/
package org.apache.xml.security.stax.securityEvent;
-import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
-import org.apache.xml.security.stax.ext.XMLSecurityConstants;
-
import java.util.List;
+import org.apache.xml.security.stax.ext.XMLSecurityConstants;
+import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
+
/**
*/
public class EncryptedElementSecurityEvent extends AbstractSecuredElementSecurityEvent {
diff --git a/src/main/java/org/apache/xml/security/stax/securityEvent/SignedElementSecurityEvent.java b/src/main/java/org/apache/xml/security/stax/securityEvent/SignedElementSecurityEvent.java
index 71a18141..e0988dfb 100644
--- a/src/main/java/org/apache/xml/security/stax/securityEvent/SignedElementSecurityEvent.java
+++ b/src/main/java/org/apache/xml/security/stax/securityEvent/SignedElementSecurityEvent.java
@@ -18,11 +18,11 @@
*/
package org.apache.xml.security.stax.securityEvent;
-import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
-import org.apache.xml.security.stax.ext.XMLSecurityConstants;
-
import java.util.List;
+import org.apache.xml.security.stax.ext.XMLSecurityConstants;
+import org.apache.xml.security.stax.securityToken.InboundSecurityToken;
+
/**
*/
public class SignedElementSecurityEvent extends AbstractSecuredElementSecurityEvent {
diff --git a/src/main/java/org/apache/xml/security/stax/securityEvent/TokenSecurityEvent.java b/src/main/java/org/apache/xml/security/stax/securityEvent/TokenSecurityEvent.java
index 345aa3d1..78b109f8 100644
--- a/src/main/java/org/apache/xml/security/stax/securityEvent/TokenSecurityEvent.java
+++ b/src/main/java/org/apache/xml/security/stax/securityEvent/TokenSecurityEvent.java
@@ -18,8 +18,8 @@
*/
package org.apache.xml.security.stax.securityEvent;
-import org.apache.xml.security.stax.securityToken.SecurityToken;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants.Event;
+import org.apache.xml.security.stax.securityToken.SecurityToken;
/**
*/
diff --git a/src/main/java/org/apache/xml/security/stax/securityToken/OutboundSecurityToken.java b/src/main/java/org/apache/xml/security/stax/securityToken/OutboundSecurityToken.java
index cce52035..bb288f31 100644
--- a/src/main/java/org/apache/xml/security/stax/securityToken/OutboundSecurityToken.java
+++ b/src/main/java/org/apache/xml/security/stax/securityToken/OutboundSecurityToken.java
@@ -20,11 +20,10 @@ package org.apache.xml.security.stax.securityToken;
import java.security.Key;
+import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.OutputProcessor;
import org.w3c.dom.Element;
-import org.apache.xml.security.exceptions.XMLSecurityException;
-
/**
*/
public interface OutboundSecurityToken extends SecurityToken {
diff --git a/src/main/java/org/apache/xml/security/transforms/Transform.java b/src/main/java/org/apache/xml/security/transforms/Transform.java
index 8c9aebd5..3eef3e5f 100644
--- a/src/main/java/org/apache/xml/security/transforms/Transform.java
+++ b/src/main/java/org/apache/xml/security/transforms/Transform.java
@@ -20,8 +20,9 @@ package org.apache.xml.security.transforms;
import java.io.IOException;
import java.io.OutputStream;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
import javax.xml.parsers.ParserConfigurationException;
import org.apache.xml.security.c14n.CanonicalizationException;
@@ -338,6 +339,7 @@ public final class Transform extends SignatureElementProxy {
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_TRANSFORM;
}
diff --git a/src/main/java/org/apache/xml/security/transforms/TransformSpi.java b/src/main/java/org/apache/xml/security/transforms/TransformSpi.java
index fa89e4fc..c4e52e23 100644
--- a/src/main/java/org/apache/xml/security/transforms/TransformSpi.java
+++ b/src/main/java/org/apache/xml/security/transforms/TransformSpi.java
@@ -20,6 +20,7 @@ package org.apache.xml.security.transforms;
import java.io.IOException;
import java.io.OutputStream;
+
import javax.xml.parsers.ParserConfigurationException;
import org.apache.xml.security.c14n.CanonicalizationException;
diff --git a/src/main/java/org/apache/xml/security/transforms/Transforms.java b/src/main/java/org/apache/xml/security/transforms/Transforms.java
index 27732553..023d7ef5 100644
--- a/src/main/java/org/apache/xml/security/transforms/Transforms.java
+++ b/src/main/java/org/apache/xml/security/transforms/Transforms.java
@@ -318,6 +318,7 @@ public class Transforms extends SignatureElementProxy {
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_TRANSFORMS;
}
diff --git a/src/main/java/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java b/src/main/java/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java
index 3456be9e..383ac8bc 100644
--- a/src/main/java/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java
+++ b/src/main/java/org/apache/xml/security/transforms/implementations/TransformBase64Decode.java
@@ -26,13 +26,12 @@ import org.apache.xml.security.signature.XMLSignatureInput;
import org.apache.xml.security.transforms.TransformSpi;
import org.apache.xml.security.transforms.TransformationException;
import org.apache.xml.security.transforms.Transforms;
+import org.apache.xml.security.utils.JavaUtils;
import org.apache.xml.security.utils.XMLUtils;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
-import org.apache.xml.security.utils.JavaUtils;
-
/**
* Implements the <CODE>http://www.w3.org/2000/09/xmldsig#base64</CODE> decoding
* transform.
diff --git a/src/main/java/org/apache/xml/security/transforms/implementations/TransformEnvelopedSignature.java b/src/main/java/org/apache/xml/security/transforms/implementations/TransformEnvelopedSignature.java
index 5dab0490..7b92388e 100644
--- a/src/main/java/org/apache/xml/security/transforms/implementations/TransformEnvelopedSignature.java
+++ b/src/main/java/org/apache/xml/security/transforms/implementations/TransformEnvelopedSignature.java
@@ -116,6 +116,7 @@ public class TransformEnvelopedSignature extends TransformSpi {
exclude = n;
}
+ @Override
public int isNodeIncludeDO(Node n, int level) {
if (n == exclude) {
return -1;
@@ -126,6 +127,7 @@ public class TransformEnvelopedSignature extends TransformSpi {
/**
* @see org.apache.xml.security.signature.NodeFilter#isNodeInclude(org.w3c.dom.Node)
*/
+ @Override
public int isNodeInclude(Node n) {
if (n == exclude || XMLUtils.isDescendantOrSelf(exclude, n)) {
return -1;
diff --git a/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java b/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java
index 5e418e0b..3904d207 100644
--- a/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java
+++ b/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath.java
@@ -29,7 +29,11 @@ import org.apache.xml.security.signature.XMLSignatureInput;
import org.apache.xml.security.transforms.TransformSpi;
import org.apache.xml.security.transforms.TransformationException;
import org.apache.xml.security.transforms.Transforms;
-import org.apache.xml.security.utils.*;
+import org.apache.xml.security.utils.Constants;
+import org.apache.xml.security.utils.JDKXPathFactory;
+import org.apache.xml.security.utils.XMLUtils;
+import org.apache.xml.security.utils.XPathAPI;
+import org.apache.xml.security.utils.XPathFactory;
import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -130,6 +134,7 @@ public class TransformXPath extends TransformSpi {
/**
* @see org.apache.xml.security.signature.NodeFilter#isNodeInclude(org.w3c.dom.Node)
*/
+ @Override
public int isNodeInclude(Node currentNode) throws TransformationException {
try {
boolean include = xPathAPI.evaluate(currentNode, xpathnode, str, xpathElement);
@@ -142,6 +147,7 @@ public class TransformXPath extends TransformSpi {
}
}
+ @Override
public int isNodeIncludeDO(Node n, int level) throws TransformationException {
return isNodeInclude(n);
}
diff --git a/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java b/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java
index 8ea2c784..356ed02f 100644
--- a/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java
+++ b/src/main/java/org/apache/xml/security/transforms/implementations/TransformXPath2Filter.java
@@ -158,6 +158,7 @@ class XPath2NodeFilter implements NodeFilter {
/**
* @see org.apache.xml.security.signature.NodeFilter#isNodeInclude(org.w3c.dom.Node)
*/
+ @Override
public int isNodeInclude(Node currentNode) {
int result = 1;
@@ -180,6 +181,7 @@ class XPath2NodeFilter implements NodeFilter {
return result;
}
+ @Override
public int isNodeIncludeDO(Node n, int level) {
int result = 1;
if (hasSubtractFilter) {
diff --git a/src/main/java/org/apache/xml/security/transforms/params/InclusiveNamespaces.java b/src/main/java/org/apache/xml/security/transforms/params/InclusiveNamespaces.java
index e645b5e5..3cf243f8 100644
--- a/src/main/java/org/apache/xml/security/transforms/params/InclusiveNamespaces.java
+++ b/src/main/java/org/apache/xml/security/transforms/params/InclusiveNamespaces.java
@@ -150,6 +150,7 @@ public class InclusiveNamespaces extends ElementProxy implements TransformParam
*
* {@inheritDoc}
*/
+ @Override
public String getBaseNamespace() {
return InclusiveNamespaces.ExclusiveCanonicalizationNamespace;
}
@@ -159,6 +160,7 @@ public class InclusiveNamespaces extends ElementProxy implements TransformParam
*
* {@inheritDoc}
*/
+ @Override
public String getBaseLocalName() {
return InclusiveNamespaces._TAG_EC_INCLUSIVENAMESPACES;
}
diff --git a/src/main/java/org/apache/xml/security/transforms/params/XPath2FilterContainer.java b/src/main/java/org/apache/xml/security/transforms/params/XPath2FilterContainer.java
index bea67516..4071fec5 100644
--- a/src/main/java/org/apache/xml/security/transforms/params/XPath2FilterContainer.java
+++ b/src/main/java/org/apache/xml/security/transforms/params/XPath2FilterContainer.java
@@ -264,7 +264,8 @@ public final class XPath2FilterContainer extends ElementProxy implements Transfo
*
* @return the XPATH2 tag
*/
- public final String getBaseLocalName() {
+ @Override
+ public String getBaseLocalName() {
return XPath2FilterContainer._TAG_XPATH2;
}
@@ -273,7 +274,8 @@ public final class XPath2FilterContainer extends ElementProxy implements Transfo
*
* @return XPATH2 tag namespace
*/
- public final String getBaseNamespace() {
+ @Override
+ public String getBaseNamespace() {
return XPath2FilterContainer.XPathFilter2NS;
}
}
diff --git a/src/main/java/org/apache/xml/security/transforms/params/XPathContainer.java b/src/main/java/org/apache/xml/security/transforms/params/XPathContainer.java
index f3428de1..5986e5f8 100644
--- a/src/main/java/org/apache/xml/security/transforms/params/XPathContainer.java
+++ b/src/main/java/org/apache/xml/security/transforms/params/XPathContainer.java
@@ -70,6 +70,7 @@ public class XPathContainer extends SignatureElementProxy implements TransformPa
}
/** {@inheritDoc} */
+ @Override
public String getBaseLocalName() {
return Constants._TAG_XPATH;
}
diff --git a/src/main/java/org/apache/xml/security/utils/Base64.java b/src/main/java/org/apache/xml/security/utils/Base64.java
index 0a1feecc..09199897 100644
--- a/src/main/java/org/apache/xml/security/utils/Base64.java
+++ b/src/main/java/org/apache/xml/security/utils/Base64.java
@@ -104,7 +104,7 @@ public final class Base64 {
* @param bitlen <code>int</code> the desired length in bits of the representation
* @return a byte array with <code>bitlen</code> bits of <code>big</code>
*/
- static final byte[] getBytes(BigInteger big, int bitlen) {
+ static byte[] getBytes(BigInteger big, int bitlen) {
//round bitlen
bitlen = ((bitlen + 7) >> 3) << 3;
@@ -144,7 +144,7 @@ public final class Base64 {
* @param big
* @return String with Base64 encoding
*/
- public static final String encode(BigInteger big) {
+ public static String encode(BigInteger big) {
byte[] bytes = XMLUtils.getBytes(big, big.bitLength());
return XMLUtils.encodeToString(bytes);
}
@@ -160,7 +160,7 @@ public final class Base64 {
* @param bitlen <code>int</code> the desired length in bits of the representation
* @return a byte array with <code>bitlen</code> bits of <code>big</code>
*/
- public static final byte[] encode(BigInteger big, int bitlen) {
+ public static byte[] encode(BigInteger big, int bitlen) {
//round bitlen
bitlen = ((bitlen + 7) >> 3) << 3;
@@ -201,7 +201,7 @@ public final class Base64 {
* @return the biginteger obtained from the node
* @throws Base64DecodingException
*/
- public static final BigInteger decodeBigIntegerFromElement(Element element)
+ public static BigInteger decodeBigIntegerFromElement(Element element)
throws Base64DecodingException {
return new BigInteger(1, Base64.decode(element));
}
@@ -212,7 +212,7 @@ public final class Base64 {
* @return a decoded BigInteger
* @throws Base64DecodingException
*/
- public static final BigInteger decodeBigIntegerFromText(Text text)
+ public static BigInteger decodeBigIntegerFromText(Text text)
throws Base64DecodingException {
return new BigInteger(1, Base64.decode(text.getData()));
}
@@ -224,7 +224,7 @@ public final class Base64 {
* @param element
* @param biginteger
*/
- public static final void fillElementWithBigInteger(Element element, BigInteger biginteger) {
+ public static void fillElementWithBigInteger(Element element, BigInteger biginteger) {
String encodedInt = encode(biginteger);
@@ -249,7 +249,7 @@ public final class Base64 {
* $todo$ not tested yet
* @throws Base64DecodingException
*/
- public static final byte[] decode(Element element) throws Base64DecodingException {
+ public static byte[] decode(Element element) throws Base64DecodingException {
Node sibling = element.getFirstChild();
StringBuilder sb = new StringBuilder();
@@ -275,7 +275,7 @@ public final class Base64 {
* @return an Element with the base64 encoded in the text.
*
*/
- public static final Element encodeToElement(Document doc, String localName, byte[] bytes) {
+ public static Element encodeToElement(Document doc, String localName, byte[] bytes) {
Element el = XMLUtils.createElementInSignatureSpace(doc, localName);
Text text = doc.createTextNode(encode(bytes));
@@ -292,7 +292,7 @@ public final class Base64 {
* @throws Base64DecodingException
*
*/
- public static final byte[] decode(byte[] base64) throws Base64DecodingException {
+ public static byte[] decode(byte[] base64) throws Base64DecodingException {
return decodeInternal(base64, -1);
}
@@ -303,7 +303,7 @@ public final class Base64 {
* @param binaryData <code>byte[]</code> to be base64 encoded
* @return the <code>String</code> with encoded data
*/
- public static final String encode(byte[] binaryData) {
+ public static String encode(byte[] binaryData) {
return XMLUtils.ignoreLineBreaks()
? encode(binaryData, Integer.MAX_VALUE)
: encode(binaryData, BASE64DEFAULTLENGTH);
@@ -319,7 +319,7 @@ public final class Base64 {
* @throws IOException
* @throws Base64DecodingException
*/
- public static final byte[] decode(BufferedReader reader)
+ public static byte[] decode(BufferedReader reader)
throws IOException, Base64DecodingException {
byte[] retBytes = null;
@@ -338,11 +338,11 @@ public final class Base64 {
return retBytes;
}
- protected static final boolean isWhiteSpace(byte octet) {
+ protected static boolean isWhiteSpace(byte octet) {
return octet == 0x20 || octet == 0xd || octet == 0xa || octet == 0x9;
}
- protected static final boolean isPad(byte octet) {
+ protected static boolean isPad(byte octet) {
return octet == PAD;
}
@@ -360,7 +360,7 @@ public final class Base64 {
* @param length <code>int</code> length of wrapped lines; No wrapping if less than 4.
* @return a <code>String</code> with encoded data
*/
- public static final String encode(byte[] binaryData, int length) {
+ public static String encode(byte[] binaryData, int length) {
if (length < 4) {
length = Integer.MAX_VALUE;
}
@@ -470,7 +470,7 @@ public final class Base64 {
* @return byte array containing the decoded data
* @throws Base64DecodingException if there is a problem decoding the data
*/
- public static final byte[] decode(String encoded) throws Base64DecodingException {
+ public static byte[] decode(String encoded) throws Base64DecodingException {
if (encoded == null) {
return null;
}
@@ -479,7 +479,7 @@ public final class Base64 {
return decodeInternal(bytes, len);
}
- protected static final int getBytesInternal(String s, byte[] result) {
+ protected static int getBytesInternal(String s, byte[] result) {
int length = s.length();
int newSize = 0;
@@ -492,7 +492,7 @@ public final class Base64 {
return newSize;
}
- protected static final byte[] decodeInternal(byte[] base64Data, int len)
+ protected static byte[] decodeInternal(byte[] base64Data, int len)
throws Base64DecodingException {
// remove white spaces
if (len == -1) {
@@ -587,7 +587,7 @@ public final class Base64 {
* @throws IOException
* @throws Base64DecodingException
*/
- public static final void decode(String base64Data, OutputStream os)
+ public static void decode(String base64Data, OutputStream os)
throws Base64DecodingException, IOException {
byte[] bytes = new byte[base64Data.length()];
int len = getBytesInternal(base64Data, bytes);
@@ -602,12 +602,12 @@ public final class Base64 {
* @throws IOException
* @throws Base64DecodingException
*/
- public static final void decode(byte[] base64Data, OutputStream os)
+ public static void decode(byte[] base64Data, OutputStream os)
throws Base64DecodingException, IOException {
decode(base64Data, os, -1);
}
- protected static final void decode(byte[] base64Data, OutputStream os, int len)
+ protected static void decode(byte[] base64Data, OutputStream os, int len)
throws Base64DecodingException, IOException {
// remove white spaces
if (len == -1) {
@@ -690,7 +690,7 @@ public final class Base64 {
* @throws IOException
* @throws Base64DecodingException
*/
- public static final void decode(InputStream is, OutputStream os)
+ public static void decode(InputStream is, OutputStream os)
throws Base64DecodingException, IOException {
//byte[] decodedData = null;
byte b1 = 0, b2 = 0, b3 = 0, b4 = 0;
@@ -767,7 +767,7 @@ public final class Base64 {
* @param data the byte array of base64 data (with WS)
* @return the new length
*/
- protected static final int removeWhiteSpace(byte[] data) {
+ protected static int removeWhiteSpace(byte[] data) {
if (data == null) {
return 0;
}
diff --git a/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java b/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java
index 5b100630..febe0af5 100644
--- a/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java
+++ b/src/main/java/org/apache/xml/security/utils/ClassLoaderUtils.java
@@ -114,9 +114,11 @@ public final class ClassLoaderUtils {
}
List<URL> ret = new ArrayList<>();
Enumeration<URL> urls = new Enumeration<URL>() {
+ @Override
public boolean hasMoreElements() {
return false;
}
+ @Override
public URL nextElement() {
return null;
}
diff --git a/src/main/java/org/apache/xml/security/utils/DOMNamespaceContext.java b/src/main/java/org/apache/xml/security/utils/DOMNamespaceContext.java
index 91305b8c..aca7cf68 100644
--- a/src/main/java/org/apache/xml/security/utils/DOMNamespaceContext.java
+++ b/src/main/java/org/apache/xml/security/utils/DOMNamespaceContext.java
@@ -80,6 +80,7 @@ public class DOMNamespaceContext implements NamespaceContext {
this.context = context;
}
+ @Override
public String getNamespaceURI(String prefix) {
if (prefix == null) {
throw new IllegalArgumentException("prefix is null");
@@ -103,6 +104,7 @@ public class DOMNamespaceContext implements NamespaceContext {
return NULL_NS_URI;
}
+ @Override
public String getPrefix(String namespaceURI) {
if (namespaceURI == null) {
throw new IllegalArgumentException("namespace URI is null");
@@ -136,6 +138,7 @@ public class DOMNamespaceContext implements NamespaceContext {
/**
* Throws {@link UnsupportedOperationException}.
*/
+ @Override
public Iterator<String> getPrefixes(String namespaceURI) {
throw new UnsupportedOperationException();
}
diff --git a/src/main/java/org/apache/xml/security/utils/DigesterOutputStream.java b/src/main/java/org/apache/xml/security/utils/DigesterOutputStream.java
index c419ddac..aa22bfd3 100644
--- a/src/main/java/org/apache/xml/security/utils/DigesterOutputStream.java
+++ b/src/main/java/org/apache/xml/security/utils/DigesterOutputStream.java
@@ -39,16 +39,19 @@ public class DigesterOutputStream extends ByteArrayOutputStream {
}
/** {@inheritDoc} */
+ @Override
public void write(byte[] arg0) {
write(arg0, 0, arg0.length);
}
/** {@inheritDoc} */
+ @Override
public void write(int arg0) {
mda.update((byte)arg0);
}
/** {@inheritDoc} */
+ @Override
public void write(byte[] arg0, int arg1, int arg2) {
if (LOG.isDebugEnabled()) {
LOG.debug("Pre-digested input:");
diff --git a/src/main/java/org/apache/xml/security/utils/ElementProxy.java b/src/main/java/org/apache/xml/security/utils/ElementProxy.java
index 4e39b9eb..a3edd35f 100644
--- a/src/main/java/org/apache/xml/security/utils/ElementProxy.java
+++ b/src/main/java/org/apache/xml/security/utils/ElementProxy.java
@@ -19,8 +19,8 @@
package org.apache.xml.security.utils;
import java.math.BigInteger;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.w3c.dom.Attr;
diff --git a/src/main/java/org/apache/xml/security/utils/HelperNodeList.java b/src/main/java/org/apache/xml/security/utils/HelperNodeList.java
index 6dbc48f2..ffcd1bbb 100644
--- a/src/main/java/org/apache/xml/security/utils/HelperNodeList.java
+++ b/src/main/java/org/apache/xml/security/utils/HelperNodeList.java
@@ -53,6 +53,7 @@ public class HelperNodeList implements NodeList {
* @param index
* @return node with index i
*/
+ @Override
public Node item(int index) {
return nodes.get(index);
}
@@ -62,6 +63,7 @@ public class HelperNodeList implements NodeList {
*
* @return length of the list
*/
+ @Override
public int getLength() {
return nodes.size();
}
diff --git a/src/main/java/org/apache/xml/security/utils/JDKXPathAPI.java b/src/main/java/org/apache/xml/security/utils/JDKXPathAPI.java
index 09e424fb..89c21b66 100644
--- a/src/main/java/org/apache/xml/security/utils/JDKXPathAPI.java
+++ b/src/main/java/org/apache/xml/security/utils/JDKXPathAPI.java
@@ -53,6 +53,7 @@ class JDKXPathAPI implements XPathAPI {
*
* @throws TransformerException
*/
+ @Override
public NodeList selectNodeList(
Node contextNode, Node xpathnode, String str, Node namespaceNode
) throws TransformerException {
@@ -88,6 +89,7 @@ class JDKXPathAPI implements XPathAPI {
* @param str The XPath expression
* @param namespaceNode The node from which prefixes in the XPath will be resolved to namespaces.
*/
+ @Override
public boolean evaluate(Node contextNode, Node xpathnode, String str, Node namespaceNode)
throws TransformerException {
if (!str.equals(xpathStr) || xpathExpression == null) {
@@ -118,6 +120,7 @@ class JDKXPathAPI implements XPathAPI {
/**
* Clear any context information from this object
*/
+ @Override
public void clear() {
xpathStr = null;
xpathExpression = null;
diff --git a/src/main/java/org/apache/xml/security/utils/JDKXPathFactory.java b/src/main/java/org/apache/xml/security/utils/JDKXPathFactory.java
index 20bff551..17729ad4 100644
--- a/src/main/java/org/apache/xml/security/utils/JDKXPathFactory.java
+++ b/src/main/java/org/apache/xml/security/utils/JDKXPathFactory.java
@@ -27,6 +27,7 @@ public class JDKXPathFactory extends XPathFactory {
/**
* Get a new XPathAPI instance
*/
+ @Override
public XPathAPI newXPathAPI() {
return new JDKXPathAPI();
}
diff --git a/src/main/java/org/apache/xml/security/utils/Signature11ElementProxy.java b/src/main/java/org/apache/xml/security/utils/Signature11ElementProxy.java
index ad5a22c8..772f8718 100644
--- a/src/main/java/org/apache/xml/security/utils/Signature11ElementProxy.java
+++ b/src/main/java/org/apache/xml/security/utils/Signature11ElementProxy.java
@@ -65,6 +65,7 @@ public abstract class Signature11ElementProxy extends ElementProxy {
}
/** {@inheritDoc} */
+ @Override
public String getBaseNamespace() {
return Constants.SignatureSpec11NS;
}
diff --git a/src/main/java/org/apache/xml/security/utils/SignatureElementProxy.java b/src/main/java/org/apache/xml/security/utils/SignatureElementProxy.java
index 8eb944c3..00697f5e 100644
--- a/src/main/java/org/apache/xml/security/utils/SignatureElementProxy.java
+++ b/src/main/java/org/apache/xml/security/utils/SignatureElementProxy.java
@@ -59,6 +59,7 @@ public abstract class SignatureElementProxy extends ElementProxy {
}
/** {@inheritDoc} */
+ @Override
public String getBaseNamespace() {
return Constants.SignatureSpecNS;
}
diff --git a/src/main/java/org/apache/xml/security/utils/SignerOutputStream.java b/src/main/java/org/apache/xml/security/utils/SignerOutputStream.java
index f0bbbfba..8dea6b79 100644
--- a/src/main/java/org/apache/xml/security/utils/SignerOutputStream.java
+++ b/src/main/java/org/apache/xml/security/utils/SignerOutputStream.java
@@ -40,6 +40,7 @@ public class SignerOutputStream extends ByteArrayOutputStream {
}
/** {@inheritDoc} */
+ @Override
public void write(byte[] arg0) {
try {
sa.update(arg0);
@@ -49,6 +50,7 @@ public class SignerOutputStream extends ByteArrayOutputStream {
}
/** {@inheritDoc} */
+ @Override
public void write(int arg0) {
try {
sa.update((byte)arg0);
@@ -58,6 +60,7 @@ public class SignerOutputStream extends ByteArrayOutputStream {
}
/** {@inheritDoc} */
+ @Override
public void write(byte[] arg0, int arg1, int arg2) {
if (LOG.isDebugEnabled()) {
LOG.debug("Canonicalized SignedInfo:");
diff --git a/src/main/java/org/apache/xml/security/utils/UnsyncByteArrayOutputStream.java b/src/main/java/org/apache/xml/security/utils/UnsyncByteArrayOutputStream.java
index 0996786c..f3efdb86 100644
--- a/src/main/java/org/apache/xml/security/utils/UnsyncByteArrayOutputStream.java
+++ b/src/main/java/org/apache/xml/security/utils/UnsyncByteArrayOutputStream.java
@@ -40,6 +40,7 @@ public class UnsyncByteArrayOutputStream extends OutputStream {
buf = new byte[INITIAL_SIZE];
}
+ @Override
public void write(byte[] arg0) {
if ((VM_ARRAY_INDEX_MAX_VALUE - pos) < arg0.length) {
throw new OutOfMemoryError("Required length exceeds implementation limit");
@@ -52,6 +53,7 @@ public class UnsyncByteArrayOutputStream extends OutputStream {
pos = newPos;
}
+ @Override
public void write(byte[] arg0, int arg1, int arg2) {
if ((VM_ARRAY_INDEX_MAX_VALUE - pos) < arg2) {
throw new OutOfMemoryError("Required length exceeds implementation limit");
@@ -64,6 +66,7 @@ public class UnsyncByteArrayOutputStream extends OutputStream {
pos = newPos;
}
+ @Override
public void write(int arg0) {
if (VM_ARRAY_INDEX_MAX_VALUE - pos == 0) {
throw new OutOfMemoryError("Required length exceeds implementation limit");
diff --git a/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java b/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java
index b23ba9eb..a2753133 100644
--- a/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java
+++ b/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverDirectHTTP.java
@@ -23,8 +23,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.InetSocketAddress;
import java.net.Proxy;
-import java.net.URISyntaxException;
import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLConnection;
import java.nio.charset.StandardCharsets;
@@ -201,6 +201,7 @@ public class ResolverDirectHTTP extends ResourceResolverSpi {
* @param context
* @return true if can be resolved
*/
+ @Override
public boolean engineCanResolveURI(ResourceResolverContext context) {
if (context.uriToResolve == null) {
LOG.debug("quick fail, uri == null");
diff --git a/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java b/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java
index b6804c1b..affe9ef7 100644
--- a/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java
+++ b/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverFragment.java
@@ -106,6 +106,7 @@ public class ResolverFragment extends ResourceResolverSpi {
* {@inheritDoc}
* @param context
*/
+ @Override
public boolean engineCanResolveURI(ResourceResolverContext context) {
if (context.uriToResolve == null) {
LOG.debug("Quick fail for null uri");
diff --git a/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java b/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java
index 8dc1548b..2d8261f4 100644
--- a/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java
+++ b/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverLocalFilesystem.java
@@ -62,6 +62,7 @@ public class ResolverLocalFilesystem extends ResourceResolverSpi {
/**
* {@inheritDoc}
*/
+ @Override
public boolean engineCanResolveURI(ResourceResolverContext context) {
if (context.uriToResolve == null) {
return false;
diff --git a/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java b/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java
index b4a77bfa..edb79c37 100644
--- a/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java
+++ b/src/main/java/org/apache/xml/security/utils/resolver/implementations/ResolverXPointer.java
@@ -100,6 +100,7 @@ public class ResolverXPointer extends ResourceResolverSpi {
/**
* {@inheritDoc}
*/
+ @Override
public boolean engineCanResolveURI(ResourceResolverContext context) {
return isXPointerSlash(context.uriToResolve) || isXPointerId(context.uriToResolve);
}
diff --git a/src/test/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImplTest.java b/src/test/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImplTest.java
index d672ee1d..7c7ad59b 100644
--- a/src/test/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImplTest.java
+++ b/src/test/java/org/apache/xml/security/stax/impl/securityToken/SecurityTokenFactoryImplTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.xml.security.stax.impl.securityToken;
+import jakarta.xml.bind.JAXBElement;
+
import java.security.Key;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
-import jakarta.xml.bind.JAXBElement;
-
import org.apache.xml.security.binding.xmldsig.KeyInfoType;
import org.apache.xml.security.binding.xmldsig.ObjectFactory;
import org.apache.xml.security.exceptions.XMLSecurityException;
diff --git a/src/test/java/org/apache/xml/security/test/dom/DSNamespaceContext.java b/src/test/java/org/apache/xml/security/test/dom/DSNamespaceContext.java
index 7ea496a6..4e259365 100644
--- a/src/test/java/org/apache/xml/security/test/dom/DSNamespaceContext.java
+++ b/src/test/java/org/apache/xml/security/test/dom/DSNamespaceContext.java
@@ -42,6 +42,7 @@ public class DSNamespaceContext implements NamespaceContext {
namespaceMap.putAll(namespaces);
}
+ @Override
public String getNamespaceURI(String arg0) {
return namespaceMap.get(arg0);
}
@@ -50,6 +51,7 @@ public class DSNamespaceContext implements NamespaceContext {
namespaceMap.put(prefix, namespace);
}
+ @Override
public String getPrefix(String arg0) {
for (String key : namespaceMap.keySet()) {
String value = namespaceMap.get(key);
@@ -60,6 +62,7 @@ public class DSNamespaceContext implements NamespaceContext {
return null;
}
+ @Override
public Iterator<String> getPrefixes(String arg0) {
return namespaceMap.keySet().iterator();
}
diff --git a/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/MockCanonicalizationMethod.java b/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/MockCanonicalizationMethod.java
index 290c2b82..39d92f57 100644
--- a/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/MockCanonicalizationMethod.java
+++ b/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/MockCanonicalizationMethod.java
@@ -24,7 +24,6 @@ import java.util.Set;
import org.apache.xml.security.c14n.CanonicalizationException;
import org.apache.xml.security.c14n.CanonicalizerSpi;
import org.apache.xml.security.c14n.implementations.Canonicalizer11_OmitComments;
-
import org.w3c.dom.Node;
public class MockCanonicalizationMethod extends CanonicalizerSpi {
@@ -36,32 +35,38 @@ public class MockCanonicalizationMethod extends CanonicalizerSpi {
_impl = new Canonicalizer11_OmitComments();
}
+ @Override
public void engineCanonicalizeSubTree(Node rootNode, OutputStream writer)
throws CanonicalizationException {
_impl.engineCanonicalizeSubTree(rootNode, writer);
}
+ @Override
public void engineCanonicalizeSubTree(Node rootNode, String inclusiveNamespaces, OutputStream writer)
throws CanonicalizationException {
_impl.engineCanonicalizeSubTree(rootNode, inclusiveNamespaces, writer);
}
+ @Override
public void engineCanonicalizeSubTree(Node rootNode, String inclusiveNamespaces,
boolean propagateDefaultNamespace, OutputStream writer)
throws CanonicalizationException {
_impl.engineCanonicalizeSubTree(rootNode, inclusiveNamespaces, propagateDefaultNamespace, writer);
}
+ @Override
public void engineCanonicalizeXPathNodeSet(Set<Node> xpathNodeSet, OutputStream writer)
throws CanonicalizationException {
_impl.engineCanonicalizeXPathNodeSet(xpathNodeSet, writer);
}
+ @Override
public void engineCanonicalizeXPathNodeSet(Set<Node> xpathNodeSet, String inclusiveNamespaces, OutputStream writer)
throws CanonicalizationException {
_impl.engineCanonicalizeXPathNodeSet(xpathNodeSet, inclusiveNamespaces, writer);
}
+ @Override
public String engineGetURI() {
return MOCK_CANONICALIZATION_METHOD;
}
diff --git a/src/test/java/org/apache/xml/security/test/dom/encryption/BobKeyResolver.java b/src/test/java/org/apache/xml/security/test/dom/encryption/BobKeyResolver.java
index 2fc7b03b..00bf4f60 100644
--- a/src/test/java/org/apache/xml/security/test/dom/encryption/BobKeyResolver.java
+++ b/src/test/java/org/apache/xml/security/test/dom/encryption/BobKeyResolver.java
@@ -18,10 +18,11 @@
*/
package org.apache.xml.security.test.dom.encryption;
-import java.security.cert.X509Certificate;
import java.nio.charset.StandardCharsets;
import java.security.PrivateKey;
import java.security.PublicKey;
+import java.security.cert.X509Certificate;
+
import javax.crypto.SecretKey;
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.DESedeKeySpec;
diff --git a/src/test/java/org/apache/xml/security/test/dom/encryption/SignedEncryptedTest.java b/src/test/java/org/apache/xml/security/test/dom/encryption/SignedEncryptedTest.java
index 53f07f6c..cc67857d 100644
--- a/src/test/java/org/apache/xml/security/test/dom/encryption/SignedEncryptedTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/encryption/SignedEncryptedTest.java
@@ -18,6 +18,23 @@
*/
package org.apache.xml.security.test.dom.encryption;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.nio.charset.StandardCharsets;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.util.UUID;
+
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+
import org.apache.xml.security.encryption.DocumentSerializer;
import org.apache.xml.security.encryption.TransformSerializer;
import org.apache.xml.security.encryption.XMLCipher;
@@ -31,22 +48,6 @@ import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import javax.crypto.KeyGenerator;
-import javax.crypto.SecretKey;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathFactory;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.lang.reflect.Field;
-import java.nio.charset.StandardCharsets;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.util.UUID;
-
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
diff --git a/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResolverDirectHTTPTest.java b/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResolverDirectHTTPTest.java
index ad0e2079..2b0d0fa5 100644
--- a/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResolverDirectHTTPTest.java
+++ b/src/test/java/org/apache/xml/security/test/dom/utils/resolver/ResolverDirectHTTPTest.java
@@ -18,6 +18,9 @@
*/
package org.apache.xml.security.test.dom.utils.resolver;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.xml.security.Init;
import org.apache.xml.security.test.dom.TestUtils;
import org.apache.xml.security.utils.resolver.ResourceResolverContext;
@@ -32,9 +35,6 @@ import org.w3c.dom.Document;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
-import java.util.HashMap;
-import java.util.Map;
-
public class ResolverDirectHTTPTest {
diff --git a/src/test/java/org/apache/xml/security/test/dom/xalan/FuncHere.java b/src/test/java/org/apache/xml/security/test/dom/xalan/FuncHere.java
index fee78555..1438b4f8 100644
--- a/src/test/java/org/apache/xml/security/test/dom/xalan/FuncHere.java
+++ b/src/test/java/org/apache/xml/security/test/dom/xalan/FuncHere.java
@@ -18,6 +18,8 @@
*/
package org.apache.xml.security.test.dom.xalan;
+import javax.xml.transform.TransformerException;
+
import org.apache.xml.dtm.DTM;
import org.apache.xml.security.utils.I18n;
import org.apache.xml.security.utils.XMLUtils;
@@ -30,8 +32,6 @@ import org.apache.xpath.res.XPATHErrorResources;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
-import javax.xml.transform.TransformerException;
-
/**
* The 'here()' function returns a node-set containing the attribute or
* processing instruction node or the parent element of the text node
@@ -67,6 +67,7 @@ public class FuncHere extends Function {
* @return the xobject
* @throws TransformerException
*/
+ @Override
public XObject execute(XPathContext xctxt) throws TransformerException {
Node xpathOwnerNode = (Node) xctxt.getOwnerObject();
@@ -139,6 +140,7 @@ public class FuncHere extends Function {
* @param vars
* @param globalsSize
*/
+ @Override
public void fixupVariables(@SuppressWarnings("rawtypes") java.util.Vector vars, int globalsSize) { //NOPMD
// do nothing
}
diff --git a/src/test/java/org/apache/xml/security/test/dom/xalan/TransformXPath.java b/src/test/java/org/apache/xml/security/test/dom/xalan/TransformXPath.java
index ae08270c..865a284e 100644
--- a/src/test/java/org/apache/xml/security/test/dom/xalan/TransformXPath.java
+++ b/src/test/java/org/apache/xml/security/test/dom/xalan/TransformXPath.java
@@ -22,6 +22,7 @@ import org.apache.xml.security.utils.XPathFactory;
public class TransformXPath extends org.apache.xml.security.transforms.implementations.TransformXPath {
+ @Override
protected XPathFactory getXPathFactory() {
return new XalanXPathFactory();
}
diff --git a/src/test/java/org/apache/xml/security/test/dom/xalan/TransformXPath2Filter.java b/src/test/java/org/apache/xml/security/test/dom/xalan/TransformXPath2Filter.java
index 768b5081..f54d4afe 100644
--- a/src/test/java/org/apache/xml/security/test/dom/xalan/TransformXPath2Filter.java
+++ b/src/test/java/org/apache/xml/security/test/dom/xalan/TransformXPath2Filter.java
@@ -27,6 +27,7 @@ import org.apache.xml.security.utils.XPathFactory;
*/
public class TransformXPath2Filter extends org.apache.xml.security.transforms.implementations.TransformXPath2Filter {
+ @Override
protected XPathFactory getXPathFactory() {
return new XalanXPathFactory();
}
diff --git a/src/test/java/org/apache/xml/security/test/dom/xalan/XalanXPathAPI.java b/src/test/java/org/apache/xml/security/test/dom/xalan/XalanXPathAPI.java
index f5fb9914..ed3f631c 100644
--- a/src/test/java/org/apache/xml/security/test/dom/xalan/XalanXPathAPI.java
+++ b/src/test/java/org/apache/xml/security/test/dom/xalan/XalanXPathAPI.java
@@ -18,6 +18,14 @@
*/
package org.apache.xml.security.test.dom.xalan;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+
+import javax.xml.transform.ErrorListener;
+import javax.xml.transform.SourceLocator;
+import javax.xml.transform.TransformerException;
+
import org.apache.xml.security.utils.XPathAPI;
import org.apache.xml.utils.PrefixResolver;
import org.apache.xml.utils.PrefixResolverDefault;
@@ -30,13 +38,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import javax.xml.transform.ErrorListener;
-import javax.xml.transform.SourceLocator;
-import javax.xml.transform.TransformerException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-
/**
* An implementation of XPathAPI using Xalan. This supports the "here()" function defined in the digital
* signature spec.
diff --git a/src/test/java/org/apache/xml/security/test/dom/xalan/XalanXPathFactory.java b/src/test/java/org/apache/xml/security/test/dom/xalan/XalanXPathFactory.java
index ea0aac6c..08a7b643 100644
--- a/src/test/java/org/apache/xml/security/test/dom/xalan/XalanXPathFactory.java
+++ b/src/test/java/org/apache/xml/security/test/dom/xalan/XalanXPathFactory.java
@@ -30,6 +30,7 @@ public class XalanXPathFactory extends XPathFactory {
/**
* Get a new XPathAPI instance
*/
+ @Override
public XPathAPI newXPathAPI() {
return new XalanXPathAPI();
}
diff --git a/src/test/java/org/apache/xml/security/test/javax/xml/crypto/KeySelectors.java b/src/test/java/org/apache/xml/security/test/javax/xml/crypto/KeySelectors.java
index f1b642ef..9d156027 100644
--- a/src/test/java/org/apache/xml/security/test/javax/xml/crypto/KeySelectors.java
+++ b/src/test/java/org/apache/xml/security/test/javax/xml/crypto/KeySelectors.java
@@ -21,14 +21,36 @@
*/
package org.apache.xml.security.test.javax.xml.crypto;
-import java.io.*;
-import java.security.*;
-import java.security.cert.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.security.Key;
+import java.security.KeyException;
+import java.security.Principal;
+import java.security.PublicKey;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509CRL;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
-import javax.xml.crypto.*;
-import javax.xml.crypto.dsig.keyinfo.*;
import javax.crypto.SecretKey;
+import javax.xml.crypto.AlgorithmMethod;
+import javax.xml.crypto.KeySelector;
+import javax.xml.crypto.KeySelectorException;
+import javax.xml.crypto.KeySelectorResult;
+import javax.xml.crypto.XMLCryptoContext;
+import javax.xml.crypto.XMLStructure;
+import javax.xml.crypto.dsig.keyinfo.KeyInfo;
+import javax.xml.crypto.dsig.keyinfo.KeyName;
+import javax.xml.crypto.dsig.keyinfo.KeyValue;
+import javax.xml.crypto.dsig.keyinfo.RetrievalMethod;
+import javax.xml.crypto.dsig.keyinfo.X509Data;
+import javax.xml.crypto.dsig.keyinfo.X509IssuerSerial;
/**
@@ -50,6 +72,7 @@ public class KeySelectors {
this.key = key;
}
+ @Override
public KeySelectorResult select(KeyInfo ki,
KeySelector.Purpose purpose,
AlgorithmMethod method,
@@ -62,14 +85,17 @@ public class KeySelectors {
return new SecretKey() {
private static final long serialVersionUID = 3457835482691931082L;
+ @Override
public String getFormat() {
return "RAW";
}
+ @Override
public String getAlgorithm() {
return "Secret key";
}
+ @Override
public byte[] getEncoded() {
return bytes.clone();
}
@@ -85,6 +111,7 @@ public class KeySelectors {
*/
public static class RawX509KeySelector extends KeySelector {
+ @Override
public KeySelectorResult select(KeyInfo keyInfo,
KeySelector.Purpose purpose,
AlgorithmMethod method,
@@ -136,6 +163,7 @@ public class KeySelectors {
* then the public key will be ignored.
*/
public static class KeyValueKeySelector extends KeySelector {
+ @Override
public KeySelectorResult select(KeyInfo keyInfo,
KeySelector.Purpose purpose,
AlgorithmMethod method,
@@ -252,6 +280,7 @@ public class KeySelectors {
return matchResult;
}
+ @Override
public KeySelectorResult select(KeyInfo keyInfo,
KeySelector.Purpose purpose,
AlgorithmMethod method,
@@ -390,6 +419,7 @@ public class KeySelectors {
SimpleKSResult(Key key) { this.key = key; }
+ @Override
public Key getKey() { return key; }
}
}
diff --git a/src/test/java/org/apache/xml/security/test/javax/xml/crypto/dsig/AppB.java b/src/test/java/org/apache/xml/security/test/javax/xml/crypto/dsig/AppB.java
index b649e3ca..614ac44c 100644
--- a/src/test/java/org/apache/xml/security/test/javax/xml/crypto/dsig/AppB.java
+++ b/src/test/java/org/apache/xml/security/test/javax/xml/crypto/dsig/AppB.java
@@ -20,6 +20,7 @@ package org.apache.xml.security.test.javax.xml.crypto.dsig;
import java.security.Provider;
import java.security.Security;
+
import javax.xml.crypto.dsig.Transform;
import javax.xml.crypto.dsig.TransformService;
diff --git a/src/test/java/org/apache/xml/security/test/javax/xml/crypto/dsig/TestUtils.java b/src/test/java/org/apache/xml/security/test/javax/xml/crypto/dsig/TestUtils.java
index 776e5c89..45aa0767 100644
--- a/src/test/java/org/apache/xml/security/test/javax/xml/crypto/dsig/TestUtils.java
+++ b/src/test/java/org/apache/xml/security/test/javax/xml/crypto/dsig/TestUtils.java
@@ -220,8 +220,11 @@ public class TestUtils {
return new SecretKey() {
private static final long serialVersionUID = 5629454124145851381L;
+ @Override
public String getFormat() { return "RAW"; }
+ @Override
public byte[] getEncoded() { return secret; }
+ @Override
public String getAlgorithm(){ return "SECRET"; }
};
}
@@ -290,6 +293,7 @@ public class TestUtils {
digest = null;
}
+ @Override
public byte[] getDigestValue() {
if (digest == null) {
byte[] inBytes = id.getBytes();
@@ -301,28 +305,35 @@ public class TestUtils {
return digest;
}
+ @Override
public byte[] getCalculatedDigestValue() {
return new byte[0];
}
+ @Override
public DigestMethod getDigestMethod() { return DIG_METHOD; }
+ @Override
public String getId() {
return id;
}
+ @Override
public String getType() {
return null;
}
+ @Override
public String getURI() {
return null;
}
+ @Override
public List<Transform> getTransforms() {
return Collections.emptyList();
}
+ @Override
public boolean validate(XMLValidateContext vCtx)
throws XMLSignatureException {
this.dis = new ByteArrayInputStream(id.getBytes());
@@ -330,10 +341,12 @@ public class TestUtils {
return status;
}
+ @Override
public Data getDereferencedData() {
return derefData;
}
+ @Override
public InputStream getDigestInputStream() {
return dis;
}
@@ -341,6 +354,7 @@ public class TestUtils {
public static class MyOwnXMLStructure implements XMLStructure {
+ @Override
public boolean isFeatureSupported(String feature)
throws NullPointerException {
if (feature == null) {
@@ -358,6 +372,7 @@ public class TestUtils {
data = in.clone();
}
+ @Override
public Data dereference(URIReference ref, XMLCryptoContext ctxt) {
return new OctetStreamData(new ByteArrayInputStream(data));
}
@@ -366,6 +381,7 @@ public class TestUtils {
return data;
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof OctetStreamURIDereferencer) {
return Arrays.equals
@@ -375,6 +391,7 @@ public class TestUtils {
}
}
+ @Override
public int hashCode() {
return 5678;
}
@@ -388,8 +405,10 @@ public class TestUtils {
data = node;
}
+ @Override
public Data dereference(URIReference ref, XMLCryptoContext ctxt) {
return new NodeSetData() {
+ @Override
public Iterator<Node> iterator() {
return Collections.singletonList(data).iterator();
}
diff --git a/src/test/java/org/apache/xml/security/test/stax/IVSplittingOutputStreamTest.java b/src/test/java/org/apache/xml/security/test/stax/IVSplittingOutputStreamTest.java
index 903adb4c..00f9b348 100644
--- a/src/test/java/org/apache/xml/security/test/stax/IVSplittingOutputStreamTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/IVSplittingOutputStreamTest.java
@@ -18,15 +18,15 @@
*/
package org.apache.xml.security.test.stax;
-import org.junit.jupiter.api.Test;
-
-import org.apache.xml.security.stax.impl.util.IVSplittingOutputStream;
-import org.apache.xml.security.stax.impl.util.ReplaceableOuputStream;
+import java.io.ByteArrayOutputStream;
import javax.crypto.Cipher;
import javax.crypto.KeyGenerator;
import javax.crypto.SecretKey;
-import java.io.ByteArrayOutputStream;
+
+import org.apache.xml.security.stax.impl.util.IVSplittingOutputStream;
+import org.apache.xml.security.stax.impl.util.ReplaceableOuputStream;
+import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/src/test/java/org/apache/xml/security/test/stax/InputProcessorChainTest.java b/src/test/java/org/apache/xml/security/test/stax/InputProcessorChainTest.java
index d2f3aff7..1b8497fa 100644
--- a/src/test/java/org/apache/xml/security/test/stax/InputProcessorChainTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/InputProcessorChainTest.java
@@ -18,21 +18,21 @@
*/
package org.apache.xml.security.test.stax;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.xml.stream.XMLStreamException;
+
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.config.Init;
-import org.apache.xml.security.stax.impl.InboundSecurityContextImpl;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
import org.apache.xml.security.stax.ext.InputProcessor;
import org.apache.xml.security.stax.ext.InputProcessorChain;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import org.apache.xml.security.stax.impl.InboundSecurityContextImpl;
import org.apache.xml.security.stax.impl.InputProcessorChainImpl;
-
-import javax.xml.stream.XMLStreamException;
-import java.util.HashSet;
-import java.util.Set;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/test/java/org/apache/xml/security/test/stax/OutputProcessorChainTest.java b/src/test/java/org/apache/xml/security/test/stax/OutputProcessorChainTest.java
index b76f1a9d..75fe60d2 100644
--- a/src/test/java/org/apache/xml/security/test/stax/OutputProcessorChainTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/OutputProcessorChainTest.java
@@ -33,7 +33,6 @@ import org.apache.xml.security.stax.ext.XMLSecurityProperties;
import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
import org.apache.xml.security.stax.impl.OutboundSecurityContextImpl;
import org.apache.xml.security.stax.impl.OutputProcessorChainImpl;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/apache/xml/security/test/stax/TrimmerOutputStreamTest.java b/src/test/java/org/apache/xml/security/test/stax/TrimmerOutputStreamTest.java
index d20cb3a9..8ad662cf 100644
--- a/src/test/java/org/apache/xml/security/test/stax/TrimmerOutputStreamTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/TrimmerOutputStreamTest.java
@@ -18,11 +18,10 @@
*/
package org.apache.xml.security.test.stax;
-import org.junit.jupiter.api.Test;
+import java.io.ByteArrayOutputStream;
import org.apache.xml.security.stax.impl.util.TrimmerOutputStream;
-
-import java.io.ByteArrayOutputStream;
+import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/test/java/org/apache/xml/security/test/stax/UncategorizedTest.java b/src/test/java/org/apache/xml/security/test/stax/UncategorizedTest.java
index 9d33220b..6ac3c62c 100644
--- a/src/test/java/org/apache/xml/security/test/stax/UncategorizedTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/UncategorizedTest.java
@@ -18,17 +18,17 @@
*/
package org.apache.xml.security.test.stax;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.xml.security.exceptions.XMLSecurityException;
-import org.junit.jupiter.api.Test;
import org.apache.xml.security.stax.config.Init;
import org.apache.xml.security.stax.ext.XMLSec;
import org.apache.xml.security.stax.ext.XMLSecurityConfigurationException;
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.ext.XMLSecurityProperties;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
+import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
diff --git a/src/test/java/org/apache/xml/security/test/stax/XMLSecEventTest.java b/src/test/java/org/apache/xml/security/test/stax/XMLSecEventTest.java
index 95ea00f8..391ec07b 100644
--- a/src/test/java/org/apache/xml/security/test/stax/XMLSecEventTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/XMLSecEventTest.java
@@ -45,7 +45,6 @@ import org.apache.xml.security.stax.impl.stax.XMLSecEntityDeclarationImpl;
import org.apache.xml.security.stax.impl.stax.XMLSecEntityReferenceImpl;
import org.apache.xml.security.stax.impl.stax.XMLSecNamespaceImpl;
import org.apache.xml.security.stax.impl.stax.XMLSecProcessingInstructionImpl;
-
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventReaderTest.java b/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventReaderTest.java
index 14453939..74662725 100644
--- a/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventReaderTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventReaderTest.java
@@ -18,18 +18,18 @@
*/
package org.apache.xml.security.test.stax;
-import org.junit.jupiter.api.Test;
-
-import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
-import org.apache.xml.security.stax.ext.stax.XMLSecEventFactory;
-import org.apache.xml.security.stax.impl.XMLSecurityEventReader;
+import java.util.ArrayDeque;
+import java.util.Deque;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.events.XMLEvent;
-import java.util.ArrayDeque;
-import java.util.Deque;
+
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import org.apache.xml.security.stax.ext.stax.XMLSecEventFactory;
+import org.apache.xml.security.stax.impl.XMLSecurityEventReader;
+import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
diff --git a/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventWriterTest.java b/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventWriterTest.java
index cb6f215e..0d0db192 100644
--- a/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventWriterTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/XMLSecurityEventWriterTest.java
@@ -18,20 +18,25 @@
*/
package org.apache.xml.security.test.stax;
+import java.io.StringWriter;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLEventWriter;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+import javax.xml.stream.events.XMLEvent;
+
import org.apache.xml.security.stax.ext.XMLSecurityConstants;
import org.apache.xml.security.stax.ext.stax.XMLSecEventFactory;
+import org.apache.xml.security.stax.impl.XMLSecurityEventWriter;
import org.apache.xml.security.stax.impl.stax.XMLSecEndElementImpl;
import org.apache.xml.security.stax.impl.stax.XMLSecNamespaceImpl;
import org.apache.xml.security.stax.impl.stax.XMLSecStartElementImpl;
import org.hamcrest.MatcherAssert;
import org.junit.jupiter.api.Test;
import org.xmlunit.matchers.CompareMatcher;
-import org.apache.xml.security.stax.impl.XMLSecurityEventWriter;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.*;
-import javax.xml.stream.events.XMLEvent;
-import java.io.StringWriter;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java b/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java
index dc5be4cf..b3dba2eb 100644
--- a/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/encryption/BaltimoreEncTest.java
@@ -50,7 +50,6 @@ import org.apache.xml.security.test.dom.DSNamespaceContext;
import org.apache.xml.security.test.stax.signature.TestSecurityEventListener;
import org.apache.xml.security.test.stax.utils.StAX2DOM;
import org.apache.xml.security.test.stax.utils.XMLSecEventAllocator;
-import org.apache.xml.security.utils.JavaUtils;
import org.apache.xml.security.utils.XMLUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java b/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java
index a5f74381..99adf76e 100644
--- a/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/encryption/DecryptionTest.java
@@ -72,7 +72,10 @@ import org.apache.xml.security.test.stax.utils.XMLSecEventAllocator;
import org.apache.xml.security.utils.XMLUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import org.w3c.dom.*;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
diff --git a/src/test/java/org/apache/xml/security/test/stax/performance/AbstractPerformanceTest.java b/src/test/java/org/apache/xml/security/test/stax/performance/AbstractPerformanceTest.java
index d446135c..eaa72ed9 100644
--- a/src/test/java/org/apache/xml/security/test/stax/performance/AbstractPerformanceTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/performance/AbstractPerformanceTest.java
@@ -39,9 +39,6 @@ import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
import org.apache.xml.security.encryption.XMLCipher;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.signature.XMLSignature;
@@ -55,9 +52,10 @@ import org.apache.xml.security.stax.securityToken.SecurityTokenConstants;
import org.apache.xml.security.test.stax.utils.XmlReaderToWriter;
import org.apache.xml.security.transforms.Transforms;
import org.apache.xml.security.utils.XMLUtils;
-
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
/**
*/
diff --git a/src/test/java/org/apache/xml/security/test/stax/performance/PerformanceMemoryTest.java b/src/test/java/org/apache/xml/security/test/stax/performance/PerformanceMemoryTest.java
index f3bfb7b3..239cc98a 100644
--- a/src/test/java/org/apache/xml/security/test/stax/performance/PerformanceMemoryTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/performance/PerformanceMemoryTest.java
@@ -18,15 +18,19 @@
*/
package org.apache.xml.security.test.stax.performance;
+import java.io.File;
+import java.io.FileWriter;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
-import java.io.File;
-import java.io.FileWriter;
-import java.util.*;
-
/**
*/
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
diff --git a/src/test/java/org/apache/xml/security/test/stax/performance/PerformanceTimingTest.java b/src/test/java/org/apache/xml/security/test/stax/performance/PerformanceTimingTest.java
index b7fc7237..0bccf9bb 100644
--- a/src/test/java/org/apache/xml/security/test/stax/performance/PerformanceTimingTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/performance/PerformanceTimingTest.java
@@ -18,17 +18,17 @@
*/
package org.apache.xml.security.test.stax.performance;
-import org.junit.jupiter.api.MethodOrderer;
-import org.junit.jupiter.api.Order;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestMethodOrder;
-
import java.io.File;
import java.io.FileWriter;
import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+
/**
*/
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
diff --git a/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreRemoteReferenceTest.java b/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreRemoteReferenceTest.java
index 69995196..005c4a68 100644
--- a/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreRemoteReferenceTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreRemoteReferenceTest.java
@@ -33,6 +33,7 @@ import java.security.spec.DSAPublicKeySpec;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.KeySpec;
import java.security.spec.RSAPublicKeySpec;
+
import javax.crypto.SecretKey;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
@@ -59,10 +60,8 @@ import org.apache.xml.security.test.stax.utils.HttpRequestRedirectorProxy;
import org.apache.xml.security.test.stax.utils.StAX2DOM;
import org.apache.xml.security.test.stax.utils.XMLSecEventAllocator;
import org.apache.xml.security.utils.XMLUtils;
-
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-
import org.w3c.dom.Document;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java b/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java
index 440cbb8f..f7136f4e 100644
--- a/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/signature/BaltimoreTest.java
@@ -31,6 +31,7 @@ import java.security.spec.DSAPublicKeySpec;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.KeySpec;
import java.security.spec.RSAPublicKeySpec;
+
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
import javax.xml.stream.XMLInputFactory;
@@ -57,10 +58,8 @@ import org.apache.xml.security.stax.securityToken.SecurityTokenConstants;
import org.apache.xml.security.test.stax.utils.StAX2DOM;
import org.apache.xml.security.test.stax.utils.XMLSecEventAllocator;
import org.apache.xml.security.utils.XMLUtils;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-
import org.w3c.dom.Document;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/test/java/org/apache/xml/security/test/stax/signature/IAIKRemoteReferenceTest.java b/src/test/java/org/apache/xml/security/test/stax/signature/IAIKRemoteReferenceTest.java
index 125bd7a4..8345d143 100644
--- a/src/test/java/org/apache/xml/security/test/stax/signature/IAIKRemoteReferenceTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/signature/IAIKRemoteReferenceTest.java
@@ -27,6 +27,7 @@ import java.security.spec.DSAPublicKeySpec;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.KeySpec;
import java.security.spec.RSAPublicKeySpec;
+
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.stream.StreamSource;
@@ -47,7 +48,6 @@ import org.apache.xml.security.stax.securityEvent.X509TokenSecurityEvent;
import org.apache.xml.security.stax.securityToken.SecurityTokenConstants;
import org.apache.xml.security.test.stax.utils.StAX2DOM;
import org.apache.xml.security.test.stax.utils.XMLSecEventAllocator;
-
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/apache/xml/security/test/stax/signature/PhaosExceptionForManifestTest.java b/src/test/java/org/apache/xml/security/test/stax/signature/PhaosExceptionForManifestTest.java
index 4a233b9f..48f47dba 100644
--- a/src/test/java/org/apache/xml/security/test/stax/signature/PhaosExceptionForManifestTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/signature/PhaosExceptionForManifestTest.java
@@ -22,6 +22,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
+
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
import javax.xml.stream.XMLInputFactory;
@@ -37,10 +38,8 @@ import org.apache.xml.security.stax.ext.XMLSecurityProperties;
import org.apache.xml.security.test.stax.utils.StAX2DOM;
import org.apache.xml.security.test.stax.utils.XMLSecEventAllocator;
import org.apache.xml.security.utils.XMLUtils;
-
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-
import org.w3c.dom.Document;
diff --git a/src/test/java/org/apache/xml/security/test/stax/signature/PhaosRemoteReferenceTest.java b/src/test/java/org/apache/xml/security/test/stax/signature/PhaosRemoteReferenceTest.java
index 02c90319..f3c25dcb 100644
--- a/src/test/java/org/apache/xml/security/test/stax/signature/PhaosRemoteReferenceTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/signature/PhaosRemoteReferenceTest.java
@@ -23,6 +23,7 @@ import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.net.Proxy;
import java.nio.charset.StandardCharsets;
+
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
import javax.xml.stream.XMLInputFactory;
@@ -40,10 +41,8 @@ import org.apache.xml.security.test.stax.utils.HttpRequestRedirectorProxy;
import org.apache.xml.security.test.stax.utils.StAX2DOM;
import org.apache.xml.security.test.stax.utils.XMLSecEventAllocator;
import org.apache.xml.security.utils.XMLUtils;
-
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-
import org.w3c.dom.Document;
diff --git a/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java b/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java
index 8e7a7fbf..3cffe6d7 100644
--- a/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/signature/PhaosTest.java
@@ -18,6 +18,20 @@
*/
package org.apache.xml.security.test.stax.signature;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.config.Init;
import org.apache.xml.security.stax.ext.InboundXMLSec;
@@ -30,20 +44,6 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
diff --git a/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationReferenceURIResolverTest.java b/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationReferenceURIResolverTest.java
index a8875089..e68d12b1 100644
--- a/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationReferenceURIResolverTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/signature/SignatureCreationReferenceURIResolverTest.java
@@ -29,8 +29,6 @@ import java.nio.charset.StandardCharsets;
import java.security.GeneralSecurityException;
import java.security.Key;
import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java b/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java
index 5c604c62..c322c495 100644
--- a/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java
@@ -32,10 +32,6 @@ import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
import org.apache.xml.security.stax.ext.OutboundXMLSec;
import org.apache.xml.security.stax.ext.SecurePart;
import org.apache.xml.security.stax.ext.XMLSec;
@@ -45,6 +41,9 @@ import org.apache.xml.security.test.stax.utils.XmlReaderToWriter;
import org.apache.xml.security.utils.XMLUtils;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationMaxRefTest.java b/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationMaxRefTest.java
index 7b475c0d..7e5e0375 100644
--- a/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationMaxRefTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationMaxRefTest.java
@@ -26,6 +26,7 @@ import java.security.KeyStore;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.List;
+
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.TransformerFactory;
@@ -40,7 +41,6 @@ import org.apache.xml.security.stax.ext.XMLSec;
import org.apache.xml.security.stax.ext.XMLSecurityProperties;
import org.apache.xml.security.test.stax.utils.StAX2DOM;
import org.apache.xml.security.utils.XMLUtils;
-
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
diff --git a/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationMaxTransTest.java b/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationMaxTransTest.java
index 13cc6812..215ff4ad 100644
--- a/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationMaxTransTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationMaxTransTest.java
@@ -26,6 +26,7 @@ import java.security.KeyStore;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.List;
+
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.TransformerFactory;
@@ -43,6 +44,7 @@ import org.apache.xml.security.utils.XMLUtils;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
+
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
diff --git a/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationReferenceURIResolverTest.java b/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationReferenceURIResolverTest.java
index f2f77b18..0435a31c 100644
--- a/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationReferenceURIResolverTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationReferenceURIResolverTest.java
@@ -27,6 +27,7 @@ import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
+
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
@@ -41,9 +42,7 @@ import org.apache.xml.security.stax.ext.XMLSecurityProperties;
import org.apache.xml.security.test.dom.DSNamespaceContext;
import org.apache.xml.security.test.stax.utils.StAX2DOM;
import org.apache.xml.security.utils.XMLUtils;
-
import org.junit.jupiter.api.Test;
-
import org.w3c.dom.Document;
import org.w3c.dom.Element;
diff --git a/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java b/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java
index a50417be..208ea581 100644
--- a/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/signature/SignatureVerificationTest.java
@@ -39,9 +39,6 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
import org.apache.xml.security.c14n.Canonicalizer;
import org.apache.xml.security.c14n.implementations.Canonicalizer20010315OmitComments;
import org.apache.xml.security.exceptions.XMLSecurityException;
@@ -66,8 +63,9 @@ import org.apache.xml.security.test.stax.utils.StAX2DOM;
import org.apache.xml.security.transforms.Transform;
import org.apache.xml.security.transforms.implementations.TransformC14N;
import org.apache.xml.security.utils.XMLUtils;
-
import org.junit.jupiter.api.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/src/test/java/org/apache/xml/security/test/stax/signature/TestSecurityEventListener.java b/src/test/java/org/apache/xml/security/test/stax/signature/TestSecurityEventListener.java
index 6b84f6f6..a69ef56d 100644
--- a/src/test/java/org/apache/xml/security/test/stax/signature/TestSecurityEventListener.java
+++ b/src/test/java/org/apache/xml/security/test/stax/signature/TestSecurityEventListener.java
@@ -18,9 +18,6 @@
*/
package org.apache.xml.security.test.stax.signature;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.util.ArrayList;
import java.util.List;
@@ -29,6 +26,9 @@ import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.xml.security.stax.securityEvent.SecurityEventConstants.Event;
import org.apache.xml.security.stax.securityEvent.SecurityEventListener;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class TestSecurityEventListener implements SecurityEventListener {
private List<SecurityEvent> events = new ArrayList<>();
diff --git a/src/test/java/org/apache/xml/security/test/stax/transformer/TransformBase64DecodeTest.java b/src/test/java/org/apache/xml/security/test/stax/transformer/TransformBase64DecodeTest.java
index 9ad7ca89..282ec2a8 100644
--- a/src/test/java/org/apache/xml/security/test/stax/transformer/TransformBase64DecodeTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/transformer/TransformBase64DecodeTest.java
@@ -18,6 +18,19 @@
*/
package org.apache.xml.security.test.stax.transformer;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLEventReader;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.config.Init;
import org.apache.xml.security.stax.ext.Transformer;
@@ -29,19 +42,6 @@ import org.apache.xml.security.test.stax.utils.XMLSecEventAllocator;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLEventReader;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
diff --git a/src/test/java/org/apache/xml/security/test/stax/transformer/TransformCanonicalizerTest.java b/src/test/java/org/apache/xml/security/test/stax/transformer/TransformCanonicalizerTest.java
index c02e4370..665dd85b 100644
--- a/src/test/java/org/apache/xml/security/test/stax/transformer/TransformCanonicalizerTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/transformer/TransformCanonicalizerTest.java
@@ -18,6 +18,16 @@
*/
package org.apache.xml.security.test.stax.transformer;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Map;
+
+import javax.xml.stream.XMLEventReader;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.config.Init;
import org.apache.xml.security.stax.ext.Transformer;
@@ -29,16 +39,6 @@ import org.apache.xml.security.test.stax.utils.XMLSecEventAllocator;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import javax.xml.stream.XMLEventReader;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
diff --git a/src/test/java/org/apache/xml/security/test/stax/transformer/TransformEnvelopedSignatureTest.java b/src/test/java/org/apache/xml/security/test/stax/transformer/TransformEnvelopedSignatureTest.java
index 9479f7fd..84a201fe 100644
--- a/src/test/java/org/apache/xml/security/test/stax/transformer/TransformEnvelopedSignatureTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/transformer/TransformEnvelopedSignatureTest.java
@@ -18,6 +18,18 @@
*/
package org.apache.xml.security.test.stax.transformer;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.stream.XMLEventReader;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.config.Init;
import org.apache.xml.security.stax.ext.Transformer;
@@ -29,18 +41,6 @@ import org.apache.xml.security.test.stax.utils.XMLSecEventAllocator;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import javax.xml.stream.XMLEventReader;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
diff --git a/src/test/java/org/apache/xml/security/test/stax/transformer/TransformIdentityTest.java b/src/test/java/org/apache/xml/security/test/stax/transformer/TransformIdentityTest.java
index e5bdd0b6..b6f4e9a6 100644
--- a/src/test/java/org/apache/xml/security/test/stax/transformer/TransformIdentityTest.java
+++ b/src/test/java/org/apache/xml/security/test/stax/transformer/TransformIdentityTest.java
@@ -18,6 +18,19 @@
*/
package org.apache.xml.security.test.stax.transformer;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLEventReader;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.config.Init;
import org.apache.xml.security.stax.ext.Transformer;
@@ -30,19 +43,6 @@ import org.apache.xml.security.test.stax.utils.XMLSecEventAllocator;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLEventReader;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
diff --git a/src/test/java/org/apache/xml/security/test/stax/utils/HttpRequestRedirectorProxy.java b/src/test/java/org/apache/xml/security/test/stax/utils/HttpRequestRedirectorProxy.java
index e46b7cc5..12830d1f 100644
--- a/src/test/java/org/apache/xml/security/test/stax/utils/HttpRequestRedirectorProxy.java
+++ b/src/test/java/org/apache/xml/security/test/stax/utils/HttpRequestRedirectorProxy.java
@@ -18,16 +18,6 @@
*/
package org.apache.xml.security.test.stax.utils;
-import org.apache.xml.security.stax.ext.XMLSecurityUtils;
-import org.eclipse.jetty.http.MimeTypes;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.net.InetAddress;
@@ -37,6 +27,17 @@ import java.net.ServerSocket;
import java.util.ArrayList;
import java.util.List;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.xml.security.stax.ext.XMLSecurityUtils;
+import org.eclipse.jetty.http.MimeTypes;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+
/**
*/
public class HttpRequestRedirectorProxy {
diff --git a/src/test/java/org/apache/xml/security/test/stax/utils/StAX2DOM.java b/src/test/java/org/apache/xml/security/test/stax/utils/StAX2DOM.java
index 7298b83b..8106845d 100644
--- a/src/test/java/org/apache/xml/security/test/stax/utils/StAX2DOM.java
+++ b/src/test/java/org/apache/xml/security/test/stax/utils/StAX2DOM.java
@@ -18,14 +18,18 @@
*/
package org.apache.xml.security.test.stax.utils;
-import org.w3c.dom.*;
-
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.stream.Location;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.UserDataHandler;
+
/**
*/
public class StAX2DOM {
diff --git a/src/test/java/org/apache/xml/security/test/stax/utils/XMLSecEventAllocator.java b/src/test/java/org/apache/xml/security/test/stax/utils/XMLSecEventAllocator.java
index cadc2508..d6429b1e 100644
--- a/src/test/java/org/apache/xml/security/test/stax/utils/XMLSecEventAllocator.java
+++ b/src/test/java/org/apache/xml/security/test/stax/utils/XMLSecEventAllocator.java
@@ -18,10 +18,6 @@
*/
package org.apache.xml.security.test.stax.utils;
-import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
-import org.apache.xml.security.stax.ext.stax.XMLSecEventFactory;
-import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
-
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -29,6 +25,10 @@ import javax.xml.stream.events.XMLEvent;
import javax.xml.stream.util.XMLEventAllocator;
import javax.xml.stream.util.XMLEventConsumer;
+import org.apache.xml.security.stax.ext.stax.XMLSecEvent;
+import org.apache.xml.security.stax.ext.stax.XMLSecEventFactory;
+import org.apache.xml.security.stax.ext.stax.XMLSecStartElement;
+
/**
* <p></p>
* An extended XMLEventAllocator to collect namespaces and C14N relevant attributes
diff --git a/src/test/java/org/apache/xml/security/test/stax/utils/XmlReaderToWriter.java b/src/test/java/org/apache/xml/security/test/stax/utils/XmlReaderToWriter.java
index 2e2ebe42..5b0e161b 100644
--- a/src/test/java/org/apache/xml/security/test/stax/utils/XmlReaderToWriter.java
+++ b/src/test/java/org/apache/xml/security/test/stax/utils/XmlReaderToWriter.java
@@ -19,7 +19,6 @@
package org.apache.xml.security.test.stax.utils;
import javax.xml.stream.XMLStreamConstants;
-
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
diff --git a/src/test/java/org/apache/xml/security/utils/DOMNamespaceContextTest.java b/src/test/java/org/apache/xml/security/utils/DOMNamespaceContextTest.java
index d2bf3d3a..11a529c1 100644
--- a/src/test/java/org/apache/xml/security/utils/DOMNamespaceContextTest.java
+++ b/src/test/java/org/apache/xml/security/utils/DOMNamespaceContextTest.java
@@ -18,6 +18,12 @@
*/
package org.apache.xml.security.utils;
+import java.io.IOException;
+import java.io.StringReader;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -26,11 +32,6 @@ import org.w3c.dom.traversal.TreeWalker;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.IOException;
-import java.io.StringReader;
-
import static javax.xml.XMLConstants.DEFAULT_NS_PREFIX;
import static javax.xml.XMLConstants.NULL_NS_URI;
import static javax.xml.XMLConstants.XMLNS_ATTRIBUTE;