[java-metadata-aggregator] branch main updated: Nullability annotations

[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=5dbb7484ab9097acf0fe1ec26ceec6e73f3cad82

The following commit(s) were added to refs/heads/main by this push:
     new 5dbb748  Nullability annotations
5dbb748 is described below

commit 5dbb7484ab9097acf0fe1ec26ceec6e73f3cad82
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Tue Oct 18 12:00:22 2022 +0100

    Nullability annotations
---
 .../java/net/shibboleth/metadata/dom/AbstractDOMTraversalStage.java  | 5 +++--
 .../net/shibboleth/metadata/dom/AbstractElementValidationStage.java  | 2 ++
 .../net/shibboleth/metadata/dom/AbstractElementVisitingStage.java    | 1 +
 .../java/net/shibboleth/metadata/dom/SimpleDOMTraversalContext.java  | 2 ++
 .../net/shibboleth/metadata/dom/StringElementValidationStage.java    | 1 +
 .../net/shibboleth/metadata/pipeline/AbstractIteratingStage.java     | 2 +-
 6 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractDOMTraversalStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractDOMTraversalStage.java
index a87a3db..7c44beb 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractDOMTraversalStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractDOMTraversalStage.java
@@ -59,6 +59,7 @@ public abstract class AbstractDOMTraversalStage<C extends DOMTraversalContext>
      *
      * @return an appropriate context
      */
+    @Nonnull
     protected abstract C buildContext(@Nonnull final Item<Element> item);
 
     /**
@@ -95,7 +96,7 @@ public abstract class AbstractDOMTraversalStage<C extends DOMTraversalContext>
     private void traverse(@Nonnull final Element element, @Nonnull final C context) 
         throws StageProcessingException {
         final List<Element> children = ElementSupport.getChildElements(element);
-        for (final Element child : children) {
+        for (@Nonnull final Element child : children) {
             traverse(child, context);
         }
         if (applicable(element, context)) {
@@ -104,7 +105,7 @@ public abstract class AbstractDOMTraversalStage<C extends DOMTraversalContext>
     }
 
     @Override
-    protected void doExecute(final Item<Element> item) throws StageProcessingException {
+    protected void doExecute(@Nonnull final Item<Element> item) throws StageProcessingException {
         final Element docElement = item.unwrap();
         final C context = buildContext(item);
         traverse(docElement, context);
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementValidationStage.java
index 0f4e797..fa77de6 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementValidationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementValidationStage.java
@@ -92,6 +92,7 @@ public abstract class AbstractElementValidationStage<T> extends AbstractDOMValid
      * @param element {@link Element} being validated
      * @return converted value
      */
+    @Nonnull
     protected abstract T convert(@Nonnull final Element element);
 
     @Override
@@ -101,6 +102,7 @@ public abstract class AbstractElementValidationStage<T> extends AbstractDOMValid
     }
     
     @Override
+    @Nonnull
     protected DOMTraversalContext buildContext(@Nonnull final Item<Element> item) {
         return new SimpleDOMTraversalContext(item);
     }
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementVisitingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementVisitingStage.java
index 992b9e4..5c9fbe8 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementVisitingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/AbstractElementVisitingStage.java
@@ -86,6 +86,7 @@ public abstract class AbstractElementVisitingStage extends AbstractDOMTraversalS
     }
 
     @Override
+    @Nonnull
     protected DOMTraversalContext buildContext(@Nonnull final Item<Element> item) {
         return new SimpleDOMTraversalContext(item);
     }
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/SimpleDOMTraversalContext.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/SimpleDOMTraversalContext.java
index efedfed..516f426 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/SimpleDOMTraversalContext.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/SimpleDOMTraversalContext.java
@@ -29,6 +29,7 @@ import net.shibboleth.metadata.Item;
 public class SimpleDOMTraversalContext implements DOMTraversalContext {
 
     /** The {@link Item} this traversal is being performed on. */
+    @Nonnull
     private final Item<Element> item;
 
     /**
@@ -41,6 +42,7 @@ public class SimpleDOMTraversalContext implements DOMTraversalContext {
     }
 
     @Override
+    @Nonnull
     public final Item<Element> getItem() {
         return item;
     }
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/StringElementValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/StringElementValidationStage.java
index 013c1ae..a4593be 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/StringElementValidationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/StringElementValidationStage.java
@@ -31,6 +31,7 @@ import net.shibboleth.metadata.pipeline.Stage;
 public class StringElementValidationStage extends AbstractElementValidationStage<String> {
 
     @Override
+    @Nonnull
     protected String convert(@Nonnull final Element element) {
         return element.getTextContent();
     }
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractIteratingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractIteratingStage.java
index dba4b2b..6640160 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractIteratingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/AbstractIteratingStage.java
@@ -44,7 +44,7 @@ public abstract class AbstractIteratingStage<T> extends AbstractStage<T> {
     @Override
     protected void doExecute(@Nonnull @NonnullElements final List<Item<T>> items)
             throws StageProcessingException {
-        for (final Item<T> item : items) {
+        for (@Nonnull final Item<T> item : items) {
             doExecute(item);
         }
     }

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