[java-opensaml] 02/02: Checkstyle.
Brent Putman
putmanb at georgetown.edu
Fri Aug 11 00:52:49 UTC 2023
This is an automated email from the git hooks/post-receive script.
putmanb pushed a commit to branch main
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=95f2b11f28be0b4fc6cc6bfc023f34f0b6f70ea8
commit 95f2b11f28be0b4fc6cc6bfc023f34f0b6f70ea8
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Thu Aug 10 20:30:49 2023 -0400
Checkstyle.
---
.../opensaml/storage/AbstractMapBackedStorageService.java | 4 ++--
.../storage/impl/client/JSONClientStorageServiceStore.java | 4 ++--
.../storage/impl/client/XMLClientStorageServiceStore.java | 4 ++--
.../main/java/org/opensaml/xmlsec/DecryptionParameters.java | 2 +-
.../xmlsec/algorithm/descriptors/DigestSHA3_224.java | 2 +-
.../xmlsec/algorithm/descriptors/DigestSHA3_256.java | 2 +-
.../xmlsec/algorithm/descriptors/DigestSHA3_384.java | 2 +-
.../xmlsec/algorithm/descriptors/DigestSHA3_512.java | 2 +-
.../xmlsec/criterion/DecryptionRecipientsCriterion.java | 4 ++--
.../encryption/support/AbstractEncryptedKeyResolver.java | 4 ++--
.../encryption/support/InlineEncryptedKeyResolver.java | 12 +++---------
.../opensaml/xmlsec/impl/BasicDecryptionConfiguration.java | 2 +-
12 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractMapBackedStorageService.java b/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractMapBackedStorageService.java
index 9404cbef4..51cd93e12 100644
--- a/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractMapBackedStorageService.java
+++ b/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractMapBackedStorageService.java
@@ -247,8 +247,8 @@ public abstract class AbstractMapBackedStorageService extends AbstractStorageSer
}
/** {@inheritDoc} */
- @Nonnull public Iterable<String> getContextKeys(@Nonnull @NotEmpty final String context, @Nullable final String prefix)
- throws IOException {
+ @Nonnull public Iterable<String> getContextKeys(@Nonnull @NotEmpty final String context,
+ @Nullable final String prefix) throws IOException {
final Lock readLock = getLock().readLock();
try {
diff --git a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/JSONClientStorageServiceStore.java b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/JSONClientStorageServiceStore.java
index 4135bacb3..8be401a45 100644
--- a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/JSONClientStorageServiceStore.java
+++ b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/JSONClientStorageServiceStore.java
@@ -89,7 +89,7 @@ public class JSONClientStorageServiceStore extends AbstractClientStorageServiceS
}
}
-//Checkstyle: CyclomaticComplexity OFF
+//Checkstyle: CyclomaticComplexity|MethodLength OFF
/** {@inheritDoc} */
@Nullable public ClientStorageServiceOperation save(@Nonnull final ClientStorageService storageService)
throws IOException {
@@ -166,7 +166,7 @@ public class JSONClientStorageServiceStore extends AbstractClientStorageServiceS
throw new IOException(e);
}
}
-//Checkstyle: CyclomaticComplexity ON
+//Checkstyle: CyclomaticComplexity|MethodLength ON
/** Factory for JSON-backed store. */
public static class JSONClientStorageServiceStoreFactory implements Factory {
diff --git a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/XMLClientStorageServiceStore.java b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/XMLClientStorageServiceStore.java
index 7079b4272..5d9fbc351 100644
--- a/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/XMLClientStorageServiceStore.java
+++ b/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/client/XMLClientStorageServiceStore.java
@@ -170,8 +170,8 @@ public class XMLClientStorageServiceStore extends AbstractClientStorageServiceSt
if (empty) {
log.trace("{} Data is empty", storageService.getLogPrefix());
- return new ClientStorageServiceOperation(storageService.ensureId(), storageService.getStorageName(), null,
- source);
+ return new ClientStorageServiceOperation(storageService.ensureId(), storageService.getStorageName(),
+ null, source);
}
assert rootElement != null;
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/DecryptionParameters.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/DecryptionParameters.java
index 2a4c77f60..50449565f 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/DecryptionParameters.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/DecryptionParameters.java
@@ -108,7 +108,7 @@ public class DecryptionParameters extends AlgorithmPolicyParameters {
*
* @param newRecipients the recipients
*/
- public void setRecipients(@Nullable Set<String> newRecipients) {
+ public void setRecipients(@Nullable final Set<String> newRecipients) {
recipients = newRecipients;
}
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/descriptors/DigestSHA3_224.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/descriptors/DigestSHA3_224.java
index 11028978a..e602edb98 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/descriptors/DigestSHA3_224.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/descriptors/DigestSHA3_224.java
@@ -21,7 +21,7 @@ import org.opensaml.xmlsec.algorithm.DigestAlgorithm;
import org.opensaml.xmlsec.signature.support.SignatureConstants;
/**
- * Algorithm descriptor for digest algorithm: SHA3-224
+ * Algorithm descriptor for digest algorithm: SHA3-224.
*/
public final class DigestSHA3_224 implements DigestAlgorithm {
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/descriptors/DigestSHA3_256.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/descriptors/DigestSHA3_256.java
index 60d060c63..b9d03c537 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/descriptors/DigestSHA3_256.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/descriptors/DigestSHA3_256.java
@@ -21,7 +21,7 @@ import org.opensaml.xmlsec.algorithm.DigestAlgorithm;
import org.opensaml.xmlsec.signature.support.SignatureConstants;
/**
- * Algorithm descriptor for digest algorithm: SHA3-256
+ * Algorithm descriptor for digest algorithm: SHA3-256.
*/
public final class DigestSHA3_256 implements DigestAlgorithm {
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/descriptors/DigestSHA3_384.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/descriptors/DigestSHA3_384.java
index 7f38dd3fd..4dba144be 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/descriptors/DigestSHA3_384.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/descriptors/DigestSHA3_384.java
@@ -21,7 +21,7 @@ import org.opensaml.xmlsec.algorithm.DigestAlgorithm;
import org.opensaml.xmlsec.signature.support.SignatureConstants;
/**
- * Algorithm descriptor for digest algorithm: SHA3-384
+ * Algorithm descriptor for digest algorithm: SHA3-384.
*/
public final class DigestSHA3_384 implements DigestAlgorithm {
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/descriptors/DigestSHA3_512.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/descriptors/DigestSHA3_512.java
index b7bed5760..9f3f462f4 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/descriptors/DigestSHA3_512.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/algorithm/descriptors/DigestSHA3_512.java
@@ -21,7 +21,7 @@ import org.opensaml.xmlsec.algorithm.DigestAlgorithm;
import org.opensaml.xmlsec.signature.support.SignatureConstants;
/**
- * Algorithm descriptor for digest algorithm: SHA3-512
+ * Algorithm descriptor for digest algorithm: SHA3-512.
*/
public final class DigestSHA3_512 implements DigestAlgorithm {
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/DecryptionRecipientsCriterion.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/DecryptionRecipientsCriterion.java
index 3ffde2bea..5b14a3a5d 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/DecryptionRecipientsCriterion.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/criterion/DecryptionRecipientsCriterion.java
@@ -44,7 +44,7 @@ public class DecryptionRecipientsCriterion implements Criterion {
}
/**
- * Get the set of recipients
+ * Get the set of recipients.
*
* @return the set of recipients
*/
@@ -53,7 +53,7 @@ public class DecryptionRecipientsCriterion implements Criterion {
}
/**
- * Set the set of recipients
+ * Set the set of recipients.
*
* @param values the new recipients
*/
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 606fdc1cc..48a6e39a4 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
@@ -88,7 +88,7 @@ public abstract class AbstractEncryptedKeyResolver implements EncryptedKeyResolv
* @return the merged recipients
*/
@Nonnull @Unmodifiable @NotLive
- protected Set<String> getEffectiveRecipients(@Nullable Set<String> values) {
+ protected Set<String> getEffectiveRecipients(@Nullable final Set<String> values) {
final Set<String> temp = new HashSet<>();
temp.addAll(getRecipients());
if (values != null) {
@@ -106,7 +106,7 @@ public abstract class AbstractEncryptedKeyResolver implements EncryptedKeyResolv
* If empty, then all recipients match
* @return true if the recipient value matches the resolver's criteria, false otherwise
*/
- protected boolean matchRecipient(@Nullable final String recipient, @Nonnull Set<String> validRecipients) {
+ protected boolean matchRecipient(@Nullable final String recipient, @Nonnull final Set<String> validRecipients) {
if (validRecipients.isEmpty()) {
return true;
}
diff --git a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/InlineEncryptedKeyResolver.java b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/InlineEncryptedKeyResolver.java
index 0eacbe0bf..f1b15513f 100644
--- a/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/InlineEncryptedKeyResolver.java
+++ b/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/InlineEncryptedKeyResolver.java
@@ -1,11 +1,7 @@
/*
- * Licensed to the University Corporation for Advanced Internet Development,
-
- * Inc. (UCAID) under one or more contributor license agreements. See the
- * NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The UCAID licenses this file to You under the Apache
- * License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
@@ -18,8 +14,6 @@
package org.opensaml.xmlsec.encryption.support;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
diff --git a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicDecryptionConfiguration.java b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicDecryptionConfiguration.java
index 70c14c4e1..9bd58ac37 100644
--- a/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicDecryptionConfiguration.java
+++ b/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/impl/BasicDecryptionConfiguration.java
@@ -125,7 +125,7 @@ public class BasicDecryptionConfiguration extends BasicAlgorithmPolicyConfigurat
*
* @param newRecipients the recipients
*/
- public void setRecipients(@Nullable Set<String> newRecipients) {
+ public void setRecipients(@Nullable final Set<String> newRecipients) {
recipients = newRecipients;
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list