diff --git a/.classpath b/.classpath index 606b047..c7806a0 100644 --- a/.classpath +++ b/.classpath @@ -29,7 +29,7 @@ - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index b5e60c9..995e505 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -11,9 +11,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -25,6 +25,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled @@ -51,6 +52,7 @@ org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled @@ -73,8 +75,8 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/pom.xml b/pom.xml index a7198fb..f991c6b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,8 +5,8 @@ net.shibboleth - parent-v3 - 10 + parent + 11.1.0-SNAPSHOT uk.org.iay.incommon @@ -21,10 +21,10 @@ 2017 - 0.9.2 - 0.9.4 - 7.2.0 - 5.2.0 + 0.10.0-SNAPSHOT + 0.10.0-SNAPSHOT + 8.0.0 + 6.0.0 7.6 @@ -64,9 +64,9 @@ test - uk.org.ukfederation - ukf-mda - ${ukf-mda.version} + net.shibboleth.metadata + aggregator-pipeline + ${mda.version} test-jar test @@ -90,6 +90,16 @@ spring-test test + + org.testng + testng + test + + + ch.qos.logback + logback-classic + test + diff --git a/src/main/java/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategy.java b/src/main/java/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategy.java index b0b5fb1..2dda916 100644 --- a/src/main/java/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategy.java +++ b/src/main/java/uk/org/iay/incommon/mda/dom/saml/InCommonEntityOrderingStrategy.java @@ -15,7 +15,6 @@ package uk.org.iay.incommon.mda.dom.saml; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.List; @@ -28,8 +27,8 @@ import net.shibboleth.metadata.Item; import net.shibboleth.metadata.ItemId; -import net.shibboleth.metadata.dom.saml.EntitiesDescriptorAssemblerStage.ItemOrderingStrategy; import net.shibboleth.metadata.dom.saml.mdrpi.RegistrationAuthority; +import net.shibboleth.metadata.pipeline.ItemOrderingStrategy; import net.shibboleth.metadata.pipeline.StageProcessingException; import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements; @@ -43,24 +42,29 @@ * * The registrar and entityID values used for ordering are required to be * present in the item's item metadata. + * + * @param type of item to be handled */ @ThreadSafe -public class InCommonEntityOrderingStrategy implements ItemOrderingStrategy { +public class InCommonEntityOrderingStrategy implements ItemOrderingStrategy { /** Class logger. */ private final Logger log = LoggerFactory.getLogger(InCommonEntityOrderingStrategy.class); /** The registrar whose entities should always appear first, in the provided order. */ + private final String distinguishedRegistrar; /** - * Helper class which wraps an {@link Element} {@link Item} but extracts any + * Helper class which wraps an {@link Item} but extracts any * associated {@link RegistrationAuthority} and {@link ItemId} for simpler comparisons. + * + * @param type of item to be handled */ - private static class OrderableItem implements Comparable { + private static class OrderableItem implements Comparable { /** The wrapped {@link Element} {@link Item}. */ - private final Item item; + private final Item item; /** The registrar for this entity. */ private final String registrar; @@ -75,7 +79,7 @@ private static class OrderableItem implements Comparable { * @param reg the registrar for this entity * @param entity the entityID for this entity */ - public OrderableItem(@Nonnull final Item domItem, + public OrderableItem(@Nonnull final Item domItem, @Nonnull final String reg, @Nonnull final String entity) { item = domItem; registrar = reg; @@ -99,7 +103,7 @@ public int compareTo(@Nonnull final OrderableItem o) { * * @return the wrapped {@link Element} {@link Item}. */ - public Item unwrap() { + public Item unwrap() { return item; } } @@ -114,10 +118,10 @@ public InCommonEntityOrderingStrategy(@Nonnull final String registrar) { } @Override - public List> order(@Nonnull @NonnullElements final Collection> items) { + public List> order(@Nonnull @NonnullElements final List> items) { // Collect the results here - final List> results = new ArrayList<>(items.size()); + final List> results = new ArrayList<>(items.size()); /* * Construct an orderable list wrapping the original items. @@ -125,9 +129,9 @@ public List> order(@Nonnull @NonnullElements final Collection orderableList = new ArrayList<>(items.size()); + final List> orderableList = new ArrayList<>(items.size()); try { - for (Item item : items) { + for (final Item item : items) { final List registrars = item.getItemMetadata().get(RegistrationAuthority.class); final String registrar; if (registrars.size() == 0) { @@ -150,7 +154,7 @@ public List> order(@Nonnull @NonnullElements final Collection> order(@Nonnull @NonnullElements final Collectionregexp * attribute being true and false. */ -public class ScopeValidationStage extends AbstractDOMValidationStage { +public class ScopeValidationStage extends AbstractDOMValidationStage { /** The sequence of validators to apply to regexp scopes. */ @Nonnull @@ -61,12 +64,17 @@ public List> getRegexpValidators() { } @Override - protected boolean applicable(@Nonnull final Element element) { + protected DOMTraversalContext buildContext(@Nonnull final Item item) { + return new SimpleDOMTraversalContext(item); + } + + @Override + protected boolean applicable(@Nonnull final Element element, @Nonnull final DOMTraversalContext context) { return ElementSupport.isElementNamed(element, ShibbolethMetadataSupport.SCOPE_NAME); } @Override - protected void visit(@Nonnull final Element element, @Nonnull final TraversalContext context) + protected void visit(@Nonnull final Element element, @Nonnull final DOMTraversalContext context) throws StageProcessingException { final String text = element.getTextContent(); final Boolean isRegexp = AttributeSupport.getAttributeValueAsBoolean( 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 ec43c4d..1329cb2 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 @@ -20,6 +20,7 @@ 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.utilities.java.support.component.ComponentInitializationException; @@ -47,7 +48,7 @@ * @param type of the original value * @param type of the new value to which validators should be applied */ -public abstract class BaseAsValidator extends BaseLocalValidator implements Validator { +public abstract class BaseAsValidator extends BaseValidator implements Validator { /** The validator sequence to apply. */ @Nonnull diff --git a/src/main/java/uk/org/iay/incommon/mda/validate/BaseLocalValidator.java b/src/main/java/uk/org/iay/incommon/mda/validate/BaseLocalValidator.java deleted file mode 100644 index 6fe7033..0000000 --- a/src/main/java/uk/org/iay/incommon/mda/validate/BaseLocalValidator.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package uk.org.iay.incommon.mda.validate; - -import javax.annotation.Nonnull; - -import net.shibboleth.metadata.ErrorStatus; -import net.shibboleth.metadata.Item; -import net.shibboleth.metadata.validate.BaseValidator; -import net.shibboleth.utilities.java.support.component.ComponentSupport; -import net.shibboleth.utilities.java.support.logic.Constraint; - -/** - * An extended version of {@link BaseValidator} containing methods to be - * moved to the upstream implementation when possible. - */ -public abstract class BaseLocalValidator extends BaseValidator { - - /** - * Message format string. - * - * The generated message is formatted using this with the object being validated passed - * as an argument. - * - * Defaults to "value rejected: '%s'". - */ - @Nonnull - private String message = "value rejected: '%s'"; - - /** - * Constructor. - * - */ - public BaseLocalValidator() { - super(); - } - - /** - * Returns the message format string. - * - * @return the message format string - */ - @Nonnull - public String getMessage() { - return message; - } - - /** - * Set the message format string. - * - * @param newMessage the new message format string - */ - public void setMessage(@Nonnull final String newMessage) { - ComponentSupport.ifDestroyedThrowDestroyedComponentException(this); - ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this); - - message = Constraint.isNotNull(newMessage, "message format string may not be null"); - } - - /** - * Add an {@link ErrorStatus} to the given {@link Item}. - * - * The status message included in the {@link ErrorStatus} is generated - * by formatting the provided value with the {@link #message} field. - * - * @param extra extra value to include in the status metadata - * @param item {@link Item} to add the status metadata to - * @param stageId component identifier for the calling stage - */ - protected void addErrorMessage(@Nonnull final Object extra, @Nonnull final Item item, - @Nonnull final String stageId) { - final String mess = String.format(getMessage(), extra); - addError(mess, item, stageId); - } - -} 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 8556ec6..248e91d 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 @@ -17,6 +17,7 @@ import javax.annotation.Nonnull; import net.shibboleth.metadata.Item; +import net.shibboleth.metadata.validate.BaseValidator; import net.shibboleth.metadata.validate.Validator; /** @@ -29,7 +30,7 @@ * * @param type of the object to be validated */ -public class RejectAllValidator extends BaseLocalValidator implements Validator { +public class RejectAllValidator extends BaseValidator implements Validator { @Override public Action validate(@Nonnull final V e, @Nonnull final Item item, @Nonnull final String stageId) { 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 d80a216..db944e3 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 @@ -25,6 +25,7 @@ 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.utilities.java.support.component.ComponentInitializationException; import net.shibboleth.utilities.java.support.component.ComponentSupport; @@ -39,7 +40,7 @@ * * @param type of the object to be validated */ -public class ValidatorSequence extends BaseLocalValidator implements Validator { +public class ValidatorSequence extends BaseValidator implements Validator { /** The list of validators to apply. */ @Nonnull 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 08cc901..e248f5a 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 @@ -19,8 +19,8 @@ import com.google.common.net.InternetDomainName; import net.shibboleth.metadata.Item; +import net.shibboleth.metadata.validate.BaseValidator; import net.shibboleth.metadata.validate.Validator; -import uk.org.iay.incommon.mda.validate.BaseLocalValidator; /** * A validator that checks whether an {@link InternetDomainName} is under a public suffix. @@ -28,7 +28,7 @@ * A domain name which is not under a public suffix might be a public suffix itself, * or might terminate in something which is not a public suffix. */ -public class RejectDomainNameNotUnderPublicSuffixValidator extends BaseLocalValidator +public class RejectDomainNameNotUnderPublicSuffixValidator extends BaseValidator implements Validator { @Override 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 951e804..7aa2e74 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 @@ -19,13 +19,13 @@ import com.google.common.net.InternetDomainName; import net.shibboleth.metadata.Item; +import net.shibboleth.metadata.validate.BaseValidator; import net.shibboleth.metadata.validate.Validator; -import uk.org.iay.incommon.mda.validate.BaseLocalValidator; /** * A validator that rejects an {@link InternetDomainName} if it is a public suffix. */ -public class RejectDomainNamePublicSuffixValidator extends BaseLocalValidator +public class RejectDomainNamePublicSuffixValidator extends BaseValidator implements Validator { @Override diff --git a/src/main/java/uk/org/iay/incommon/mda/validate/string/BaseStringRegexValidator.java b/src/main/java/uk/org/iay/incommon/mda/validate/string/BaseStringRegexValidator.java index ea5c3c0..234e858 100644 --- a/src/main/java/uk/org/iay/incommon/mda/validate/string/BaseStringRegexValidator.java +++ b/src/main/java/uk/org/iay/incommon/mda/validate/string/BaseStringRegexValidator.java @@ -18,15 +18,15 @@ import javax.annotation.Nonnull; +import net.shibboleth.metadata.validate.BaseValidator; import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit; import net.shibboleth.utilities.java.support.component.ComponentInitializationException; import net.shibboleth.utilities.java.support.component.ComponentSupport; -import uk.org.iay.incommon.mda.validate.BaseLocalValidator; /** * A base class for Validators that match {@link String} values against a regular expression. */ -public abstract class BaseStringRegexValidator extends BaseLocalValidator { +public abstract class BaseStringRegexValidator extends BaseValidator { /** Regular expression to be accepted by this validator. */ @NonnullAfterInit 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 184c774..1017aab 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,10 +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 uk.org.iay.incommon.mda.dom.saml.InCommonEntityOrderingStrategy; -import uk.org.ukfederation.mda.BaseDOMTest; public class InCommonEntityOrderingStrategyTest extends BaseDOMTest { @@ -22,7 +21,7 @@ protected InCommonEntityOrderingStrategyTest() { } private Item makeItem(String registrar, String entityID) throws Exception { - final Item item = new DOMElementItem(readXmlData("trivial.xml")); + final Item item = new DOMElementItem(readXMLData("trivial.xml")); item.getItemMetadata().put(new ItemId(entityID)); item.getItemMetadata().put(new RegistrationAuthority(registrar)); return item; diff --git a/src/test/java/uk/org/iay/incommon/mda/dom/saml/shib/ScopeValidationStageLitmusTest.java b/src/test/java/uk/org/iay/incommon/mda/dom/saml/shib/ScopeValidationStageLitmusTest.java index 8a59d5e..0f23847 100644 --- a/src/test/java/uk/org/iay/incommon/mda/dom/saml/shib/ScopeValidationStageLitmusTest.java +++ b/src/test/java/uk/org/iay/incommon/mda/dom/saml/shib/ScopeValidationStageLitmusTest.java @@ -2,7 +2,6 @@ package uk.org.iay.incommon.mda.dom.saml.shib; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import javax.xml.parsers.DocumentBuilder; @@ -71,7 +70,7 @@ private Document buildDocument(final String value, final boolean isRegex) { /** Run the test stage on a single {@link Item}. */ private List runTest(final Item item) throws Exception { - final Collection> coll = new ArrayList<>(); + final List> coll = new ArrayList<>(); coll.add(item); stage.execute(coll); final List errors = item.getItemMetadata().get(ErrorStatus.class); 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 11e1a79..d95c204 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,9 +8,9 @@ import net.shibboleth.metadata.ErrorStatus; import net.shibboleth.metadata.Item; +import net.shibboleth.metadata.MockItem; import net.shibboleth.metadata.validate.Validator; import net.shibboleth.metadata.validate.Validator.Action; -import uk.org.ukfederation.mda.MockItem; public class AcceptAllValidatorTest { 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 ba0a254..80cba3f 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,9 +8,9 @@ import net.shibboleth.metadata.ErrorStatus; import net.shibboleth.metadata.Item; +import net.shibboleth.metadata.MockItem; import net.shibboleth.metadata.validate.Validator; import net.shibboleth.metadata.validate.Validator.Action; -import uk.org.ukfederation.mda.MockItem; public class RejectAllValidatorTest { 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 4bf8c47..010d6d4 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,9 +9,9 @@ import net.shibboleth.metadata.ErrorStatus; import net.shibboleth.metadata.Item; +import net.shibboleth.metadata.MockItem; import net.shibboleth.metadata.validate.Validator; import net.shibboleth.metadata.validate.Validator.Action; -import uk.org.ukfederation.mda.MockItem; public class ValidatorSequenceTest { 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 57918f2..6f3126b 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,8 +7,8 @@ import net.shibboleth.metadata.ErrorStatus; import net.shibboleth.metadata.Item; +import net.shibboleth.metadata.MockItem; import net.shibboleth.metadata.validate.Validator.Action; -import uk.org.ukfederation.mda.MockItem; 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 7d4625f..1be4e54 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,8 +7,8 @@ import net.shibboleth.metadata.ErrorStatus; import net.shibboleth.metadata.Item; +import net.shibboleth.metadata.MockItem; import net.shibboleth.metadata.validate.Validator.Action; -import uk.org.ukfederation.mda.MockItem; 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 92d0abd..1b8ff04 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,9 +8,9 @@ import net.shibboleth.metadata.ErrorStatus; import net.shibboleth.metadata.Item; +import net.shibboleth.metadata.MockItem; import net.shibboleth.metadata.validate.Validator; import net.shibboleth.metadata.validate.Validator.Action; -import uk.org.ukfederation.mda.MockItem; public class AcceptStringRegexValidatorTest { 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 2b92d69..ab9d1ea 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,9 +8,9 @@ import net.shibboleth.metadata.ErrorStatus; import net.shibboleth.metadata.Item; +import net.shibboleth.metadata.MockItem; import net.shibboleth.metadata.validate.Validator; import net.shibboleth.metadata.validate.Validator.Action; -import uk.org.ukfederation.mda.MockItem; public class AcceptStringValueValidatorTest { 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 c96a0bf..323aee6 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 @@ -11,15 +11,15 @@ 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.validate.BaseValidator; import net.shibboleth.metadata.validate.Validator; import net.shibboleth.metadata.validate.Validator.Action; -import uk.org.iay.incommon.mda.validate.BaseLocalValidator; -import uk.org.ukfederation.mda.MockItem; public class AsDomainNameStringValidatorTest { - private static class CountingValidator extends BaseLocalValidator implements Validator { + private static class CountingValidator extends BaseValidator implements Validator { public int count; private final Action action; 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 a86d885..00f5c7b 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 @@ -10,15 +10,15 @@ 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.validate.BaseValidator; import net.shibboleth.metadata.validate.Validator; import net.shibboleth.metadata.validate.Validator.Action; -import uk.org.iay.incommon.mda.validate.BaseLocalValidator; -import uk.org.ukfederation.mda.MockItem; public class AsLiteralTailStringValidatorTest { - private static class CountingCapturingValidator extends BaseLocalValidator implements Validator { + private static class CountingCapturingValidator extends BaseValidator implements Validator { public int count; public String value; private final Action action; 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 f93e09e..c2b103d 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,9 +8,9 @@ import net.shibboleth.metadata.ErrorStatus; import net.shibboleth.metadata.Item; +import net.shibboleth.metadata.MockItem; import net.shibboleth.metadata.validate.Validator; import net.shibboleth.metadata.validate.Validator.Action; -import uk.org.ukfederation.mda.MockItem; public class RejectStringRegexValidatorTest {