[java-opensaml] 10/12: JPAR-85 - Checkstyle, check final variables
Tom Zeller
tzeller at dragonacea.biz
Thu Aug 10 18:25:59 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=8df1a667c95447ce75425f7ab628e0d9f67d9d5a
commit 8df1a667c95447ce75425f7ab628e0d9f67d9d5a
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Thu Aug 10 17:01:10 2017 -0500
JPAR-85 - Checkstyle, check final variables
---
.../xmlsec/algorithm/AlgorithmRegistry.java | 22 +--
.../xmlsec/algorithm/AlgorithmSupport.java | 40 ++---
.../config/GlobalAlgorithmRegistryInitializer.java | 8 +-
.../DecryptionConfigurationCriterion.java | 2 +-
.../EncryptionConfigurationCriterion.java | 2 +-
.../KeyInfoGenerationProfileCriterion.java | 2 +-
.../SignatureSigningConfigurationCriterion.java | 2 +-
.../SignatureValidationConfigurationCriterion.java | 2 +-
.../org/opensaml/xmlsec/crypto/XMLSigningUtil.java | 8 +-
.../support/AbstractEncryptedKeyResolver.java | 10 +-
.../xmlsec/encryption/support/Decrypter.java | 88 ++++++-----
.../xmlsec/encryption/support/Encrypter.java | 64 ++++----
...SimpleKeyInfoReferenceEncryptedKeyResolver.java | 6 +-
.../SimpleRetrievalMethodEncryptedKeyResolver.java | 8 +-
.../opensaml/xmlsec/keyinfo/KeyInfoCriterion.java | 2 +-
.../opensaml/xmlsec/keyinfo/KeyInfoSupport.java | 172 ++++++++++-----------
.../keyinfo/NamedKeyInfoGeneratorManager.java | 4 +-
.../xmlsec/signature/support/SignatureSupport.java | 18 +--
.../SignatureValidationParametersCriterion.java | 2 +-
.../signature/support/SignatureValidator.java | 7 +-
.../opensaml/xmlsec/signature/support/Signer.java | 10 +-
.../signature/support/URIContentReference.java | 4 +-
22 files changed, 244 insertions(+), 239 deletions(-)
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/AlgorithmRegistry.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/AlgorithmRegistry.java
index c7b3ef5..9a83643 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/AlgorithmRegistry.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/AlgorithmRegistry.java
@@ -76,7 +76,7 @@ public class AlgorithmRegistry {
* @return the resolved algorithm descriptor or null
*/
@Nullable public AlgorithmDescriptor get(@Nullable final String algorithmURI) {
- String trimmed = StringSupport.trimOrNull(algorithmURI);
+ final String trimmed = StringSupport.trimOrNull(algorithmURI);
if (trimmed == null) {
return null;
}
@@ -96,13 +96,13 @@ public class AlgorithmRegistry {
* @return true if the algorithm is supported by the current runtime environment, false otherwise
*/
public boolean isRuntimeSupported(@Nullable final String algorithmURI) {
- String trimmed = StringSupport.trimOrNull(algorithmURI);
+ final String trimmed = StringSupport.trimOrNull(algorithmURI);
if (trimmed == null) {
log.debug("Runtime support failed, algorithm URI was null or empty");
return false;
}
- boolean supported = runtimeSupported.contains(trimmed);
+ final boolean supported = runtimeSupported.contains(trimmed);
log.debug("Runtime support eval for algorithm URI '{}': {}", trimmed, supported ? "supported" : "unsupported");
return supported;
}
@@ -127,7 +127,7 @@ public class AlgorithmRegistry {
log.debug("Registering algorithm descriptor with URI: {}", descriptor.getURI());
- AlgorithmDescriptor old = descriptors.get(descriptor.getURI());
+ final AlgorithmDescriptor old = descriptors.get(descriptor.getURI());
if (old != null) {
log.debug("Registry contained existing descriptor with URI, removing old instance and re-registering: {}",
descriptor.getURI());
@@ -160,7 +160,7 @@ public class AlgorithmRegistry {
*/
public void deregister(@Nonnull final String uri) {
Constraint.isNotNull(uri, "AlgorithmDescriptor URI was null");
- AlgorithmDescriptor descriptor = get(uri);
+ final AlgorithmDescriptor descriptor = get(uri);
if (descriptor != null) {
deregister(descriptor);
}
@@ -210,11 +210,11 @@ public class AlgorithmRegistry {
}
if (descriptor instanceof DigestAlgorithm) {
- DigestAlgorithm digestAlgorithm = (DigestAlgorithm) descriptor;
+ final DigestAlgorithm digestAlgorithm = (DigestAlgorithm) descriptor;
digestAlgorithms.put(digestAlgorithm.getJCAAlgorithmID(), digestAlgorithm);
}
if (descriptor instanceof SignatureAlgorithm) {
- SignatureAlgorithm sigAlg = (SignatureAlgorithm) descriptor;
+ final SignatureAlgorithm sigAlg = (SignatureAlgorithm) descriptor;
signatureAlgorithms.put(new SignatureAlgorithmIndex(sigAlg.getKey(), sigAlg.getDigest()), sigAlg);
}
}
@@ -229,11 +229,11 @@ public class AlgorithmRegistry {
runtimeSupported.remove(descriptor.getURI());
if (descriptor instanceof DigestAlgorithm) {
- DigestAlgorithm digestAlgorithm = (DigestAlgorithm) descriptor;
+ final DigestAlgorithm digestAlgorithm = (DigestAlgorithm) descriptor;
digestAlgorithms.remove(digestAlgorithm.getJCAAlgorithmID());
}
if (descriptor instanceof SignatureAlgorithm) {
- SignatureAlgorithm sigAlg = (SignatureAlgorithm) descriptor;
+ final SignatureAlgorithm sigAlg = (SignatureAlgorithm) descriptor;
signatureAlgorithms.remove(new SignatureAlgorithmIndex(sigAlg.getKey(), sigAlg.getDigest()));
}
}
@@ -302,8 +302,8 @@ public class AlgorithmRegistry {
private boolean checkCipherSupportedKeyLength(final AlgorithmDescriptor descriptor)
throws NoSuchAlgorithmException {
if (descriptor instanceof KeyLengthSpecifiedAlgorithm) {
- int algoLength = ((KeyLengthSpecifiedAlgorithm)descriptor).getKeyLength();
- int cipherMaxLength = Cipher.getMaxAllowedKeyLength(descriptor.getJCAAlgorithmID());
+ final int algoLength = ((KeyLengthSpecifiedAlgorithm)descriptor).getKeyLength();
+ final int cipherMaxLength = Cipher.getMaxAllowedKeyLength(descriptor.getJCAAlgorithmID());
if (algoLength > cipherMaxLength) {
log.info("Cipher algorithm '{}' is not supported, its key length {} exceeds Cipher max key length {}",
descriptor.getURI(), algoLength, cipherMaxLength);
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/AlgorithmSupport.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/AlgorithmSupport.java
index edd46f8..b7a2814 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/AlgorithmSupport.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/AlgorithmSupport.java
@@ -124,7 +124,7 @@ public final class AlgorithmSupport {
return false;
}
- Key key = CredentialSupport.extractSigningKey(credential);
+ final Key key = CredentialSupport.extractSigningKey(credential);
if (key == null) {
return false;
}
@@ -166,7 +166,7 @@ public final class AlgorithmSupport {
return false;
}
- Key key = CredentialSupport.extractEncryptionKey(credential);
+ final Key key = CredentialSupport.extractEncryptionKey(credential);
if (key == null) {
return false;
}
@@ -203,14 +203,14 @@ public final class AlgorithmSupport {
@Nonnull final AlgorithmDescriptor algorithm) {
if (algorithm instanceof KeySpecifiedAlgorithm) {
- String specifiedKey = ((KeySpecifiedAlgorithm)algorithm).getKey();
+ final String specifiedKey = ((KeySpecifiedAlgorithm)algorithm).getKey();
if (!specifiedKey.equals(key.getAlgorithm())) {
return false;
}
}
if (algorithm instanceof KeyLengthSpecifiedAlgorithm) {
- Integer specifiedKeyLength = ((KeyLengthSpecifiedAlgorithm)algorithm).getKeyLength();
+ final Integer specifiedKeyLength = ((KeyLengthSpecifiedAlgorithm)algorithm).getKeyLength();
if (!specifiedKeyLength.equals(KeySupport.getKeyLength(key))) {
return false;
}
@@ -226,9 +226,9 @@ public final class AlgorithmSupport {
* @return the Java algorithm identifier, or null if the mapping is unavailable or indeterminable from the URI
*/
@Nullable public static String getAlgorithmID(@Nonnull final String algorithmURI) {
- AlgorithmRegistry registry = getGlobalAlgorithmRegistry();
+ final AlgorithmRegistry registry = getGlobalAlgorithmRegistry();
if (registry != null){
- AlgorithmDescriptor descriptor = registry.get(algorithmURI);
+ final AlgorithmDescriptor descriptor = registry.get(algorithmURI);
if (descriptor != null) {
return descriptor.getJCAAlgorithmID();
}
@@ -254,9 +254,9 @@ public final class AlgorithmSupport {
* @return true if URI indicates HMAC, false otherwise
*/
public static boolean isHMAC(@Nonnull final String signatureAlgorithm) {
- AlgorithmRegistry registry = getGlobalAlgorithmRegistry();
+ final AlgorithmRegistry registry = getGlobalAlgorithmRegistry();
if (registry != null){
- AlgorithmDescriptor descriptor = registry.get(signatureAlgorithm);
+ final AlgorithmDescriptor descriptor = registry.get(signatureAlgorithm);
if (descriptor != null) {
return descriptor.getType().equals(AlgorithmDescriptor.AlgorithmType.Mac);
}
@@ -271,9 +271,9 @@ public final class AlgorithmSupport {
* @return the Java key algorithm specifier, or null if the mapping is unavailable or indeterminable from the URI
*/
@Nullable public static String getKeyAlgorithm(@Nonnull final String algorithmURI) {
- AlgorithmRegistry registry = getGlobalAlgorithmRegistry();
+ final AlgorithmRegistry registry = getGlobalAlgorithmRegistry();
if (registry != null){
- AlgorithmDescriptor descriptor = registry.get(algorithmURI);
+ final AlgorithmDescriptor descriptor = registry.get(algorithmURI);
if (descriptor != null && descriptor instanceof KeySpecifiedAlgorithm) {
return ((KeySpecifiedAlgorithm)descriptor).getKey();
}
@@ -289,10 +289,10 @@ public final class AlgorithmSupport {
* indeterminable from the URI
*/
@Nullable public static Integer getKeyLength(@Nonnull final String algorithmURI) {
- Logger log = getLogger();
- AlgorithmRegistry registry = getGlobalAlgorithmRegistry();
+ final Logger log = getLogger();
+ final AlgorithmRegistry registry = getGlobalAlgorithmRegistry();
if (registry != null){
- AlgorithmDescriptor descriptor = registry.get(algorithmURI);
+ final AlgorithmDescriptor descriptor = registry.get(algorithmURI);
if (descriptor != null && descriptor instanceof KeyLengthSpecifiedAlgorithm) {
return ((KeyLengthSpecifiedAlgorithm)descriptor).getKeyLength();
}
@@ -312,8 +312,8 @@ public final class AlgorithmSupport {
*/
@Nonnull public static SecretKey generateSymmetricKey(@Nonnull final String algoURI)
throws NoSuchAlgorithmException, KeyException {
- Logger log = getLogger();
- String jceAlgorithmName = getKeyAlgorithm(algoURI);
+ final Logger log = getLogger();
+ final String jceAlgorithmName = getKeyAlgorithm(algoURI);
if (Strings.isNullOrEmpty(jceAlgorithmName)) {
log.error("Mapping from algorithm URI '" + algoURI
+ "' to key algorithm not available, key generation failed");
@@ -337,7 +337,7 @@ public final class AlgorithmSupport {
log.error("Key length could not be determined from algorithm URI, can't generate key");
throw new KeyException("Key length not determinable from algorithm URI, could not generate new key");
}
- KeyGenerator keyGenerator = KeyGenerator.getInstance(jceAlgorithmName);
+ final KeyGenerator keyGenerator = KeyGenerator.getInstance(jceAlgorithmName);
keyGenerator.init(keyLength);
return keyGenerator.generateKey();
}
@@ -353,7 +353,7 @@ public final class AlgorithmSupport {
*/
@Nonnull public static KeyPair generateKeyPair(@Nonnull final String algoURI, final int keyLength)
throws NoSuchAlgorithmException, NoSuchProviderException {
- String jceAlgorithmName = getKeyAlgorithm(algoURI);
+ final String jceAlgorithmName = getKeyAlgorithm(algoURI);
return KeySupport.generateKeyPair(jceAlgorithmName, keyLength, null);
}
@@ -367,7 +367,7 @@ public final class AlgorithmSupport {
*/
@Nonnull public static Credential generateSymmetricKeyAndCredential(@Nonnull final String algorithmURI)
throws NoSuchAlgorithmException, KeyException {
- SecretKey key = generateSymmetricKey(algorithmURI);
+ final SecretKey key = generateSymmetricKey(algorithmURI);
return new BasicCredential(key);
}
@@ -384,8 +384,8 @@ public final class AlgorithmSupport {
@Nonnull public static Credential generateKeyPairAndCredential(@Nonnull final String algorithmURI,
final int keyLength,
final boolean includePrivate) throws NoSuchAlgorithmException, NoSuchProviderException {
- KeyPair keyPair = generateKeyPair(algorithmURI, keyLength);
- BasicCredential credential = new BasicCredential(keyPair.getPublic());
+ final KeyPair keyPair = generateKeyPair(algorithmURI, keyLength);
+ final BasicCredential credential = new BasicCredential(keyPair.getPublic());
if (includePrivate) {
credential.setPrivateKey(keyPair.getPrivate());
}
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/config/GlobalAlgorithmRegistryInitializer.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/config/GlobalAlgorithmRegistryInitializer.java
index b66bf3a..c931094 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/config/GlobalAlgorithmRegistryInitializer.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/config/GlobalAlgorithmRegistryInitializer.java
@@ -38,12 +38,12 @@ public class GlobalAlgorithmRegistryInitializer implements Initializer {
/** {@inheritDoc} */
public void init() throws InitializationException {
- AlgorithmRegistry algorithmRegistry = new AlgorithmRegistry();
+ final AlgorithmRegistry algorithmRegistry = new AlgorithmRegistry();
- ServiceLoader<AlgorithmDescriptor> descriptorsLoader = ServiceLoader.load(AlgorithmDescriptor.class);
- Iterator<AlgorithmDescriptor> iter = descriptorsLoader.iterator();
+ final ServiceLoader<AlgorithmDescriptor> descriptorsLoader = ServiceLoader.load(AlgorithmDescriptor.class);
+ final Iterator<AlgorithmDescriptor> iter = descriptorsLoader.iterator();
while (iter.hasNext()) {
- AlgorithmDescriptor descriptor = iter.next();
+ final AlgorithmDescriptor descriptor = iter.next();
log.debug("Registering AlgorithmDescriptor of type '{}' with URI '{}': {}",
descriptor.getType(), descriptor.getURI(), descriptor.getClass().getName());
algorithmRegistry.register(descriptor);
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/DecryptionConfigurationCriterion.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/DecryptionConfigurationCriterion.java
index 702063b..18674fd 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/DecryptionConfigurationCriterion.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/DecryptionConfigurationCriterion.java
@@ -82,7 +82,7 @@ public class DecryptionConfigurationCriterion implements Criterion {
/** {@inheritDoc} */
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append("DecryptionConfigurationCriterion [configs=");
builder.append(configs);
builder.append("]");
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/EncryptionConfigurationCriterion.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/EncryptionConfigurationCriterion.java
index 25cba7b..b34140d 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/EncryptionConfigurationCriterion.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/EncryptionConfigurationCriterion.java
@@ -81,7 +81,7 @@ public class EncryptionConfigurationCriterion implements Criterion {
/** {@inheritDoc} */
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append("EncryptionConfigurationCriterion [configs=");
builder.append(configs);
builder.append("]");
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/KeyInfoGenerationProfileCriterion.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/KeyInfoGenerationProfileCriterion.java
index 9bddecc..0bd0638 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/KeyInfoGenerationProfileCriterion.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/KeyInfoGenerationProfileCriterion.java
@@ -55,7 +55,7 @@ public final class KeyInfoGenerationProfileCriterion implements Criterion {
/** {@inheritDoc} */
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append("KeyInfoGenerationProfileCriterion [name=");
builder.append(name);
builder.append("]");
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/SignatureSigningConfigurationCriterion.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/SignatureSigningConfigurationCriterion.java
index afad861..eca63f1 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/SignatureSigningConfigurationCriterion.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/SignatureSigningConfigurationCriterion.java
@@ -81,7 +81,7 @@ public class SignatureSigningConfigurationCriterion implements Criterion {
/** {@inheritDoc} */
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append("SignatureSigningConfigurationCriterion [configs=");
builder.append(configs);
builder.append("]");
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/SignatureValidationConfigurationCriterion.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/SignatureValidationConfigurationCriterion.java
index 8aa7d39..497b0d8 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/SignatureValidationConfigurationCriterion.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/SignatureValidationConfigurationCriterion.java
@@ -81,7 +81,7 @@ public class SignatureValidationConfigurationCriterion implements Criterion {
/** {@inheritDoc} */
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append("SignatureValidationConfigurationCriterion [configs=");
builder.append(configs);
builder.append("]");
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/crypto/XMLSigningUtil.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/crypto/XMLSigningUtil.java
index 7027aa5..722ee79 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/crypto/XMLSigningUtil.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/crypto/XMLSigningUtil.java
@@ -49,12 +49,12 @@ public final class XMLSigningUtil {
public static byte[] signWithURI(@Nonnull final Credential signingCredential, @Nonnull final String algorithmURI,
@Nonnull final byte[] input) throws SecurityException {
- String jcaAlgorithmID = AlgorithmSupport.getAlgorithmID(algorithmURI);
+ final String jcaAlgorithmID = AlgorithmSupport.getAlgorithmID(algorithmURI);
if (jcaAlgorithmID == null) {
throw new SecurityException("Could not derive JCA algorithm identifier from algorithm URI");
}
- boolean isHMAC = AlgorithmSupport.isHMAC(algorithmURI);
+ final boolean isHMAC = AlgorithmSupport.isHMAC(algorithmURI);
return SigningUtil.sign(signingCredential, jcaAlgorithmID, isHMAC, input);
}
@@ -77,12 +77,12 @@ public final class XMLSigningUtil {
@Nonnull final String algorithmURI, @Nonnull final byte[] signature, @Nonnull final byte[] input)
throws SecurityException {
- String jcaAlgorithmID = AlgorithmSupport.getAlgorithmID(algorithmURI);
+ final String jcaAlgorithmID = AlgorithmSupport.getAlgorithmID(algorithmURI);
if (jcaAlgorithmID == null) {
throw new SecurityException("Could not derive JCA algorithm identifier from algorithm URI");
}
- boolean isHMAC = AlgorithmSupport.isHMAC(algorithmURI);
+ final boolean isHMAC = AlgorithmSupport.isHMAC(algorithmURI);
return SigningUtil.verify(verificationCredential, jcaAlgorithmID, isHMAC, signature, input);
}
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/AbstractEncryptedKeyResolver.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/AbstractEncryptedKeyResolver.java
index 7dc9fd0..4ece656 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/AbstractEncryptedKeyResolver.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/AbstractEncryptedKeyResolver.java
@@ -90,7 +90,7 @@ public abstract class AbstractEncryptedKeyResolver implements EncryptedKeyResolv
* @return true if the recipient value matches the resolver's criteria, false otherwise
*/
protected boolean matchRecipient(@Nullable final String recipient) {
- String trimmedRecipient = StringSupport.trimOrNull(recipient);
+ final String trimmedRecipient = StringSupport.trimOrNull(recipient);
if (trimmedRecipient == null || recipients.isEmpty()) {
return true;
}
@@ -120,8 +120,8 @@ public abstract class AbstractEncryptedKeyResolver implements EncryptedKeyResolv
return false;
}
- String keyCarriedKeyName = encryptedKey.getCarriedKeyName().getValue();
- List<String> dataKeyNames = KeyInfoSupport.getKeyNames(encryptedData.getKeyInfo());
+ final String keyCarriedKeyName = encryptedKey.getCarriedKeyName().getValue();
+ final List<String> dataKeyNames = KeyInfoSupport.getKeyNames(encryptedData.getKeyInfo());
return dataKeyNames.contains(keyCarriedKeyName);
}
@@ -147,8 +147,8 @@ public abstract class AbstractEncryptedKeyResolver implements EncryptedKeyResolv
return false;
}
- List<DataReference> drlist = encryptedKey.getReferenceList().getDataReferences();
- for (DataReference dr : drlist) {
+ final List<DataReference> drlist = encryptedKey.getReferenceList().getDataReferences();
+ for (final DataReference dr : drlist) {
if (Strings.isNullOrEmpty(dr.getURI()) || !dr.getURI().startsWith("#") ) {
continue;
} else if (dr.resolveIDFromRoot(dr.getURI().substring(1)) == encryptedData) {
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Decrypter.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Decrypter.java
index c5721bf..ead3f66 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Decrypter.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Decrypter.java
@@ -409,7 +409,7 @@ public class Decrypter {
@Nonnull public XMLObject decryptData(@Nonnull final EncryptedData encryptedData,
final boolean rootInNewDocument) throws DecryptionException {
- List<XMLObject> xmlObjects = decryptDataToList(encryptedData, rootInNewDocument);
+ final List<XMLObject> xmlObjects = decryptDataToList(encryptedData, rootInNewDocument);
if (xmlObjects.size() != 1) {
log.error("The decrypted data contained more than one top-level XMLObject child");
throw new DecryptionException("The decrypted data contained more than one XMLObject child");
@@ -447,15 +447,15 @@ public class Decrypter {
*/
@Nonnull public List<XMLObject> decryptDataToList(@Nonnull final EncryptedData encryptedData,
final boolean rootInNewDocument) throws DecryptionException {
- List<XMLObject> xmlObjects = new LinkedList<>();
+ final List<XMLObject> xmlObjects = new LinkedList<>();
- DocumentFragment docFragment = decryptDataToDOM(encryptedData);
+ final DocumentFragment docFragment = decryptDataToDOM(encryptedData);
XMLObject xmlObject;
Node node;
Element element;
- NodeList children = docFragment.getChildNodes();
+ final NodeList children = docFragment.getChildNodes();
for (int i = 0; i < children.getLength(); i++) {
node = children.item(i);
if (node.getNodeType() != Node.ELEMENT_NODE) {
@@ -482,7 +482,7 @@ public class Decrypter {
unmarshaller = unmarshallerFactory.getUnmarshaller(
XMLObjectProviderRegistrySupport.getDefaultProviderQName());
if (unmarshaller == null) {
- String errorMsg = "No unmarshaller available for " + QNameSupport.getNodeQName(element);
+ final String errorMsg = "No unmarshaller available for " + QNameSupport.getNodeQName(element);
log.error(errorMsg);
throw new UnmarshallingException(errorMsg);
} else {
@@ -529,9 +529,9 @@ public class Decrypter {
}
}
- String algorithm = encryptedData.getEncryptionMethod().getAlgorithm();
+ final String algorithm = encryptedData.getEncryptionMethod().getAlgorithm();
if (Strings.isNullOrEmpty(algorithm)) {
- String msg = "EncryptedData's EncryptionMethod Algorithm attribute was empty, "
+ final String msg = "EncryptedData's EncryptionMethod Algorithm attribute was empty, "
+ "key decryption could not be attempted";
log.error(msg);
throw new DecryptionException(msg);
@@ -581,9 +581,9 @@ public class Decrypter {
log.error("Error marshalling EncryptedData for decryption", e);
throw e;
}
- Element targetElement = encryptedData.getDOM();
+ final Element targetElement = encryptedData.getDOM();
- XMLCipher xmlCipher;
+ final XMLCipher xmlCipher;
try {
if (getJCAProviderName() != null) {
xmlCipher = XMLCipher.getProviderInstance(getJCAProviderName());
@@ -611,8 +611,8 @@ public class Decrypter {
if (bytes == null) {
throw new DecryptionException("EncryptedData could not be decrypted");
}
- ByteArrayInputStream input = new ByteArrayInputStream(bytes);
- DocumentFragment docFragment = parseInputStream(input, encryptedData.getDOM().getOwnerDocument());
+ final ByteArrayInputStream input = new ByteArrayInputStream(bytes);
+ final DocumentFragment docFragment = parseInputStream(input, encryptedData.getDOM().getOwnerDocument());
return docFragment;
}
@@ -636,13 +636,14 @@ public class Decrypter {
throw new DecryptionException("Algorithm of encrypted key not supplied, key decryption cannot proceed.");
}
- CriteriaSet criteriaSet = buildCredentialCriteria(encryptedKey, kekResolverCriteria);
+ final CriteriaSet criteriaSet = buildCredentialCriteria(encryptedKey, kekResolverCriteria);
try {
- for (Credential cred : kekResolver.resolve(criteriaSet)) {
+ for (final Credential cred : kekResolver.resolve(criteriaSet)) {
try {
return decryptKey(encryptedKey, algorithm, CredentialSupport.extractDecryptionKey(cred));
} catch (final DecryptionException e) {
- String msg = "Attempt to decrypt EncryptedKey using credential from KEK KeyInfo resolver failed: ";
+ final String msg =
+ "Attempt to decrypt EncryptedKey using credential from KEK KeyInfo resolver failed: ";
log.debug(msg, e);
continue;
}
@@ -685,7 +686,7 @@ public class Decrypter {
}
preProcessEncryptedKey(encryptedKey, algorithm, kek);
- XMLCipher xmlCipher;
+ final XMLCipher xmlCipher;
try {
if (getJCAProviderName() != null) {
xmlCipher = XMLCipher.getProviderInstance(getJCAProviderName());
@@ -698,9 +699,9 @@ public class Decrypter {
throw new DecryptionException("Error initialzing cipher instance on key decryption", e);
}
- org.apache.xml.security.encryption.EncryptedKey encKey;
+ final org.apache.xml.security.encryption.EncryptedKey encKey;
try {
- Element targetElement = encryptedKey.getDOM();
+ final Element targetElement = encryptedKey.getDOM();
encKey = xmlCipher.loadEncryptedKey(targetElement.getOwnerDocument(), targetElement);
} catch (final XMLEncryptionException e) {
log.error("Error when loading library native encrypted key representation", e);
@@ -708,7 +709,7 @@ public class Decrypter {
}
try {
- Key key = xmlCipher.decryptKey(encKey, algorithm);
+ final Key key = xmlCipher.decryptKey(encKey, algorithm);
if (key == null) {
throw new DecryptionException("Key could not be decrypted");
}
@@ -747,13 +748,14 @@ public class Decrypter {
*/
@Nullable private DocumentFragment decryptUsingResolvedKey(@Nonnull final EncryptedData encryptedData) {
if (resolver != null) {
- CriteriaSet criteriaSet = buildCredentialCriteria(encryptedData, resolverCriteria);
+ final CriteriaSet criteriaSet = buildCredentialCriteria(encryptedData, resolverCriteria);
try {
- for (Credential cred : resolver.resolve(criteriaSet)) {
+ for (final Credential cred : resolver.resolve(criteriaSet)) {
try {
return decryptDataToDOM(encryptedData, CredentialSupport.extractDecryptionKey(cred));
} catch (final DecryptionException e) {
- String msg = "Decryption attempt using credential from standard KeyInfo resolver failed: ";
+ final String msg =
+ "Decryption attempt using credential from standard KeyInfo resolver failed: ";
log.debug(msg, e);
continue;
}
@@ -776,12 +778,13 @@ public class Decrypter {
@Nullable private DocumentFragment decryptUsingResolvedEncryptedKey(@Nonnull final EncryptedData encryptedData,
@Nonnull final String algorithm) {
if (encKeyResolver != null) {
- for (EncryptedKey encryptedKey : encKeyResolver.resolve(encryptedData)) {
+ for (final EncryptedKey encryptedKey : encKeyResolver.resolve(encryptedData)) {
try {
- Key decryptedKey = decryptKey(encryptedKey, algorithm);
+ final Key decryptedKey = decryptKey(encryptedKey, algorithm);
return decryptDataToDOM(encryptedData, decryptedKey);
} catch (final DecryptionException e) {
- String msg = "Attempt to decrypt EncryptedData using key extracted from EncryptedKey failed: ";
+ final String msg =
+ "Attempt to decrypt EncryptedData using key extracted from EncryptedKey failed: ";
log.debug(msg, e);
continue;
}
@@ -813,10 +816,10 @@ public class Decrypter {
throw new DecryptionException("Error parsing input stream", e);
}
- Element element = newDocument.getDocumentElement();
+ final Element element = newDocument.getDocumentElement();
owningDocument.adoptNode(element);
- DocumentFragment container = owningDocument.createDocumentFragment();
+ final DocumentFragment container = owningDocument.createDocumentFragment();
container.appendChild(element);
return container;
@@ -833,14 +836,14 @@ public class Decrypter {
@Nonnull private CriteriaSet buildCredentialCriteria(@Nonnull final EncryptedType encryptedType,
@Nullable final CriteriaSet staticCriteria) {
- CriteriaSet newCriteriaSet = new CriteriaSet();
+ final CriteriaSet newCriteriaSet = new CriteriaSet();
// This is the main criteria based on the encrypted type's KeyInfo
newCriteriaSet.add(new KeyInfoCriterion(encryptedType.getKeyInfo()));
// Also attemtpt to dynamically construct key criteria based on information
// in the encrypted object
- Set<Criterion> keyCriteria = buildKeyCriteria(encryptedType);
+ final Set<Criterion> keyCriteria = buildKeyCriteria(encryptedType);
if (keyCriteria != null && !keyCriteria.isEmpty()) {
newCriteriaSet.addAll(keyCriteria);
}
@@ -865,19 +868,19 @@ public class Decrypter {
* @return a set of credential criteria pertaining to the decryption key
*/
@Nullable private Set<Criterion> buildKeyCriteria(@Nonnull final EncryptedType encryptedType) {
- EncryptionMethod encMethod = encryptedType.getEncryptionMethod();
+ final EncryptionMethod encMethod = encryptedType.getEncryptionMethod();
if (encMethod == null) {
// This element is optional
return null;
}
- String encAlgorithmURI = StringSupport.trimOrNull(encMethod.getAlgorithm());
+ final String encAlgorithmURI = StringSupport.trimOrNull(encMethod.getAlgorithm());
if (encAlgorithmURI == null) {
return null;
}
- Set<Criterion> critSet = new HashSet<>(2);
+ final Set<Criterion> critSet = new HashSet<>(2);
- KeyAlgorithmCriterion algoCrit = buildKeyAlgorithmCriteria(encAlgorithmURI);
+ final KeyAlgorithmCriterion algoCrit = buildKeyAlgorithmCriteria(encAlgorithmURI);
if (algoCrit != null) {
critSet.add(algoCrit);
log.debug("Added decryption key algorithm criteria: {}", algoCrit.getKeyAlgorithm());
@@ -911,7 +914,7 @@ public class Decrypter {
return null;
}
- String jcaKeyAlgorithm = AlgorithmSupport.getKeyAlgorithm(encAlgorithmURI);
+ final String jcaKeyAlgorithm = AlgorithmSupport.getKeyAlgorithm(encAlgorithmURI);
if (!Strings.isNullOrEmpty(jcaKeyAlgorithm)) {
return new KeyAlgorithmCriterion(jcaKeyAlgorithm);
}
@@ -930,7 +933,7 @@ public class Decrypter {
return null;
}
- Integer keyLength = AlgorithmSupport.getKeyLength(encAlgorithmURI);
+ final Integer keyLength = AlgorithmSupport.getKeyLength(encAlgorithmURI);
if (keyLength != null) {
return new KeyLengthCriterion(keyLength);
}
@@ -954,7 +957,7 @@ public class Decrypter {
marshaller = XMLObjectProviderRegistrySupport.getMarshallerFactory().getMarshaller(
XMLObjectProviderRegistrySupport.getDefaultProviderQName());
if (marshaller == null) {
- String errorMsg = "No marshaller available for " + xmlObject.getElementQName();
+ final String errorMsg = "No marshaller available for " + xmlObject.getElementQName();
log.error(errorMsg);
throw new DecryptionException(errorMsg);
}
@@ -979,8 +982,8 @@ public class Decrypter {
* @return a new parser pool instance
*/
protected ParserPool buildParserPool() {
- BasicParserPool pp = new BasicParserPool();
- HashMap<String, Boolean> features = new HashMap<>();
+ final BasicParserPool pp = new BasicParserPool();
+ final HashMap<String, Boolean> features = new HashMap<>();
pp.setNamespaceAware(true);
@@ -1009,16 +1012,16 @@ public class Decrypter {
* @throws DecryptionException if any algorithms do not satisfy whitelist/blacklist policy
*/
protected void validateAlgorithms(@Nonnull final EncryptedKey encryptedKey) throws DecryptionException {
- String encryptionAlgorithm = encryptedKey.getEncryptionMethod().getAlgorithm();
+ final String encryptionAlgorithm = encryptedKey.getEncryptionMethod().getAlgorithm();
validateAlgorithmURI(encryptionAlgorithm);
if (AlgorithmSupport.isRSAOAEP(encryptionAlgorithm)) {
// ds:DigestMethod
String digestAlgorithm = null;
- List<XMLObject> digestMethods = encryptedKey.getEncryptionMethod()
+ final List<XMLObject> digestMethods = encryptedKey.getEncryptionMethod()
.getUnknownXMLObjects(DigestMethod.DEFAULT_ELEMENT_NAME);
if (digestMethods.size() > 0) {
- DigestMethod digestMethod = (DigestMethod) digestMethods.get(0);
+ final DigestMethod digestMethod = (DigestMethod) digestMethods.get(0);
digestAlgorithm = StringSupport.trimOrNull(digestMethod.getAlgorithm());
}
if (digestAlgorithm == null) {
@@ -1029,9 +1032,10 @@ public class Decrypter {
// xenc11:MGF
String mgfAlgorithm = null;
- List<XMLObject> mgfs = encryptedKey.getEncryptionMethod().getUnknownXMLObjects(MGF.DEFAULT_ELEMENT_NAME);
+ final List<XMLObject> mgfs =
+ encryptedKey.getEncryptionMethod().getUnknownXMLObjects(MGF.DEFAULT_ELEMENT_NAME);
if (mgfs.size() > 0) {
- MGF mgf = (MGF) mgfs.get(0);
+ final MGF mgf = (MGF) mgfs.get(0);
mgfAlgorithm = StringSupport.trimOrNull(mgf.getAlgorithm());
}
if (mgfAlgorithm == null) {
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Encrypter.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Encrypter.java
index 09e136f..7173d55 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Encrypter.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Encrypter.java
@@ -111,13 +111,13 @@ public class Encrypter {
*
*/
public Encrypter() {
- UnmarshallerFactory unmarshallerFactory = XMLObjectProviderRegistrySupport.getUnmarshallerFactory();
+ final UnmarshallerFactory unmarshallerFactory = XMLObjectProviderRegistrySupport.getUnmarshallerFactory();
encryptedDataUnmarshaller = unmarshallerFactory.getUnmarshaller(EncryptedData.DEFAULT_ELEMENT_NAME);
encryptedKeyUnmarshaller = unmarshallerFactory.getUnmarshaller(EncryptedKey.DEFAULT_ELEMENT_NAME);
Constraint.isNotNull(encryptedDataUnmarshaller, "EncryptedData unmarshaller not configured");
Constraint.isNotNull(encryptedKeyUnmarshaller, "EncryptedKey unmarshaller not configured");
- XMLObjectBuilderFactory builderFactory = XMLObjectProviderRegistrySupport.getBuilderFactory();
+ final XMLObjectBuilderFactory builderFactory = XMLObjectProviderRegistrySupport.getBuilderFactory();
keyInfoBuilder = (XMLSignatureBuilder<KeyInfo>) builderFactory.getBuilder(KeyInfo.DEFAULT_ELEMENT_NAME);
Constraint.isNotNull(keyInfoBuilder, "KeyInfo builder not configured");
}
@@ -159,7 +159,7 @@ public class Encrypter {
*/
@Nonnull public EncryptedData encryptElement(@Nonnull final XMLObject xmlObject,
@Nonnull final DataEncryptionParameters encParams) throws EncryptionException {
- List<KeyEncryptionParameters> emptyKEKParamsList = new ArrayList<>();
+ final List<KeyEncryptionParameters> emptyKEKParamsList = new ArrayList<>();
return encryptElement(xmlObject, encParams, emptyKEKParamsList, false);
}
@@ -177,7 +177,7 @@ public class Encrypter {
@Nonnull public EncryptedData encryptElement(@Nonnull final XMLObject xmlObject,
@Nonnull final DataEncryptionParameters encParams, @Nonnull final KeyEncryptionParameters kekParams)
throws EncryptionException {
- List<KeyEncryptionParameters> kekParamsList = new ArrayList<>();
+ final List<KeyEncryptionParameters> kekParamsList = new ArrayList<>();
kekParamsList.add(kekParams);
return encryptElement(xmlObject, encParams, kekParamsList, false);
}
@@ -210,7 +210,7 @@ public class Encrypter {
*/
@Nonnull public EncryptedData encryptElementContent(@Nonnull final XMLObject xmlObject,
@Nonnull final DataEncryptionParameters encParams) throws EncryptionException {
- List<KeyEncryptionParameters> emptyKEKParamsList = new ArrayList<>();
+ final List<KeyEncryptionParameters> emptyKEKParamsList = new ArrayList<>();
return encryptElement(xmlObject, encParams, emptyKEKParamsList, true);
}
@@ -228,7 +228,7 @@ public class Encrypter {
@Nonnull public EncryptedData encryptElementContent(@Nonnull final XMLObject xmlObject,
@Nonnull final DataEncryptionParameters encParams, @Nonnull final KeyEncryptionParameters kekParams)
throws EncryptionException {
- List<KeyEncryptionParameters> kekParamsList = new ArrayList<>();
+ final List<KeyEncryptionParameters> kekParamsList = new ArrayList<>();
kekParamsList.add(kekParams);
return encryptElement(xmlObject, encParams, kekParamsList, true);
}
@@ -268,9 +268,9 @@ public class Encrypter {
checkParams(kekParamsList, false);
- List<EncryptedKey> encKeys = new ArrayList<>();
+ final List<EncryptedKey> encKeys = new ArrayList<>();
- for (KeyEncryptionParameters kekParam : kekParamsList) {
+ for (final KeyEncryptionParameters kekParam : kekParamsList) {
encKeys.add(encryptKey(key, kekParam, containingDocument));
}
return encKeys;
@@ -292,13 +292,13 @@ public class Encrypter {
checkParams(kekParams, false);
- Key encryptionKey = CredentialSupport.extractEncryptionKey(kekParams.getEncryptionCredential());
+ final Key encryptionKey = CredentialSupport.extractEncryptionKey(kekParams.getEncryptionCredential());
- EncryptedKey encryptedKey = encryptKey(key, encryptionKey, kekParams.getAlgorithm(),
+ final EncryptedKey encryptedKey = encryptKey(key, encryptionKey, kekParams.getAlgorithm(),
kekParams.getRSAOAEPParameters(), containingDocument);
if (kekParams.getKeyInfoGenerator() != null) {
- KeyInfoGenerator generator = kekParams.getKeyInfoGenerator();
+ final KeyInfoGenerator generator = kekParams.getKeyInfoGenerator();
log.debug("Dynamically generating KeyInfo from Credential for EncryptedKey using generator: {}", generator
.getClass().getName());
try {
@@ -344,7 +344,7 @@ public class Encrypter {
log.debug("Encrypting encryption key with algorithm: {}", encryptionAlgorithmURI);
- XMLCipher xmlCipher;
+ final XMLCipher xmlCipher;
try {
xmlCipher = buildXMLCipher(encryptionKey, encryptionAlgorithmURI, rsaOAEPParams);
} catch (final XMLEncryptionException e) {
@@ -352,7 +352,7 @@ public class Encrypter {
throw new EncryptionException("Error initializing cipher instance on key encryption", e);
}
- org.apache.xml.security.encryption.EncryptedKey apacheEncryptedKey;
+ final org.apache.xml.security.encryption.EncryptedKey apacheEncryptedKey;
try {
if (AlgorithmSupport.isRSAOAEP(encryptionAlgorithmURI) && rsaOAEPParams != null) {
apacheEncryptedKey = xmlCipher.encryptKey(containingDocument, targetKey,
@@ -369,7 +369,7 @@ public class Encrypter {
}
try {
- Element encKeyElement = xmlCipher.martial(containingDocument, apacheEncryptedKey);
+ final Element encKeyElement = xmlCipher.martial(containingDocument, apacheEncryptedKey);
return (EncryptedKey) encryptedKeyUnmarshaller.unmarshall(encKeyElement);
} catch (final UnmarshallingException e) {
log.error("Error unmarshalling EncryptedKey element", e);
@@ -390,7 +390,7 @@ public class Encrypter {
@Nonnull final String encryptionAlgorithmURI, @Nullable final RSAOAEPParameters rsaOAEPParams)
throws XMLEncryptionException {
- XMLCipher xmlCipher;
+ final XMLCipher xmlCipher;
if (getJCAProviderName() != null) {
if (AlgorithmSupport.isRSAOAEP(encryptionAlgorithmURI) && rsaOAEPParams != null
@@ -442,7 +442,7 @@ public class Encrypter {
@Nullable protected byte[] decodeOAEPParams(@Nullable final String base64Params) throws EncryptionException {
try {
if (base64Params != null) {
- byte[] oaepParams = Base64Support.decode(base64Params);
+ final byte[] oaepParams = Base64Support.decode(base64Params);
if (oaepParams.length == 0) {
return null;
} else {
@@ -478,7 +478,7 @@ public class Encrypter {
// parameters to RSA-OAEP key transport algorithm. The latter only applies to the XML Encryption 1.1 variant.
// Check and only add if the library hasn't already done so.
if (AlgorithmSupport.isRSAOAEP(encryptionAlgorithmURI)) {
- org.apache.xml.security.encryption.EncryptionMethod apacheEncryptionMethod =
+ final org.apache.xml.security.encryption.EncryptionMethod apacheEncryptionMethod =
apacheEncryptedKey.getEncryptionMethod();
if (apacheEncryptionMethod.getDigestAlgorithm() == null) {
@@ -519,10 +519,10 @@ public class Encrypter {
checkAndMarshall(xmlObject);
- Element targetElement = xmlObject.getDOM();
- Document ownerDocument = targetElement.getOwnerDocument();
+ final Element targetElement = xmlObject.getDOM();
+ final Document ownerDocument = targetElement.getOwnerDocument();
- XMLCipher xmlCipher;
+ final XMLCipher xmlCipher;
try {
if (getJCAProviderName() != null) {
xmlCipher = XMLCipher.getProviderInstance(encryptionAlgorithmURI, getJCAProviderName());
@@ -535,7 +535,7 @@ public class Encrypter {
throw new EncryptionException("Error initializing cipher instance", e);
}
- org.apache.xml.security.encryption.EncryptedData apacheEncryptedData;
+ final org.apache.xml.security.encryption.EncryptedData apacheEncryptedData;
try {
apacheEncryptedData = xmlCipher.encryptData(ownerDocument, targetElement, encryptContentMode);
} catch (final Exception e) {
@@ -544,7 +544,7 @@ public class Encrypter {
}
try {
- Element encDataElement = xmlCipher.martial(ownerDocument, apacheEncryptedData);
+ final Element encDataElement = xmlCipher.martial(ownerDocument, apacheEncryptedData);
return (EncryptedData) encryptedDataUnmarshaller.unmarshall(encDataElement);
} catch (final UnmarshallingException e) {
log.error("Error unmarshalling EncryptedData element", e);
@@ -571,18 +571,18 @@ public class Encrypter {
checkParams(encParams, kekParamsList);
- String encryptionAlgorithmURI = encParams.getAlgorithm();
+ final String encryptionAlgorithmURI = encParams.getAlgorithm();
Key encryptionKey = CredentialSupport.extractEncryptionKey(encParams.getEncryptionCredential());
if (encryptionKey == null) {
encryptionKey = generateEncryptionKey(encryptionAlgorithmURI);
}
- EncryptedData encryptedData =
+ final EncryptedData encryptedData =
encryptElement(xmlObject, encryptionKey, encryptionAlgorithmURI, encryptContentMode);
- Document ownerDocument = encryptedData.getDOM().getOwnerDocument();
+ final Document ownerDocument = encryptedData.getDOM().getOwnerDocument();
if (encParams.getKeyInfoGenerator() != null) {
- KeyInfoGenerator generator = encParams.getKeyInfoGenerator();
+ final KeyInfoGenerator generator = encParams.getKeyInfoGenerator();
log.debug("Dynamically generating KeyInfo from Credential for EncryptedData using generator: {}", generator
.getClass().getName());
try {
@@ -593,10 +593,10 @@ public class Encrypter {
}
}
- for (KeyEncryptionParameters kekParams : kekParamsList) {
- EncryptedKey encryptedKey = encryptKey(encryptionKey, kekParams, ownerDocument);
+ for (final KeyEncryptionParameters kekParams : kekParamsList) {
+ final EncryptedKey encryptedKey = encryptKey(encryptionKey, kekParams, ownerDocument);
if (encryptedData.getKeyInfo() == null) {
- KeyInfo keyInfo = keyInfoBuilder.buildObject();
+ final KeyInfo keyInfo = keyInfoBuilder.buildObject();
encryptedData.setKeyInfo(keyInfo);
}
encryptedData.getKeyInfo().getEncryptedKeys().add(encryptedKey);
@@ -615,7 +615,7 @@ public class Encrypter {
Element targetElement = xmlObject.getDOM();
if (targetElement == null) {
try {
- Marshaller marshaller =
+ final Marshaller marshaller =
XMLObjectProviderRegistrySupport.getMarshallerFactory().getMarshaller(xmlObject);
if (marshaller == null) {
throw new MarshallingException("No marshaller available for " + xmlObject.getElementQName());
@@ -663,7 +663,7 @@ public class Encrypter {
throw new EncryptionException("Key encryption parameters are required");
}
}
- Key key = CredentialSupport.extractEncryptionKey(kekParams.getEncryptionCredential());
+ final Key key = CredentialSupport.extractEncryptionKey(kekParams.getEncryptionCredential());
if (key == null) {
log.error("Key encryption credential and contained key are required");
throw new EncryptionException("Key encryption credential and contained key are required");
@@ -697,7 +697,7 @@ public class Encrypter {
throw new EncryptionException("Key encryption parameters list may not be empty");
}
}
- for (KeyEncryptionParameters kekParams : kekParamsList) {
+ for (final KeyEncryptionParameters kekParams : kekParamsList) {
checkParams(kekParams, false);
}
}
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/SimpleKeyInfoReferenceEncryptedKeyResolver.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/SimpleKeyInfoReferenceEncryptedKeyResolver.java
index 409ef8d..df728ec 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/SimpleKeyInfoReferenceEncryptedKeyResolver.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/SimpleKeyInfoReferenceEncryptedKeyResolver.java
@@ -111,7 +111,7 @@ public class SimpleKeyInfoReferenceEncryptedKeyResolver extends AbstractEncrypte
* @return encrypted keys
*/
@Nonnull protected Iterable<EncryptedKey> resolveKeyInfo(@Nullable final KeyInfo keyInfo, final int limit) {
- List<EncryptedKey> resolvedEncKeys = new ArrayList<>();
+ final List<EncryptedKey> resolvedEncKeys = new ArrayList<>();
if (keyInfo == null) {
return resolvedEncKeys;
@@ -147,12 +147,12 @@ public class SimpleKeyInfoReferenceEncryptedKeyResolver extends AbstractEncrypte
* @return the dereferenced KeyInfo
*/
@Nullable protected KeyInfo dereferenceURI(@Nonnull final KeyInfoReference ref) {
- String uri = ref.getURI();
+ final String uri = ref.getURI();
if (uri == null || uri.isEmpty() || !uri.startsWith("#")) {
log.warn("EncryptedKey KeyInfoReference did not contain a same-document URI reference, cannot process");
return null;
}
- XMLObject target = ref.resolveIDFromRoot(uri.substring(1));
+ final XMLObject target = ref.resolveIDFromRoot(uri.substring(1));
if (target == null) {
log.warn("EncryptedKey KeyInfoReference URI could not be dereferenced");
return null;
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/SimpleRetrievalMethodEncryptedKeyResolver.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/SimpleRetrievalMethodEncryptedKeyResolver.java
index 2fad7c7..e5de975 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/SimpleRetrievalMethodEncryptedKeyResolver.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/SimpleRetrievalMethodEncryptedKeyResolver.java
@@ -85,7 +85,7 @@ public class SimpleRetrievalMethodEncryptedKeyResolver extends AbstractEncrypted
return resolvedEncKeys;
}
- for (RetrievalMethod rm : encryptedData.getKeyInfo().getRetrievalMethods()) {
+ for (final RetrievalMethod rm : encryptedData.getKeyInfo().getRetrievalMethods()) {
if (!Objects.equals(rm.getType(), EncryptionConstants.TYPE_ENCRYPTED_KEY)) {
continue;
} else if (rm.getTransforms() != null) {
@@ -93,7 +93,7 @@ public class SimpleRetrievalMethodEncryptedKeyResolver extends AbstractEncrypted
continue;
}
- EncryptedKey encKey = dereferenceURI(rm);
+ final EncryptedKey encKey = dereferenceURI(rm);
if (encKey == null) {
continue;
} else if (matchRecipient(encKey.getRecipient())) {
@@ -111,13 +111,13 @@ public class SimpleRetrievalMethodEncryptedKeyResolver extends AbstractEncrypted
* @return the dereferenced EncryptedKey
*/
@Nullable protected EncryptedKey dereferenceURI(@Nonnull final RetrievalMethod rm) {
- String uri = rm.getURI();
+ final String uri = rm.getURI();
if (Strings.isNullOrEmpty(uri) || !uri.startsWith("#")) {
log.warn("EncryptedKey RetrievalMethod did not contain a same-document URI reference, cannot process");
return null;
}
- XMLObject target = rm.resolveIDFromRoot(uri.substring(1));
+ final XMLObject target = rm.resolveIDFromRoot(uri.substring(1));
if (target == null) {
log.warn("EncryptedKey RetrievalMethod URI could not be dereferenced");
return null;
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoCriterion.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoCriterion.java
index 69c66cd..53ca4cd 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoCriterion.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoCriterion.java
@@ -64,7 +64,7 @@ public final class KeyInfoCriterion implements Criterion {
/** {@inheritDoc} */
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append("KeyInfoCriterion [keyInfo=");
builder.append("<contents not displayable>");
builder.append("]");
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupport.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupport.java
index 85c29b2..a3fd43b 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupport.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupport.java
@@ -103,14 +103,14 @@ public class KeyInfoSupport {
* @return a list of key name strings
*/
@Nonnull public static List<String> getKeyNames(@Nullable final KeyInfo keyInfo) {
- List<String> keynameList = new LinkedList<>();
+ final List<String> keynameList = new LinkedList<>();
if (keyInfo == null) {
return keynameList;
}
- List<KeyName> keyNames = keyInfo.getKeyNames();
- for (KeyName keyName : keyNames) {
+ final List<KeyName> keyNames = keyInfo.getKeyNames();
+ for (final KeyName keyName : keyNames) {
if (keyName.getValue() != null) {
keynameList.add(keyName.getValue());
}
@@ -128,9 +128,9 @@ public class KeyInfoSupport {
public static void addKeyName(@Nonnull final KeyInfo keyInfo, @Nullable final String keyNameValue) {
Constraint.isNotNull(keyInfo, "KeyInfo cannot be null");
- XMLObjectBuilder<KeyName> keyNameBuilder = (XMLObjectBuilder<KeyName>)
+ final XMLObjectBuilder<KeyName> keyNameBuilder = (XMLObjectBuilder<KeyName>)
XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(KeyName.DEFAULT_ELEMENT_NAME);
- KeyName keyName = Constraint.isNotNull(keyNameBuilder, "KeyName builder not available").buildObject(
+ final KeyName keyName = Constraint.isNotNull(keyNameBuilder, "KeyName builder not available").buildObject(
KeyName.DEFAULT_ELEMENT_NAME);
keyName.setValue(keyNameValue);
keyInfo.getKeyNames().add(keyName);
@@ -148,14 +148,14 @@ public class KeyInfoSupport {
*/
@Nonnull public static List<X509Certificate> getCertificates(@Nullable final KeyInfo keyInfo)
throws CertificateException {
- List<X509Certificate> certList = new LinkedList<>();
+ final List<X509Certificate> certList = new LinkedList<>();
if (keyInfo == null) {
return certList;
}
- List<X509Data> x509Datas = keyInfo.getX509Datas();
- for (X509Data x509Data : x509Datas) {
+ final List<X509Data> x509Datas = keyInfo.getX509Datas();
+ for (final X509Data x509Data : x509Datas) {
certList.addAll(getCertificates(x509Data));
}
@@ -174,14 +174,14 @@ public class KeyInfoSupport {
*/
@Nonnull public static List<X509Certificate> getCertificates(@Nullable final X509Data x509Data)
throws CertificateException {
- List<X509Certificate> certList = new LinkedList<>();
+ final List<X509Certificate> certList = new LinkedList<>();
if (x509Data == null) {
return certList;
}
- for (org.opensaml.xmlsec.signature.X509Certificate xmlCert : x509Data.getX509Certificates()) {
- X509Certificate newCert = getCertificate(xmlCert);
+ for (final org.opensaml.xmlsec.signature.X509Certificate xmlCert : x509Data.getX509Certificates()) {
+ final X509Certificate newCert = getCertificate(xmlCert);
if (newCert != null) {
certList.add(newCert);
}
@@ -221,14 +221,14 @@ public class KeyInfoSupport {
* s
*/
@Nonnull public static List<X509CRL> getCRLs(@Nullable final KeyInfo keyInfo) throws CRLException {
- List<X509CRL> crlList = new LinkedList<>();
+ final List<X509CRL> crlList = new LinkedList<>();
if (keyInfo == null) {
return crlList;
}
- List<X509Data> x509Datas = keyInfo.getX509Datas();
- for (X509Data x509Data : x509Datas) {
+ final List<X509Data> x509Datas = keyInfo.getX509Datas();
+ for (final X509Data x509Data : x509Datas) {
crlList.addAll(getCRLs(x509Data));
}
@@ -246,14 +246,14 @@ public class KeyInfoSupport {
* s
*/
@Nonnull public static List<X509CRL> getCRLs(@Nullable final X509Data x509Data) throws CRLException {
- List<X509CRL> crlList = new LinkedList<>();
+ final List<X509CRL> crlList = new LinkedList<>();
if (x509Data == null) {
return crlList;
}
- for (org.opensaml.xmlsec.signature.X509CRL xmlCRL : x509Data.getX509CRLs()) {
- X509CRL newCRL = getCRL(xmlCRL);
+ for (final org.opensaml.xmlsec.signature.X509CRL xmlCRL : x509Data.getX509CRLs()) {
+ final X509CRL newCRL = getCRL(xmlCRL);
if (newCRL != null) {
crlList.add(newCRL);
}
@@ -298,9 +298,9 @@ public class KeyInfoSupport {
throws CertificateEncodingException {
Constraint.isNotNull(keyInfo, "KeyInfo cannot be null");
- X509Data x509Data;
+ final X509Data x509Data;
if (keyInfo.getX509Datas().size() == 0) {
- XMLObjectBuilder<X509Data> x509DataBuilder = (XMLObjectBuilder<X509Data>)
+ final XMLObjectBuilder<X509Data> x509DataBuilder = (XMLObjectBuilder<X509Data>)
XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(X509Data.DEFAULT_ELEMENT_NAME);
x509Data = Constraint.isNotNull(x509DataBuilder, "X509Data builder not available").buildObject(
X509Data.DEFAULT_ELEMENT_NAME);
@@ -323,9 +323,9 @@ public class KeyInfoSupport {
public static void addCRL(@Nonnull final KeyInfo keyInfo, @Nonnull final X509CRL crl) throws CRLException {
Constraint.isNotNull(keyInfo, "KeyInfo cannot be null");
- X509Data x509Data;
+ final X509Data x509Data;
if (keyInfo.getX509Datas().size() == 0) {
- XMLObjectBuilder<X509Data> x509DataBuilder = (XMLObjectBuilder<X509Data>)
+ final XMLObjectBuilder<X509Data> x509DataBuilder = (XMLObjectBuilder<X509Data>)
XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(X509Data.DEFAULT_ELEMENT_NAME);
x509Data = Constraint.isNotNull(x509DataBuilder, "X509Data builder not available").buildObject(
X509Data.DEFAULT_ELEMENT_NAME);
@@ -350,11 +350,11 @@ public class KeyInfoSupport {
throws CertificateEncodingException {
Constraint.isNotNull(cert, "X.509 certificate cannot be null");
- XMLObjectBuilder<org.opensaml.xmlsec.signature.X509Certificate> xmlCertBuilder =
+ final XMLObjectBuilder<org.opensaml.xmlsec.signature.X509Certificate> xmlCertBuilder =
(XMLObjectBuilder<org.opensaml.xmlsec.signature.X509Certificate>)
XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(
org.opensaml.xmlsec.signature.X509Certificate.DEFAULT_ELEMENT_NAME);
- org.opensaml.xmlsec.signature.X509Certificate xmlCert =
+ final org.opensaml.xmlsec.signature.X509Certificate xmlCert =
Constraint.isNotNull(xmlCertBuilder, "X509Certificate builder not available").buildObject(
org.opensaml.xmlsec.signature.X509Certificate.DEFAULT_ELEMENT_NAME);
xmlCert.setValue(Base64Support.encode(cert.getEncoded(), Base64Support.CHUNKED));
@@ -374,11 +374,11 @@ public class KeyInfoSupport {
@Nonnull public static org.opensaml.xmlsec.signature.X509CRL buildX509CRL(final X509CRL crl) throws CRLException {
Constraint.isNotNull(crl, "X.509 CRL cannot be null");
- XMLObjectBuilder<org.opensaml.xmlsec.signature.X509CRL> xmlCRLBuilder =
+ final XMLObjectBuilder<org.opensaml.xmlsec.signature.X509CRL> xmlCRLBuilder =
(XMLObjectBuilder<org.opensaml.xmlsec.signature.X509CRL>)
XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(
org.opensaml.xmlsec.signature.X509CRL.DEFAULT_ELEMENT_NAME);
- org.opensaml.xmlsec.signature.X509CRL xmlCRL =
+ final org.opensaml.xmlsec.signature.X509CRL xmlCRL =
Constraint.isNotNull(xmlCRLBuilder, "X509Certificate builder not available").buildObject(
org.opensaml.xmlsec.signature.X509CRL.DEFAULT_ELEMENT_NAME);
xmlCRL.setValue(Base64Support.encode(crl.getEncoded(), Base64Support.CHUNKED));
@@ -393,9 +393,9 @@ public class KeyInfoSupport {
* @return the new X509SubjectName
*/
@Nonnull public static X509SubjectName buildX509SubjectName(@Nullable final String subjectName) {
- XMLObjectBuilder<X509SubjectName> xmlSubjectNameBuilder = (XMLObjectBuilder<X509SubjectName>)
+ final XMLObjectBuilder<X509SubjectName> xmlSubjectNameBuilder = (XMLObjectBuilder<X509SubjectName>)
XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(X509SubjectName.DEFAULT_ELEMENT_NAME);
- X509SubjectName xmlSubjectName =
+ final X509SubjectName xmlSubjectName =
Constraint.isNotNull(xmlSubjectNameBuilder, "X509SubjectName builder not available").buildObject(
X509SubjectName.DEFAULT_ELEMENT_NAME);
xmlSubjectName.setValue(subjectName);
@@ -411,25 +411,25 @@ public class KeyInfoSupport {
*/
@Nonnull public static X509IssuerSerial buildX509IssuerSerial(@Nullable final String issuerName,
@Nullable final BigInteger serialNumber) {
- XMLObjectBuilderFactory builderFactory = XMLObjectProviderRegistrySupport.getBuilderFactory();
+ final XMLObjectBuilderFactory builderFactory = XMLObjectProviderRegistrySupport.getBuilderFactory();
- XMLObjectBuilder<X509IssuerName> xmlIssuerNameBuilder = (XMLObjectBuilder<X509IssuerName>)
+ final XMLObjectBuilder<X509IssuerName> xmlIssuerNameBuilder = (XMLObjectBuilder<X509IssuerName>)
builderFactory.getBuilder(X509IssuerName.DEFAULT_ELEMENT_NAME);
- X509IssuerName xmlIssuerName =
+ final X509IssuerName xmlIssuerName =
Constraint.isNotNull(xmlIssuerNameBuilder, "X509IssuerName builder not available").buildObject(
X509IssuerName.DEFAULT_ELEMENT_NAME);
xmlIssuerName.setValue(issuerName);
- XMLObjectBuilder<X509SerialNumber> xmlSerialNumberBuilder = (XMLObjectBuilder<X509SerialNumber>)
+ final XMLObjectBuilder<X509SerialNumber> xmlSerialNumberBuilder = (XMLObjectBuilder<X509SerialNumber>)
builderFactory.getBuilder(X509SerialNumber.DEFAULT_ELEMENT_NAME);
- X509SerialNumber xmlSerialNumber =
+ final X509SerialNumber xmlSerialNumber =
Constraint.isNotNull(xmlSerialNumberBuilder, "X509SerialNumber builder not available").buildObject(
X509SerialNumber.DEFAULT_ELEMENT_NAME);
xmlSerialNumber.setValue(serialNumber);
- XMLObjectBuilder<X509IssuerSerial> xmlIssuerSerialBuilder = (XMLObjectBuilder<X509IssuerSerial>)
+ final XMLObjectBuilder<X509IssuerSerial> xmlIssuerSerialBuilder = (XMLObjectBuilder<X509IssuerSerial>)
builderFactory.getBuilder(X509IssuerSerial.DEFAULT_ELEMENT_NAME);
- X509IssuerSerial xmlIssuerSerial =
+ final X509IssuerSerial xmlIssuerSerial =
Constraint.isNotNull(xmlIssuerSerialBuilder, "X509IssuerSerial builder not available").buildObject(
X509IssuerSerial.DEFAULT_ELEMENT_NAME);
xmlIssuerSerial.setX509IssuerName(xmlIssuerName);
@@ -445,14 +445,14 @@ public class KeyInfoSupport {
* @return a new X509SKI object, or null if the certificate did not contain the subject key identifier extension
*/
@Nullable public static X509SKI buildX509SKI(@Nonnull final X509Certificate javaCert) {
- byte[] skiPlainValue = X509Support.getSubjectKeyIdentifier(javaCert);
+ final byte[] skiPlainValue = X509Support.getSubjectKeyIdentifier(javaCert);
if (skiPlainValue == null || skiPlainValue.length == 0) {
return null;
}
- XMLObjectBuilder<X509SKI> xmlSKIBuilder = (XMLObjectBuilder<X509SKI>)
+ final XMLObjectBuilder<X509SKI> xmlSKIBuilder = (XMLObjectBuilder<X509SKI>)
XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(X509SKI.DEFAULT_ELEMENT_NAME);
- X509SKI xmlSKI = Constraint.isNotNull(xmlSKIBuilder, "X509SKI builder not available").buildObject(
+ final X509SKI xmlSKI = Constraint.isNotNull(xmlSKIBuilder, "X509SKI builder not available").buildObject(
X509SKI.DEFAULT_ELEMENT_NAME);
xmlSKI.setValue(Base64Support.encode(skiPlainValue, Base64Support.CHUNKED));
@@ -472,16 +472,16 @@ public class KeyInfoSupport {
@Nonnull final String algorithmURI) throws NoSuchAlgorithmException, CertificateEncodingException {
Constraint.isNotNull(javaCert, "Certificate cannot be null");
- String jceAlg = AlgorithmSupport.getAlgorithmID(algorithmURI);
+ final String jceAlg = AlgorithmSupport.getAlgorithmID(algorithmURI);
if (jceAlg == null) {
throw new NoSuchAlgorithmException("No JCE algorithm found for " + algorithmURI);
}
- MessageDigest md = MessageDigest.getInstance(jceAlg);
- byte[] hash = md.digest(javaCert.getEncoded());
+ final MessageDigest md = MessageDigest.getInstance(jceAlg);
+ final byte[] hash = md.digest(javaCert.getEncoded());
- XMLObjectBuilder<X509Digest> builder = (XMLObjectBuilder<X509Digest>)
+ final XMLObjectBuilder<X509Digest> builder = (XMLObjectBuilder<X509Digest>)
XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(X509Digest.DEFAULT_ELEMENT_NAME);
- X509Digest xmlDigest = Constraint.isNotNull(builder, "X509Digest builder not available").buildObject(
+ final X509Digest xmlDigest = Constraint.isNotNull(builder, "X509Digest builder not available").buildObject(
X509Digest.DEFAULT_ELEMENT_NAME);
xmlDigest.setAlgorithm(algorithmURI);
xmlDigest.setValue(Base64Support.encode(hash, Base64Support.CHUNKED));
@@ -502,9 +502,9 @@ public class KeyInfoSupport {
public static void addPublicKey(@Nonnull final KeyInfo keyInfo, @Nullable final PublicKey pk) {
Constraint.isNotNull(keyInfo, "KeyInfo cannot be null");
- XMLObjectBuilder<KeyValue> keyValueBuilder = (XMLObjectBuilder<KeyValue>)
+ final XMLObjectBuilder<KeyValue> keyValueBuilder = (XMLObjectBuilder<KeyValue>)
XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(KeyValue.DEFAULT_ELEMENT_NAME);
- KeyValue keyValue = Constraint.isNotNull(keyValueBuilder, "KeyValue builder not available").buildObject(
+ final KeyValue keyValue = Constraint.isNotNull(keyValueBuilder, "KeyValue builder not available").buildObject(
KeyValue.DEFAULT_ELEMENT_NAME);
// TODO handle ECKeyValue
@@ -529,22 +529,22 @@ public class KeyInfoSupport {
@Nonnull public static RSAKeyValue buildRSAKeyValue(@Nonnull final RSAPublicKey rsaPubKey) {
Constraint.isNotNull(rsaPubKey, "RSA public key cannot be null");
- XMLObjectBuilderFactory builderFactory = XMLObjectProviderRegistrySupport.getBuilderFactory();
+ final XMLObjectBuilderFactory builderFactory = XMLObjectProviderRegistrySupport.getBuilderFactory();
- XMLObjectBuilder<RSAKeyValue> rsaKeyValueBuilder = (XMLObjectBuilder<RSAKeyValue>)
+ final XMLObjectBuilder<RSAKeyValue> rsaKeyValueBuilder = (XMLObjectBuilder<RSAKeyValue>)
builderFactory.getBuilder(RSAKeyValue.DEFAULT_ELEMENT_NAME);
- RSAKeyValue rsaKeyValue =
+ final RSAKeyValue rsaKeyValue =
Constraint.isNotNull(rsaKeyValueBuilder, "RSAKeyValue builder not available").buildObject(
RSAKeyValue.DEFAULT_ELEMENT_NAME);
- XMLObjectBuilder<Modulus> modulusBuilder = (XMLObjectBuilder<Modulus>)
+ final XMLObjectBuilder<Modulus> modulusBuilder = (XMLObjectBuilder<Modulus>)
builderFactory.getBuilder(Modulus.DEFAULT_ELEMENT_NAME);
- Modulus modulus = Constraint.isNotNull(modulusBuilder, "Modulus builder not available").buildObject(
+ final Modulus modulus = Constraint.isNotNull(modulusBuilder, "Modulus builder not available").buildObject(
Modulus.DEFAULT_ELEMENT_NAME);
- XMLObjectBuilder<Exponent> exponentBuilder = (XMLObjectBuilder<Exponent>)
+ final XMLObjectBuilder<Exponent> exponentBuilder = (XMLObjectBuilder<Exponent>)
builderFactory.getBuilder(Exponent.DEFAULT_ELEMENT_NAME);
- Exponent exponent = Constraint.isNotNull(exponentBuilder, "Exponent builder not available").buildObject(
+ final Exponent exponent = Constraint.isNotNull(exponentBuilder, "Exponent builder not available").buildObject(
Exponent.DEFAULT_ELEMENT_NAME);
modulus.setValueBigInt(rsaPubKey.getModulus());
@@ -565,23 +565,23 @@ public class KeyInfoSupport {
@Nonnull public static DSAKeyValue buildDSAKeyValue(@Nonnull final DSAPublicKey dsaPubKey) {
Constraint.isNotNull(dsaPubKey, "DSA public key cannot be null");
- XMLObjectBuilderFactory builderFactory = XMLObjectProviderRegistrySupport.getBuilderFactory();
+ final XMLObjectBuilderFactory builderFactory = XMLObjectProviderRegistrySupport.getBuilderFactory();
- XMLObjectBuilder<DSAKeyValue> dsaKeyValueBuilder = (XMLObjectBuilder<DSAKeyValue>)
+ final XMLObjectBuilder<DSAKeyValue> dsaKeyValueBuilder = (XMLObjectBuilder<DSAKeyValue>)
builderFactory.getBuilder(DSAKeyValue.DEFAULT_ELEMENT_NAME);
- DSAKeyValue dsaKeyValue =
+ final DSAKeyValue dsaKeyValue =
Constraint.isNotNull(dsaKeyValueBuilder, "DSAKeyValue builder not available").buildObject(
DSAKeyValue.DEFAULT_ELEMENT_NAME);
- XMLObjectBuilder<Y> yBuilder = (XMLObjectBuilder<Y>) builderFactory.getBuilder(Y.DEFAULT_ELEMENT_NAME);
- XMLObjectBuilder<G> gBuilder = (XMLObjectBuilder<G>) builderFactory.getBuilder(G.DEFAULT_ELEMENT_NAME);
- XMLObjectBuilder<P> pBuilder = (XMLObjectBuilder<P>) builderFactory.getBuilder(P.DEFAULT_ELEMENT_NAME);
- XMLObjectBuilder<Q> qBuilder = (XMLObjectBuilder<Q>) builderFactory.getBuilder(Q.DEFAULT_ELEMENT_NAME);
+ final XMLObjectBuilder<Y> yBuilder = (XMLObjectBuilder<Y>) builderFactory.getBuilder(Y.DEFAULT_ELEMENT_NAME);
+ final XMLObjectBuilder<G> gBuilder = (XMLObjectBuilder<G>) builderFactory.getBuilder(G.DEFAULT_ELEMENT_NAME);
+ final XMLObjectBuilder<P> pBuilder = (XMLObjectBuilder<P>) builderFactory.getBuilder(P.DEFAULT_ELEMENT_NAME);
+ final XMLObjectBuilder<Q> qBuilder = (XMLObjectBuilder<Q>) builderFactory.getBuilder(Q.DEFAULT_ELEMENT_NAME);
- Y y = Constraint.isNotNull(yBuilder, "Y builder not available").buildObject(Y.DEFAULT_ELEMENT_NAME);
- G g = Constraint.isNotNull(gBuilder, "G builder not available").buildObject(G.DEFAULT_ELEMENT_NAME);
- P p = Constraint.isNotNull(pBuilder, "P builder not available").buildObject(P.DEFAULT_ELEMENT_NAME);
- Q q = Constraint.isNotNull(qBuilder, "Q builder not available").buildObject(Q.DEFAULT_ELEMENT_NAME);
+ final Y y = Constraint.isNotNull(yBuilder, "Y builder not available").buildObject(Y.DEFAULT_ELEMENT_NAME);
+ final G g = Constraint.isNotNull(gBuilder, "G builder not available").buildObject(G.DEFAULT_ELEMENT_NAME);
+ final P p = Constraint.isNotNull(pBuilder, "P builder not available").buildObject(P.DEFAULT_ELEMENT_NAME);
+ final Q q = Constraint.isNotNull(qBuilder, "Q builder not available").buildObject(Q.DEFAULT_ELEMENT_NAME);
y.setValueBigInt(dsaPubKey.getY());
dsaKeyValue.setY(y);
@@ -612,14 +612,14 @@ public class KeyInfoSupport {
Constraint.isNotNull(keyInfo, "KeyInfo cannot be null");
Constraint.isNotNull(pk, "Public key cannot be null");
- XMLObjectBuilder<DEREncodedKeyValue> builder = (XMLObjectBuilder<DEREncodedKeyValue>)
+ final XMLObjectBuilder<DEREncodedKeyValue> builder = (XMLObjectBuilder<DEREncodedKeyValue>)
XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(
DEREncodedKeyValue.DEFAULT_ELEMENT_NAME);
- DEREncodedKeyValue keyValue = Constraint.isNotNull(builder,
+ final DEREncodedKeyValue keyValue = Constraint.isNotNull(builder,
"DEREncodedKeyValue builder not available").buildObject(DEREncodedKeyValue.DEFAULT_ELEMENT_NAME);
- KeyFactory keyFactory = KeyFactory.getInstance(pk.getAlgorithm());
- X509EncodedKeySpec keySpec = keyFactory.getKeySpec(pk, X509EncodedKeySpec.class);
+ final KeyFactory keyFactory = KeyFactory.getInstance(pk.getAlgorithm());
+ final X509EncodedKeySpec keySpec = keyFactory.getKeySpec(pk, X509EncodedKeySpec.class);
keyValue.setValue(Base64Support.encode(keySpec.getEncoded(), Base64Support.CHUNKED));
keyInfo.getDEREncodedKeyValues().add(keyValue);
@@ -639,21 +639,21 @@ public class KeyInfoSupport {
// TODO support ECKeyValue and DEREncodedKeyValue
- List<PublicKey> keys = new LinkedList<>();
+ final List<PublicKey> keys = new LinkedList<>();
if (keyInfo == null) {
return keys;
}
- for (KeyValue keyDescriptor : keyInfo.getKeyValues()) {
- PublicKey newKey = getKey(keyDescriptor);
+ for (final KeyValue keyDescriptor : keyInfo.getKeyValues()) {
+ final PublicKey newKey = getKey(keyDescriptor);
if (newKey != null) {
keys.add(newKey);
}
}
- for (DEREncodedKeyValue keyDescriptor : keyInfo.getDEREncodedKeyValues()) {
- PublicKey newKey = getKey(keyDescriptor);
+ for (final DEREncodedKeyValue keyDescriptor : keyInfo.getDEREncodedKeyValues()) {
+ final PublicKey newKey = getKey(keyDescriptor);
if (newKey != null) {
keys.add(newKey);
}
@@ -698,11 +698,11 @@ public class KeyInfoSupport {
throw new KeyException("DSAKeyValue element did not contain at least one of DSA parameters P, Q or G");
}
- BigInteger gComponent = keyDescriptor.getG().getValueBigInt();
- BigInteger pComponent = keyDescriptor.getP().getValueBigInt();
- BigInteger qComponent = keyDescriptor.getQ().getValueBigInt();
+ final BigInteger gComponent = keyDescriptor.getG().getValueBigInt();
+ final BigInteger pComponent = keyDescriptor.getP().getValueBigInt();
+ final BigInteger qComponent = keyDescriptor.getQ().getValueBigInt();
- DSAParams dsaParams = new DSAParameterSpec(pComponent, qComponent, gComponent);
+ final DSAParams dsaParams = new DSAParameterSpec(pComponent, qComponent, gComponent);
return getDSAKey(keyDescriptor, dsaParams);
}
@@ -723,9 +723,9 @@ public class KeyInfoSupport {
Constraint.isNotNull(keyDescriptor, "DSAKeyValue cannot be null");
Constraint.isNotNull(dsaParams, "DSAParams cannot be null");
- BigInteger yComponent = keyDescriptor.getY().getValueBigInt();
+ final BigInteger yComponent = keyDescriptor.getY().getValueBigInt();
- DSAPublicKeySpec keySpec =
+ final DSAPublicKeySpec keySpec =
new DSAPublicKeySpec(yComponent, dsaParams.getP(), dsaParams.getQ(), dsaParams.getG());
return buildKey(keySpec, "DSA");
}
@@ -760,10 +760,10 @@ public class KeyInfoSupport {
@Nonnull public static PublicKey getRSAKey(@Nonnull final RSAKeyValue keyDescriptor) throws KeyException {
Constraint.isNotNull(keyDescriptor, "RSAKeyValue cannot be null");
- BigInteger modulus = keyDescriptor.getModulus().getValueBigInt();
- BigInteger exponent = keyDescriptor.getExponent().getValueBigInt();
+ final BigInteger modulus = keyDescriptor.getModulus().getValueBigInt();
+ final BigInteger exponent = keyDescriptor.getExponent().getValueBigInt();
- RSAPublicKeySpec keySpec = new RSAPublicKeySpec(modulus, exponent);
+ final RSAPublicKeySpec keySpec = new RSAPublicKeySpec(modulus, exponent);
return buildKey(keySpec, "RSA");
}
@@ -787,7 +787,7 @@ public class KeyInfoSupport {
Constraint.isNotNull(bigInt, "BigInteger cannot be null");
// This code is really complicated, for now just use the Apache xmlsec lib code directly.
- byte[] bigIntBytes = org.apache.xml.security.utils.Base64.encode(bigInt, bigInt.bitLength());
+ final byte[] bigIntBytes = org.apache.xml.security.utils.Base64.encode(bigInt, bigInt.bitLength());
return Base64Support.encode(bigIntBytes, Base64Support.UNCHUNKED);
}
@@ -837,11 +837,11 @@ public class KeyInfoSupport {
final byte[] encodedKey = Base64Support.decode(keyValue.getValue());
// Iterate over the supported key types until one produces a public key.
- for (String keyType : supportedKeyTypes) {
+ for (final String keyType : supportedKeyTypes) {
try {
- KeyFactory keyFactory = KeyFactory.getInstance(keyType);
- X509EncodedKeySpec keySpec = new X509EncodedKeySpec(encodedKey);
- PublicKey publicKey = keyFactory.generatePublic(keySpec);
+ final KeyFactory keyFactory = KeyFactory.getInstance(keyType);
+ final X509EncodedKeySpec keySpec = new X509EncodedKeySpec(encodedKey);
+ final PublicKey publicKey = keyFactory.generatePublic(keySpec);
if (publicKey != null) {
return publicKey;
}
@@ -888,7 +888,7 @@ public class KeyInfoSupport {
Constraint.isNotNull(credential, "Credential may not be null");
Constraint.isNotNull(manager, "NamedKeyInfoGeneratorManager may not be null");
- Logger log = getLogger();
+ final Logger log = getLogger();
KeyInfoGeneratorFactory factory = null;
if (keyInfoProfileName != null) {
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/NamedKeyInfoGeneratorManager.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/NamedKeyInfoGeneratorManager.java
index 8c2a06f..f9612ce 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/NamedKeyInfoGeneratorManager.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/NamedKeyInfoGeneratorManager.java
@@ -107,7 +107,7 @@ public class NamedKeyInfoGeneratorManager {
* @param factory the factory to register
*/
public void registerFactory(@Nonnull final String name, @Nonnull final KeyInfoGeneratorFactory factory) {
- KeyInfoGeneratorManager manager = getManager(name);
+ final KeyInfoGeneratorManager manager = getManager(name);
manager.registerFactory(factory);
}
@@ -118,7 +118,7 @@ public class NamedKeyInfoGeneratorManager {
* @param factory the factory to de-register
*/
public void deregisterFactory(@Nonnull final String name, @Nonnull final KeyInfoGeneratorFactory factory) {
- KeyInfoGeneratorManager manager = managers.get(name);
+ final KeyInfoGeneratorManager manager = managers.get(name);
if (manager == null) {
throw new IllegalArgumentException("Manager with name '" + name + "' does not exist");
}
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureSupport.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureSupport.java
index cf8dd27..bb9508a 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureSupport.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureSupport.java
@@ -99,7 +99,7 @@ public final class SignatureSupport {
Constraint.isNotNull(signature, "Signature cannot be null");
Constraint.isNotNull(parameters, "Signature signing parameters cannot be null");
- Logger log = getLogger();
+ final Logger log = getLogger();
// Signing credential
if (signature.getSigningCredential() == null) {
@@ -131,10 +131,10 @@ public final class SignatureSupport {
}
// Reference(s) digest method
- String paramsDigestAlgo = parameters.getSignatureReferenceDigestMethod();
- for (ContentReference cr : signature.getContentReferences()) {
+ final String paramsDigestAlgo = parameters.getSignatureReferenceDigestMethod();
+ for (final ContentReference cr : signature.getContentReferences()) {
if (cr instanceof ConfigurableContentReference) {
- ConfigurableContentReference configurableReference = (ConfigurableContentReference) cr;
+ final ConfigurableContentReference configurableReference = (ConfigurableContentReference) cr;
if (paramsDigestAlgo != null) {
configurableReference.setDigestAlgorithm(paramsDigestAlgo);
}
@@ -147,10 +147,10 @@ public final class SignatureSupport {
// KeyInfo
if (signature.getKeyInfo() == null) {
- KeyInfoGenerator kiGenerator = parameters.getKeyInfoGenerator();
+ final KeyInfoGenerator kiGenerator = parameters.getKeyInfoGenerator();
if (kiGenerator != null) {
try {
- KeyInfo keyInfo = kiGenerator.generate(signature.getSigningCredential());
+ final KeyInfo keyInfo = kiGenerator.generate(signature.getSigningCredential());
signature.setKeyInfo(keyInfo);
} catch (final SecurityException e) {
log.error("Error generating KeyInfo from credential", e);
@@ -181,16 +181,16 @@ public final class SignatureSupport {
Constraint.isNotNull(signable, "Signable XMLObject cannot be null");
Constraint.isNotNull(parameters, "Signature signing parameters cannot be null");
- XMLObjectBuilder<Signature> signatureBuilder =
+ final XMLObjectBuilder<Signature> signatureBuilder =
(XMLObjectBuilder<Signature>) XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(
Signature.DEFAULT_ELEMENT_NAME);
- Signature signature = signatureBuilder.buildObject(Signature.DEFAULT_ELEMENT_NAME);
+ final Signature signature = signatureBuilder.buildObject(Signature.DEFAULT_ELEMENT_NAME);
signable.setSignature(signature);
SignatureSupport.prepareSignatureParams(signature, parameters);
- Marshaller marshaller = XMLObjectProviderRegistrySupport.getMarshallerFactory().getMarshaller(signable);
+ final Marshaller marshaller = XMLObjectProviderRegistrySupport.getMarshallerFactory().getMarshaller(signable);
marshaller.marshall(signable);
Signer.signObject(signature);
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureValidationParametersCriterion.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureValidationParametersCriterion.java
index 274b6ca..e0c3a11 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureValidationParametersCriterion.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureValidationParametersCriterion.java
@@ -57,7 +57,7 @@ public class SignatureValidationParametersCriterion implements Criterion {
/** {@inheritDoc} */
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
+ final StringBuilder builder = new StringBuilder();
builder.append("SignatureValidationParametersCriterion [params=");
builder.append(params);
builder.append("]");
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureValidator.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureValidator.java
index 996e9eb..1004ad8 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureValidator.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/SignatureValidator.java
@@ -49,7 +49,7 @@ public final class SignatureValidator {
*/
public static void validate(@Nonnull final Signature signature, @Nonnull final Credential validationCredential)
throws SignatureException {
- SignatureValidationProvider validator = getSignatureValidationProvider();
+ final SignatureValidationProvider validator = getSignatureValidationProvider();
getLogger().debug("Using a validation provider of implementation: {}", validator.getClass().getName());
validator.validate(signature, validationCredential);
}
@@ -62,8 +62,9 @@ public final class SignatureValidator {
*/
@Nonnull private static SignatureValidationProvider getSignatureValidationProvider() throws SignatureException {
if (validatorInstance == null) {
- ServiceLoader<SignatureValidationProvider> loader = ServiceLoader.load(SignatureValidationProvider.class);
- Iterator<SignatureValidationProvider> iterator = loader.iterator();
+ final ServiceLoader<SignatureValidationProvider> loader =
+ ServiceLoader.load(SignatureValidationProvider.class);
+ final Iterator<SignatureValidationProvider> iterator = loader.iterator();
if (iterator.hasNext()) {
validatorInstance = iterator.next();
} else {
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/Signer.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/Signer.java
index 4ffc06f..6710fa5 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/Signer.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/Signer.java
@@ -54,9 +54,9 @@ public final class Signer {
* @throws SignatureException thrown if there is an error computing the signature
*/
public static void signObjects(@Nonnull final List<Signature> signatures) throws SignatureException {
- SignerProvider signer = getSignerProvider();
+ final SignerProvider signer = getSignerProvider();
getLogger().debug("Using a signer of implementation: {}", signer.getClass().getName());
- for (Signature signature : signatures) {
+ for (final Signature signature : signatures) {
signer.signObject(signature);
}
}
@@ -68,7 +68,7 @@ public final class Signer {
* @throws SignatureException thrown if there is an error computing the signature
*/
public static void signObject(@Nonnull final Signature signature) throws SignatureException {
- SignerProvider signer = getSignerProvider();
+ final SignerProvider signer = getSignerProvider();
getLogger().debug("Using a signer of implemenation: {}", signer.getClass().getName());
signer.signObject(signature);
}
@@ -81,8 +81,8 @@ public final class Signer {
*/
@Nonnull private static SignerProvider getSignerProvider() throws SignatureException {
if (signerInstance == null) {
- ServiceLoader<SignerProvider> loader = ServiceLoader.load(SignerProvider.class);
- Iterator<SignerProvider> iterator = loader.iterator();
+ final ServiceLoader<SignerProvider> loader = ServiceLoader.load(SignerProvider.class);
+ final Iterator<SignerProvider> iterator = loader.iterator();
if (iterator.hasNext()) {
signerInstance = iterator.next();
} else {
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/URIContentReference.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/URIContentReference.java
index 0cfefe9..d77a289 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/URIContentReference.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/support/URIContentReference.java
@@ -90,8 +90,8 @@ public class URIContentReference implements ConfigurableContentReference {
/** {@inheritDoc} */
public void createReference(@Nonnull final XMLSignature signature) {
try {
- Transforms dsigTransforms = new Transforms(signature.getDocument());
- for (String transform : getTransforms()) {
+ final Transforms dsigTransforms = new Transforms(signature.getDocument());
+ for (final String transform : getTransforms()) {
dsigTransforms.addTransform(transform);
}
signature.addDocument(referenceID, dsigTransforms, digestAlgorithm);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list