[java-metadata-aggregator] 01/02: MDA-239 - Annotate ItemCollectionSerializer as null-intolerant

[Ian Young]

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

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

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

commit cfc83f0aa8a81a7f5aa643383192124f8792a366
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Mon Apr 13 11:11:41 2020 +0100

    MDA-239 - Annotate ItemCollectionSerializer as null-intolerant
    
    https://issues.shibboleth.net/jira/browse/MDA-239
---
 .../main/java/net/shibboleth/metadata/ItemCollectionSerializer.java  | 4 +++-
 .../java/net/shibboleth/metadata/SimpleItemCollectionSerializer.java | 5 ++++-
 .../main/java/net/shibboleth/metadata/dom/DOMElementSerializer.java  | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemCollectionSerializer.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemCollectionSerializer.java
index a720e10..5466cbc 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemCollectionSerializer.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemCollectionSerializer.java
@@ -23,6 +23,8 @@ import java.util.Collection;
 
 import javax.annotation.Nonnull;
 
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+
 /**
  * Item collection serializers convert a {@link Collection} of {@link Item}s into an octet stream.
  * 
@@ -41,7 +43,7 @@ public interface ItemCollectionSerializer<T> {
      * 
      * @throws IOException if an I/O exception occurs during serialization
      */
-    void serializeCollection(@Nonnull Collection<Item<T>> items, @Nonnull OutputStream output)
+    void serializeCollection(@Nonnull @NonnullElements Collection<Item<T>> items, @Nonnull OutputStream output)
         throws IOException;
 
 }
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/SimpleItemCollectionSerializer.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/SimpleItemCollectionSerializer.java
index 5715fec..75b82b6 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/SimpleItemCollectionSerializer.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/SimpleItemCollectionSerializer.java
@@ -23,6 +23,8 @@ import java.util.Collection;
 
 import javax.annotation.Nonnull;
 
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+
 /**
  * A simple {@link ItemCollectionSerializer} which just serializes each {@link Item}
  * in turn.
@@ -44,7 +46,8 @@ public class SimpleItemCollectionSerializer<T> implements ItemCollectionSerializ
     }
 
     @Override
-    public void serializeCollection(@Nonnull final Collection<Item<T>> items, @Nonnull final OutputStream output)
+    public void serializeCollection(@Nonnull @NonnullElements final Collection<Item<T>> items,
+            @Nonnull final OutputStream output)
         throws IOException {
         for (final Item<T> item : items) {
             serializer.serialize(item, output);
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMElementSerializer.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMElementSerializer.java
index 78aaf28..cd88797 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMElementSerializer.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMElementSerializer.java
@@ -33,6 +33,7 @@ import javax.xml.transform.stream.StreamResult;
 import net.shibboleth.metadata.Item;
 import net.shibboleth.metadata.ItemCollectionSerializer;
 import net.shibboleth.metadata.ItemSerializer;
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -72,7 +73,7 @@ public class DOMElementSerializer implements ItemSerializer<Element>, ItemCollec
     }
 
     @Override
-    public void serializeCollection(@Nonnull final Collection<Item<Element>> items,
+    public void serializeCollection(@Nonnull @NonnullElements final Collection<Item<Element>> items,
             @Nonnull final OutputStream output) throws IOException {
         final Iterator<Item<Element>> iter = items.iterator();
         if (iter.hasNext()) {

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