From b16bcfd28aad2568141135b6aa7f14d67b5563a6 Mon Sep 17 00:00:00 2001 From: Ian Young Date: Thu, 6 Apr 2023 14:58:02 +0100 Subject: [PATCH] Track upstream changes --- .../mda/validate/AcceptAllValidator.java | 2 +- .../mda/validate/BaseAsValidator.java | 4 +-- .../mda/validate/RejectAllValidator.java | 2 +- .../mda/validate/ValidatorSequence.java | 27 +++++-------------- ...mainNameNotUnderPublicSuffixValidator.java | 2 +- ...RejectDomainNamePublicSuffixValidator.java | 2 +- .../string/AcceptStringRegexValidator.java | 2 +- .../string/AcceptStringValueValidator.java | 2 +- .../string/AsDomainNameStringValidator.java | 2 +- .../string/AsLiteralTailStringValidator.java | 2 +- .../string/RejectStringRegexValidator.java | 2 +- .../InCommonEntityOrderingStrategyTest.java | 2 +- .../mda/validate/AcceptAllValidatorTest.java | 2 +- .../mda/validate/RejectAllValidatorTest.java | 2 +- .../mda/validate/ValidatorSequenceTest.java | 2 +- ...NameNotUnderPublicSuffixValidatorTest.java | 2 +- ...ctDomainNamePublicSuffixValidatorTest.java | 2 +- .../AcceptStringRegexValidatorTest.java | 2 +- .../AcceptStringValueValidatorTest.java | 2 +- .../AsDomainNameStringValidatorTest.java | 11 +++++--- .../AsLiteralTailStringValidatorTest.java | 10 ++++--- .../RejectStringRegexValidatorTest.java | 2 +- 22 files changed, 40 insertions(+), 48 deletions(-) diff --git a/src/main/java/uk/org/iay/incommon/mda/validate/AcceptAllValidator.java b/src/main/java/uk/org/iay/incommon/mda/validate/AcceptAllValidator.java index 3157eb8..a4be16c 100644 --- a/src/main/java/uk/org/iay/incommon/mda/validate/AcceptAllValidator.java +++ b/src/main/java/uk/org/iay/incommon/mda/validate/AcceptAllValidator.java @@ -30,7 +30,7 @@ public class AcceptAllValidator extends BaseValidator implements Validator { @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/src/main/java/uk/org/iay/incommon/mda/validate/BaseAsValidator.java b/src/main/java/uk/org/iay/incommon/mda/validate/BaseAsValidator.java index 2ec05e4..ece4b3d 100644 --- a/src/main/java/uk/org/iay/incommon/mda/validate/BaseAsValidator.java +++ b/src/main/java/uk/org/iay/incommon/mda/validate/BaseAsValidator.java @@ -116,10 +116,10 @@ protected Action applyValidators(@Nonnull final A value, @Nonnull final Item * @return a value of the new type * @throws IllegalArgumentException if a conversion can not be performed */ - protected abstract A convert(@Nonnull final V from) throws IllegalArgumentException; + protected abstract @Nonnull A convert(@Nonnull final V from) throws IllegalArgumentException; @Override - public Action validate(@Nonnull final V t, @Nonnull final Item item, @Nonnull final String stageId) + public @Nonnull Action validate(@Nonnull final V t, @Nonnull final Item item, @Nonnull final String stageId) throws StageProcessingException { try { final A v = convert(t); diff --git a/src/main/java/uk/org/iay/incommon/mda/validate/RejectAllValidator.java b/src/main/java/uk/org/iay/incommon/mda/validate/RejectAllValidator.java index 248e91d..0f0db01 100644 --- a/src/main/java/uk/org/iay/incommon/mda/validate/RejectAllValidator.java +++ b/src/main/java/uk/org/iay/incommon/mda/validate/RejectAllValidator.java @@ -33,7 +33,7 @@ public class RejectAllValidator extends BaseValidator implements Validator { @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/src/main/java/uk/org/iay/incommon/mda/validate/ValidatorSequence.java b/src/main/java/uk/org/iay/incommon/mda/validate/ValidatorSequence.java index 01543b1..084a364 100644 --- a/src/main/java/uk/org/iay/incommon/mda/validate/ValidatorSequence.java +++ b/src/main/java/uk/org/iay/incommon/mda/validate/ValidatorSequence.java @@ -14,21 +14,16 @@ package uk.org.iay.incommon.mda.validate; -import java.util.Collections; import java.util.List; import javax.annotation.Nonnull; -import com.google.common.base.Predicates; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; - import net.shibboleth.metadata.Item; import net.shibboleth.metadata.pipeline.StageProcessingException; import net.shibboleth.metadata.validate.BaseValidator; import net.shibboleth.metadata.validate.Validator; +import net.shibboleth.shared.collection.CollectionSupport; import net.shibboleth.shared.component.ComponentInitializationException; -import net.shibboleth.shared.component.ComponentSupport; /** * A {@link Validator} implementation which encapsulates the functionality of stepping @@ -44,7 +39,7 @@ public class ValidatorSequence extends BaseValidator implements Validator /** The list of validators to apply. */ @Nonnull - private List> validators = Collections.emptyList(); + private List> validators = CollectionSupport.listOf(); /** * Set the list of validators to apply to each item. @@ -52,10 +47,9 @@ public class ValidatorSequence extends BaseValidator implements Validator * @param newValidators the list of validators to set */ public void setValidators(@Nonnull final List> newValidators) { - ComponentSupport.ifDestroyedThrowDestroyedComponentException(this); - ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this); + checkSetterPreconditions(); - validators = ImmutableList.copyOf(Iterables.filter(newValidators, Predicates.notNull())); + validators = CollectionSupport.copyToList(newValidators); } /** @@ -63,13 +57,12 @@ public void setValidators(@Nonnull final List> newValidators) { * * @return list of validators */ - @Nonnull - public List> getValidators() { - return Collections.unmodifiableList(validators); + public @Nonnull List> getValidators() { + return validators; } @Override - public Action validate(@Nonnull final V value, @Nonnull final Item item, @Nonnull final String stageId) + public @Nonnull Action validate(@Nonnull final V value, @Nonnull final Item item, @Nonnull final String stageId) throws StageProcessingException { for (final Validator validator: validators) { final Action action = validator.validate(value, item, stageId); @@ -80,12 +73,6 @@ public Action validate(@Nonnull final V value, @Nonnull final Item item, @Non return Action.CONTINUE; } - @Override - protected void doDestroy() { - validators = null; - super.doDestroy(); - } - @Override protected void doInitialize() throws ComponentInitializationException { super.doInitialize(); diff --git a/src/main/java/uk/org/iay/incommon/mda/validate/net/RejectDomainNameNotUnderPublicSuffixValidator.java b/src/main/java/uk/org/iay/incommon/mda/validate/net/RejectDomainNameNotUnderPublicSuffixValidator.java index e248f5a..e54d3cf 100644 --- a/src/main/java/uk/org/iay/incommon/mda/validate/net/RejectDomainNameNotUnderPublicSuffixValidator.java +++ b/src/main/java/uk/org/iay/incommon/mda/validate/net/RejectDomainNameNotUnderPublicSuffixValidator.java @@ -32,7 +32,7 @@ public class RejectDomainNameNotUnderPublicSuffixValidator extends BaseValidator implements Validator { @Override - public Action validate(@Nonnull final InternetDomainName domain, @Nonnull final Item item, + public @Nonnull Action validate(@Nonnull final InternetDomainName domain, @Nonnull final Item item, @Nonnull final String stageId) { if (domain.isUnderPublicSuffix()) { return Action.CONTINUE; diff --git a/src/main/java/uk/org/iay/incommon/mda/validate/net/RejectDomainNamePublicSuffixValidator.java b/src/main/java/uk/org/iay/incommon/mda/validate/net/RejectDomainNamePublicSuffixValidator.java index 7aa2e74..845f864 100644 --- a/src/main/java/uk/org/iay/incommon/mda/validate/net/RejectDomainNamePublicSuffixValidator.java +++ b/src/main/java/uk/org/iay/incommon/mda/validate/net/RejectDomainNamePublicSuffixValidator.java @@ -29,7 +29,7 @@ public class RejectDomainNamePublicSuffixValidator extends BaseValidator implements Validator { @Override - public Action validate(@Nonnull final InternetDomainName domain, @Nonnull final Item item, + public @Nonnull Action validate(@Nonnull final InternetDomainName domain, @Nonnull final Item item, @Nonnull final String stageId) { if (domain.isPublicSuffix()) { addErrorMessage(domain, item, stageId); diff --git a/src/main/java/uk/org/iay/incommon/mda/validate/string/AcceptStringRegexValidator.java b/src/main/java/uk/org/iay/incommon/mda/validate/string/AcceptStringRegexValidator.java index 909e136..57ed5a9 100644 --- a/src/main/java/uk/org/iay/incommon/mda/validate/string/AcceptStringRegexValidator.java +++ b/src/main/java/uk/org/iay/incommon/mda/validate/string/AcceptStringRegexValidator.java @@ -30,7 +30,7 @@ public class AcceptStringRegexValidator extends BaseStringRegexValidator implements Validator { @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/src/main/java/uk/org/iay/incommon/mda/validate/string/AcceptStringValueValidator.java b/src/main/java/uk/org/iay/incommon/mda/validate/string/AcceptStringValueValidator.java index d9818cf..6206cb9 100644 --- a/src/main/java/uk/org/iay/incommon/mda/validate/string/AcceptStringValueValidator.java +++ b/src/main/java/uk/org/iay/incommon/mda/validate/string/AcceptStringValueValidator.java @@ -54,7 +54,7 @@ public void setValue(@Nonnull final String v) { } @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(value)) { return Action.DONE; } else { diff --git a/src/main/java/uk/org/iay/incommon/mda/validate/string/AsDomainNameStringValidator.java b/src/main/java/uk/org/iay/incommon/mda/validate/string/AsDomainNameStringValidator.java index 2049ce9..285454a 100644 --- a/src/main/java/uk/org/iay/incommon/mda/validate/string/AsDomainNameStringValidator.java +++ b/src/main/java/uk/org/iay/incommon/mda/validate/string/AsDomainNameStringValidator.java @@ -35,7 +35,7 @@ public class AsDomainNameStringValidator extends BaseAsValidator { @Override - protected InternetDomainName convert(@Nonnull final String domain) throws IllegalArgumentException { + protected @Nonnull InternetDomainName convert(@Nonnull final String domain) throws IllegalArgumentException { return InternetDomainName.from(domain); } diff --git a/src/main/java/uk/org/iay/incommon/mda/validate/string/AsLiteralTailStringValidator.java b/src/main/java/uk/org/iay/incommon/mda/validate/string/AsLiteralTailStringValidator.java index 167ee30..49ac9be 100644 --- a/src/main/java/uk/org/iay/incommon/mda/validate/string/AsLiteralTailStringValidator.java +++ b/src/main/java/uk/org/iay/incommon/mda/validate/string/AsLiteralTailStringValidator.java @@ -84,7 +84,7 @@ public class AsLiteralTailStringValidator extends BaseAsValidator { @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/src/test/java/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategyTest.java b/src/test/java/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategyTest.java index 1017aab..2503892 100644 --- a/src/test/java/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategyTest.java +++ b/src/test/java/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategyTest.java @@ -10,9 +10,9 @@ import net.shibboleth.metadata.Item; import net.shibboleth.metadata.ItemId; -import net.shibboleth.metadata.dom.BaseDOMTest; import net.shibboleth.metadata.dom.DOMElementItem; import net.shibboleth.metadata.dom.saml.mdrpi.RegistrationAuthority; +import net.shibboleth.metadata.dom.testing.BaseDOMTest; public class InCommonEntityOrderingStrategyTest extends BaseDOMTest { diff --git a/src/test/java/uk/org/iay/incommon/mda/validate/AcceptAllValidatorTest.java b/src/test/java/uk/org/iay/incommon/mda/validate/AcceptAllValidatorTest.java index d95c204..9187a62 100644 --- a/src/test/java/uk/org/iay/incommon/mda/validate/AcceptAllValidatorTest.java +++ b/src/test/java/uk/org/iay/incommon/mda/validate/AcceptAllValidatorTest.java @@ -8,7 +8,7 @@ import net.shibboleth.metadata.ErrorStatus; import net.shibboleth.metadata.Item; -import net.shibboleth.metadata.MockItem; +import net.shibboleth.metadata.testing.MockItem; import net.shibboleth.metadata.validate.Validator; import net.shibboleth.metadata.validate.Validator.Action; diff --git a/src/test/java/uk/org/iay/incommon/mda/validate/RejectAllValidatorTest.java b/src/test/java/uk/org/iay/incommon/mda/validate/RejectAllValidatorTest.java index 80cba3f..97c78a8 100644 --- a/src/test/java/uk/org/iay/incommon/mda/validate/RejectAllValidatorTest.java +++ b/src/test/java/uk/org/iay/incommon/mda/validate/RejectAllValidatorTest.java @@ -8,7 +8,7 @@ import net.shibboleth.metadata.ErrorStatus; import net.shibboleth.metadata.Item; -import net.shibboleth.metadata.MockItem; +import net.shibboleth.metadata.testing.MockItem; import net.shibboleth.metadata.validate.Validator; import net.shibboleth.metadata.validate.Validator.Action; diff --git a/src/test/java/uk/org/iay/incommon/mda/validate/ValidatorSequenceTest.java b/src/test/java/uk/org/iay/incommon/mda/validate/ValidatorSequenceTest.java index 010d6d4..274c0a8 100644 --- a/src/test/java/uk/org/iay/incommon/mda/validate/ValidatorSequenceTest.java +++ b/src/test/java/uk/org/iay/incommon/mda/validate/ValidatorSequenceTest.java @@ -9,7 +9,7 @@ import net.shibboleth.metadata.ErrorStatus; import net.shibboleth.metadata.Item; -import net.shibboleth.metadata.MockItem; +import net.shibboleth.metadata.testing.MockItem; import net.shibboleth.metadata.validate.Validator; import net.shibboleth.metadata.validate.Validator.Action; diff --git a/src/test/java/uk/org/iay/incommon/mda/validate/net/RejectDomainNameNotUnderPublicSuffixValidatorTest.java b/src/test/java/uk/org/iay/incommon/mda/validate/net/RejectDomainNameNotUnderPublicSuffixValidatorTest.java index 6f3126b..08bbbd2 100644 --- a/src/test/java/uk/org/iay/incommon/mda/validate/net/RejectDomainNameNotUnderPublicSuffixValidatorTest.java +++ b/src/test/java/uk/org/iay/incommon/mda/validate/net/RejectDomainNameNotUnderPublicSuffixValidatorTest.java @@ -7,7 +7,7 @@ import net.shibboleth.metadata.ErrorStatus; import net.shibboleth.metadata.Item; -import net.shibboleth.metadata.MockItem; +import net.shibboleth.metadata.testing.MockItem; import net.shibboleth.metadata.validate.Validator.Action; public class RejectDomainNameNotUnderPublicSuffixValidatorTest { diff --git a/src/test/java/uk/org/iay/incommon/mda/validate/net/RejectDomainNamePublicSuffixValidatorTest.java b/src/test/java/uk/org/iay/incommon/mda/validate/net/RejectDomainNamePublicSuffixValidatorTest.java index 1be4e54..856d677 100644 --- a/src/test/java/uk/org/iay/incommon/mda/validate/net/RejectDomainNamePublicSuffixValidatorTest.java +++ b/src/test/java/uk/org/iay/incommon/mda/validate/net/RejectDomainNamePublicSuffixValidatorTest.java @@ -7,7 +7,7 @@ import net.shibboleth.metadata.ErrorStatus; import net.shibboleth.metadata.Item; -import net.shibboleth.metadata.MockItem; +import net.shibboleth.metadata.testing.MockItem; import net.shibboleth.metadata.validate.Validator.Action; public class RejectDomainNamePublicSuffixValidatorTest { diff --git a/src/test/java/uk/org/iay/incommon/mda/validate/string/AcceptStringRegexValidatorTest.java b/src/test/java/uk/org/iay/incommon/mda/validate/string/AcceptStringRegexValidatorTest.java index 1b8ff04..9f79d91 100644 --- a/src/test/java/uk/org/iay/incommon/mda/validate/string/AcceptStringRegexValidatorTest.java +++ b/src/test/java/uk/org/iay/incommon/mda/validate/string/AcceptStringRegexValidatorTest.java @@ -8,7 +8,7 @@ import net.shibboleth.metadata.ErrorStatus; import net.shibboleth.metadata.Item; -import net.shibboleth.metadata.MockItem; +import net.shibboleth.metadata.testing.MockItem; import net.shibboleth.metadata.validate.Validator; import net.shibboleth.metadata.validate.Validator.Action; diff --git a/src/test/java/uk/org/iay/incommon/mda/validate/string/AcceptStringValueValidatorTest.java b/src/test/java/uk/org/iay/incommon/mda/validate/string/AcceptStringValueValidatorTest.java index ab9d1ea..357abbe 100644 --- a/src/test/java/uk/org/iay/incommon/mda/validate/string/AcceptStringValueValidatorTest.java +++ b/src/test/java/uk/org/iay/incommon/mda/validate/string/AcceptStringValueValidatorTest.java @@ -8,7 +8,7 @@ import net.shibboleth.metadata.ErrorStatus; import net.shibboleth.metadata.Item; -import net.shibboleth.metadata.MockItem; +import net.shibboleth.metadata.testing.MockItem; import net.shibboleth.metadata.validate.Validator; import net.shibboleth.metadata.validate.Validator.Action; diff --git a/src/test/java/uk/org/iay/incommon/mda/validate/string/AsDomainNameStringValidatorTest.java b/src/test/java/uk/org/iay/incommon/mda/validate/string/AsDomainNameStringValidatorTest.java index 323aee6..4817621 100644 --- a/src/test/java/uk/org/iay/incommon/mda/validate/string/AsDomainNameStringValidatorTest.java +++ b/src/test/java/uk/org/iay/incommon/mda/validate/string/AsDomainNameStringValidatorTest.java @@ -4,6 +4,8 @@ import java.util.ArrayList; import java.util.List; +import javax.annotation.Nonnull; + import org.testng.Assert; import org.testng.annotations.Test; @@ -11,8 +13,8 @@ import net.shibboleth.metadata.ErrorStatus; import net.shibboleth.metadata.Item; -import net.shibboleth.metadata.MockItem; import net.shibboleth.metadata.pipeline.StageProcessingException; +import net.shibboleth.metadata.testing.MockItem; import net.shibboleth.metadata.validate.BaseValidator; import net.shibboleth.metadata.validate.Validator; import net.shibboleth.metadata.validate.Validator.Action; @@ -21,16 +23,17 @@ public class AsDomainNameStringValidatorTest { private static class CountingValidator extends BaseValidator implements Validator { public int count; - private final Action action; + private final @Nonnull Action action; @Override - public Action validate(InternetDomainName e, Item item, String stageId) throws StageProcessingException { + public @Nonnull Action validate(@Nonnull InternetDomainName e, @Nonnull Item item, @Nonnull String stageId) + throws StageProcessingException { count++; return action; } /** Constructor. */ - public CountingValidator(final Action a) { + public CountingValidator(final @Nonnull Action a) { action = a; } } diff --git a/src/test/java/uk/org/iay/incommon/mda/validate/string/AsLiteralTailStringValidatorTest.java b/src/test/java/uk/org/iay/incommon/mda/validate/string/AsLiteralTailStringValidatorTest.java index 00f5c7b..b312645 100644 --- a/src/test/java/uk/org/iay/incommon/mda/validate/string/AsLiteralTailStringValidatorTest.java +++ b/src/test/java/uk/org/iay/incommon/mda/validate/string/AsLiteralTailStringValidatorTest.java @@ -6,12 +6,14 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.annotation.Nonnull; + import org.testng.Assert; import org.testng.annotations.Test; import net.shibboleth.metadata.Item; -import net.shibboleth.metadata.MockItem; import net.shibboleth.metadata.pipeline.StageProcessingException; +import net.shibboleth.metadata.testing.MockItem; import net.shibboleth.metadata.validate.BaseValidator; import net.shibboleth.metadata.validate.Validator; import net.shibboleth.metadata.validate.Validator.Action; @@ -21,17 +23,17 @@ public class AsLiteralTailStringValidatorTest { private static class CountingCapturingValidator extends BaseValidator implements Validator { public int count; public String value; - private final Action action; + private final @Nonnull Action action; @Override - public Action validate(String e, Item item, String stageId) throws StageProcessingException { + public @Nonnull Action validate(@Nonnull String e, @Nonnull Item item, @Nonnull String stageId) throws StageProcessingException { count++; value = e; return action; } /** Constructor. */ - public CountingCapturingValidator(final Action a) { + public CountingCapturingValidator(final @Nonnull Action a) { action = a; } } diff --git a/src/test/java/uk/org/iay/incommon/mda/validate/string/RejectStringRegexValidatorTest.java b/src/test/java/uk/org/iay/incommon/mda/validate/string/RejectStringRegexValidatorTest.java index c2b103d..73c8c50 100644 --- a/src/test/java/uk/org/iay/incommon/mda/validate/string/RejectStringRegexValidatorTest.java +++ b/src/test/java/uk/org/iay/incommon/mda/validate/string/RejectStringRegexValidatorTest.java @@ -8,7 +8,7 @@ import net.shibboleth.metadata.ErrorStatus; import net.shibboleth.metadata.Item; -import net.shibboleth.metadata.MockItem; +import net.shibboleth.metadata.testing.MockItem; import net.shibboleth.metadata.validate.Validator; import net.shibboleth.metadata.validate.Validator.Action;