Author: kwin Date: Wed Apr 5 10:48:56 2017 New Revision: 1790209 URL: http://svn.apache.org/viewvc?rev=1790209&view=rev Log: ValidationContext -> ValidatorContext
Added: sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/ValidatorContext.java - copied, changed from r1787191, sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/ValidationContext.java Removed: sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/ValidationContext.java Modified: sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/Validator.java sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/support/DefaultValidationFailure.java sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/support/DefaultValidationResult.java sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationContextImpl.java sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/validators/RegexValidator.java sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/ValidatorTypeUtilTest.java sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/DateValidator.java sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/ExtendedStringValidator.java sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/IntegerValidator.java sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/StringArrayValidator.java sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/StringValidator.java Modified: sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/Validator.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/Validator.java?rev=1790209&r1=1790208&r2=1790209&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/Validator.java (original) +++ sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/Validator.java Wed Apr 5 10:48:56 2017 @@ -73,7 +73,7 @@ public interface Validator <T> { * @return the validation result (encapsulates the validation status as well as messages). * @throws SlingValidationException if some expected arguments are missing from the arguments map */ - @Nonnull ValidationResult validate(@Nonnull T data, @Nonnull ValidationContext context, @Nonnull ValueMap arguments) throws SlingValidationException; + @Nonnull ValidationResult validate(@Nonnull T data, @Nonnull ValidatorContext context, @Nonnull ValueMap arguments) throws SlingValidationException; /** * Each {@link Validator} must have a service property with name {@code validator.id} of type {@link String}. The validators are only addressable via the value of this property Copied: sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/ValidatorContext.java (from r1787191, sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/ValidationContext.java) URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/ValidatorContext.java?p2=sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/ValidatorContext.java&p1=sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/ValidationContext.java&r1=1787191&r2=1790209&rev=1790209&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/ValidationContext.java (original) +++ sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/ValidatorContext.java Wed Apr 5 10:48:56 2017 @@ -30,14 +30,14 @@ import org.osgi.annotation.versioning.Pr /** - * Used as parameter for each call of {@link Validator#validate(Object, ValidationContext, ValueMap)} + * Used as parameter for each call of {@link Validator#validate(Object, ValidatorContext, ValueMap)} * Exposes additional information about the context in which the validation was called. */ @ProviderType -public interface ValidationContext { +public interface ValidatorContext { /** - * @return the relative location of the property which should be checked by the validator. Refers to the 'data' parameter of {@link Validator#validate(Object, ValidationContext, ValueMap)} + * @return the relative location of the property which should be checked by the validator. Refers to the 'data' parameter of {@link Validator#validate(Object, ValidatorContext, ValueMap)} */ @Nonnull String getLocation(); Modified: sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/support/DefaultValidationFailure.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/support/DefaultValidationFailure.java?rev=1790209&r1=1790208&r2=1790209&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/support/DefaultValidationFailure.java (original) +++ sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/support/DefaultValidationFailure.java Wed Apr 5 10:48:56 2017 @@ -26,7 +26,7 @@ import java.util.ResourceBundle; import javax.annotation.Nonnull; import org.apache.sling.validation.ValidationFailure; -import org.apache.sling.validation.spi.ValidationContext; +import org.apache.sling.validation.spi.ValidatorContext; import org.osgi.annotation.versioning.ProviderType; /** @@ -52,7 +52,7 @@ public final class DefaultValidationFail * @param messageKey the key to look up in the resource bundle * @param messageArguments the arguments to be used with the looked up value from the resource bundle (given in {@link #getMessage(ResourceBundle)} */ - public DefaultValidationFailure(@Nonnull ValidationContext validationContext, @Nonnull String messageKey, Object... messageArguments) { + public DefaultValidationFailure(@Nonnull ValidatorContext validationContext, @Nonnull String messageKey, Object... messageArguments) { this.location = validationContext.getLocation(); this.severity = validationContext.getSeverity(); this.defaultResourceBundle = validationContext.getDefaultResourceBundle(); Modified: sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/support/DefaultValidationResult.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/support/DefaultValidationResult.java?rev=1790209&r1=1790208&r2=1790209&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/support/DefaultValidationResult.java (original) +++ sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/support/DefaultValidationResult.java Wed Apr 5 10:48:56 2017 @@ -29,7 +29,7 @@ import javax.annotation.Nonnull; import org.apache.sling.validation.ValidationFailure; import org.apache.sling.validation.ValidationResult; -import org.apache.sling.validation.spi.ValidationContext; +import org.apache.sling.validation.spi.ValidatorContext; import org.osgi.annotation.versioning.ProviderType; /** @@ -58,7 +58,7 @@ public final class DefaultValidationResu * @param messageKey the message key used for looking up a value in the resource bundle given in {@link ValidationFailure#getMessage(java.util.ResourceBundle)} * @param messageArguments optional number of arguments being used in {@link MessageFormat#format(String, Object...)} */ - public DefaultValidationResult(@Nonnull ValidationContext validationContext, @Nonnull String messageKey, Object... messageArguments) { + public DefaultValidationResult(@Nonnull ValidatorContext validationContext, @Nonnull String messageKey, Object... messageArguments) { this.isValid = false; this.failures = Collections.<ValidationFailure>singletonList(new DefaultValidationFailure(validationContext, messageKey, messageArguments)); } Modified: sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationContextImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationContextImpl.java?rev=1790209&r1=1790208&r2=1790209&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationContextImpl.java (original) +++ sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationContextImpl.java Wed Apr 5 10:48:56 2017 @@ -25,9 +25,9 @@ import javax.annotation.Nonnull; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ValueMap; -import org.apache.sling.validation.spi.ValidationContext; +import org.apache.sling.validation.spi.ValidatorContext; -public class ValidationContextImpl implements ValidationContext { +public class ValidationContextImpl implements ValidatorContext { private final @Nonnull String location; private final int severity; Modified: sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java?rev=1790209&r1=1790208&r2=1790209&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java (original) +++ sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/ValidationServiceImpl.java Wed Apr 5 10:48:56 2017 @@ -50,7 +50,7 @@ import org.apache.sling.validation.model import org.apache.sling.validation.model.ResourceProperty; import org.apache.sling.validation.model.ValidationModel; import org.apache.sling.validation.model.spi.ValidationModelRetriever; -import org.apache.sling.validation.spi.ValidationContext; +import org.apache.sling.validation.spi.ValidatorContext; import org.apache.sling.validation.spi.Validator; import org.osgi.framework.ServiceReference; import org.osgi.service.component.annotations.Activate; @@ -392,7 +392,7 @@ public class ValidationServiceImpl imple @SuppressWarnings({ "rawtypes", "unchecked" }) private void validateValue(CompositeValidationResult result, @Nonnull Object value, String property, String relativePath, @Nonnull ValueMap valueMap, Resource resource, @Nonnull Validator validator, ValueMap validatorParameters, @Nonnull ResourceBundle defaultResourceBundle, int severity) { try { - ValidationContext validationContext = new ValidationContextImpl(relativePath + property, severity, valueMap, resource, defaultResourceBundle); + ValidatorContext validationContext = new ValidationContextImpl(relativePath + property, severity, valueMap, resource, defaultResourceBundle); ValidationResult validatorResult = ((Validator)validator).validate(value, validationContext, validatorParameters); result.addValidationResult(validatorResult); } catch (SlingValidationException e) { Modified: sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/validators/RegexValidator.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/validators/RegexValidator.java?rev=1790209&r1=1790208&r2=1790209&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/validators/RegexValidator.java (original) +++ sling/trunk/bundles/extensions/validation/core/src/main/java/org/apache/sling/validation/impl/validators/RegexValidator.java Wed Apr 5 10:48:56 2017 @@ -27,7 +27,7 @@ import org.apache.commons.lang3.StringUt import org.apache.sling.api.resource.ValueMap; import org.apache.sling.validation.SlingValidationException; import org.apache.sling.validation.ValidationResult; -import org.apache.sling.validation.spi.ValidationContext; +import org.apache.sling.validation.spi.ValidatorContext; import org.apache.sling.validation.spi.Validator; import org.apache.sling.validation.spi.support.DefaultValidationResult; import org.osgi.service.component.annotations.Component; @@ -43,7 +43,7 @@ public class RegexValidator implements V public static final @Nonnull String REGEX_PARAM = "regex"; @Override - public @Nonnull ValidationResult validate(@Nonnull String data, @Nonnull ValidationContext context, @Nonnull ValueMap arguments) + public @Nonnull ValidationResult validate(@Nonnull String data, @Nonnull ValidatorContext context, @Nonnull ValueMap arguments) throws SlingValidationException { String regex = arguments.get(REGEX_PARAM, ""); if (StringUtils.isEmpty(regex)) { Modified: sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java?rev=1790209&r1=1790208&r2=1790209&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java (original) +++ sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationServiceImplTest.java Wed Apr 5 10:48:56 2017 @@ -56,7 +56,7 @@ import org.apache.sling.validation.model import org.apache.sling.validation.model.ResourceProperty; import org.apache.sling.validation.model.ValidationModel; import org.apache.sling.validation.model.spi.ValidationModelRetriever; -import org.apache.sling.validation.spi.ValidationContext; +import org.apache.sling.validation.spi.ValidatorContext; import org.apache.sling.validation.spi.Validator; import org.apache.sling.validation.spi.support.DefaultValidationFailure; import org.apache.sling.validation.spi.support.DefaultValidationResult; @@ -176,7 +176,7 @@ public class ValidationServiceImplTest { public void testValidateNeverCalledWithNullValues() throws Exception { Validator<String> myValidator = new Validator<String>() { @Override - public @Nonnull ValidationResult validate(@Nonnull String data, @Nonnull ValidationContext context, @Nonnull ValueMap arguments) + public @Nonnull ValidationResult validate(@Nonnull String data, @Nonnull ValidatorContext context, @Nonnull ValueMap arguments) throws SlingValidationException { Assert.assertNotNull("data parameter for validate should never be null", data); Assert.assertNotNull("location of context parameter for validate should never be null", context.getLocation()); @@ -394,7 +394,7 @@ public class ValidationServiceImplTest { Validator<String> extendedValidator = new Validator<String>() { @Override @Nonnull - public ValidationResult validate(@Nonnull String data, @Nonnull ValidationContext context, @Nonnull ValueMap arguments) + public ValidationResult validate(@Nonnull String data, @Nonnull ValidatorContext context, @Nonnull ValueMap arguments) throws SlingValidationException { Resource resource = context.getResource(); if (resource == null) { Modified: sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/ValidatorTypeUtilTest.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/ValidatorTypeUtilTest.java?rev=1790209&r1=1790208&r2=1790209&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/ValidatorTypeUtilTest.java (original) +++ sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/ValidatorTypeUtilTest.java Wed Apr 5 10:48:56 2017 @@ -32,7 +32,7 @@ import org.apache.sling.validation.impl. import org.apache.sling.validation.impl.util.examplevalidators.StringArrayValidator; import org.apache.sling.validation.impl.util.examplevalidators.StringValidator; import org.apache.sling.validation.impl.validators.RegexValidator; -import org.apache.sling.validation.spi.ValidationContext; +import org.apache.sling.validation.spi.ValidatorContext; import org.apache.sling.validation.spi.Validator; import org.apache.sling.validation.spi.support.DefaultValidationResult; import org.hamcrest.CoreMatchers; @@ -64,7 +64,7 @@ public class ValidatorTypeUtilTest { private class InnerStringValidator implements Validator<String> { @Override - public @Nonnull ValidationResult validate(@Nonnull String data, @Nonnull ValidationContext context, @Nonnull ValueMap arguments) + public @Nonnull ValidationResult validate(@Nonnull String data, @Nonnull ValidatorContext context, @Nonnull ValueMap arguments) throws SlingValidationException { return DefaultValidationResult.VALID; } @@ -81,7 +81,7 @@ public class ValidatorTypeUtilTest { public void testGetValidatorTypeWithAnonymousClass() { Assert.assertThat((Class<String>)ValidatorTypeUtil.getValidatorType(new Validator<String>() { @Override - public @Nonnull ValidationResult validate(@Nonnull String data, @Nonnull ValidationContext context, @Nonnull ValueMap arguments) + public @Nonnull ValidationResult validate(@Nonnull String data, @Nonnull ValidatorContext context, @Nonnull ValueMap arguments) throws SlingValidationException { return DefaultValidationResult.VALID; } @@ -99,7 +99,7 @@ public class ValidatorTypeUtilTest { public void testGetValidatorTypeWithCollectionType() { ValidatorTypeUtil.getValidatorType(new Validator<Collection<String>>() { @Override - public @Nonnull ValidationResult validate(@Nonnull Collection<String> data, @Nonnull ValidationContext context, @Nonnull ValueMap arguments) + public @Nonnull ValidationResult validate(@Nonnull Collection<String> data, @Nonnull ValidatorContext context, @Nonnull ValueMap arguments) throws SlingValidationException { return DefaultValidationResult.VALID; } @@ -108,7 +108,7 @@ public class ValidatorTypeUtilTest { private class InnerStringValidatorWithAdditionalBaseClass extends GenericTypeParameterBaseClass<Integer> implements Validator<String> { @Override - public @Nonnull ValidationResult validate(@Nonnull String data, @Nonnull ValidationContext context, @Nonnull ValueMap arguments) + public @Nonnull ValidationResult validate(@Nonnull String data, @Nonnull ValidatorContext context, @Nonnull ValueMap arguments) throws SlingValidationException { return DefaultValidationResult.VALID; } Modified: sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/DateValidator.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/DateValidator.java?rev=1790209&r1=1790208&r2=1790209&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/DateValidator.java (original) +++ sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/DateValidator.java Wed Apr 5 10:48:56 2017 @@ -25,14 +25,14 @@ import javax.annotation.Nonnull; import org.apache.sling.api.resource.ValueMap; import org.apache.sling.validation.ValidationResult; import org.apache.sling.validation.SlingValidationException; -import org.apache.sling.validation.spi.ValidationContext; +import org.apache.sling.validation.spi.ValidatorContext; import org.apache.sling.validation.spi.Validator; import org.apache.sling.validation.spi.support.DefaultValidationResult; public class DateValidator implements Validator<Date> { @Override - public @Nonnull ValidationResult validate(@Nonnull Date data, @Nonnull ValidationContext context, @Nonnull ValueMap arguments) throws SlingValidationException { + public @Nonnull ValidationResult validate(@Nonnull Date data, @Nonnull ValidatorContext context, @Nonnull ValueMap arguments) throws SlingValidationException { return DefaultValidationResult.VALID; } Modified: sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/ExtendedStringValidator.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/ExtendedStringValidator.java?rev=1790209&r1=1790208&r2=1790209&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/ExtendedStringValidator.java (original) +++ sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/ExtendedStringValidator.java Wed Apr 5 10:48:56 2017 @@ -23,13 +23,13 @@ import javax.annotation.Nonnull; import org.apache.sling.api.resource.ValueMap; import org.apache.sling.validation.ValidationResult; import org.apache.sling.validation.SlingValidationException; -import org.apache.sling.validation.spi.ValidationContext; +import org.apache.sling.validation.spi.ValidatorContext; import org.apache.sling.validation.spi.support.DefaultValidationResult; public class ExtendedStringValidator extends AbstractValidatorWithAdditionalType<Boolean, String, Integer> { @Override - public @Nonnull ValidationResult validate(@Nonnull String data, @Nonnull ValidationContext context, @Nonnull ValueMap arguments) + public @Nonnull ValidationResult validate(@Nonnull String data, @Nonnull ValidatorContext context, @Nonnull ValueMap arguments) throws SlingValidationException { return DefaultValidationResult.VALID; } Modified: sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/IntegerValidator.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/IntegerValidator.java?rev=1790209&r1=1790208&r2=1790209&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/IntegerValidator.java (original) +++ sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/IntegerValidator.java Wed Apr 5 10:48:56 2017 @@ -23,14 +23,14 @@ import javax.annotation.Nonnull; import org.apache.sling.api.resource.ValueMap; import org.apache.sling.validation.ValidationResult; import org.apache.sling.validation.SlingValidationException; -import org.apache.sling.validation.spi.ValidationContext; +import org.apache.sling.validation.spi.ValidatorContext; import org.apache.sling.validation.spi.Validator; import org.apache.sling.validation.spi.support.DefaultValidationResult; public class IntegerValidator implements Validator<Integer> { @Override - public @Nonnull ValidationResult validate(@Nonnull Integer data, @Nonnull ValidationContext context, @Nonnull ValueMap arguments) + public @Nonnull ValidationResult validate(@Nonnull Integer data, @Nonnull ValidatorContext context, @Nonnull ValueMap arguments) throws SlingValidationException { return DefaultValidationResult.VALID; } Modified: sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/StringArrayValidator.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/StringArrayValidator.java?rev=1790209&r1=1790208&r2=1790209&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/StringArrayValidator.java (original) +++ sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/StringArrayValidator.java Wed Apr 5 10:48:56 2017 @@ -23,14 +23,14 @@ import javax.annotation.Nonnull; import org.apache.sling.api.resource.ValueMap; import org.apache.sling.validation.ValidationResult; import org.apache.sling.validation.SlingValidationException; -import org.apache.sling.validation.spi.ValidationContext; +import org.apache.sling.validation.spi.ValidatorContext; import org.apache.sling.validation.spi.Validator; import org.apache.sling.validation.spi.support.DefaultValidationResult; public class StringArrayValidator implements Validator<String[]> { @Override - public @Nonnull ValidationResult validate(@Nonnull String[] data, @Nonnull ValidationContext context, @Nonnull ValueMap arguments) + public @Nonnull ValidationResult validate(@Nonnull String[] data, @Nonnull ValidatorContext context, @Nonnull ValueMap arguments) throws SlingValidationException { return DefaultValidationResult.VALID; } Modified: sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/StringValidator.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/StringValidator.java?rev=1790209&r1=1790208&r2=1790209&view=diff ============================================================================== --- sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/StringValidator.java (original) +++ sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/util/examplevalidators/StringValidator.java Wed Apr 5 10:48:56 2017 @@ -23,14 +23,14 @@ import javax.annotation.Nonnull; import org.apache.sling.api.resource.ValueMap; import org.apache.sling.validation.ValidationResult; import org.apache.sling.validation.SlingValidationException; -import org.apache.sling.validation.spi.ValidationContext; +import org.apache.sling.validation.spi.ValidatorContext; import org.apache.sling.validation.spi.Validator; import org.apache.sling.validation.spi.support.DefaultValidationResult; public class StringValidator implements Validator<String> { @Override - public @Nonnull ValidationResult validate(@Nonnull String data, @Nonnull ValidationContext context, @Nonnull ValueMap arguments) + public @Nonnull ValidationResult validate(@Nonnull String data, @Nonnull ValidatorContext context, @Nonnull ValueMap arguments) throws SlingValidationException { return DefaultValidationResult.VALID; }