[java-metadata-aggregator] 02/02: Nullability annotation
Ian Young
ian at iay.org.uk
Wed Feb 1 12:23:05 UTC 2023
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=54228e924b60b231453f335842f70dbfd38be571
commit 54228e924b60b231453f335842f70dbfd38be571
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Wed Feb 1 12:23:00 2023 +0000
Nullability annotation
---
.../metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java | 6 +++---
.../shibboleth/metadata/dom/saml/mdui/IPHintValidationStage.java | 2 +-
.../net/shibboleth/metadata/pipeline/impl/PipelineCallable.java | 4 ++--
.../java/net/shibboleth/metadata/validate/AcceptAllValidator.java | 2 +-
.../java/net/shibboleth/metadata/validate/RejectAllValidator.java | 2 +-
.../metadata/validate/string/AcceptStringRegexValidator.java | 2 +-
.../metadata/validate/string/AcceptStringValueValidator.java | 2 +-
.../metadata/validate/string/RejectStringRegexValidator.java | 2 +-
.../metadata/validate/string/RejectStringValueValidator.java | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java
index f728af7..9e799aa 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdattr/EntityAttributeFilteringStage.java
@@ -166,17 +166,17 @@ public class EntityAttributeFilteringStage extends AbstractIteratingStage<Elemen
}
@Override
- public String getNameFormat() {
+ public @Nonnull String getNameFormat() {
return nameFormat;
}
@Override
- public String getName() {
+ public @Nonnull String getName() {
return name;
}
@Override
- public String getValue() {
+ public @Nonnull String getValue() {
return value;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage.java
index bb83cba..5b9f042 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage.java
@@ -82,7 +82,7 @@ public class IPHintValidationStage extends AbstractDOMTraversalStage<DOMTraversa
}
@Override
- protected DOMTraversalContext buildContext(final Item<Element> item) {
+ protected @Nonnull DOMTraversalContext buildContext(final @Nonnull Item<Element> item) {
return new SimpleDOMTraversalContext(item);
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/impl/PipelineCallable.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/impl/PipelineCallable.java
index 16ce6a5..47c0ced 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/impl/PipelineCallable.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/impl/PipelineCallable.java
@@ -44,10 +44,10 @@ public class PipelineCallable<T> implements Callable<List<Item<T>>> {
private final Logger log = LoggerFactory.getLogger(PipelineCallable.class);
/** The pipeline to be executed, never null. */
- private final Pipeline<T> thePipeline;
+ private final @Nonnull Pipeline<T> thePipeline;
/** The collection of items upon which the pipeline will operate. */
- private final List<Item<T>> theItems;
+ private final @Nonnull @NonnullElements List<Item<T>> theItems;
/**
* Constructor.
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/validate/AcceptAllValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/AcceptAllValidator.java
index f6a7acf..f6eaad3 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/validate/AcceptAllValidator.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/validate/AcceptAllValidator.java
@@ -35,7 +35,7 @@ import net.shibboleth.metadata.Item;
public class AcceptAllValidator<V> extends BaseValidator implements Validator<V> {
@Override
- public Action validate(@Nonnull final V e, @Nonnull final Item<?> item, @Nonnull final String stageId) {
+ public @Nonnull Action validate(@Nonnull final V e, @Nonnull final Item<?> item, @Nonnull final String stageId) {
return Action.DONE;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/validate/RejectAllValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/RejectAllValidator.java
index 874a907..05305c7 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/validate/RejectAllValidator.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/validate/RejectAllValidator.java
@@ -38,7 +38,7 @@ import net.shibboleth.metadata.Item;
public class RejectAllValidator<V> extends BaseValidator implements Validator<V> {
@Override
- public Action validate(@Nonnull final V e, @Nonnull final Item<?> item, @Nonnull final String stageId) {
+ public @Nonnull Action validate(@Nonnull final V e, @Nonnull final Item<?> item, @Nonnull final String stageId) {
addErrorMessage(e, item, stageId);
return Action.DONE;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/AcceptStringRegexValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/AcceptStringRegexValidator.java
index 6b9a9b9..e322ec7 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/AcceptStringRegexValidator.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/AcceptStringRegexValidator.java
@@ -37,7 +37,7 @@ import net.shibboleth.metadata.validate.Validator;
public class AcceptStringRegexValidator extends BaseStringRegexValidator implements Validator<String> {
@Override
- public Action validate(@Nonnull final String e, @Nonnull final Item<?> item, @Nonnull final String stageId) {
+ public @Nonnull Action validate(@Nonnull final String e, @Nonnull final Item<?> item, @Nonnull final String stageId) {
final Matcher matcher = getPattern().matcher(e);
if (matcher.matches()) {
return Action.DONE;
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/AcceptStringValueValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/AcceptStringValueValidator.java
index 910b916..d53251a 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/AcceptStringValueValidator.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/AcceptStringValueValidator.java
@@ -35,7 +35,7 @@ import net.shibboleth.metadata.validate.Validator;
public class AcceptStringValueValidator extends BaseStringValueValidator implements Validator<String> {
@Override
- public Action validate(@Nonnull final String e, @Nonnull final Item<?> item, @Nonnull final String stageId) {
+ public @Nonnull Action validate(@Nonnull final String e, @Nonnull final Item<?> item, @Nonnull final String stageId) {
if (e.equals(getValue())) {
return Action.DONE;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/RejectStringRegexValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/RejectStringRegexValidator.java
index d246038..134a5c4 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/RejectStringRegexValidator.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/RejectStringRegexValidator.java
@@ -37,7 +37,7 @@ import net.shibboleth.metadata.validate.Validator;
public class RejectStringRegexValidator extends BaseStringRegexValidator implements Validator<String> {
@Override
- public Action validate(@Nonnull final String e, @Nonnull final Item<?> item, @Nonnull final String stageId) {
+ public @Nonnull Action validate(@Nonnull final String e, @Nonnull final Item<?> item, @Nonnull final String stageId) {
final Matcher matcher = getPattern().matcher(e);
if (matcher.matches()) {
addErrorMessage(e, item, stageId);
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/RejectStringValueValidator.java b/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/RejectStringValueValidator.java
index 117b758..d796ef9 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/RejectStringValueValidator.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/validate/string/RejectStringValueValidator.java
@@ -35,7 +35,7 @@ import net.shibboleth.metadata.validate.Validator;
public class RejectStringValueValidator extends BaseStringValueValidator implements Validator<String> {
@Override
- public Action validate(@Nonnull final String e, @Nonnull final Item<?> item, @Nonnull final String stageId) {
+ public @Nonnull Action validate(@Nonnull final String e, @Nonnull final Item<?> item, @Nonnull final String stageId) {
if (e.equals(getValue())) {
addErrorMessage(e, item, stageId);
return Action.DONE;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list