[java-opensaml] 12/12: JPAR-85 - Checkstyle, check final variables
Tom Zeller
tzeller at dragonacea.biz
Thu Aug 10 18:26:01 EDT 2017
This is an automated email from the git hooks/post-receive script.
tzeller pushed a commit to branch master
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=0dd7e6b9656eeb781084b8eac470498cdd5137de
commit 0dd7e6b9656eeb781084b8eac470498cdd5137de
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Thu Aug 10 17:21:02 2017 -0500
JPAR-85 - Checkstyle, check final variables
---
.../config/impl/ApacheXMLSecurityInitializer.java | 2 +-
.../DefaultSecurityConfigurationBootstrap.java | 30 ++++-----
.../impl/JavaCryptoValidationInitializer.java | 7 +-
.../encryption/impl/AgreementMethodImpl.java | 2 +-
.../encryption/impl/AgreementMethodMarshaller.java | 2 +-
.../impl/AgreementMethodUnmarshaller.java | 4 +-
.../impl/AlgorithmIdentifierTypeImpl.java | 2 +-
.../impl/AlgorithmIdentifierTypeMarshaller.java | 2 +-
.../impl/AlgorithmIdentifierTypeUnmarshaller.java | 6 +-
.../xmlsec/encryption/impl/CipherDataImpl.java | 2 +-
.../encryption/impl/CipherDataUnmarshaller.java | 2 +-
.../encryption/impl/CipherReferenceImpl.java | 2 +-
.../encryption/impl/CipherReferenceMarshaller.java | 2 +-
.../impl/CipherReferenceUnmarshaller.java | 4 +-
.../xmlsec/encryption/impl/DHKeyValueImpl.java | 2 +-
.../encryption/impl/DHKeyValueUnmarshaller.java | 2 +-
.../xmlsec/encryption/impl/EncryptedKeyImpl.java | 2 +-
.../encryption/impl/EncryptedKeyMarshaller.java | 2 +-
.../encryption/impl/EncryptedKeyUnmarshaller.java | 4 +-
.../xmlsec/encryption/impl/EncryptedTypeImpl.java | 4 +-
.../encryption/impl/EncryptedTypeMarshaller.java | 2 +-
.../encryption/impl/EncryptedTypeUnmarshaller.java | 4 +-
.../encryption/impl/EncryptionMethodImpl.java | 2 +-
.../impl/EncryptionMethodMarshaller.java | 2 +-
.../impl/EncryptionMethodUnmarshaller.java | 4 +-
.../encryption/impl/EncryptionPropertiesImpl.java | 4 +-
.../impl/EncryptionPropertiesMarshaller.java | 2 +-
.../impl/EncryptionPropertiesUnmarshaller.java | 4 +-
.../encryption/impl/EncryptionPropertyImpl.java | 4 +-
.../impl/EncryptionPropertyMarshaller.java | 4 +-
.../impl/EncryptionPropertyUnmarshaller.java | 6 +-
.../xmlsec/encryption/impl/ReferenceListImpl.java | 2 +-
.../encryption/impl/ReferenceListUnmarshaller.java | 2 +-
.../xmlsec/encryption/impl/ReferenceTypeImpl.java | 2 +-
.../encryption/impl/ReferenceTypeMarshaller.java | 2 +-
.../encryption/impl/ReferenceTypeUnmarshaller.java | 4 +-
.../xmlsec/encryption/impl/TransformsImpl.java | 2 +-
.../encryption/impl/TransformsUnmarshaller.java | 2 +-
.../impl/AbstractSecurityParametersResolver.java | 22 ++++---
.../impl/BasicDecryptionParametersResolver.java | 10 +--
.../impl/BasicEncryptionParametersResolver.java | 76 +++++++++++-----------
.../BasicSignatureSigningParametersResolver.java | 39 +++++------
...BasicSignatureValidationParametersResolver.java | 7 +-
.../keyinfo/impl/BasicKeyInfoGeneratorFactory.java | 10 +--
.../BasicProviderKeyInfoCredentialResolver.java | 32 ++++-----
.../impl/LocalKeyInfoCredentialResolver.java | 18 ++---
.../keyinfo/impl/StaticKeyInfoGenerator.java | 2 +-
.../keyinfo/impl/X509KeyInfoGeneratorFactory.java | 42 ++++++------
.../impl/provider/DEREncodedKeyValueProvider.java | 10 +--
.../keyinfo/impl/provider/DSAKeyValueProvider.java | 10 +--
.../impl/provider/InlineX509DataProvider.java | 4 +-
.../impl/provider/KeyInfoReferenceProvider.java | 18 ++---
.../keyinfo/impl/provider/RSAKeyValueProvider.java | 10 +--
.../signature/impl/DEREncodedKeyValueImpl.java | 2 +-
.../impl/DEREncodedKeyValueMarshaller.java | 2 +-
.../impl/DEREncodedKeyValueUnmarshaller.java | 2 +-
.../xmlsec/signature/impl/DSAKeyValueImpl.java | 2 +-
.../signature/impl/DSAKeyValueUnmarshaller.java | 2 +-
.../xmlsec/signature/impl/DigestMethodImpl.java | 2 +-
.../signature/impl/DigestMethodMarshaller.java | 2 +-
.../signature/impl/DigestMethodUnmarshaller.java | 4 +-
.../xmlsec/signature/impl/ECKeyValueImpl.java | 4 +-
.../signature/impl/ECKeyValueMarshaller.java | 2 +-
.../signature/impl/ECKeyValueUnmarshaller.java | 4 +-
.../xmlsec/signature/impl/KeyInfoImpl.java | 4 +-
.../xmlsec/signature/impl/KeyInfoMarshaller.java | 2 +-
.../signature/impl/KeyInfoReferenceImpl.java | 2 +-
.../signature/impl/KeyInfoReferenceMarshaller.java | 2 +-
.../impl/KeyInfoReferenceUnmarshaller.java | 2 +-
.../xmlsec/signature/impl/KeyInfoUnmarshaller.java | 4 +-
.../xmlsec/signature/impl/KeyValueImpl.java | 2 +-
.../signature/impl/KeyValueUnmarshaller.java | 2 +-
.../signature/impl/NamedCurveMarshaller.java | 2 +-
.../signature/impl/NamedCurveUnmarshaller.java | 2 +-
.../xmlsec/signature/impl/PGPDataImpl.java | 2 +-
.../xmlsec/signature/impl/PGPDataUnmarshaller.java | 2 +-
.../xmlsec/signature/impl/RSAKeyValueImpl.java | 2 +-
.../signature/impl/RSAKeyValueUnmarshaller.java | 2 +-
.../xmlsec/signature/impl/RetrievalMethodImpl.java | 2 +-
.../signature/impl/RetrievalMethodMarshaller.java | 2 +-
.../impl/RetrievalMethodUnmarshaller.java | 4 +-
.../xmlsec/signature/impl/SPKIDataImpl.java | 2 +-
.../signature/impl/SPKIDataUnmarshaller.java | 2 +-
.../xmlsec/signature/impl/SignatureMarshaller.java | 17 ++---
.../signature/impl/SignatureUnmarshaller.java | 20 +++---
.../xmlsec/signature/impl/TransformImpl.java | 2 +-
.../xmlsec/signature/impl/TransformMarshaller.java | 2 +-
.../signature/impl/TransformUnmarshaller.java | 4 +-
.../xmlsec/signature/impl/TransformsImpl.java | 2 +-
.../signature/impl/TransformsUnmarshaller.java | 2 +-
.../xmlsec/signature/impl/X509DataImpl.java | 2 +-
.../signature/impl/X509DataUnmarshaller.java | 2 +-
.../signature/impl/X509DigestMarshaller.java | 2 +-
.../signature/impl/X509DigestUnmarshaller.java | 2 +-
.../signature/impl/X509IssuerSerialImpl.java | 2 +-
.../impl/X509IssuerSerialUnmarshaller.java | 2 +-
.../signature/impl/X509SerialNumberMarshaller.java | 2 +-
.../impl/X509SerialNumberUnmarshaller.java | 2 +-
.../support/impl/BaseSignatureTrustEngine.java | 14 ++--
.../impl/ExplicitKeySignatureTrustEngine.java | 4 +-
.../support/impl/PKIXSignatureTrustEngine.java | 2 +-
...heSantuarioSignatureValidationProviderImpl.java | 4 +-
.../ApacheSantuarioSignerProviderImpl.java | 2 +-
103 files changed, 310 insertions(+), 302 deletions(-)
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/impl/ApacheXMLSecurityInitializer.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/impl/ApacheXMLSecurityInitializer.java
index 580b0b2..fc191fa 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/impl/ApacheXMLSecurityInitializer.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/impl/ApacheXMLSecurityInitializer.java
@@ -33,7 +33,7 @@ public class ApacheXMLSecurityInitializer implements Initializer {
/** {@inheritDoc} */
public void init() throws InitializationException {
- String lineBreakPropName = "org.apache.xml.security.ignoreLineBreaks";
+ final String lineBreakPropName = "org.apache.xml.security.ignoreLineBreaks";
// Don't override if it was set explicitly
if (System.getProperty(lineBreakPropName) == null) {
System.setProperty(lineBreakPropName, "true");
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/impl/DefaultSecurityConfigurationBootstrap.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/impl/DefaultSecurityConfigurationBootstrap.java
index ac442c7..b21287f 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/impl/DefaultSecurityConfigurationBootstrap.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/impl/DefaultSecurityConfigurationBootstrap.java
@@ -64,7 +64,7 @@ public class DefaultSecurityConfigurationBootstrap {
* @return a new basic configuration with reasonable default values
*/
@Nonnull public static BasicEncryptionConfiguration buildDefaultEncryptionConfiguration() {
- BasicEncryptionConfiguration config = new BasicEncryptionConfiguration();
+ final BasicEncryptionConfiguration config = new BasicEncryptionConfiguration();
config.setBlacklistedAlgorithms(Collections.singletonList(
EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSA15
@@ -109,7 +109,7 @@ public class DefaultSecurityConfigurationBootstrap {
* @return a new basic configuration with reasonable default values
*/
@Nonnull public static BasicDecryptionConfiguration buildDefaultDecryptionConfiguration() {
- BasicDecryptionConfiguration config = new BasicDecryptionConfiguration();
+ final BasicDecryptionConfiguration config = new BasicDecryptionConfiguration();
config.setBlacklistedAlgorithms(Collections.singletonList(
EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSA15
@@ -126,7 +126,7 @@ public class DefaultSecurityConfigurationBootstrap {
* @return a new basic configuration with reasonable default values
*/
@Nonnull public static BasicSignatureSigningConfiguration buildDefaultSignatureSigningConfiguration() {
- BasicSignatureSigningConfiguration config = new BasicSignatureSigningConfiguration();
+ final BasicSignatureSigningConfiguration config = new BasicSignatureSigningConfiguration();
config.setBlacklistedAlgorithms(Arrays.asList(
SignatureConstants.ALGO_ID_DIGEST_NOT_RECOMMENDED_MD5,
@@ -181,7 +181,7 @@ public class DefaultSecurityConfigurationBootstrap {
* @return a new basic configuration with reasonable default values
*/
@Nonnull public static BasicSignatureValidationConfiguration buildDefaultSignatureValidationConfiguration() {
- BasicSignatureValidationConfiguration config = new BasicSignatureValidationConfiguration();
+ final BasicSignatureValidationConfiguration config = new BasicSignatureValidationConfiguration();
config.setBlacklistedAlgorithms(Arrays.asList(
SignatureConstants.ALGO_ID_DIGEST_NOT_RECOMMENDED_MD5,
@@ -198,7 +198,7 @@ public class DefaultSecurityConfigurationBootstrap {
* @return an EncryptedKey resolver instance
*/
protected static EncryptedKeyResolver buildBasicEncryptedKeyResolver() {
- List<EncryptedKeyResolver> resolverChain = new ArrayList<>();
+ final List<EncryptedKeyResolver> resolverChain = new ArrayList<>();
resolverChain.add(new InlineEncryptedKeyResolver());
resolverChain.add(new SimpleRetrievalMethodEncryptedKeyResolver());
resolverChain.add(new SimpleKeyInfoReferenceEncryptedKeyResolver());
@@ -213,13 +213,13 @@ public class DefaultSecurityConfigurationBootstrap {
*/
public static KeyInfoCredentialResolver buildBasicInlineKeyInfoCredentialResolver() {
// Basic resolver for inline info
- ArrayList<KeyInfoProvider> providers = new ArrayList<>();
+ final ArrayList<KeyInfoProvider> providers = new ArrayList<>();
providers.add( new RSAKeyValueProvider() );
providers.add( new DSAKeyValueProvider() );
providers.add( new DEREncodedKeyValueProvider() );
providers.add( new InlineX509DataProvider() );
- KeyInfoCredentialResolver resolver = new BasicProviderKeyInfoCredentialResolver(providers);
+ final KeyInfoCredentialResolver resolver = new BasicProviderKeyInfoCredentialResolver(providers);
return resolver;
}
@@ -250,19 +250,19 @@ public class DefaultSecurityConfigurationBootstrap {
* @return a named KeyInfo generator manager instance
*/
protected static NamedKeyInfoGeneratorManager buildSignatureKeyInfoGeneratorManager() {
- NamedKeyInfoGeneratorManager namedManager = new NamedKeyInfoGeneratorManager();
+ final NamedKeyInfoGeneratorManager namedManager = new NamedKeyInfoGeneratorManager();
namedManager.setUseDefaultManager(true);
- KeyInfoGeneratorManager defaultManager = namedManager.getDefaultManager();
+ final KeyInfoGeneratorManager defaultManager = namedManager.getDefaultManager();
// Generator for basic Credentials
- BasicKeyInfoGeneratorFactory basicFactory = new BasicKeyInfoGeneratorFactory();
+ final BasicKeyInfoGeneratorFactory basicFactory = new BasicKeyInfoGeneratorFactory();
basicFactory.setEmitPublicKeyValue(true);
basicFactory.setEmitPublicDEREncodedKeyValue(true);
basicFactory.setEmitKeyNames(true);
// Generator for X509Credentials
- X509KeyInfoGeneratorFactory x509Factory = new X509KeyInfoGeneratorFactory();
+ final X509KeyInfoGeneratorFactory x509Factory = new X509KeyInfoGeneratorFactory();
x509Factory.setEmitEntityCertificate(true);
x509Factory.setEmitEntityCertificateChain(true);
@@ -278,19 +278,19 @@ public class DefaultSecurityConfigurationBootstrap {
* @return a named KeyInfo generator manager instance
*/
public static NamedKeyInfoGeneratorManager buildBasicKeyInfoGeneratorManager() {
- NamedKeyInfoGeneratorManager namedManager = new NamedKeyInfoGeneratorManager();
+ final NamedKeyInfoGeneratorManager namedManager = new NamedKeyInfoGeneratorManager();
namedManager.setUseDefaultManager(true);
- KeyInfoGeneratorManager defaultManager = namedManager.getDefaultManager();
+ final KeyInfoGeneratorManager defaultManager = namedManager.getDefaultManager();
// Generator for basic Credentials
- BasicKeyInfoGeneratorFactory basicFactory = new BasicKeyInfoGeneratorFactory();
+ final BasicKeyInfoGeneratorFactory basicFactory = new BasicKeyInfoGeneratorFactory();
basicFactory.setEmitPublicKeyValue(true);
basicFactory.setEmitPublicDEREncodedKeyValue(true);
basicFactory.setEmitKeyNames(true);
// Generator for X509Credentials
- X509KeyInfoGeneratorFactory x509Factory = new X509KeyInfoGeneratorFactory();
+ final X509KeyInfoGeneratorFactory x509Factory = new X509KeyInfoGeneratorFactory();
x509Factory.setEmitEntityCertificate(true);
defaultManager.registerFactory(basicFactory);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/impl/JavaCryptoValidationInitializer.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/impl/JavaCryptoValidationInitializer.java
index d3ed8df..ebbde1f 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/impl/JavaCryptoValidationInitializer.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/config/impl/JavaCryptoValidationInitializer.java
@@ -61,7 +61,7 @@ public class JavaCryptoValidationInitializer implements Initializer {
// Some JREs are known to ship with no JCEs that support
// the ISO10126Padding padding scheme.
- String errorMsgAESPadding = "The JCE providers currently configured in the JVM do not support\n"
+ final String errorMsgAESPadding = "The JCE providers currently configured in the JVM do not support\n"
+ "required capabilities for XML Encryption, either the 'AES' cipher algorithm\n"
+ "or the 'ISO10126Padding' padding scheme\n";
@@ -78,8 +78,9 @@ public class JavaCryptoValidationInitializer implements Initializer {
}
if (!valid) {
- Properties props = ConfigurationService.getConfigurationProperties();
- String isFatal = (props != null) ? props.getProperty(CONFIG_PROPERTY_FAIL_IS_FATAL, "false") : "false";
+ final Properties props = ConfigurationService.getConfigurationProperties();
+ final String isFatal =
+ (props != null) ? props.getProperty(CONFIG_PROPERTY_FAIL_IS_FATAL, "false") : "false";
if ("true".equalsIgnoreCase(isFatal) || "1".equals(isFatal)) {
log.warn("Configuration indicates an invalid crypto configuration should be fatal");
throw new InitializationException(
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodImpl.java
index e228ef6..0ff0033 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodImpl.java
@@ -115,7 +115,7 @@ public class AgreementMethodImpl extends AbstractXMLObject implements AgreementM
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
if (kaNonce != null) {
children.add(kaNonce);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodMarshaller.java
index eb11cc7..3d576d0 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodMarshaller.java
@@ -29,7 +29,7 @@ public class AgreementMethodMarshaller extends AbstractXMLEncryptionMarshaller {
/** {@inheritDoc} */
protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
- AgreementMethod am = (AgreementMethod) xmlObject;
+ final AgreementMethod am = (AgreementMethod) xmlObject;
if (am.getAlgorithm() != null) {
domElement.setAttributeNS(null, AgreementMethod.ALGORITHM_ATTRIBUTE_NAME, am.getAlgorithm());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodUnmarshaller.java
index 32cea70..742d587 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AgreementMethodUnmarshaller.java
@@ -32,7 +32,7 @@ public class AgreementMethodUnmarshaller extends AbstractXMLEncryptionUnmarshall
/** {@inheritDoc} */
protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
- AgreementMethod am = (AgreementMethod) xmlObject;
+ final AgreementMethod am = (AgreementMethod) xmlObject;
if (attribute.getLocalName().equals(AgreementMethod.ALGORITHM_ATTRIBUTE_NAME)) {
am.setAlgorithm(attribute.getValue());
@@ -44,7 +44,7 @@ public class AgreementMethodUnmarshaller extends AbstractXMLEncryptionUnmarshall
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- AgreementMethod am = (AgreementMethod) parentXMLObject;
+ final AgreementMethod am = (AgreementMethod) parentXMLObject;
if (childXMLObject instanceof KANonce) {
am.setKANonce((KANonce) childXMLObject);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeImpl.java
index cdd14cf..836c604 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeImpl.java
@@ -72,7 +72,7 @@ public abstract class AlgorithmIdentifierTypeImpl extends AbstractXMLObject impl
/** {@inheritDoc} */
@Nullable public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
if (parameters != null) {
children.add(parameters);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeMarshaller.java
index a50d2a1..eda76b2 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeMarshaller.java
@@ -29,7 +29,7 @@ public class AlgorithmIdentifierTypeMarshaller extends AbstractXMLEncryptionMars
/** {@inheritDoc} */
protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
- AlgorithmIdentifierType algoIdType = (AlgorithmIdentifierType) xmlObject;
+ final AlgorithmIdentifierType algoIdType = (AlgorithmIdentifierType) xmlObject;
if (algoIdType.getAlgorithm() != null) {
domElement.setAttributeNS(null, AlgorithmIdentifierType.ALGORITHM_ATTRIB_NAME, algoIdType.getAlgorithm());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeUnmarshaller.java
index 4a22bae..9503fbb 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeUnmarshaller.java
@@ -33,7 +33,7 @@ public class AlgorithmIdentifierTypeUnmarshaller extends AbstractXMLEncryptionUn
/** {@inheritDoc} */
protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
- AlgorithmIdentifierType algoIdType = (AlgorithmIdentifierType) xmlObject;
+ final AlgorithmIdentifierType algoIdType = (AlgorithmIdentifierType) xmlObject;
if (attribute.getLocalName().equals(AlgorithmIdentifierType.ALGORITHM_ATTRIB_NAME)) {
algoIdType.setAlgorithm(attribute.getValue());
@@ -45,9 +45,9 @@ public class AlgorithmIdentifierTypeUnmarshaller extends AbstractXMLEncryptionUn
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- AlgorithmIdentifierType algoIdType = (AlgorithmIdentifierType) parentXMLObject;
+ final AlgorithmIdentifierType algoIdType = (AlgorithmIdentifierType) parentXMLObject;
- QName childQName = childXMLObject.getElementQName();
+ final QName childQName = childXMLObject.getElementQName();
if (childQName.getLocalPart().equals(Parameters.DEFAULT_ELEMENT_LOCAL_NAME)
&& childQName.getNamespaceURI().equals(EncryptionConstants.XMLENC11_NS)) {
algoIdType.setParameters(childXMLObject);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherDataImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherDataImpl.java
index 14f3169..4d29564 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherDataImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherDataImpl.java
@@ -71,7 +71,7 @@ public class CipherDataImpl extends AbstractXMLObject implements CipherData {
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
if (cipherValue != null) {
children.add(cipherValue);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherDataUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherDataUnmarshaller.java
index 3bc086b..8f7ff18 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherDataUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherDataUnmarshaller.java
@@ -31,7 +31,7 @@ public class CipherDataUnmarshaller extends AbstractXMLEncryptionUnmarshaller {
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- CipherData cipherData = (CipherData) parentXMLObject;
+ final CipherData cipherData = (CipherData) parentXMLObject;
if (childXMLObject instanceof CipherValue) {
cipherData.setCipherValue((CipherValue) childXMLObject);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceImpl.java
index ad1e1b4..1dc3114 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceImpl.java
@@ -71,7 +71,7 @@ public class CipherReferenceImpl extends AbstractXMLObject implements CipherRefe
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
if (transforms != null) {
children.add(transforms);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceMarshaller.java
index 085ab3a..af1695e 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceMarshaller.java
@@ -29,7 +29,7 @@ public class CipherReferenceMarshaller extends AbstractXMLEncryptionMarshaller {
/** {@inheritDoc} */
protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
- CipherReference cr = (CipherReference) xmlObject;
+ final CipherReference cr = (CipherReference) xmlObject;
if (cr.getURI() != null) {
domElement.setAttributeNS(null, CipherReference.URI_ATTRIB_NAME, cr.getURI());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceUnmarshaller.java
index 46e384f..531d849 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/CipherReferenceUnmarshaller.java
@@ -30,7 +30,7 @@ public class CipherReferenceUnmarshaller extends AbstractXMLEncryptionUnmarshall
/** {@inheritDoc} */
protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
- CipherReference cr = (CipherReference) xmlObject;
+ final CipherReference cr = (CipherReference) xmlObject;
if (attribute.getLocalName().equals(CipherReference.URI_ATTRIB_NAME)) {
cr.setURI(attribute.getValue());
@@ -42,7 +42,7 @@ public class CipherReferenceUnmarshaller extends AbstractXMLEncryptionUnmarshall
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- CipherReference cr = (CipherReference) parentXMLObject;
+ final CipherReference cr = (CipherReference) parentXMLObject;
if (childXMLObject instanceof Transforms) {
cr.setTransforms((Transforms) childXMLObject);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueImpl.java
index 1c8f8bb..97c386c 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueImpl.java
@@ -127,7 +127,7 @@ public class DHKeyValueImpl extends AbstractXMLObject implements DHKeyValue {
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
if (p != null) {
children.add(p);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueUnmarshaller.java
index e8d9da6..c8f8a3d 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/DHKeyValueUnmarshaller.java
@@ -35,7 +35,7 @@ public class DHKeyValueUnmarshaller extends AbstractXMLEncryptionUnmarshaller {
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- DHKeyValue keyValue = (DHKeyValue) parentXMLObject;
+ final DHKeyValue keyValue = (DHKeyValue) parentXMLObject;
if (childXMLObject instanceof P) {
keyValue.setP((P) childXMLObject);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyImpl.java
index 8640f7f..3c8fbbd 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyImpl.java
@@ -83,7 +83,7 @@ public class EncryptedKeyImpl extends EncryptedTypeImpl implements EncryptedKey
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
if (super.getOrderedChildren() != null) {
children.addAll(super.getOrderedChildren());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyMarshaller.java
index 00b3bda..cb09368 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyMarshaller.java
@@ -29,7 +29,7 @@ public class EncryptedKeyMarshaller extends EncryptedTypeMarshaller {
/** {@inheritDoc} */
protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
- EncryptedKey ek = (EncryptedKey) xmlObject;
+ final EncryptedKey ek = (EncryptedKey) xmlObject;
if (ek.getRecipient() != null) {
domElement.setAttributeNS(null, EncryptedKey.RECIPIENT_ATTRIB_NAME, ek.getRecipient());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyUnmarshaller.java
index b1cca44..58cff29 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedKeyUnmarshaller.java
@@ -31,7 +31,7 @@ public class EncryptedKeyUnmarshaller extends EncryptedTypeUnmarshaller {
/** {@inheritDoc} */
protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
- EncryptedKey ek = (EncryptedKey) xmlObject;
+ final EncryptedKey ek = (EncryptedKey) xmlObject;
if (attribute.getLocalName().equals(EncryptedKey.RECIPIENT_ATTRIB_NAME)) {
ek.setRecipient(attribute.getValue());
@@ -43,7 +43,7 @@ public class EncryptedKeyUnmarshaller extends EncryptedTypeUnmarshaller {
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- EncryptedKey ek = (EncryptedKey) parentXMLObject;
+ final EncryptedKey ek = (EncryptedKey) parentXMLObject;
if (childXMLObject instanceof ReferenceList) {
ek.setReferenceList((ReferenceList) childXMLObject);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeImpl.java
index d7c8a64..65f0659 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeImpl.java
@@ -77,7 +77,7 @@ public abstract class EncryptedTypeImpl extends AbstractXMLObject implements Enc
/** {@inheritDoc} */
public void setID(final String newID) {
- String oldID = this.id;
+ final String oldID = this.id;
this.id = prepareForAssignment(this.id, newID);
registerOwnID(oldID, this.id);
}
@@ -154,7 +154,7 @@ public abstract class EncryptedTypeImpl extends AbstractXMLObject implements Enc
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
if (encryptionMethod != null) {
children.add(encryptionMethod);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeMarshaller.java
index b9aeea1..0c2dc6e 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeMarshaller.java
@@ -29,7 +29,7 @@ public abstract class EncryptedTypeMarshaller extends AbstractXMLEncryptionMarsh
/** {@inheritDoc} */
protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
- EncryptedType et = (EncryptedType) xmlObject;
+ final EncryptedType et = (EncryptedType) xmlObject;
if (et.getID() != null) {
domElement.setAttributeNS(null, EncryptedType.ID_ATTRIB_NAME, et.getID());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeUnmarshaller.java
index 5467915..65bbe1e 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptedTypeUnmarshaller.java
@@ -34,7 +34,7 @@ public abstract class EncryptedTypeUnmarshaller extends AbstractXMLEncryptionUnm
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- EncryptedType et = (EncryptedType) parentXMLObject;
+ final EncryptedType et = (EncryptedType) parentXMLObject;
if (childXMLObject instanceof EncryptionMethod) {
et.setEncryptionMethod((EncryptionMethod) childXMLObject);
@@ -52,7 +52,7 @@ public abstract class EncryptedTypeUnmarshaller extends AbstractXMLEncryptionUnm
/** {@inheritDoc} */
protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
- EncryptedType et = (EncryptedType) xmlObject;
+ final EncryptedType et = (EncryptedType) xmlObject;
if (attribute.getLocalName().equals(EncryptedType.ID_ATTRIB_NAME)) {
et.setID(attribute.getValue());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodImpl.java
index 6c91db7..c0ff969 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodImpl.java
@@ -102,7 +102,7 @@ public class EncryptionMethodImpl extends AbstractXMLObject implements Encryptio
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
if (keySize != null) {
children.add(keySize);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodMarshaller.java
index 3423622..7f89296 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodMarshaller.java
@@ -29,7 +29,7 @@ public class EncryptionMethodMarshaller extends AbstractXMLEncryptionMarshaller
/** {@inheritDoc} */
protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
- EncryptionMethod em = (EncryptionMethod) xmlObject;
+ final EncryptionMethod em = (EncryptionMethod) xmlObject;
if (em.getAlgorithm() != null) {
domElement.setAttributeNS(null, EncryptionMethod.ALGORITHM_ATTRIB_NAME, em.getAlgorithm());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodUnmarshaller.java
index 3ac4999..30799e6 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionMethodUnmarshaller.java
@@ -31,7 +31,7 @@ public class EncryptionMethodUnmarshaller extends AbstractXMLEncryptionUnmarshal
/** {@inheritDoc} */
protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
- EncryptionMethod em = (EncryptionMethod) xmlObject;
+ final EncryptionMethod em = (EncryptionMethod) xmlObject;
if (attribute.getLocalName().equals(EncryptionMethod.ALGORITHM_ATTRIB_NAME)) {
em.setAlgorithm(attribute.getValue());
@@ -43,7 +43,7 @@ public class EncryptionMethodUnmarshaller extends AbstractXMLEncryptionUnmarshal
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- EncryptionMethod em = (EncryptionMethod) parentXMLObject;
+ final EncryptionMethod em = (EncryptionMethod) parentXMLObject;
if (childXMLObject instanceof KeySize) {
em.setKeySize((KeySize) childXMLObject);
} else if (childXMLObject instanceof OAEPparams) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesImpl.java
index 6ce68e8..d19dc82 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesImpl.java
@@ -58,7 +58,7 @@ public class EncryptionPropertiesImpl extends AbstractXMLObject implements Encry
/** {@inheritDoc} */
public void setID(final String newID) {
- String oldID = this.id;
+ final String oldID = this.id;
this.id = prepareForAssignment(this.id, newID);
registerOwnID(oldID, this.id);
}
@@ -70,7 +70,7 @@ public class EncryptionPropertiesImpl extends AbstractXMLObject implements Encry
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
children.addAll((List<XMLObject>) encryptionProperties);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesMarshaller.java
index 68be3f7..97d5629 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesMarshaller.java
@@ -29,7 +29,7 @@ public class EncryptionPropertiesMarshaller extends AbstractXMLEncryptionMarshal
/** {@inheritDoc} */
protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
- EncryptionProperties ep = (EncryptionProperties) xmlObject;
+ final EncryptionProperties ep = (EncryptionProperties) xmlObject;
if (ep.getID() != null) {
domElement.setAttributeNS(null, EncryptionProperties.ID_ATTRIB_NAME, ep.getID());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesUnmarshaller.java
index 3c8f14d..4d3a359 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertiesUnmarshaller.java
@@ -30,7 +30,7 @@ public class EncryptionPropertiesUnmarshaller extends AbstractXMLEncryptionUnmar
/** {@inheritDoc} */
protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
- EncryptionProperties ep = (EncryptionProperties) xmlObject;
+ final EncryptionProperties ep = (EncryptionProperties) xmlObject;
if (attribute.getLocalName().equals(EncryptionProperties.ID_ATTRIB_NAME)) {
ep.setID(attribute.getValue());
@@ -43,7 +43,7 @@ public class EncryptionPropertiesUnmarshaller extends AbstractXMLEncryptionUnmar
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- EncryptionProperties ep = (EncryptionProperties) parentXMLObject;
+ final EncryptionProperties ep = (EncryptionProperties) parentXMLObject;
if (childXMLObject instanceof EncryptionProperty) {
ep.getEncryptionProperties().add((EncryptionProperty) childXMLObject);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyImpl.java
index 10b26ed..79dc088 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyImpl.java
@@ -77,7 +77,7 @@ public class EncryptionPropertyImpl extends AbstractXMLObject implements
/** {@inheritDoc} */
public void setID(final String newID) {
- String oldID = this.id;
+ final String oldID = this.id;
this.id = prepareForAssignment(this.id, newID);
registerOwnID(oldID, this.id);
}
@@ -98,7 +98,7 @@ public class EncryptionPropertyImpl extends AbstractXMLObject implements
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
children.addAll((List<XMLObject>) unknownChildren);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyMarshaller.java
index 4656ee0..fbd1aeb 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyMarshaller.java
@@ -37,7 +37,7 @@ public class EncryptionPropertyMarshaller extends AbstractXMLEncryptionMarshalle
/** {@inheritDoc} */
protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
- EncryptionProperty ep = (EncryptionProperty) xmlObject;
+ final EncryptionProperty ep = (EncryptionProperty) xmlObject;
if (ep.getID() != null) {
domElement.setAttributeNS(null, EncryptionProperty.ID_ATTRIB_NAME, ep.getID());
@@ -48,7 +48,7 @@ public class EncryptionPropertyMarshaller extends AbstractXMLEncryptionMarshalle
}
Attr attribute;
- for (Entry<QName, String> entry : ep.getUnknownAttributes().entrySet()) {
+ for (final Entry<QName, String> entry : ep.getUnknownAttributes().entrySet()) {
attribute = AttributeSupport.constructAttribute(domElement.getOwnerDocument(), entry.getKey());
attribute.setValue(entry.getValue());
domElement.setAttributeNodeNS(attribute);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyUnmarshaller.java
index d289868..05ccb0b 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/EncryptionPropertyUnmarshaller.java
@@ -33,7 +33,7 @@ public class EncryptionPropertyUnmarshaller extends AbstractXMLEncryptionUnmarsh
/** {@inheritDoc} */
protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
- EncryptionProperty ep = (EncryptionProperty) xmlObject;
+ final EncryptionProperty ep = (EncryptionProperty) xmlObject;
if (attribute.getLocalName().equals(EncryptionProperty.ID_ATTRIB_NAME)) {
ep.setID(attribute.getValue());
@@ -41,7 +41,7 @@ public class EncryptionPropertyUnmarshaller extends AbstractXMLEncryptionUnmarsh
} else if (attribute.getLocalName().equals(EncryptionProperty.TARGET_ATTRIB_NAME)) {
ep.setTarget(attribute.getValue());
} else {
- QName attributeName = QNameSupport.getNodeQName(attribute);
+ final QName attributeName = QNameSupport.getNodeQName(attribute);
if (attribute.isId()) {
ep.getUnknownAttributes().registerID(attributeName);
}
@@ -52,7 +52,7 @@ public class EncryptionPropertyUnmarshaller extends AbstractXMLEncryptionUnmarsh
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- EncryptionProperty ep = (EncryptionProperty) parentXMLObject;
+ final EncryptionProperty ep = (EncryptionProperty) parentXMLObject;
// <any> content model
ep.getUnknownXMLObjects().add(childXMLObject);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceListImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceListImpl.java
index 63e6dc6..923eb93 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceListImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceListImpl.java
@@ -67,7 +67,7 @@ public class ReferenceListImpl extends AbstractXMLObject implements ReferenceLis
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
children.addAll((List<XMLObject>) indexedChildren);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceListUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceListUnmarshaller.java
index 340e0ab..1924e77 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceListUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceListUnmarshaller.java
@@ -31,7 +31,7 @@ public class ReferenceListUnmarshaller extends AbstractXMLEncryptionUnmarshaller
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- ReferenceList rl = (ReferenceList) parentXMLObject;
+ final ReferenceList rl = (ReferenceList) parentXMLObject;
if (childXMLObject instanceof DataReference) {
rl.getReferences().add((DataReference) childXMLObject);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeImpl.java
index 17369d9..3e69042 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeImpl.java
@@ -74,7 +74,7 @@ public class ReferenceTypeImpl extends AbstractXMLObject implements ReferenceTyp
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
children.addAll(xmlChildren);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeMarshaller.java
index c2cefe7..fb8883f 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeMarshaller.java
@@ -29,7 +29,7 @@ public class ReferenceTypeMarshaller extends AbstractXMLEncryptionMarshaller {
/** {@inheritDoc} */
protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
- ReferenceType rt = (ReferenceType) xmlObject;
+ final ReferenceType rt = (ReferenceType) xmlObject;
if (rt.getURI() != null) {
domElement.setAttributeNS(null, ReferenceType.URI_ATTRIB_NAME, rt.getURI());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeUnmarshaller.java
index cb948d0..188df14 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/ReferenceTypeUnmarshaller.java
@@ -29,7 +29,7 @@ public class ReferenceTypeUnmarshaller extends AbstractXMLEncryptionUnmarshaller
/** {@inheritDoc} */
protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
- ReferenceType rt = (ReferenceType) xmlObject;
+ final ReferenceType rt = (ReferenceType) xmlObject;
if (attribute.getLocalName().equals(ReferenceType.URI_ATTRIB_NAME)) {
rt.setURI(attribute.getValue());
@@ -41,7 +41,7 @@ public class ReferenceTypeUnmarshaller extends AbstractXMLEncryptionUnmarshaller
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- ReferenceType rt = (ReferenceType) parentXMLObject;
+ final ReferenceType rt = (ReferenceType) parentXMLObject;
rt.getUnknownXMLObjects().add(childXMLObject);
}
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/TransformsImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/TransformsImpl.java
index 520d354..f54b9c3 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/TransformsImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/TransformsImpl.java
@@ -54,7 +54,7 @@ public class TransformsImpl extends AbstractXMLObject implements Transforms {
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
children.addAll((List<Transform>) transforms);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/TransformsUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/TransformsUnmarshaller.java
index 1c17755..7160106 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/TransformsUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/TransformsUnmarshaller.java
@@ -30,7 +30,7 @@ public class TransformsUnmarshaller extends AbstractXMLEncryptionUnmarshaller {
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- Transforms transforms = (Transforms) parentXMLObject;
+ final Transforms transforms = (Transforms) parentXMLObject;
if (childXMLObject instanceof Transform) {
transforms.getTransforms().add((Transform) childXMLObject);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolver.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolver.java
index 89f71f1..86cf444 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolver.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/AbstractSecurityParametersResolver.java
@@ -100,10 +100,10 @@ public abstract class AbstractSecurityParametersResolver<ProductType>
@Nonnull final CriteriaSet criteria,
@Nonnull @NonnullElements @NotEmpty final List<? extends WhitelistBlacklistConfiguration> configs) {
- Collection<String> whitelist = resolveEffectiveWhitelist(criteria, configs);
+ final Collection<String> whitelist = resolveEffectiveWhitelist(criteria, configs);
log.trace("Resolved effective whitelist: {}", whitelist);
- Collection<String> blacklist = resolveEffectiveBlacklist(criteria, configs);
+ final Collection<String> blacklist = resolveEffectiveBlacklist(criteria, configs);
log.trace("Resolved effective blacklist: {}", blacklist);
if (whitelist.isEmpty() && blacklist.isEmpty()) {
@@ -123,7 +123,8 @@ public abstract class AbstractSecurityParametersResolver<ProductType>
return;
}
- WhitelistBlacklistConfiguration.Precedence precedence = resolveWhitelistBlacklistPrecedence(criteria, configs);
+ final WhitelistBlacklistConfiguration.Precedence precedence =
+ resolveWhitelistBlacklistPrecedence(criteria, configs);
log.trace("Resolved effective precedence: {}", precedence);
switch(precedence) {
case WHITELIST:
@@ -153,10 +154,10 @@ public abstract class AbstractSecurityParametersResolver<ProductType>
@Nonnull protected Predicate<String> resolveWhitelistBlacklistPredicate(@Nonnull final CriteriaSet criteria,
@Nonnull @NonnullElements @NotEmpty final List<? extends WhitelistBlacklistConfiguration> configs) {
- Collection<String> whitelist = resolveEffectiveWhitelist(criteria, configs);
+ final Collection<String> whitelist = resolveEffectiveWhitelist(criteria, configs);
log.trace("Resolved effective whitelist: {}", whitelist);
- Collection<String> blacklist = resolveEffectiveBlacklist(criteria, configs);
+ final Collection<String> blacklist = resolveEffectiveBlacklist(criteria, configs);
log.trace("Resolved effective blacklist: {}", blacklist);
if (whitelist.isEmpty() && blacklist.isEmpty()) {
@@ -174,7 +175,8 @@ public abstract class AbstractSecurityParametersResolver<ProductType>
return new WhitelistPredicate(whitelist);
}
- WhitelistBlacklistConfiguration.Precedence precedence = resolveWhitelistBlacklistPrecedence(criteria, configs);
+ final WhitelistBlacklistConfiguration.Precedence precedence =
+ resolveWhitelistBlacklistPrecedence(criteria, configs);
log.trace("Resolved effective precedence: {}", precedence);
switch(precedence) {
case WHITELIST:
@@ -201,8 +203,8 @@ public abstract class AbstractSecurityParametersResolver<ProductType>
@Nonnull protected Collection<String> resolveEffectiveBlacklist(@Nonnull final CriteriaSet criteria,
@Nonnull @NonnullElements @NotEmpty final List<? extends WhitelistBlacklistConfiguration> configs) {
- LazySet<String> accumulator = new LazySet<>();
- for (WhitelistBlacklistConfiguration config : configs) {
+ final LazySet<String> accumulator = new LazySet<>();
+ for (final WhitelistBlacklistConfiguration config : configs) {
accumulator.addAll(config.getBlacklistedAlgorithms());
if (!config.isBlacklistMerge()) {
break;
@@ -222,8 +224,8 @@ public abstract class AbstractSecurityParametersResolver<ProductType>
@Nonnull protected Collection<String> resolveEffectiveWhitelist(@Nonnull final CriteriaSet criteria,
@Nonnull @NonnullElements @NotEmpty final List<? extends WhitelistBlacklistConfiguration> configs) {
- LazySet<String> accumulator = new LazySet<>();
- for (WhitelistBlacklistConfiguration config : configs) {
+ final LazySet<String> accumulator = new LazySet<>();
+ for (final WhitelistBlacklistConfiguration config : configs) {
accumulator.addAll(config.getWhitelistedAlgorithms());
if (!config.isWhitelistMerge()) {
break;
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicDecryptionParametersResolver.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicDecryptionParametersResolver.java
index 7161a4e..67fbcfd 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicDecryptionParametersResolver.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicDecryptionParametersResolver.java
@@ -55,7 +55,7 @@ public class BasicDecryptionParametersResolver extends AbstractSecurityParameter
@Nonnull public Iterable<DecryptionParameters> resolve(@Nonnull final CriteriaSet criteria)
throws ResolverException {
- DecryptionParameters params = resolveSingle(criteria);
+ final DecryptionParameters params = resolveSingle(criteria);
if (params != null) {
return Collections.singletonList(params);
} else {
@@ -69,7 +69,7 @@ public class BasicDecryptionParametersResolver extends AbstractSecurityParameter
Constraint.isNotNull(criteria.get(DecryptionConfigurationCriterion.class),
"Resolver requires an instance of DecryptionConfigurationCriterion");
- DecryptionParameters params = new DecryptionParameters();
+ final DecryptionParameters params = new DecryptionParameters();
resolveAndPopulateWhiteAndBlacklists(params, criteria,
criteria.get(DecryptionConfigurationCriterion.class).getConfigurations());
@@ -114,7 +114,7 @@ public class BasicDecryptionParametersResolver extends AbstractSecurityParameter
*/
@Nullable protected EncryptedKeyResolver resolveEncryptedKeyResolver(@Nonnull final CriteriaSet criteria) {
- for (DecryptionConfiguration config : criteria.get(DecryptionConfigurationCriterion.class)
+ for (final DecryptionConfiguration config : criteria.get(DecryptionConfigurationCriterion.class)
.getConfigurations()) {
if (config.getEncryptedKeyResolver() != null) {
return config.getEncryptedKeyResolver();
@@ -133,7 +133,7 @@ public class BasicDecryptionParametersResolver extends AbstractSecurityParameter
@Nullable protected KeyInfoCredentialResolver resolveKEKKeyInfoCredentialResolver(
@Nonnull final CriteriaSet criteria) {
- for (DecryptionConfiguration config : criteria.get(DecryptionConfigurationCriterion.class)
+ for (final DecryptionConfiguration config : criteria.get(DecryptionConfigurationCriterion.class)
.getConfigurations()) {
if (config.getKEKKeyInfoCredentialResolver() != null) {
return config.getKEKKeyInfoCredentialResolver();
@@ -152,7 +152,7 @@ public class BasicDecryptionParametersResolver extends AbstractSecurityParameter
@Nullable protected KeyInfoCredentialResolver resolveDataKeyInfoCredentialResolver(
@Nonnull final CriteriaSet criteria) {
- for (DecryptionConfiguration config : criteria.get(DecryptionConfigurationCriterion.class)
+ for (final DecryptionConfiguration config : criteria.get(DecryptionConfigurationCriterion.class)
.getConfigurations()) {
if (config.getDataKeyInfoCredentialResolver() != null) {
return config.getDataKeyInfoCredentialResolver();
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java
index e08a1a6..1fed081 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicEncryptionParametersResolver.java
@@ -127,7 +127,7 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
@Override
@Nonnull public Iterable<EncryptionParameters> resolve(@Nonnull final CriteriaSet criteria)
throws ResolverException {
- EncryptionParameters params = resolveSingle(criteria);
+ final EncryptionParameters params = resolveSingle(criteria);
if (params != null) {
return Collections.singletonList(params);
} else {
@@ -142,9 +142,9 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
Constraint.isNotNull(criteria.get(EncryptionConfigurationCriterion.class),
"Resolver requires an instance of EncryptionConfigurationCriterion");
- Predicate<String> whitelistBlacklistPredicate = getWhitelistBlacklistPredicate(criteria);
+ final Predicate<String> whitelistBlacklistPredicate = getWhitelistBlacklistPredicate(criteria);
- EncryptionParameters params = new EncryptionParameters();
+ final EncryptionParameters params = new EncryptionParameters();
resolveAndPopulateCredentialsAndAlgorithms(params, criteria, whitelistBlacklistPredicate);
@@ -181,7 +181,8 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
if (log.isDebugEnabled()) {
log.debug("Resolved EncryptionParameters:");
- Key keyTransportKey = CredentialSupport.extractEncryptionKey(params.getKeyTransportEncryptionCredential());
+ final Key keyTransportKey =
+ CredentialSupport.extractEncryptionKey(params.getKeyTransportEncryptionCredential());
if (keyTransportKey != null) {
log.debug("\tKey transport credential with key algorithm: {}", keyTransportKey.getAlgorithm());
} else {
@@ -201,7 +202,7 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
log.debug("\tKey transport KeyInfoGenerator: {}",
params.getKeyTransportKeyInfoGenerator() != null ? "present" : "null");
- Key dataKey = CredentialSupport.extractEncryptionKey(params.getDataEncryptionCredential());
+ final Key dataKey = CredentialSupport.extractEncryptionKey(params.getDataEncryptionCredential());
if (dataKey != null) {
log.debug("\tData encryption credential with key algorithm: {}", dataKey.getAlgorithm());
} else {
@@ -245,7 +246,7 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
protected boolean validate(@Nonnull final EncryptionParameters params, final boolean encryptionOptional) {
if (params.getKeyTransportEncryptionCredential() == null
&& params.getDataEncryptionCredential() == null) {
- String msg = "Validation failure: Failed to resolve both a data and a key encryption credential";
+ final String msg = "Validation failure: Failed to resolve both a data and a key encryption credential";
if (encryptionOptional) {
log.debug(msg);
} else {
@@ -255,7 +256,7 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
}
if (params.getKeyTransportEncryptionCredential() != null
&& params.getKeyTransportEncryptionAlgorithm() == null) {
- String msg = "Validation failure: Unable to resolve key encryption algorithm URI for credential";
+ final String msg = "Validation failure: Unable to resolve key encryption algorithm URI for credential";
if (encryptionOptional) {
log.debug(msg);
} else {
@@ -265,7 +266,7 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
}
if (params.getDataEncryptionCredential() != null
&& params.getDataEncryptionAlgorithm() == null) {
- String msg = "Validation failure: Unable to resolve data encryption algorithm URI for credential";
+ final String msg = "Validation failure: Unable to resolve data encryption algorithm URI for credential";
if (encryptionOptional) {
log.debug(msg);
} else {
@@ -276,7 +277,7 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
if (params.getKeyTransportEncryptionCredential() != null
&& params.getDataEncryptionCredential() == null
&& params.getDataEncryptionAlgorithm() == null) {
- String msg = "Validation failure: Unable to resolve a data encryption algorithm URI "
+ final String msg = "Validation failure: Unable to resolve a data encryption algorithm URI "
+ "for auto-generation of data encryption key";
if (encryptionOptional) {
log.debug(msg);
@@ -314,12 +315,13 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
@Nonnull final CriteriaSet criteria, @Nonnull final Predicate<String> whitelistBlacklistPredicate) {
// Pre-resolve these for efficiency
- List<Credential> keyTransportCredentials = getEffectiveKeyTransportCredentials(criteria);
- List<String> keyTransportAlgorithms = getEffectiveKeyTransportAlgorithms(criteria, whitelistBlacklistPredicate);
+ final List<Credential> keyTransportCredentials = getEffectiveKeyTransportCredentials(criteria);
+ final List<String> keyTransportAlgorithms =
+ getEffectiveKeyTransportAlgorithms(criteria, whitelistBlacklistPredicate);
log.trace("Resolved effective key transport algorithms: {}", keyTransportAlgorithms);
- List<Credential> dataEncryptionCredentials = getEffectiveDataEncryptionCredentials(criteria);
- List<String> dataEncryptionAlgorithms = getEffectiveDataEncryptionAlgorithms(criteria,
+ final List<Credential> dataEncryptionCredentials = getEffectiveDataEncryptionCredentials(criteria);
+ final List<String> dataEncryptionAlgorithms = getEffectiveDataEncryptionAlgorithms(criteria,
whitelistBlacklistPredicate);
log.trace("Resolved effective data encryption algorithms: {}", dataEncryptionAlgorithms);
@@ -328,8 +330,8 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
// This is probably the most typical case
params.setDataEncryptionAlgorithm(resolveDataEncryptionAlgorithm(null, dataEncryptionAlgorithms));
} else {
- for (Credential dataEncryptionCredential : dataEncryptionCredentials) {
- String dataEncryptionAlgorithm = resolveDataEncryptionAlgorithm(dataEncryptionCredential,
+ for (final Credential dataEncryptionCredential : dataEncryptionCredentials) {
+ final String dataEncryptionAlgorithm = resolveDataEncryptionAlgorithm(dataEncryptionCredential,
dataEncryptionAlgorithms);
if (dataEncryptionAlgorithm != null) {
params.setDataEncryptionCredential(dataEncryptionCredential);
@@ -343,12 +345,12 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
}
}
- KeyTransportAlgorithmPredicate keyTransportPredicate = resolveKeyTransportAlgorithmPredicate(criteria);
+ final KeyTransportAlgorithmPredicate keyTransportPredicate = resolveKeyTransportAlgorithmPredicate(criteria);
// Select key encryption cred and algorithm
- for (Credential keyTransportCredential : keyTransportCredentials) {
- String keyTransportAlgorithm = resolveKeyTransportAlgorithm(keyTransportCredential, keyTransportAlgorithms,
- params.getDataEncryptionAlgorithm(), keyTransportPredicate);
+ for (final Credential keyTransportCredential : keyTransportCredentials) {
+ final String keyTransportAlgorithm = resolveKeyTransportAlgorithm(keyTransportCredential,
+ keyTransportAlgorithms, params.getDataEncryptionAlgorithm(), keyTransportPredicate);
if (keyTransportAlgorithm != null) {
params.setKeyTransportEncryptionCredential(keyTransportCredential);
@@ -409,7 +411,7 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
return;
}
- Predicate<String> algoSupportPredicate = getAlgorithmRuntimeSupportedPredicate();
+ final Predicate<String> algoSupportPredicate = getAlgorithmRuntimeSupportedPredicate();
for (final EncryptionConfiguration config :
criteria.get(EncryptionConfigurationCriterion.class).getConfigurations()) {
@@ -452,7 +454,7 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
*/
@Nullable protected KeyTransportAlgorithmPredicate resolveKeyTransportAlgorithmPredicate(
@Nonnull final CriteriaSet criteria) {
- for (EncryptionConfiguration config : criteria.get(EncryptionConfigurationCriterion.class)
+ for (final EncryptionConfiguration config : criteria.get(EncryptionConfigurationCriterion.class)
.getConfigurations()) {
if (config.getKeyTransportAlgorithmPredicate() != null) {
return config.getKeyTransportAlgorithmPredicate();
@@ -477,12 +479,12 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
@Nullable final KeyTransportAlgorithmPredicate keyTransportPredicate) {
if (log.isTraceEnabled()) {
- Key key = CredentialSupport.extractEncryptionKey(keyTransportCredential);
+ final Key key = CredentialSupport.extractEncryptionKey(keyTransportCredential);
log.trace("Evaluating key transport encryption credential of type: {}",
key != null ? key.getAlgorithm() : "n/a");
}
- for (String algorithm : keyTransportAlgorithms) {
+ for (final String algorithm : keyTransportAlgorithms) {
log.trace("Evaluating key transport credential against algorithm: {}", algorithm);
if (credentialSupportsAlgorithm(keyTransportCredential, algorithm) && isKeyTransportAlgorithm(algorithm)) {
if (keyTransportPredicate != null) {
@@ -530,7 +532,7 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
@Nonnull final List<String> dataEncryptionAlgorithms) {
if (log.isTraceEnabled()) {
- Key key = CredentialSupport.extractEncryptionKey(dataEncryptionCredential);
+ final Key key = CredentialSupport.extractEncryptionKey(dataEncryptionCredential);
log.trace("Evaluating data encryption credential of type: {}",
key != null ? key.getAlgorithm() : "n/a");
}
@@ -544,7 +546,7 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
}
}
- for (String algorithm : dataEncryptionAlgorithms) {
+ for (final String algorithm : dataEncryptionAlgorithms) {
log.trace("Evaluating data encryption credential against algorithm: {}", algorithm);
if (credentialSupportsAlgorithm(dataEncryptionCredential, algorithm)
&& isDataEncryptionAlgorithm(algorithm)) {
@@ -580,8 +582,8 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
* @return the list of credentials
*/
@Nonnull protected List<Credential> getEffectiveDataEncryptionCredentials(@Nonnull final CriteriaSet criteria) {
- ArrayList<Credential> accumulator = new ArrayList<>();
- for (EncryptionConfiguration config : criteria.get(EncryptionConfigurationCriterion.class)
+ final ArrayList<Credential> accumulator = new ArrayList<>();
+ for (final EncryptionConfiguration config : criteria.get(EncryptionConfigurationCriterion.class)
.getConfigurations()) {
accumulator.addAll(config.getDataEncryptionCredentials());
@@ -602,8 +604,8 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
@Nonnull protected List<String> getEffectiveDataEncryptionAlgorithms(@Nonnull final CriteriaSet criteria,
@Nonnull final Predicate<String> whitelistBlacklistPredicate) {
- ArrayList<String> accumulator = new ArrayList<>();
- for (EncryptionConfiguration config : criteria.get(EncryptionConfigurationCriterion.class)
+ final ArrayList<String> accumulator = new ArrayList<>();
+ for (final EncryptionConfiguration config : criteria.get(EncryptionConfigurationCriterion.class)
.getConfigurations()) {
accumulator.addAll(Collections2.filter(config.getDataEncryptionAlgorithms(),
@@ -621,8 +623,8 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
* @return the list of credentials
*/
@Nonnull protected List<Credential> getEffectiveKeyTransportCredentials(@Nonnull final CriteriaSet criteria) {
- ArrayList<Credential> accumulator = new ArrayList<>();
- for (EncryptionConfiguration config : criteria.get(EncryptionConfigurationCriterion.class)
+ final ArrayList<Credential> accumulator = new ArrayList<>();
+ for (final EncryptionConfiguration config : criteria.get(EncryptionConfigurationCriterion.class)
.getConfigurations()) {
accumulator.addAll(config.getKeyTransportEncryptionCredentials());
@@ -643,8 +645,8 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
@Nonnull protected List<String> getEffectiveKeyTransportAlgorithms(@Nonnull final CriteriaSet criteria,
@Nonnull final Predicate<String> whitelistBlacklistPredicate) {
- ArrayList<String> accumulator = new ArrayList<>();
- for (EncryptionConfiguration config : criteria.get(EncryptionConfigurationCriterion.class)
+ final ArrayList<String> accumulator = new ArrayList<>();
+ for (final EncryptionConfiguration config : criteria.get(EncryptionConfigurationCriterion.class)
.getConfigurations()) {
accumulator.addAll(Collections2.filter(config.getKeyTransportEncryptionAlgorithms(),
@@ -673,10 +675,10 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
name = criteria.get(KeyInfoGenerationProfileCriterion.class).getName();
}
- for (EncryptionConfiguration config : criteria.get(EncryptionConfigurationCriterion.class)
+ for (final EncryptionConfiguration config : criteria.get(EncryptionConfigurationCriterion.class)
.getConfigurations()) {
- KeyInfoGenerator kig = lookupKeyInfoGenerator(dataEncryptionCredential,
+ final KeyInfoGenerator kig = lookupKeyInfoGenerator(dataEncryptionCredential,
config.getDataKeyInfoGeneratorManager(), name);
if (kig != null) {
return kig;
@@ -706,10 +708,10 @@ public class BasicEncryptionParametersResolver extends AbstractSecurityParameter
name = criteria.get(KeyInfoGenerationProfileCriterion.class).getName();
}
- for (EncryptionConfiguration config : criteria.get(EncryptionConfigurationCriterion.class)
+ for (final EncryptionConfiguration config : criteria.get(EncryptionConfigurationCriterion.class)
.getConfigurations()) {
- KeyInfoGenerator kig = lookupKeyInfoGenerator(keyTransportEncryptionCredential,
+ final KeyInfoGenerator kig = lookupKeyInfoGenerator(keyTransportEncryptionCredential,
config.getKeyTransportKeyInfoGeneratorManager(), name);
if (kig != null) {
return kig;
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java
index 208b5cc..6894b51 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureSigningParametersResolver.java
@@ -100,7 +100,7 @@ public class BasicSignatureSigningParametersResolver
/** {@inheritDoc} */
@Nonnull
public Iterable<SignatureSigningParameters> resolve(@Nonnull final CriteriaSet criteria) throws ResolverException {
- SignatureSigningParameters params = resolveSingle(criteria);
+ final SignatureSigningParameters params = resolveSingle(criteria);
if (params != null) {
return Collections.singletonList(params);
} else {
@@ -115,9 +115,9 @@ public class BasicSignatureSigningParametersResolver
Constraint.isNotNull(criteria.get(SignatureSigningConfigurationCriterion.class),
"Resolver requires an instance of SignatureSigningConfigurationCriterion");
- Predicate<String> whitelistBlacklistPredicate = getWhitelistBlacklistPredicate(criteria);
+ final Predicate<String> whitelistBlacklistPredicate = getWhitelistBlacklistPredicate(criteria);
- SignatureSigningParameters params = new SignatureSigningParameters();
+ final SignatureSigningParameters params = new SignatureSigningParameters();
resolveAndPopulateCredentialAndSignatureAlgorithm(params, criteria, whitelistBlacklistPredicate);
@@ -148,7 +148,7 @@ public class BasicSignatureSigningParametersResolver
if (log.isDebugEnabled()) {
log.debug("Resolved SignatureSigningParameters:");
- Key signingKey = CredentialSupport.extractSigningKey(params.getSigningCredential());
+ final Key signingKey = CredentialSupport.extractSigningKey(params.getSigningCredential());
if (signingKey != null) {
log.debug("\tSigning credential with key algorithm: {}", signingKey.getAlgorithm());
} else {
@@ -216,16 +216,16 @@ public class BasicSignatureSigningParametersResolver
protected void resolveAndPopulateCredentialAndSignatureAlgorithm(@Nonnull final SignatureSigningParameters params,
@Nonnull final CriteriaSet criteria, final Predicate<String> whitelistBlacklistPredicate) {
- List<Credential> credentials = getEffectiveSigningCredentials(criteria);
- List<String> algorithms = getEffectiveSignatureAlgorithms(criteria, whitelistBlacklistPredicate);
+ final List<Credential> credentials = getEffectiveSigningCredentials(criteria);
+ final List<String> algorithms = getEffectiveSignatureAlgorithms(criteria, whitelistBlacklistPredicate);
log.trace("Resolved effective signature algorithms: {}", algorithms);
- for (Credential credential : credentials) {
+ for (final Credential credential : credentials) {
if (log.isTraceEnabled()) {
- Key key = CredentialSupport.extractSigningKey(credential);
+ final Key key = CredentialSupport.extractSigningKey(credential);
log.trace("Evaluating credential of type: {}", key != null ? key.getAlgorithm() : "n/a");
}
- for (String algorithm : algorithms) {
+ for (final String algorithm : algorithms) {
log.trace("Evaluating credential against algorithm: {}", algorithm);
if (credentialSupportsAlgorithm(credential, algorithm)) {
log.trace("Credential passed eval against algorithm: {}", algorithm);
@@ -271,8 +271,8 @@ public class BasicSignatureSigningParametersResolver
* @return the list of credentials
*/
@Nonnull protected List<Credential> getEffectiveSigningCredentials(@Nonnull final CriteriaSet criteria) {
- ArrayList<Credential> accumulator = new ArrayList<>();
- for (SignatureSigningConfiguration config : criteria.get(SignatureSigningConfigurationCriterion.class)
+ final ArrayList<Credential> accumulator = new ArrayList<>();
+ for (final SignatureSigningConfiguration config : criteria.get(SignatureSigningConfigurationCriterion.class)
.getConfigurations()) {
accumulator.addAll(config.getSigningCredentials());
@@ -291,8 +291,8 @@ public class BasicSignatureSigningParametersResolver
*/
@Nonnull protected List<String> getEffectiveSignatureAlgorithms(@Nonnull final CriteriaSet criteria,
@Nonnull final Predicate<String> whitelistBlacklistPredicate) {
- ArrayList<String> accumulator = new ArrayList<>();
- for (SignatureSigningConfiguration config : criteria.get(SignatureSigningConfigurationCriterion.class)
+ final ArrayList<String> accumulator = new ArrayList<>();
+ for (final SignatureSigningConfiguration config : criteria.get(SignatureSigningConfigurationCriterion.class)
.getConfigurations()) {
accumulator.addAll(Collections2.filter(config.getSignatureAlgorithms(),
@@ -311,10 +311,10 @@ public class BasicSignatureSigningParametersResolver
*/
@Nullable protected String resolveReferenceDigestMethod(@Nonnull final CriteriaSet criteria,
@Nonnull final Predicate<String> whitelistBlacklistPredicate) {
- for (SignatureSigningConfiguration config : criteria.get(SignatureSigningConfigurationCriterion.class)
+ for (final SignatureSigningConfiguration config : criteria.get(SignatureSigningConfigurationCriterion.class)
.getConfigurations()) {
- for (String digestMethod : config.getSignatureReferenceDigestMethods()) {
+ for (final String digestMethod : config.getSignatureReferenceDigestMethods()) {
if (getAlgorithmRuntimeSupportedPredicate().apply(digestMethod)
&& whitelistBlacklistPredicate.apply(digestMethod)) {
return digestMethod;
@@ -332,7 +332,7 @@ public class BasicSignatureSigningParametersResolver
* @return the canonicalization algorithm URI
*/
@Nullable protected String resolveCanonicalizationAlgorithm(@Nonnull final CriteriaSet criteria) {
- for (SignatureSigningConfiguration config : criteria.get(SignatureSigningConfigurationCriterion.class)
+ for (final SignatureSigningConfiguration config : criteria.get(SignatureSigningConfigurationCriterion.class)
.getConfigurations()) {
if (config.getSignatureCanonicalizationAlgorithm() != null) {
@@ -358,10 +358,11 @@ public class BasicSignatureSigningParametersResolver
name = criteria.get(KeyInfoGenerationProfileCriterion.class).getName();
}
- for (SignatureSigningConfiguration config : criteria.get(SignatureSigningConfigurationCriterion.class)
+ for (final SignatureSigningConfiguration config : criteria.get(SignatureSigningConfigurationCriterion.class)
.getConfigurations()) {
- KeyInfoGenerator kig = lookupKeyInfoGenerator(signingCredential, config.getKeyInfoGeneratorManager(), name);
+ final KeyInfoGenerator kig =
+ lookupKeyInfoGenerator(signingCredential, config.getKeyInfoGeneratorManager(), name);
if (kig != null) {
return kig;
}
@@ -384,7 +385,7 @@ public class BasicSignatureSigningParametersResolver
@Nonnull final Credential signingCredential, @Nonnull @NotEmpty final String algorithmURI) {
if (AlgorithmSupport.isHMAC(algorithmURI)) {
- for (SignatureSigningConfiguration config : criteria.get(SignatureSigningConfigurationCriterion.class)
+ for (final SignatureSigningConfiguration config : criteria.get(SignatureSigningConfigurationCriterion.class)
.getConfigurations()) {
if (config.getSignatureHMACOutputLength() != null) {
return config.getSignatureHMACOutputLength();
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureValidationParametersResolver.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureValidationParametersResolver.java
index 8f8f961..e77e0af 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureValidationParametersResolver.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicSignatureValidationParametersResolver.java
@@ -55,7 +55,7 @@ public class BasicSignatureValidationParametersResolver
@Nonnull public Iterable<SignatureValidationParameters> resolve(@Nonnull final CriteriaSet criteria)
throws ResolverException {
- SignatureValidationParameters params = resolveSingle(criteria);
+ final SignatureValidationParameters params = resolveSingle(criteria);
if (params != null) {
return Collections.singletonList(params);
} else {
@@ -70,7 +70,7 @@ public class BasicSignatureValidationParametersResolver
Constraint.isNotNull(criteria.get(SignatureValidationConfigurationCriterion.class),
"Resolver requires an instance of SignatureValidationConfigurationCriterion");
- SignatureValidationParameters params = new SignatureValidationParameters();
+ final SignatureValidationParameters params = new SignatureValidationParameters();
resolveAndPopulateWhiteAndBlacklists(params, criteria,
criteria.get(SignatureValidationConfigurationCriterion.class).getConfigurations());
@@ -108,7 +108,8 @@ public class BasicSignatureValidationParametersResolver
*/
@Nullable protected SignatureTrustEngine resolveSignatureTrustEngine(@Nonnull final CriteriaSet criteria) {
- for (SignatureValidationConfiguration config : criteria.get(SignatureValidationConfigurationCriterion.class)
+ for (final SignatureValidationConfiguration config : criteria
+ .get(SignatureValidationConfigurationCriterion.class)
.getConfigurations()) {
if (config.getSignatureTrustEngine() != null) {
return config.getSignatureTrustEngine();
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/BasicKeyInfoGeneratorFactory.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/BasicKeyInfoGeneratorFactory.java
index a62684d..8c45b1a 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/BasicKeyInfoGeneratorFactory.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/BasicKeyInfoGeneratorFactory.java
@@ -71,7 +71,7 @@ public class BasicKeyInfoGeneratorFactory implements KeyInfoGeneratorFactory {
/** {@inheritDoc} */
@Nonnull public KeyInfoGenerator newInstance() {
//TODO lock options during cloning ?
- BasicOptions newOptions = options.clone();
+ final BasicOptions newOptions = options.clone();
return new BasicKeyInfoGenerator(newOptions);
}
@@ -197,13 +197,13 @@ public class BasicKeyInfoGeneratorFactory implements KeyInfoGeneratorFactory {
return null;
}
- KeyInfo keyInfo = keyInfoBuilder.buildObject(KeyInfo.DEFAULT_ELEMENT_NAME);
+ final KeyInfo keyInfo = keyInfoBuilder.buildObject(KeyInfo.DEFAULT_ELEMENT_NAME);
processKeyNames(keyInfo, credential);
processEntityID(keyInfo, credential);
processPublicKey(keyInfo, credential);
- List<XMLObject> children = keyInfo.getOrderedChildren();
+ final List<XMLObject> children = keyInfo.getOrderedChildren();
if (children != null && children.size() > 0) {
return keyInfo;
} else {
@@ -218,7 +218,7 @@ public class BasicKeyInfoGeneratorFactory implements KeyInfoGeneratorFactory {
*/
protected void processKeyNames(@Nonnull final KeyInfo keyInfo, @Nonnull final Credential credential) {
if (options.emitKeyNames) {
- for (String keyNameValue : credential.getKeyNames()) {
+ for (final String keyNameValue : credential.getKeyNames()) {
if (!Strings.isNullOrEmpty(keyNameValue)) {
KeyInfoSupport.addKeyName(keyInfo, keyNameValue);
}
@@ -233,7 +233,7 @@ public class BasicKeyInfoGeneratorFactory implements KeyInfoGeneratorFactory {
*/
protected void processEntityID(@Nonnull final KeyInfo keyInfo, @Nonnull final Credential credential) {
if (options.emitEntityIDAsKeyName) {
- String keyNameValue = credential.getEntityId();
+ final String keyNameValue = credential.getEntityId();
if (!Strings.isNullOrEmpty(keyNameValue)) {
KeyInfoSupport.addKeyName(keyInfo, keyNameValue);
}
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/BasicProviderKeyInfoCredentialResolver.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/BasicProviderKeyInfoCredentialResolver.java
index 7221f4f..acafe87 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/BasicProviderKeyInfoCredentialResolver.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/BasicProviderKeyInfoCredentialResolver.java
@@ -149,12 +149,12 @@ public class BasicProviderKeyInfoCredentialResolver extends AbstractCriteriaFilt
throw new ResolverException(
"Credential criteria set did not contain an instance of KeyInfoCredentialCriteria");
}
- KeyInfo keyInfo = kiCriteria.getKeyInfo();
+ final KeyInfo keyInfo = kiCriteria.getKeyInfo();
// This will be the list of credentials to return.
- List<Credential> credentials = new ArrayList<>();
+ final List<Credential> credentials = new ArrayList<>();
- KeyInfoResolutionContext kiContext = new KeyInfoResolutionContext(credentials);
+ final KeyInfoResolutionContext kiContext = new KeyInfoResolutionContext(credentials);
// Note: we allow KeyInfo to be null to handle case where application context,
// other accompanying criteria, etc, should be used to resolve credentials via hooks below.
@@ -196,8 +196,8 @@ public class BasicProviderKeyInfoCredentialResolver extends AbstractCriteriaFilt
// Store these off so we later use the original values,
// unmodified by other providers which later run.
- Key keyValueKey = kiContext.getKey();
- HashSet<String> keyNames = new HashSet<>();
+ final Key keyValueKey = kiContext.getKey();
+ final HashSet<String> keyNames = new HashSet<>();
keyNames.addAll(kiContext.getKeyNames());
// Now process all (non-KeyValue) children
@@ -205,7 +205,7 @@ public class BasicProviderKeyInfoCredentialResolver extends AbstractCriteriaFilt
if (credentials.isEmpty() && keyValueKey != null) {
// Add the credential based on plain KeyValue if no more specifc cred type was found
- Credential keyValueCredential = buildBasicCredential(keyValueKey, keyNames);
+ final Credential keyValueCredential = buildBasicCredential(keyValueKey, keyNames);
if (keyValueCredential != null) {
log.debug("No credentials were extracted by registered non-KeyValue handling providers, "
+ "adding KeyValue credential to returned credential set");
@@ -263,14 +263,14 @@ public class BasicProviderKeyInfoCredentialResolver extends AbstractCriteriaFilt
@Nullable final CriteriaSet criteriaSet, @Nonnull final List<Credential> credentials)
throws ResolverException {
- for (XMLObject keyInfoChild : kiContext.getKeyInfo().getXMLObjects()) {
+ for (final XMLObject keyInfoChild : kiContext.getKeyInfo().getXMLObjects()) {
if (keyInfoChild instanceof KeyValue || keyInfoChild instanceof DEREncodedKeyValue) {
continue;
}
log.debug("Processing KeyInfo child with QName: {}", keyInfoChild.getElementQName());
- Collection<Credential> childCreds = processKeyInfoChild(kiContext, criteriaSet, keyInfoChild);
+ final Collection<Credential> childCreds = processKeyInfoChild(kiContext, criteriaSet, keyInfoChild);
if (childCreds != null && !childCreds.isEmpty()) {
credentials.addAll(childCreds);
@@ -305,7 +305,7 @@ public class BasicProviderKeyInfoCredentialResolver extends AbstractCriteriaFilt
@Nullable protected Collection<Credential> processKeyInfoChild(@Nonnull final KeyInfoResolutionContext kiContext,
@Nullable final CriteriaSet criteriaSet, @Nonnull final XMLObject keyInfoChild) throws ResolverException {
- for (KeyInfoProvider provider : getProviders()) {
+ for (final KeyInfoProvider provider : getProviders()) {
if (!provider.handles(keyInfoChild)) {
log.debug("Provider {} doesn't handle objects of type {}, skipping", provider.getClass().getName(),
@@ -315,7 +315,7 @@ public class BasicProviderKeyInfoCredentialResolver extends AbstractCriteriaFilt
log.debug("Processing KeyInfo child {} with provider {}", keyInfoChild.getElementQName(), provider
.getClass().getName());
- Collection<Credential> creds;
+ final Collection<Credential> creds;
try {
creds = provider.process(this, keyInfoChild, criteriaSet, kiContext);
} catch (final SecurityException e) {
@@ -381,14 +381,14 @@ public class BasicProviderKeyInfoCredentialResolver extends AbstractCriteriaFilt
@Nullable final CriteriaSet criteriaSet, @Nonnull final List<? extends XMLObject> keyValues)
throws ResolverException {
- for (XMLObject keyValue : keyValues) {
+ for (final XMLObject keyValue : keyValues) {
if (!(keyValue instanceof KeyValue) && !(keyValue instanceof DEREncodedKeyValue)) {
continue;
}
- Collection<Credential> creds = processKeyInfoChild(kiContext, criteriaSet, keyValue);
+ final Collection<Credential> creds = processKeyInfoChild(kiContext, criteriaSet, keyValue);
if (creds != null) {
- for (Credential cred : creds) {
- Key key = extractKeyValue(cred);
+ for (final Credential cred : creds) {
+ final Key key = extractKeyValue(cred);
if (key != null) {
kiContext.setKey(key);
log.debug("Found a credential based on a KeyValue/DEREncodedKeyValue having key type: {}",
@@ -424,9 +424,9 @@ public class BasicProviderKeyInfoCredentialResolver extends AbstractCriteriaFilt
} else if (key instanceof PrivateKey) {
// This would be unusual for most KeyInfo use cases,
// but go ahead and try and handle it
- PrivateKey privateKey = (PrivateKey) key;
+ final PrivateKey privateKey = (PrivateKey) key;
try {
- PublicKey publicKey = KeySupport.derivePublicKey(privateKey);
+ final PublicKey publicKey = KeySupport.derivePublicKey(privateKey);
if (publicKey != null) {
basicCred = new BasicCredential(publicKey, privateKey);
} else {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/LocalKeyInfoCredentialResolver.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/LocalKeyInfoCredentialResolver.java
index 2889164..b104198 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/LocalKeyInfoCredentialResolver.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/LocalKeyInfoCredentialResolver.java
@@ -102,9 +102,9 @@ public class LocalKeyInfoCredentialResolver extends BasicProviderKeyInfoCredenti
@Nullable final CriteriaSet criteriaSet, @Nonnull final List<Credential> credentials)
throws ResolverException {
- ArrayList<Credential> localCreds = new ArrayList<>();
+ final ArrayList<Credential> localCreds = new ArrayList<>();
- for (Credential cred : credentials) {
+ for (final Credential cred : credentials) {
if (isLocalCredential(cred)) {
localCreds.add(cred);
} else if (cred.getPublicKey() != null) {
@@ -113,7 +113,7 @@ public class LocalKeyInfoCredentialResolver extends BasicProviderKeyInfoCredenti
}
// Also resolve local creds based on any key names that are known
- for (String keyName : kiContext.getKeyNames()) {
+ for (final String keyName : kiContext.getKeyNames()) {
localCreds.addAll(resolveByKeyName(keyName));
}
@@ -143,10 +143,10 @@ public class LocalKeyInfoCredentialResolver extends BasicProviderKeyInfoCredenti
*/
@Nonnull protected Collection<? extends Credential> resolveByKeyName(@Nonnull final String keyName)
throws ResolverException {
- ArrayList<Credential> localCreds = new ArrayList<>();
+ final ArrayList<Credential> localCreds = new ArrayList<>();
- CriteriaSet criteriaSet = new CriteriaSet( new KeyNameCriterion(keyName) );
- for (Credential cred : getLocalCredentialResolver().resolve(criteriaSet)) {
+ final CriteriaSet criteriaSet = new CriteriaSet( new KeyNameCriterion(keyName) );
+ for (final Credential cred : getLocalCredentialResolver().resolve(criteriaSet)) {
if (isLocalCredential(cred)) {
localCreds.add(cred);
}
@@ -166,10 +166,10 @@ public class LocalKeyInfoCredentialResolver extends BasicProviderKeyInfoCredenti
*/
@Nonnull protected Collection<? extends Credential> resolveByPublicKey(@Nonnull final PublicKey publicKey)
throws ResolverException {
- ArrayList<Credential> localCreds = new ArrayList<>();
+ final ArrayList<Credential> localCreds = new ArrayList<>();
- CriteriaSet criteriaSet = new CriteriaSet( new PublicKeyCriterion(publicKey) );
- for (Credential cred : getLocalCredentialResolver().resolve(criteriaSet)) {
+ final CriteriaSet criteriaSet = new CriteriaSet( new PublicKeyCriterion(publicKey) );
+ for (final Credential cred : getLocalCredentialResolver().resolve(criteriaSet)) {
if (isLocalCredential(cred)) {
localCreds.add(cred);
}
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/StaticKeyInfoGenerator.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/StaticKeyInfoGenerator.java
index 1015151..2df126d 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/StaticKeyInfoGenerator.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/StaticKeyInfoGenerator.java
@@ -104,7 +104,7 @@ public class StaticKeyInfoGenerator implements KeyInfoGenerator {
// 1) marshall the original (if necessary)
// 2) unmarshall a new object around the cached or newly marshalled DOM.
// 3) ensure only one of them caches the DOM (original or marshalled)
- Element origDOM = origKeyInfo.getDOM();
+ final Element origDOM = origKeyInfo.getDOM();
if (origDOM == null) {
try {
getMarshaller().marshall(origKeyInfo);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorFactory.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorFactory.java
index 58a34d3..6eb9369 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorFactory.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/X509KeyInfoGeneratorFactory.java
@@ -83,7 +83,7 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
/** {@inheritDoc} */
@Nonnull public KeyInfoGenerator newInstance() {
//TODO lock options during cloning ?
- X509Options newOptions = options.clone();
+ final X509Options newOptions = options.clone();
return new X509KeyInfoGenerator(newOptions);
}
@@ -427,24 +427,24 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
credential.getClass().getName());
return null;
}
- X509Credential x509Credential = (X509Credential) credential;
+ final X509Credential x509Credential = (X509Credential) credential;
KeyInfo keyInfo = super.generate(credential);
if (keyInfo == null) {
keyInfo = keyInfoBuilder.buildObject(KeyInfo.DEFAULT_ELEMENT_NAME);
}
- X509Data x509Data = x509DataBuilder.buildObject(X509Data.DEFAULT_ELEMENT_NAME);
+ final X509Data x509Data = x509DataBuilder.buildObject(X509Data.DEFAULT_ELEMENT_NAME);
processEntityCertificate(keyInfo, x509Data, x509Credential);
processEntityCertificateChain(keyInfo, x509Data, x509Credential);
processCRLs(keyInfo, x509Data, x509Credential);
- List<XMLObject> x509DataChildren = x509Data.getOrderedChildren();
+ final List<XMLObject> x509DataChildren = x509Data.getOrderedChildren();
if (x509DataChildren != null && x509DataChildren.size() > 0) {
keyInfo.getX509Datas().add(x509Data);
}
- List<XMLObject> keyInfoChildren = keyInfo.getOrderedChildren();
+ final List<XMLObject> keyInfoChildren = keyInfo.getOrderedChildren();
if (keyInfoChildren != null && keyInfoChildren.size() > 0) {
return keyInfo;
} else {
@@ -466,7 +466,7 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
return;
}
- java.security.cert.X509Certificate javaCert = credential.getEntityCertificate();
+ final java.security.cert.X509Certificate javaCert = credential.getEntityCertificate();
processCertX509DataOptions(x509Data, javaCert);
processCertKeyNameOptions(keyInfo, javaCert);
@@ -474,7 +474,7 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
// The cert chain includes the entity cert, so don't add a duplicate
if (options.emitEntityCertificate && !options.emitEntityCertificateChain) {
try {
- X509Certificate xmlCert = KeyInfoSupport.buildX509Certificate(javaCert);
+ final X509Certificate xmlCert = KeyInfoSupport.buildX509Certificate(javaCert);
x509Data.getX509Certificates().add(xmlCert);
} catch (final CertificateEncodingException e) {
throw new SecurityException("Error generating X509Certificate element "
@@ -521,7 +521,7 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
protected void processCertX509SubjectName(@Nonnull final X509Data x509Data,
@Nonnull final java.security.cert.X509Certificate cert) {
if (options.emitX509SubjectName) {
- String subjectNameValue = getSubjectName(cert);
+ final String subjectNameValue = getSubjectName(cert);
if (!Strings.isNullOrEmpty(subjectNameValue)) {
x509Data.getX509SubjectNames().add(KeyInfoSupport.buildX509SubjectName(subjectNameValue));
}
@@ -538,7 +538,7 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
protected void processCertX509IssuerSerial(@Nonnull final X509Data x509Data,
@Nonnull final java.security.cert.X509Certificate cert) {
if (options.emitX509IssuerSerial) {
- String issuerNameValue = getIssuerName(cert);
+ final String issuerNameValue = getIssuerName(cert);
if (!Strings.isNullOrEmpty(issuerNameValue)) {
x509Data.getX509IssuerSerials().add(
KeyInfoSupport.buildX509IssuerSerial(issuerNameValue, cert.getSerialNumber()));
@@ -556,7 +556,7 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
protected void processCertX509SKI(@Nonnull final X509Data x509Data,
@Nonnull final java.security.cert.X509Certificate cert) {
if (options.emitX509SKI) {
- X509SKI xmlSKI = KeyInfoSupport.buildX509SKI(cert);
+ final X509SKI xmlSKI = KeyInfoSupport.buildX509SKI(cert);
if (xmlSKI != null) {
x509Data.getX509SKIs().add(xmlSKI);
}
@@ -628,7 +628,7 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
protected void processSubjectDNKeyName(@Nonnull final KeyInfo keyInfo,
@Nullable final java.security.cert.X509Certificate cert) {
if (options.emitSubjectDNAsKeyName) {
- String subjectNameValue = getSubjectName(cert);
+ final String subjectNameValue = getSubjectName(cert);
if (!Strings.isNullOrEmpty(subjectNameValue)) {
KeyInfoSupport.addKeyName(keyInfo, subjectNameValue);
}
@@ -645,9 +645,9 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
protected void processSubjectCNKeyName(@Nonnull final KeyInfo keyInfo,
@Nullable final java.security.cert.X509Certificate cert) {
if (options.emitSubjectCNAsKeyName) {
- List<String> cnames = X509Support.getCommonNames(cert.getSubjectX500Principal());
+ final List<String> cnames = X509Support.getCommonNames(cert.getSubjectX500Principal());
if (cnames != null) {
- for (String name : cnames) {
+ for (final String name : cnames) {
if (!Strings.isNullOrEmpty(name)) {
KeyInfoSupport.addKeyName(keyInfo, name);
}
@@ -666,11 +666,11 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
protected void processSubjectAltNameKeyNames(@Nonnull final KeyInfo keyInfo,
@Nullable final java.security.cert.X509Certificate cert) {
if (options.emitSubjectAltNamesAsKeyNames && options.subjectAltNames.size() > 0) {
- Integer[] nameTypes = new Integer[ options.subjectAltNames.size() ];
+ final Integer[] nameTypes = new Integer[ options.subjectAltNames.size() ];
options.subjectAltNames.toArray(nameTypes);
- List altnames = X509Support.getAltNames(cert, nameTypes);
+ final List altnames = X509Support.getAltNames(cert, nameTypes);
if (altnames != null) {
- for (Object altNameValue : altnames) {
+ for (final Object altNameValue : altnames) {
// Each returned value should either be a String or a DER-encoded byte array.
// See X509Certificate#getSubjectAlternativeNames for the type rules.
if (altNameValue instanceof String) {
@@ -697,9 +697,9 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
@Nonnull final X509Credential credential) throws SecurityException {
if (options.emitEntityCertificateChain) {
- for (java.security.cert.X509Certificate javaCert : credential.getEntityCertificateChain()) {
+ for (final java.security.cert.X509Certificate javaCert : credential.getEntityCertificateChain()) {
try {
- X509Certificate xmlCert = KeyInfoSupport.buildX509Certificate(javaCert);
+ final X509Certificate xmlCert = KeyInfoSupport.buildX509Certificate(javaCert);
x509Data.getX509Certificates().add(xmlCert);
} catch (final CertificateEncodingException e) {
throw new SecurityException("Error generating X509Certificate element "
@@ -720,9 +720,9 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
@Nonnull final X509Credential credential) throws SecurityException {
if (options.emitCRLs && credential.getCRLs() != null) {
- for (java.security.cert.X509CRL javaCRL : credential.getCRLs()) {
+ for (final java.security.cert.X509CRL javaCRL : credential.getCRLs()) {
try {
- X509CRL xmlCRL = KeyInfoSupport.buildX509CRL(javaCRL);
+ final X509CRL xmlCRL = KeyInfoSupport.buildX509CRL(javaCRL);
x509Data.getX509CRLs().add(xmlCRL);
} catch (final CRLException e) {
throw new SecurityException("Error generating X509CRL element "
@@ -798,7 +798,7 @@ public class X509KeyInfoGeneratorFactory extends BasicKeyInfoGeneratorFactory {
/** {@inheritDoc} */
protected X509Options clone() {
- X509Options clonedOptions = (X509Options) super.clone();
+ final X509Options clonedOptions = (X509Options) super.clone();
clonedOptions.subjectAltNames = new LazySet<>();
clonedOptions.subjectAltNames.addAll(subjectAltNames);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/DEREncodedKeyValueProvider.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/DEREncodedKeyValueProvider.java
index ee5171b..8c5be01 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/DEREncodedKeyValueProvider.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/DEREncodedKeyValueProvider.java
@@ -58,7 +58,7 @@ public class DEREncodedKeyValueProvider extends AbstractKeyInfoProvider {
@Nonnull final XMLObject keyInfoChild, @Nullable final CriteriaSet criteriaSet,
@Nonnull final KeyInfoResolutionContext kiContext) throws SecurityException {
- DEREncodedKeyValue keyValue = getDEREncodedKeyValue(keyInfoChild);
+ final DEREncodedKeyValue keyValue = getDEREncodedKeyValue(keyInfoChild);
if (keyValue == null) {
return null;
}
@@ -73,7 +73,7 @@ public class DEREncodedKeyValueProvider extends AbstractKeyInfoProvider {
throw new SecurityException("Error extracting DER-encoded key value", e);
}
- KeyAlgorithmCriterion algorithmCriteria = criteriaSet.get(KeyAlgorithmCriterion.class);
+ final KeyAlgorithmCriterion algorithmCriteria = criteriaSet.get(KeyAlgorithmCriterion.class);
if (algorithmCriteria != null && algorithmCriteria.getKeyAlgorithm() != null
&& !algorithmCriteria.getKeyAlgorithm().equals(pubKey.getAlgorithm())) {
log.debug("Criteria specified key algorithm {}, actually {}, skipping",
@@ -81,18 +81,18 @@ public class DEREncodedKeyValueProvider extends AbstractKeyInfoProvider {
return null;
}
- BasicCredential cred = new BasicCredential(pubKey);
+ final BasicCredential cred = new BasicCredential(pubKey);
if (kiContext != null) {
cred.getKeyNames().addAll(kiContext.getKeyNames());
}
- CredentialContext credContext = buildCredentialContext(kiContext);
+ final CredentialContext credContext = buildCredentialContext(kiContext);
if (credContext != null) {
cred.getCredentialContextSet().add(credContext);
}
log.debug("Credential successfully extracted from DEREncodedKeyValue");
- LazySet<Credential> credentialSet = new LazySet<>();
+ final LazySet<Credential> credentialSet = new LazySet<>();
credentialSet.add(cred);
return credentialSet;
}
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/DSAKeyValueProvider.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/DSAKeyValueProvider.java
index 844fa56..a866b7a 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/DSAKeyValueProvider.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/DSAKeyValueProvider.java
@@ -59,13 +59,13 @@ public class DSAKeyValueProvider extends AbstractKeyInfoProvider {
@Nonnull final XMLObject keyInfoChild, @Nullable final CriteriaSet criteriaSet,
@Nonnull final KeyInfoResolutionContext kiContext) throws SecurityException {
- DSAKeyValue keyValue = getDSAKeyValue(keyInfoChild);
+ final DSAKeyValue keyValue = getDSAKeyValue(keyInfoChild);
if (keyValue == null) {
return null;
}
if (criteriaSet != null) {
- KeyAlgorithmCriterion algorithmCriteria = criteriaSet.get(KeyAlgorithmCriterion.class);
+ final KeyAlgorithmCriterion algorithmCriteria = criteriaSet.get(KeyAlgorithmCriterion.class);
if (algorithmCriteria != null
&& algorithmCriteria.getKeyAlgorithm() != null
&& !"DSA".equals(algorithmCriteria.getKeyAlgorithm())) {
@@ -84,16 +84,16 @@ public class DSAKeyValueProvider extends AbstractKeyInfoProvider {
log.error("Error extracting DSA key value", e);
throw new SecurityException("Error extracting DSA key value", e);
}
- BasicCredential cred = new BasicCredential(pubKey);
+ final BasicCredential cred = new BasicCredential(pubKey);
cred.getKeyNames().addAll(kiContext.getKeyNames());
- CredentialContext credContext = buildCredentialContext(kiContext);
+ final CredentialContext credContext = buildCredentialContext(kiContext);
if (credContext != null) {
cred.getCredentialContextSet().add(credContext);
}
log.debug("Credential successfully extracted from DSAKeyValue");
- LazySet<Credential> credentialSet = new LazySet<>();
+ final LazySet<Credential> credentialSet = new LazySet<>();
credentialSet.add(cred);
return credentialSet;
}
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/InlineX509DataProvider.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/InlineX509DataProvider.java
index 97e519f..a457c0a 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/InlineX509DataProvider.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/InlineX509DataProvider.java
@@ -378,13 +378,13 @@ public class InlineX509DataProvider extends AbstractKeyInfoProvider {
for (final X509Digest digest : digests) {
if (!Strings.isNullOrEmpty(digest.getValue()) && !Strings.isNullOrEmpty(digest.getAlgorithm())) {
- String alg = AlgorithmSupport.getAlgorithmID(digest.getAlgorithm());
+ final String alg = AlgorithmSupport.getAlgorithmID(digest.getAlgorithm());
if (alg == null) {
log.warn("Algorithm {} not supported", digest.getAlgorithm());
continue;
}
final byte[] xmlValue = Base64Support.decode(digest.getValue());
- for (X509Certificate cert : certs) {
+ for (final X509Certificate cert : certs) {
try {
final byte[] certValue = X509Support.getX509Digest(cert, alg);
if (certValue != null && Arrays.equals(xmlValue, certValue)) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/KeyInfoReferenceProvider.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/KeyInfoReferenceProvider.java
index 3a8a470..83b5754 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/KeyInfoReferenceProvider.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/KeyInfoReferenceProvider.java
@@ -59,14 +59,14 @@ public class KeyInfoReferenceProvider extends AbstractKeyInfoProvider {
@Nonnull final XMLObject keyInfoChild, @Nullable final CriteriaSet criteriaSet,
@Nonnull final KeyInfoResolutionContext kiContext) throws SecurityException {
- KeyInfoReference ref = getKeyInfoReference(keyInfoChild);
+ final KeyInfoReference ref = getKeyInfoReference(keyInfoChild);
if (ref == null) {
return null;
}
log.debug("Attempting to follow same-document KeyInfoReference");
- XMLObject target = ref.resolveIDFromRoot(ref.getURI().substring(1));
+ final XMLObject target = ref.resolveIDFromRoot(ref.getURI().substring(1));
if (target == null) {
log.warn("KeyInfoReference URI could not be dereferenced");
return null;
@@ -81,9 +81,9 @@ public class KeyInfoReferenceProvider extends AbstractKeyInfoProvider {
log.debug("Recursively processing KeyInfoReference referent");
// Copy the existing CriteriaSet, excluding the KeyInfoCriteria, which is reset to the target.
- CriteriaSet newCriteria = new CriteriaSet();
+ final CriteriaSet newCriteria = new CriteriaSet();
newCriteria.add(new KeyInfoCriterion((KeyInfo) target));
- for (Criterion crit : criteriaSet) {
+ for (final Criterion crit : criteriaSet) {
if (!(crit instanceof KeyInfoCriterion)) {
newCriteria.add(crit);
}
@@ -91,10 +91,10 @@ public class KeyInfoReferenceProvider extends AbstractKeyInfoProvider {
// Resolve the new target and copy the results into a collection to return.
try {
- Iterable<Credential> creds = resolver.resolve(newCriteria);
+ final Iterable<Credential> creds = resolver.resolve(newCriteria);
if (creds != null) {
- Collection<Credential> result = new ArrayList<>();
- for (Credential c : creds) {
+ final Collection<Credential> result = new ArrayList<>();
+ for (final Credential c : creds) {
result.add(c);
}
return result;
@@ -114,8 +114,8 @@ public class KeyInfoReferenceProvider extends AbstractKeyInfoProvider {
*/
@Nullable protected KeyInfoReference getKeyInfoReference(@Nonnull final XMLObject xmlObject) {
if (xmlObject instanceof KeyInfoReference) {
- KeyInfoReference ref = (KeyInfoReference) xmlObject;
- String uri = ref.getURI();
+ final KeyInfoReference ref = (KeyInfoReference) xmlObject;
+ final String uri = ref.getURI();
if (uri != null && uri.startsWith("#")) {
return ref;
} else {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/RSAKeyValueProvider.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/RSAKeyValueProvider.java
index d0ec5c1..8719b6e 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/RSAKeyValueProvider.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/keyinfo/impl/provider/RSAKeyValueProvider.java
@@ -59,13 +59,13 @@ public class RSAKeyValueProvider extends AbstractKeyInfoProvider {
@Nonnull final XMLObject keyInfoChild, @Nullable final CriteriaSet criteriaSet,
@Nonnull final KeyInfoResolutionContext kiContext) throws SecurityException {
- RSAKeyValue keyValue = getRSAKeyValue(keyInfoChild);
+ final RSAKeyValue keyValue = getRSAKeyValue(keyInfoChild);
if (keyValue == null) {
return null;
}
if (criteriaSet != null) {
- KeyAlgorithmCriterion algorithmCriteria = criteriaSet.get(KeyAlgorithmCriterion.class);
+ final KeyAlgorithmCriterion algorithmCriteria = criteriaSet.get(KeyAlgorithmCriterion.class);
if (algorithmCriteria != null && algorithmCriteria.getKeyAlgorithm() != null
&& !"RSA".equals(algorithmCriteria.getKeyAlgorithm())) {
log.debug("Criterion specified non-RSA key algorithm, skipping");
@@ -82,16 +82,16 @@ public class RSAKeyValueProvider extends AbstractKeyInfoProvider {
log.error("Error extracting RSA key value", e);
throw new SecurityException("Error extracting RSA key value", e);
}
- BasicCredential cred = new BasicCredential(pubKey);
+ final BasicCredential cred = new BasicCredential(pubKey);
cred.getKeyNames().addAll(kiContext.getKeyNames());
- CredentialContext credContext = buildCredentialContext(kiContext);
+ final CredentialContext credContext = buildCredentialContext(kiContext);
if (credContext != null) {
cred.getCredentialContextSet().add(credContext);
}
log.debug("Credential successfully extracted from RSAKeyValue");
- LazySet<Credential> credentialSet = new LazySet<>();
+ final LazySet<Credential> credentialSet = new LazySet<>();
credentialSet.add(cred);
return credentialSet;
}
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueImpl.java
index 14d698f..55598d5 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueImpl.java
@@ -47,7 +47,7 @@ public class DEREncodedKeyValueImpl extends XSBase64BinaryImpl implements DEREnc
/** {@inheritDoc} */
public void setID(final String newID) {
- String oldID = id;
+ final String oldID = id;
id = prepareForAssignment(id, newID);
registerOwnID(oldID, id);
}
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueMarshaller.java
index 093ddbd..d8a3cf9 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueMarshaller.java
@@ -30,7 +30,7 @@ public class DEREncodedKeyValueMarshaller extends XSBase64BinaryMarshaller {
/** {@inheritDoc} */
protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
- DEREncodedKeyValue der = (DEREncodedKeyValue) xmlObject;
+ final DEREncodedKeyValue der = (DEREncodedKeyValue) xmlObject;
if (der.getID() != null) {
domElement.setAttributeNS(null, DEREncodedKeyValue.ID_ATTRIB_NAME, der.getID());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueUnmarshaller.java
index 250c42f..83a787a 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DEREncodedKeyValueUnmarshaller.java
@@ -30,7 +30,7 @@ public class DEREncodedKeyValueUnmarshaller extends XSBase64BinaryUnmarshaller {
/** {@inheritDoc} */
protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
- DEREncodedKeyValue der = (DEREncodedKeyValue) xmlObject;
+ final DEREncodedKeyValue der = (DEREncodedKeyValue) xmlObject;
if (attribute.getLocalName().equals(DEREncodedKeyValue.ID_ATTRIB_NAME)) {
der.setID(attribute.getValue());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueImpl.java
index 820f6d3..b4d92dd 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueImpl.java
@@ -141,7 +141,7 @@ public class DSAKeyValueImpl extends AbstractXMLObject implements DSAKeyValue {
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
if (p != null) {
children.add(p);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueUnmarshaller.java
index 17738bd..22f12f0 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DSAKeyValueUnmarshaller.java
@@ -36,7 +36,7 @@ public class DSAKeyValueUnmarshaller extends AbstractXMLSignatureUnmarshaller {
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- DSAKeyValue keyValue = (DSAKeyValue) parentXMLObject;
+ final DSAKeyValue keyValue = (DSAKeyValue) parentXMLObject;
if (childXMLObject instanceof P) {
keyValue.setP((P) childXMLObject);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodImpl.java
index ef348d5..88aed22 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodImpl.java
@@ -73,7 +73,7 @@ public class DigestMethodImpl extends AbstractXMLObject implements DigestMethod
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
children.addAll(unknownChildren);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodMarshaller.java
index 1cdaf1c..40b3236 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodMarshaller.java
@@ -29,7 +29,7 @@ public class DigestMethodMarshaller extends AbstractXMLSignatureMarshaller {
/** {@inheritDoc} */
protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
- DigestMethod dm = (DigestMethod) xmlObject;
+ final DigestMethod dm = (DigestMethod) xmlObject;
if (dm.getAlgorithm() != null) {
domElement.setAttributeNS(null, DigestMethod.ALGORITHM_ATTRIB_NAME, dm.getAlgorithm());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodUnmarshaller.java
index c663c99..9e337b5 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/DigestMethodUnmarshaller.java
@@ -29,7 +29,7 @@ public class DigestMethodUnmarshaller extends AbstractXMLSignatureUnmarshaller {
/** {@inheritDoc} */
protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
- DigestMethod dm = (DigestMethod) xmlObject;
+ final DigestMethod dm = (DigestMethod) xmlObject;
if (attribute.getLocalName().equals(DigestMethod.ALGORITHM_ATTRIB_NAME)) {
dm.setAlgorithm(attribute.getValue());
@@ -41,7 +41,7 @@ public class DigestMethodUnmarshaller extends AbstractXMLSignatureUnmarshaller {
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- DigestMethod dm = (DigestMethod) parentXMLObject;
+ final DigestMethod dm = (DigestMethod) parentXMLObject;
dm.getUnknownXMLObjects().add(childXMLObject);
}
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueImpl.java
index 914d1b3..2c9f17a 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueImpl.java
@@ -62,7 +62,7 @@ public class ECKeyValueImpl extends AbstractXMLObject implements ECKeyValue {
/** {@inheritDoc} */
public void setID(final String newID) {
- String oldID = id;
+ final String oldID = id;
id = prepareForAssignment(id, newID);
registerOwnID(oldID, id);
}
@@ -99,7 +99,7 @@ public class ECKeyValueImpl extends AbstractXMLObject implements ECKeyValue {
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
if (ecParams != null) {
children.add(ecParams);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueMarshaller.java
index b3f2e80..977c7f6 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueMarshaller.java
@@ -29,7 +29,7 @@ public class ECKeyValueMarshaller extends AbstractXMLSignatureMarshaller {
/** {@inheritDoc} */
protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
- ECKeyValue ec = (ECKeyValue) xmlObject;
+ final ECKeyValue ec = (ECKeyValue) xmlObject;
if (ec.getID() != null) {
domElement.setAttributeNS(null, ECKeyValue.ID_ATTRIB_NAME, ec.getID());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueUnmarshaller.java
index cea822c..cc1eb7e 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/ECKeyValueUnmarshaller.java
@@ -38,7 +38,7 @@ public class ECKeyValueUnmarshaller extends AbstractXMLSignatureUnmarshaller {
/** {@inheritDoc} */
protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
- ECKeyValue ec = (ECKeyValue) xmlObject;
+ final ECKeyValue ec = (ECKeyValue) xmlObject;
if (attribute.getLocalName().equals(ECKeyValue.ID_ATTRIB_NAME)) {
ec.setID(attribute.getValue());
@@ -51,7 +51,7 @@ public class ECKeyValueUnmarshaller extends AbstractXMLSignatureUnmarshaller {
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- ECKeyValue keyValue = (ECKeyValue) parentXMLObject;
+ final ECKeyValue keyValue = (ECKeyValue) parentXMLObject;
if (childXMLObject instanceof NamedCurve) {
keyValue.setNamedCurve((NamedCurve) childXMLObject);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoImpl.java
index c09e001..5eb2af4 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoImpl.java
@@ -69,7 +69,7 @@ public class KeyInfoImpl extends AbstractXMLObject implements KeyInfo {
/** {@inheritDoc} */
public void setID(final String newID) {
- String oldID = this.id;
+ final String oldID = this.id;
this.id = prepareForAssignment(this.id, newID);
registerOwnID(oldID, this.id);
}
@@ -141,7 +141,7 @@ public class KeyInfoImpl extends AbstractXMLObject implements KeyInfo {
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
children.addAll(indexedChildren);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoMarshaller.java
index 8207c6f..dd3cd91 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoMarshaller.java
@@ -29,7 +29,7 @@ public class KeyInfoMarshaller extends AbstractXMLSignatureMarshaller {
/** {@inheritDoc} */
protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
- KeyInfo keyInfo = (KeyInfo ) xmlObject;
+ final KeyInfo keyInfo = (KeyInfo ) xmlObject;
if (keyInfo.getID() != null) {
domElement.setAttributeNS(null, KeyInfo.ID_ATTRIB_NAME, keyInfo.getID());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceImpl.java
index 6a4cf9b..a493114 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceImpl.java
@@ -53,7 +53,7 @@ public class KeyInfoReferenceImpl extends AbstractXMLObject implements KeyInfoRe
/** {@inheritDoc} */
public void setID(final String newID) {
- String oldID = id;
+ final String oldID = id;
id = prepareForAssignment(id, newID);
registerOwnID(oldID, id);
}
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceMarshaller.java
index 5002778..2ba84c4 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceMarshaller.java
@@ -29,7 +29,7 @@ public class KeyInfoReferenceMarshaller extends AbstractXMLSignatureMarshaller {
/** {@inheritDoc} */
protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
- KeyInfoReference ref = (KeyInfoReference) xmlObject;
+ final KeyInfoReference ref = (KeyInfoReference) xmlObject;
if (ref.getID() != null) {
domElement.setAttributeNS(null, KeyInfoReference.ID_ATTRIB_NAME, ref.getID());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceUnmarshaller.java
index ab6b8e1..5119001 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoReferenceUnmarshaller.java
@@ -29,7 +29,7 @@ public class KeyInfoReferenceUnmarshaller extends AbstractXMLSignatureUnmarshall
/** {@inheritDoc} */
protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
- KeyInfoReference ref = (KeyInfoReference) xmlObject;
+ final KeyInfoReference ref = (KeyInfoReference) xmlObject;
if (attribute.getLocalName().equals(KeyInfoReference.ID_ATTRIB_NAME)) {
ref.setID(attribute.getValue());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoUnmarshaller.java
index e9dd56c..9026d7d 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoUnmarshaller.java
@@ -29,7 +29,7 @@ public class KeyInfoUnmarshaller extends AbstractXMLSignatureUnmarshaller {
/** {@inheritDoc} */
protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
- KeyInfo keyInfo = (KeyInfo) xmlObject;
+ final KeyInfo keyInfo = (KeyInfo) xmlObject;
if (attribute.getLocalName().equals(KeyInfo.ID_ATTRIB_NAME)) {
keyInfo.setID(attribute.getValue());
@@ -42,7 +42,7 @@ public class KeyInfoUnmarshaller extends AbstractXMLSignatureUnmarshaller {
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- KeyInfo keyInfo = (KeyInfo) parentXMLObject;
+ final KeyInfo keyInfo = (KeyInfo) parentXMLObject;
// KeyInfoType contains a range of specific types, but also
// support <any>, with an unbounded choice over all (no ordering)
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyValueImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyValueImpl.java
index 0112604..d118620 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyValueImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyValueImpl.java
@@ -98,7 +98,7 @@ public class KeyValueImpl extends AbstractXMLObject implements KeyValue {
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
if (dsaKeyValue != null) {
children.add(dsaKeyValue);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyValueUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyValueUnmarshaller.java
index 0ef426a..8e3aa89 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyValueUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyValueUnmarshaller.java
@@ -32,7 +32,7 @@ public class KeyValueUnmarshaller extends AbstractXMLSignatureUnmarshaller {
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- KeyValue keyValue = (KeyValue) parentXMLObject;
+ final KeyValue keyValue = (KeyValue) parentXMLObject;
if (childXMLObject instanceof DSAKeyValue) {
keyValue.setDSAKeyValue((DSAKeyValue) childXMLObject);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveMarshaller.java
index 8a7ad1e..ceee85a 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveMarshaller.java
@@ -29,7 +29,7 @@ public class NamedCurveMarshaller extends AbstractXMLSignatureMarshaller {
/** {@inheritDoc} */
protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
- NamedCurve nc = (NamedCurve) xmlObject;
+ final NamedCurve nc = (NamedCurve) xmlObject;
if (nc.getURI() != null) {
domElement.setAttributeNS(null, NamedCurve.URI_ATTRIB_NAME, nc.getURI());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveUnmarshaller.java
index e964777..cbc6412 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/NamedCurveUnmarshaller.java
@@ -29,7 +29,7 @@ public class NamedCurveUnmarshaller extends AbstractXMLSignatureUnmarshaller {
/** {@inheritDoc} */
protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
- NamedCurve nc = (NamedCurve) xmlObject;
+ final NamedCurve nc = (NamedCurve) xmlObject;
if (attribute.getLocalName().equals(NamedCurve.URI_ATTRIB_NAME)) {
nc.setURI(attribute.getValue());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPDataImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPDataImpl.java
index 114bb37..56e2e34 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPDataImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPDataImpl.java
@@ -87,7 +87,7 @@ public class PGPDataImpl extends AbstractXMLObject implements PGPData {
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
if (pgpKeyID != null) {
children.add(pgpKeyID);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPDataUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPDataUnmarshaller.java
index b45c21c..d5da292 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPDataUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/PGPDataUnmarshaller.java
@@ -31,7 +31,7 @@ public class PGPDataUnmarshaller extends AbstractXMLSignatureUnmarshaller {
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- PGPData pgpData = (PGPData) parentXMLObject;
+ final PGPData pgpData = (PGPData) parentXMLObject;
if (childXMLObject instanceof PGPKeyID) {
pgpData.setPGPKeyID((PGPKeyID) childXMLObject);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueImpl.java
index 6c69308..e778aee 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueImpl.java
@@ -72,7 +72,7 @@ public class RSAKeyValueImpl extends AbstractXMLObject implements RSAKeyValue {
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
if (modulus != null) {
children.add(modulus);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueUnmarshaller.java
index 7813365..127286d 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RSAKeyValueUnmarshaller.java
@@ -31,7 +31,7 @@ public class RSAKeyValueUnmarshaller extends AbstractXMLSignatureUnmarshaller {
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- RSAKeyValue keyValue = (RSAKeyValue) parentXMLObject;
+ final RSAKeyValue keyValue = (RSAKeyValue) parentXMLObject;
if (childXMLObject instanceof Modulus) {
keyValue.setModulus((Modulus) childXMLObject);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodImpl.java
index 4a1fa75..6ddface 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodImpl.java
@@ -84,7 +84,7 @@ public class RetrievalMethodImpl extends AbstractXMLObject implements RetrievalM
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
if (transforms != null) {
children.add(transforms);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodMarshaller.java
index 0ead9df..3944b01 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodMarshaller.java
@@ -29,7 +29,7 @@ public class RetrievalMethodMarshaller extends AbstractXMLSignatureMarshaller {
/** {@inheritDoc} */
protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
- RetrievalMethod rm = (RetrievalMethod) xmlObject;
+ final RetrievalMethod rm = (RetrievalMethod) xmlObject;
if (rm.getURI() != null) {
domElement.setAttributeNS(null, RetrievalMethod.URI_ATTRIB_NAME, rm.getURI());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodUnmarshaller.java
index 24ab455..53bb1bc 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/RetrievalMethodUnmarshaller.java
@@ -30,7 +30,7 @@ public class RetrievalMethodUnmarshaller extends AbstractXMLSignatureUnmarshalle
/** {@inheritDoc} */
protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
- RetrievalMethod rm = (RetrievalMethod) xmlObject;
+ final RetrievalMethod rm = (RetrievalMethod) xmlObject;
if (attribute.getLocalName().equals(RetrievalMethod.URI_ATTRIB_NAME)) {
rm.setURI(attribute.getValue());
@@ -44,7 +44,7 @@ public class RetrievalMethodUnmarshaller extends AbstractXMLSignatureUnmarshalle
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- RetrievalMethod rm = (RetrievalMethod) parentXMLObject;
+ final RetrievalMethod rm = (RetrievalMethod) parentXMLObject;
if (childXMLObject instanceof Transforms) {
rm.setTransforms((Transforms) childXMLObject);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKIDataImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKIDataImpl.java
index e0dfd87..c60e300 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKIDataImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKIDataImpl.java
@@ -66,7 +66,7 @@ public class SPKIDataImpl extends AbstractXMLObject implements SPKIData {
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
children.addAll((List<XMLObject>) indexedChildren);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKIDataUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKIDataUnmarshaller.java
index 8bd8a11..cf5c1c1 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKIDataUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SPKIDataUnmarshaller.java
@@ -29,7 +29,7 @@ public class SPKIDataUnmarshaller extends AbstractXMLSignatureUnmarshaller {
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- SPKIData spkiData = (SPKIData) parentXMLObject;
+ final SPKIData spkiData = (SPKIData) parentXMLObject;
// SPKIData contains an unbounded sequence of pairs of a single SPKISexp
// and an optional, single wildcard <any> element. Let the Validator
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureMarshaller.java
index 0705ddb..2ced898 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureMarshaller.java
@@ -59,7 +59,7 @@ public class SignatureMarshaller implements Marshaller {
/** {@inheritDoc} */
public Element marshall(final XMLObject xmlObject) throws MarshallingException {
try {
- Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+ final Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
return marshall(xmlObject, document);
} catch (final ParserConfigurationException e) {
throw new MarshallingException("Unable to create Document to place marshalled elements in", e);
@@ -68,16 +68,17 @@ public class SignatureMarshaller implements Marshaller {
/** {@inheritDoc} */
public Element marshall(final XMLObject xmlObject, final Element parentElement) throws MarshallingException {
- Element signatureElement = createSignatureElement((SignatureImpl) xmlObject, parentElement.getOwnerDocument());
+ final Element signatureElement =
+ createSignatureElement((SignatureImpl) xmlObject, parentElement.getOwnerDocument());
ElementSupport.appendChildElement(parentElement, signatureElement);
return signatureElement;
}
/** {@inheritDoc} */
public Element marshall(final XMLObject xmlObject, final Document document) throws MarshallingException {
- Element signatureElement = createSignatureElement((SignatureImpl) xmlObject, document);
+ final Element signatureElement = createSignatureElement((SignatureImpl) xmlObject, document);
- Element documentRoot = document.getDocumentElement();
+ final Element documentRoot = document.getDocumentElement();
if (documentRoot != null) {
document.replaceChild(signatureElement, documentRoot);
} else {
@@ -113,16 +114,16 @@ public class SignatureMarshaller implements Marshaller {
}
log.debug("Adding content to XMLSignature.");
- for (ContentReference contentReference : signature.getContentReferences()) {
+ for (final ContentReference contentReference : signature.getContentReferences()) {
contentReference.createReference(dsig);
}
log.debug("Creating Signature DOM element");
- Element signatureElement = dsig.getElement();
+ final Element signatureElement = dsig.getElement();
if (signature.getKeyInfo() != null) {
- Marshaller keyInfoMarshaller = XMLObjectProviderRegistrySupport.getMarshallerFactory().getMarshaller(
- KeyInfo.DEFAULT_ELEMENT_NAME);
+ final Marshaller keyInfoMarshaller = XMLObjectProviderRegistrySupport.getMarshallerFactory()
+ .getMarshaller(KeyInfo.DEFAULT_ELEMENT_NAME);
keyInfoMarshaller.marshall(signature.getKeyInfo(), signatureElement);
}
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureUnmarshaller.java
index 70238cc..c3cf515 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/SignatureUnmarshaller.java
@@ -56,28 +56,28 @@ public class SignatureUnmarshaller implements Unmarshaller {
public Signature unmarshall(final Element signatureElement) throws UnmarshallingException {
log.debug("Starting to unmarshall Apache XML-Security-based SignatureImpl element");
- SignatureImpl signature =
+ final SignatureImpl signature =
new SignatureImpl(signatureElement.getNamespaceURI(), signatureElement.getLocalName(),
signatureElement.getPrefix());
try {
log.debug("Constructing Apache XMLSignature object");
- XMLSignature xmlSignature = new XMLSignature(signatureElement, "");
+ final XMLSignature xmlSignature = new XMLSignature(signatureElement, "");
- SignedInfo signedInfo = xmlSignature.getSignedInfo();
+ final SignedInfo signedInfo = xmlSignature.getSignedInfo();
log.debug("Adding canonicalization and signing algorithms, and HMAC output length to Signature");
signature.setCanonicalizationAlgorithm(signedInfo.getCanonicalizationMethodURI());
signature.setSignatureAlgorithm(signedInfo.getSignatureMethodURI());
signature.setHMACOutputLength(getHMACOutputLengthValue(signedInfo.getSignatureMethodElement()));
- org.apache.xml.security.keys.KeyInfo xmlSecKeyInfo = xmlSignature.getKeyInfo();
+ final org.apache.xml.security.keys.KeyInfo xmlSecKeyInfo = xmlSignature.getKeyInfo();
if (xmlSecKeyInfo != null) {
log.debug("Adding KeyInfo to Signature");
- Unmarshaller unmarshaller = XMLObjectProviderRegistrySupport.getUnmarshallerFactory().getUnmarshaller(
- xmlSecKeyInfo.getElement());
- KeyInfo keyInfo = (KeyInfo) unmarshaller.unmarshall(xmlSecKeyInfo.getElement());
+ final Unmarshaller unmarshaller = XMLObjectProviderRegistrySupport.getUnmarshallerFactory()
+ .getUnmarshaller(xmlSecKeyInfo.getElement());
+ final KeyInfo keyInfo = (KeyInfo) unmarshaller.unmarshall(xmlSecKeyInfo.getElement());
signature.setKeyInfo(keyInfo);
}
signature.setXMLSignature(xmlSignature);
@@ -100,12 +100,12 @@ public class SignatureUnmarshaller implements Unmarshaller {
return null;
}
// Should be at most one element
- List<Element> children =
+ final List<Element> children =
ElementSupport.getChildElementsByTagNameNS(signatureMethodElement, SignatureConstants.XMLSIG_NS,
"HMACOutputLength");
if (!children.isEmpty()) {
- Element hmacElement = children.get(0);
- String value = StringSupport.trimOrNull(hmacElement.getTextContent());
+ final Element hmacElement = children.get(0);
+ final String value = StringSupport.trimOrNull(hmacElement.getTextContent());
if (value != null) {
return new Integer(value);
}
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformImpl.java
index cc0efd9..fa1b8ce 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformImpl.java
@@ -79,7 +79,7 @@ public class TransformImpl extends AbstractXMLObject implements Transform {
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
children.addAll((List<XMLObject>) indexedChildren);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformMarshaller.java
index a085476..51a661a 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformMarshaller.java
@@ -29,7 +29,7 @@ public class TransformMarshaller extends AbstractXMLSignatureMarshaller {
/** {@inheritDoc} */
protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
- Transform transform = (Transform) xmlObject;
+ final Transform transform = (Transform) xmlObject;
if (transform.getAlgorithm() != null) {
domElement.setAttributeNS(null, Transform.ALGORITHM_ATTRIB_NAME, transform.getAlgorithm());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformUnmarshaller.java
index 2c526ef..04be20e 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformUnmarshaller.java
@@ -29,7 +29,7 @@ public class TransformUnmarshaller extends AbstractXMLSignatureUnmarshaller {
/** {@inheritDoc} */
protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
- Transform transform = (Transform) xmlObject;
+ final Transform transform = (Transform) xmlObject;
if (attribute.getLocalName().equals(Transform.ALGORITHM_ATTRIB_NAME)) {
transform.setAlgorithm(attribute.getValue());
@@ -41,7 +41,7 @@ public class TransformUnmarshaller extends AbstractXMLSignatureUnmarshaller {
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- Transform transform = (Transform) parentXMLObject;
+ final Transform transform = (Transform) parentXMLObject;
// Has <any> open content model + XPath children
transform.getAllChildren().add(childXMLObject);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformsImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformsImpl.java
index 0c6e8fa..effc9bf 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformsImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformsImpl.java
@@ -54,7 +54,7 @@ public class TransformsImpl extends AbstractXMLObject implements Transforms {
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
children.addAll((List<Transform>) transforms);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformsUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformsUnmarshaller.java
index a17106e..7020be9 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformsUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/TransformsUnmarshaller.java
@@ -30,7 +30,7 @@ public class TransformsUnmarshaller extends AbstractXMLSignatureUnmarshaller {
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- Transforms transforms = (Transforms) parentXMLObject;
+ final Transforms transforms = (Transforms) parentXMLObject;
if (childXMLObject instanceof Transform) {
transforms.getTransforms().add((Transform) childXMLObject);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DataImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DataImpl.java
index 4e8dcb7..79152be 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DataImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DataImpl.java
@@ -94,7 +94,7 @@ public class X509DataImpl extends AbstractXMLObject implements X509Data {
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
children.addAll((List<XMLObject>) indexedChildren);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DataUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DataUnmarshaller.java
index 5753c31..e8e182e 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DataUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DataUnmarshaller.java
@@ -29,7 +29,7 @@ public class X509DataUnmarshaller extends AbstractXMLSignatureUnmarshaller {
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- X509Data x509Data = (X509Data) parentXMLObject;
+ final X509Data x509Data = (X509Data) parentXMLObject;
// X509Data contains a range of specific types, but also
// support <any>, with an unbounded choice over all (no ordering)
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestMarshaller.java
index e35dcab..e15faef 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestMarshaller.java
@@ -30,7 +30,7 @@ public class X509DigestMarshaller extends XSBase64BinaryMarshaller {
/** {@inheritDoc} */
protected void marshallAttributes(final XMLObject xmlObject, final Element domElement) throws MarshallingException {
- X509Digest xd = (X509Digest) xmlObject;
+ final X509Digest xd = (X509Digest) xmlObject;
if (xd.getAlgorithm() != null) {
domElement.setAttributeNS(null, X509Digest.ALGORITHM_ATTRIB_NAME, xd.getAlgorithm());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestUnmarshaller.java
index ee17b12..1fbd8ae 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509DigestUnmarshaller.java
@@ -30,7 +30,7 @@ public class X509DigestUnmarshaller extends XSBase64BinaryUnmarshaller {
/** {@inheritDoc} */
protected void processAttribute(final XMLObject xmlObject, final Attr attribute) throws UnmarshallingException {
- X509Digest xd = (X509Digest) xmlObject;
+ final X509Digest xd = (X509Digest) xmlObject;
if (attribute.getLocalName().equals(X509Digest.ALGORITHM_ATTRIB_NAME)) {
xd.setAlgorithm(attribute.getValue());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialImpl.java
index 2f554f8..9548381 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialImpl.java
@@ -72,7 +72,7 @@ public class X509IssuerSerialImpl extends AbstractXMLObject implements X509Issue
/** {@inheritDoc} */
public List<XMLObject> getOrderedChildren() {
- ArrayList<XMLObject> children = new ArrayList<>();
+ final ArrayList<XMLObject> children = new ArrayList<>();
if (issuerName != null) {
children.add(issuerName);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialUnmarshaller.java
index 4b1b65c..5a7e92f 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509IssuerSerialUnmarshaller.java
@@ -31,7 +31,7 @@ public class X509IssuerSerialUnmarshaller extends AbstractXMLSignatureUnmarshall
/** {@inheritDoc} */
protected void processChildElement(final XMLObject parentXMLObject, final XMLObject childXMLObject)
throws UnmarshallingException {
- X509IssuerSerial keyValue = (X509IssuerSerial) parentXMLObject;
+ final X509IssuerSerial keyValue = (X509IssuerSerial) parentXMLObject;
if (childXMLObject instanceof X509IssuerName) {
keyValue.setX509IssuerName((X509IssuerName) childXMLObject);
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberMarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberMarshaller.java
index b5542ba..1b0e624 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberMarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberMarshaller.java
@@ -38,7 +38,7 @@ public class X509SerialNumberMarshaller extends AbstractXMLObjectMarshaller {
/** {@inheritDoc} */
protected void marshallElementContent(final XMLObject xmlObject, final Element domElement)
throws MarshallingException {
- X509SerialNumber x509SerialNumber = (X509SerialNumber) xmlObject;
+ final X509SerialNumber x509SerialNumber = (X509SerialNumber) xmlObject;
if (x509SerialNumber.getValue() != null) {
ElementSupport.appendTextContent(domElement, x509SerialNumber.getValue().toString());
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberUnmarshaller.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberUnmarshaller.java
index 6990e29..7723e42 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberUnmarshaller.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/X509SerialNumberUnmarshaller.java
@@ -45,7 +45,7 @@ public class X509SerialNumberUnmarshaller extends AbstractXMLObjectUnmarshaller
/** {@inheritDoc} */
protected void processElementContent(final XMLObject xmlObject, final String elementContent) {
- X509SerialNumber x509SerialNumber = (X509SerialNumber) xmlObject;
+ final X509SerialNumber x509SerialNumber = (X509SerialNumber) xmlObject;
if(!Strings.isNullOrEmpty(elementContent)){
x509SerialNumber.setValue( new BigInteger(elementContent) );
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/BaseSignatureTrustEngine.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/BaseSignatureTrustEngine.java
index 074c180..d9acdcb 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/BaseSignatureTrustEngine.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/BaseSignatureTrustEngine.java
@@ -88,11 +88,11 @@ public abstract class BaseSignatureTrustEngine<TrustBasisType> implements Signat
checkParams(signature, trustBasisCriteria);
- SignatureValidationParametersCriterion validationCriterion =
+ final SignatureValidationParametersCriterion validationCriterion =
trustBasisCriteria.get(SignatureValidationParametersCriterion.class);
if (validationCriterion != null) {
log.debug("Performing signature algorithm whitelist/blacklist validation using params from CriteriaSet");
- SignatureAlgorithmValidator algorithmValidator =
+ final SignatureAlgorithmValidator algorithmValidator =
new SignatureAlgorithmValidator(validationCriterion.getSignatureValidationParameters());
try {
algorithmValidator.validate(signature);
@@ -125,11 +125,11 @@ public abstract class BaseSignatureTrustEngine<TrustBasisType> implements Signat
checkParamsRaw(signature, content, algorithmURI, trustBasisCriteria);
- SignatureValidationParametersCriterion validationCriterion =
+ final SignatureValidationParametersCriterion validationCriterion =
trustBasisCriteria.get(SignatureValidationParametersCriterion.class);
if (validationCriterion != null) {
log.debug("Performing signature algorithm whitelist/blacklist validation using params from CriteriaSet");
- SignatureValidationParameters params = validationCriterion.getSignatureValidationParameters();
+ final SignatureValidationParameters params = validationCriterion.getSignatureValidationParameters();
if (!AlgorithmSupport.validateAlgorithmURI(algorithmURI, params.getWhitelistedAlgorithms(),
params.getBlacklistedAlgorithms())) {
log.warn("Simple/raw signature failed algorithm whitelist/blacklist validation");
@@ -190,11 +190,11 @@ public abstract class BaseSignatureTrustEngine<TrustBasisType> implements Signat
if (signature.getKeyInfo() != null) {
- KeyInfoCriterion keyInfoCriteria = new KeyInfoCriterion(signature.getKeyInfo());
- CriteriaSet keyInfoCriteriaSet = new CriteriaSet(keyInfoCriteria);
+ final KeyInfoCriterion keyInfoCriteria = new KeyInfoCriterion(signature.getKeyInfo());
+ final CriteriaSet keyInfoCriteriaSet = new CriteriaSet(keyInfoCriteria);
try {
- for (Credential kiCred : getKeyInfoResolver().resolve(keyInfoCriteriaSet)) {
+ for (final Credential kiCred : getKeyInfoResolver().resolve(keyInfoCriteriaSet)) {
if (verifySignature(signature, kiCred)) {
log.debug("Successfully verified signature using KeyInfo-derived credential");
log.debug("Attempting to establish trust of KeyInfo-derived credential");
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/ExplicitKeySignatureTrustEngine.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/ExplicitKeySignatureTrustEngine.java
index 845fb8c..ae5fc14 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/ExplicitKeySignatureTrustEngine.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/ExplicitKeySignatureTrustEngine.java
@@ -99,7 +99,7 @@ public class ExplicitKeySignatureTrustEngine extends BaseSignatureTrustEngine<It
criteriaSet.add(new KeyAlgorithmCriterion(jcaAlgorithm), true);
}
- Iterable<Credential> trustedCredentials;
+ final Iterable<Credential> trustedCredentials;
try {
trustedCredentials = getCredentialResolver().resolve(criteriaSet);
} catch (final ResolverException e) {
@@ -141,7 +141,7 @@ public class ExplicitKeySignatureTrustEngine extends BaseSignatureTrustEngine<It
criteriaSet.add(new KeyAlgorithmCriterion(jcaAlgorithm), true);
}
- Iterable<Credential> trustedCredentials;
+ final Iterable<Credential> trustedCredentials;
try {
trustedCredentials = getCredentialResolver().resolve(criteriaSet);
} catch (final ResolverException e) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/PKIXSignatureTrustEngine.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/PKIXSignatureTrustEngine.java
index 1a82a0b..03d1e20 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/PKIXSignatureTrustEngine.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/PKIXSignatureTrustEngine.java
@@ -267,7 +267,7 @@ public class PKIXSignatureTrustEngine extends
} else {
log.debug("PKIX resolver does not support resolution of trusted names, skipping name checking");
}
- Iterable<PKIXValidationInformation> validationInfoSet;
+ final Iterable<PKIXValidationInformation> validationInfoSet;
try {
validationInfoSet = pkixResolver.resolve(trustBasisCriteria);
} catch (final ResolverException e) {
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/provider/ApacheSantuarioSignatureValidationProviderImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/provider/ApacheSantuarioSignatureValidationProviderImpl.java
index 2c7294c..3f2a07f 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/provider/ApacheSantuarioSignatureValidationProviderImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/provider/ApacheSantuarioSignatureValidationProviderImpl.java
@@ -50,13 +50,13 @@ public class ApacheSantuarioSignatureValidationProviderImpl implements Signature
log.debug("Attempting to validate signature using key from supplied credential");
Constraint.isNotNull(validationCredential, "Validation credential cannot be null");
- XMLSignature xmlSig = getXMLSignature(signature);
+ final XMLSignature xmlSig = getXMLSignature(signature);
if (xmlSig == null) {
log.debug("No native XMLSignature object associated with Signature XMLObject");
throw new SignatureException("Native XMLSignature object not available for validation");
}
- Key validationKey = CredentialSupport.extractVerificationKey(validationCredential);
+ final Key validationKey = CredentialSupport.extractVerificationKey(validationCredential);
if (validationKey == null) {
log.debug("Supplied credential contained no key suitable for signature validation");
throw new SignatureException("No key available to validate signature");
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/provider/ApacheSantuarioSignerProviderImpl.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/provider/ApacheSantuarioSignerProviderImpl.java
index 30aa6c7..0f98c98 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/provider/ApacheSantuarioSignerProviderImpl.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/support/impl/provider/ApacheSantuarioSignerProviderImpl.java
@@ -47,7 +47,7 @@ public class ApacheSantuarioSignerProviderImpl implements SignerProvider {
Constraint.isTrue(Init.isInitialized(), "Apache XML security library is not initialized");
try {
- XMLSignature xmlSignature = ((SignatureImpl) signature).getXMLSignature();
+ final XMLSignature xmlSignature = ((SignatureImpl) signature).getXMLSignature();
if (xmlSignature == null) {
log.error("Unable to compute signature, Signature XMLObject does not have the XMLSignature "
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list