[java-metadata-aggregator] branch main updated: Remove type-use cases of @Nonnull

[Ian Young]

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

iay pushed a commit to branch main
in repository java-metadata-aggregator.

View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=4d8c633fbb11ed580e61e53def5d501876889639

The following commit(s) were added to refs/heads/main by this push:
     new 4d8c633  Remove type-use cases of @Nonnull
4d8c633 is described below

commit 4d8c633fbb11ed580e61e53def5d501876889639
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Fri Oct 21 18:17:30 2022 +0100

    Remove type-use cases of @Nonnull
    
    There seems to be a difference of opinion between compilers as to
    whether this is acceptable. Eclipse thinks it's fine, but OpenJDK 11
    does not. Possibly a feature from later versions of Java leaking
    through; we can retry once we jump to Java 17.
---
 .../shibboleth/metadata/dom/AbstractAttributeValidationStage.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractAttributeValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractAttributeValidationStage.java
index 9a64c27..f1ea1cb 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractAttributeValidationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractAttributeValidationStage.java
@@ -59,14 +59,14 @@ public abstract class AbstractAttributeValidationStage<T> extends AbstractElemen
      */
     @SuppressWarnings("null")
     @NonnullElements @Unmodifiable @GuardedBy("this")
-    private @Nonnull Set<@Nonnull QName> attributeNames = Set.of();
+    private @Nonnull Set<QName> attributeNames = Set.of();
 
     /**
      * Gets the collection of attribute names to visit.
      * 
      * @return collection of attribute names to visit
      */
-    public final synchronized @Nonnull Collection<@Nonnull QName> getAttributeNames() {
+    public final synchronized @Nonnull Collection<QName> getAttributeNames() {
         return attributeNames;
     }
 
@@ -76,7 +76,7 @@ public abstract class AbstractAttributeValidationStage<T> extends AbstractElemen
      *
      * @param names collection of attribute names to visit
      */
-    public final synchronized void setAttributeNames(@Nonnull final Collection<@Nonnull String> names) {
+    public final synchronized void setAttributeNames(@Nonnull final Collection<String> names) {
         checkSetterPreconditions();
         Constraint.isNotNull(names, "attributeNames may not be null");
         final var qnames = new HashSet<QName>();
@@ -105,7 +105,7 @@ public abstract class AbstractAttributeValidationStage<T> extends AbstractElemen
      * 
      * @param names collection of qualified attribute names to visit
      */
-    public final synchronized void setQualifiedAttributeNames(@Nonnull final Collection<@Nonnull QName> names) {
+    public final synchronized void setQualifiedAttributeNames(@Nonnull final Collection<QName> names) {
         checkSetterPreconditions();
         Constraint.isNotNull(names, "attributeNames may not be null");
         attributeNames = Set.copyOf(names);

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