[java-opensaml] branch main updated: Remove some stray annotations.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor 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=aca78353418577d07ce17c55b32d1e1a3603cce8

The following commit(s) were added to refs/heads/main by this push:
     new aca783534 Remove some stray annotations.
aca783534 is described below

commit aca78353418577d07ce17c55b32d1e1a3603cce8
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jun 6 08:28:05 2023 -0400

    Remove some stray annotations.
---
 .../org/opensaml/xmlsec/signature/support/Signer.java   |  3 +--
 .../impl/AlgorithmPolicyConfigurationCriterion.java     | 17 ++++++-----------
 2 files changed, 7 insertions(+), 13 deletions(-)

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 240df894b..268f3d6b4 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
@@ -27,7 +27,6 @@ import javax.annotation.Nullable;
 import org.opensaml.xmlsec.signature.Signature;
 import org.slf4j.Logger;
 
-import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.primitive.LoggerFactory;
 
 /**
@@ -59,7 +58,7 @@ public final class Signer {
      * @param signatures an ordered list of XMLObject to be signed
      * @throws SignatureException  thrown if there is an error computing the signature
      */
-    public static void signObjects(@Nonnull @NonnullElements final List<Signature> signatures)
+    public static void signObjects(@Nonnull final List<Signature> signatures)
             throws SignatureException {
         final SignerProvider signer = getSignerProvider();
         LOG.debug("Using a signer of implementation: {}", signer.getClass().getName());
diff --git a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AlgorithmPolicyConfigurationCriterion.java b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AlgorithmPolicyConfigurationCriterion.java
index 6a1ec4126..d2f5cd435 100644
--- a/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AlgorithmPolicyConfigurationCriterion.java
+++ b/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/impl/AlgorithmPolicyConfigurationCriterion.java
@@ -21,7 +21,6 @@ import java.util.List;
 
 import javax.annotation.Nonnull;
 
-import net.shibboleth.shared.annotation.constraint.NonnullElements;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.annotation.constraint.NotLive;
 import net.shibboleth.shared.annotation.constraint.Unmodifiable;
@@ -35,7 +34,6 @@ import org.opensaml.xmlsec.AlgorithmPolicyConfiguration;
  * Criterion which holds one or more instances of {@link AlgorithmPolicyConfiguration},
  * used exclusively for testing the {@link AbstractSecurityParametersResolver}.
  */
- at SuppressWarnings({"javadoc", "null"})
 public class AlgorithmPolicyConfigurationCriterion implements Criterion {
     
     /** The list of configuration instances. */
@@ -46,8 +44,7 @@ public class AlgorithmPolicyConfigurationCriterion implements Criterion {
      *
      * @param configurations list of configuration instances
      */
-    public AlgorithmPolicyConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty
-            final List<AlgorithmPolicyConfiguration> configurations) {
+    public AlgorithmPolicyConfigurationCriterion(@Nonnull @NotEmpty final List<AlgorithmPolicyConfiguration> configurations) {
         configs = CollectionSupport.copyToList(Constraint.isNotNull(configurations, "List of configurations may not be null"));
         Constraint.isNotEmpty(configs, "At least one configuration is required");
         
@@ -58,8 +55,7 @@ public class AlgorithmPolicyConfigurationCriterion implements Criterion {
      *
      * @param configurations varargs array of configuration instances
      */
-    public AlgorithmPolicyConfigurationCriterion(@Nonnull @NonnullElements @NotEmpty
-            final AlgorithmPolicyConfiguration... configurations) {
+    public AlgorithmPolicyConfigurationCriterion(@Nonnull @NotEmpty final AlgorithmPolicyConfiguration... configurations) {
         configs = CollectionSupport.listOf(Constraint.isNotNull(configurations, "List of configurations may not be null"));
         Constraint.isNotEmpty(configs, "At least one configuration is required");
     }
@@ -68,8 +64,7 @@ public class AlgorithmPolicyConfigurationCriterion implements Criterion {
      * Get the list of configuration instances.
      * @return the list of configuration instances
      */
-    @Nonnull @NonnullElements @NotLive @Unmodifiable @NotEmpty
-    public List<AlgorithmPolicyConfiguration> getConfigurations() {
+    @Nonnull @NotLive @Unmodifiable @NotEmpty public List<AlgorithmPolicyConfiguration> getConfigurations() {
         return configs;
     }
     
@@ -77,7 +72,7 @@ public class AlgorithmPolicyConfigurationCriterion implements Criterion {
     @Override
     public String toString() {
         StringBuilder builder = new StringBuilder();
-        builder.append("WhitelistBlacklistConfigurationCriterion [configs=");
+        builder.append("AlgorithmPolicyConfigurationCriterion [configs=");
         builder.append(configs);
         builder.append("]");
         return builder.toString();
@@ -100,8 +95,8 @@ public class AlgorithmPolicyConfigurationCriterion implements Criterion {
             return false;
         }
 
-        if (obj instanceof AlgorithmPolicyConfigurationCriterion) {
-            return configs.equals(((AlgorithmPolicyConfigurationCriterion) obj).getConfigurations());
+        if (obj instanceof AlgorithmPolicyConfigurationCriterion other) {
+            return configs.equals(other.getConfigurations());
         }
 
         return false;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.