You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bval.apache.org by mb...@apache.org on 2016/10/19 16:50:56 UTC
svn commit: r1765681 [3/3] - in /bval/trunk:
bval-core/src/main/java/org/apache/bval/
bval-core/src/main/java/org/apache/bval/model/
bval-core/src/main/java/org/apache/bval/util/
bval-core/src/test/java/org/apache/bval/ bval-extras/src/main/java/org/ap...
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeImpl.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeImpl.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeImpl.java Wed Oct 19 16:50:55 2016
@@ -112,6 +112,7 @@ public class NodeImpl implements Path.No
/**
* {@inheritDoc}
*/
+ @Override
public String getName() {
return name;
}
@@ -126,6 +127,7 @@ public class NodeImpl implements Path.No
/**
* {@inheritDoc}
*/
+ @Override
public boolean isInIterable() {
return inIterable;
}
@@ -141,6 +143,7 @@ public class NodeImpl implements Path.No
/**
* {@inheritDoc}
*/
+ @Override
public Integer getIndex() {
return index;
}
@@ -162,6 +165,7 @@ public class NodeImpl implements Path.No
/**
* {@inheritDoc}
*/
+ @Override
public Object getKey() {
return key;
}
@@ -176,6 +180,7 @@ public class NodeImpl implements Path.No
this.index = null;
}
+ @Override
public ElementKind getKind() {
return kind;
}
@@ -184,6 +189,7 @@ public class NodeImpl implements Path.No
this.kind = kind;
}
+ @Override
public <T extends Node> T as(final Class<T> nodeType) {
if (nodeType.isInstance(this)) {
return nodeType.cast(this);
@@ -270,6 +276,7 @@ public class NodeImpl implements Path.No
setParameterIndex(idx);
}
+ @Override
public ElementKind getKind() {
return ElementKind.PARAMETER;
}
@@ -288,6 +295,7 @@ public class NodeImpl implements Path.No
setParameterTypes(paramTypes);
}
+ @Override
public ElementKind getKind() {
return ElementKind.CONSTRUCTOR;
}
@@ -302,6 +310,7 @@ public class NodeImpl implements Path.No
super(cast);
}
+ @Override
public ElementKind getKind() {
return ElementKind.CROSS_PARAMETER;
}
@@ -320,6 +329,7 @@ public class NodeImpl implements Path.No
setParameterTypes(classes);
}
+ @Override
public ElementKind getKind() {
return ElementKind.METHOD;
}
@@ -334,6 +344,7 @@ public class NodeImpl implements Path.No
super("<return value>");
}
+ @Override
public ElementKind getKind() {
return ElementKind.RETURN_VALUE;
}
@@ -348,6 +359,7 @@ public class NodeImpl implements Path.No
super(cast);
}
+ @Override
public ElementKind getKind() {
return ElementKind.PROPERTY;
}
@@ -362,6 +374,7 @@ public class NodeImpl implements Path.No
super(cast);
}
+ @Override
public ElementKind getKind() {
return ElementKind.BEAN;
}
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathImpl.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathImpl.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathImpl.java Wed Oct 19 16:50:55 2016
@@ -47,6 +47,7 @@ public class PathImpl implements Path, S
/**
* {@inheritDoc}
*/
+ @Override
public void handleProperty(String name) {
result.addProperty(name);
}
@@ -54,6 +55,7 @@ public class PathImpl implements Path, S
/**
* {@inheritDoc}
*/
+ @Override
public void handleIndexOrKey(String value) {
// with no context to guide us, we can only parse ints and fall back to String keys:
NodeImpl node;
@@ -68,6 +70,7 @@ public class PathImpl implements Path, S
/**
* {@inheritDoc}
*/
+ @Override
public PathImpl result() {
if (result.nodeList.isEmpty()) {
throw new IllegalStateException();
@@ -78,6 +81,7 @@ public class PathImpl implements Path, S
/**
* {@inheritDoc}
*/
+ @Override
public void handleGenericInIterable() {
result.addNode(NodeImpl.atIndex(null));
}
@@ -277,6 +281,7 @@ public class PathImpl implements Path, S
/**
* {@inheritDoc}
*/
+ @Override
public Iterator<Path.Node> iterator() {
return nodeList.iterator();
}
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathNavigation.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathNavigation.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathNavigation.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathNavigation.java Wed Oct 19 16:50:55 2016
@@ -68,6 +68,7 @@ public class PathNavigation {
/**
* {@inheritDoc}
*/
+ @Override
public final Object result() {
complete();
return null;
@@ -273,6 +274,7 @@ public class PathNavigation {
/**
* {@inheritDoc}
*/
+ @Override
public void handleProperty(String name) {
delegate.handleProperty(name);
}
@@ -280,6 +282,7 @@ public class PathNavigation {
/**
* {@inheritDoc}
*/
+ @Override
public void handleIndexOrKey(String value) {
delegate.handleIndexOrKey(value);
}
@@ -287,6 +290,7 @@ public class PathNavigation {
/**
* {@inheritDoc}
*/
+ @Override
public void handleGenericInIterable() {
delegate.handleGenericInIterable();
}
@@ -294,6 +298,7 @@ public class PathNavigation {
/**
* {@inheritDoc}
*/
+ @Override
public Object result() {
return null;
}
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/ValidationContextTraversal.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/ValidationContextTraversal.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/ValidationContextTraversal.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/ValidationContextTraversal.java Wed Oct 19 16:50:55 2016
@@ -101,6 +101,7 @@ public class ValidationContextTraversal
/**
* {@inheritDoc}
*/
+ @Override
public void handleIndexOrKey(String token) {
moveDownIfNecessary();
@@ -130,6 +131,7 @@ public class ValidationContextTraversal
/**
* {@inheritDoc}
*/
+ @Override
public void handleProperty(String token) {
moveDownIfNecessary();
@@ -186,6 +188,7 @@ public class ValidationContextTraversal
/**
* {@inheritDoc}
*/
+ @Override
public void handleGenericInIterable() {
throw new UnsupportedOperationException("Cannot navigate a ValidationContext to []");
}
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/xml/AnnotationProxy.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/xml/AnnotationProxy.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/xml/AnnotationProxy.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/xml/AnnotationProxy.java Wed Oct 19 16:50:55 2016
@@ -74,6 +74,7 @@ class AnnotationProxy implements Annotat
/**
* {@inheritDoc}
*/
+ @Override
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
if (values.containsKey(method.getName())) {
return values.get(method.getName());
@@ -84,6 +85,7 @@ class AnnotationProxy implements Annotat
/**
* {@inheritDoc}
*/
+ @Override
public Class<? extends Annotation> annotationType() {
return annotationType;
}
@@ -91,6 +93,7 @@ class AnnotationProxy implements Annotat
/**
* {@inheritDoc}
*/
+ @Override
public String toString() {
StringBuilder result = new StringBuilder();
result.append('@').append(annotationType().getName()).append('(');
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/xml/AnnotationProxyBuilder.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/xml/AnnotationProxyBuilder.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/xml/AnnotationProxyBuilder.java (original)
+++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/xml/AnnotationProxyBuilder.java Wed Oct 19 16:50:55 2016
@@ -219,6 +219,7 @@ public final class AnnotationProxyBuilde
public static final class ValidAnnotation implements Valid {
public static final ValidAnnotation INSTANCE = new ValidAnnotation();
+ @Override
public Class<? extends Annotation> annotationType() {
return Valid.class;
}
@@ -233,14 +234,17 @@ public final class AnnotationProxyBuilde
this.to = to;
}
+ @Override
public Class<? extends Annotation> annotationType() {
return ConvertGroup.class;
}
+ @Override
public Class<?> from() {
return from;
}
+ @Override
public Class<?> to() {
return to;
}
Modified: bval/trunk/bval-jsr/src/test/java/org/apache/bval/constraints/AuthorAddressKnown.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/test/java/org/apache/bval/constraints/AuthorAddressKnown.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/test/java/org/apache/bval/constraints/AuthorAddressKnown.java (original)
+++ bval/trunk/bval-jsr/src/test/java/org/apache/bval/constraints/AuthorAddressKnown.java Wed Oct 19 16:50:55 2016
@@ -52,12 +52,14 @@ public @interface AuthorAddressKnown {
/**
* {@inheritDoc}
*/
+ @Override
public void initialize(AuthorAddressKnown constraintAnnotation) {
}
/**
* {@inheritDoc}
*/
+ @Override
public boolean isValid(Author value, ConstraintValidatorContext context) {
if (value.getAddresses() == null) {
return false;
Modified: bval/trunk/bval-jsr/src/test/java/org/apache/bval/constraints/FrenchZipcodeValidator.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/test/java/org/apache/bval/constraints/FrenchZipcodeValidator.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/test/java/org/apache/bval/constraints/FrenchZipcodeValidator.java (original)
+++ bval/trunk/bval-jsr/src/test/java/org/apache/bval/constraints/FrenchZipcodeValidator.java Wed Oct 19 16:50:55 2016
@@ -25,10 +25,12 @@ import javax.validation.ConstraintValida
* Description: not implemented (test only)<br/>
*/
public class FrenchZipcodeValidator implements ConstraintValidator<FrenchZipCode, Object> {
+ @Override
public void initialize(FrenchZipCode constraintAnnotation) {
// do nothing
}
+ @Override
public boolean isValid(Object object, ConstraintValidatorContext validationContext) {
return null != object;
}
Modified: bval/trunk/bval-jsr/src/test/java/org/apache/bval/constraints/HasStringValidator.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/test/java/org/apache/bval/constraints/HasStringValidator.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/test/java/org/apache/bval/constraints/HasStringValidator.java (original)
+++ bval/trunk/bval-jsr/src/test/java/org/apache/bval/constraints/HasStringValidator.java Wed Oct 19 16:50:55 2016
@@ -29,10 +29,12 @@ import javax.validation.ConstraintValida
public class HasStringValidator implements ConstraintValidator<HasValue, String> {
private String[] values;
+ @Override
public void initialize(HasValue stringValues) {
values = stringValues.value();
}
+ @Override
public boolean isValid(String s, ConstraintValidatorContext constraintValidatorContext) {
return s == null || ArrayUtils.contains(values, s);
}
Modified: bval/trunk/bval-jsr/src/test/java/org/apache/bval/constraints/ZipCodeCityCoherenceValidator.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/test/java/org/apache/bval/constraints/ZipCodeCityCoherenceValidator.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/test/java/org/apache/bval/constraints/ZipCodeCityCoherenceValidator.java (original)
+++ bval/trunk/bval-jsr/src/test/java/org/apache/bval/constraints/ZipCodeCityCoherenceValidator.java Wed Oct 19 16:50:55 2016
@@ -32,9 +32,11 @@ import javax.validation.ConstraintValida
*/
public class ZipCodeCityCoherenceValidator
implements ConstraintValidator<ZipCodeCityCoherence, ZipCodeCityCarrier> {
+ @Override
public void initialize(ZipCodeCityCoherence constraintAnnotation) {
}
+ @Override
public boolean isValid(ZipCodeCityCarrier adr, ConstraintValidatorContext context) {
boolean r = true;
if ("error".equals(adr.getZipCode())) {
Modified: bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/BeanDescriptorTest.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/BeanDescriptorTest.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/BeanDescriptorTest.java (original)
+++ bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/BeanDescriptorTest.java Wed Oct 19 16:50:55 2016
@@ -221,6 +221,7 @@ public class BeanDescriptorTest extends
private String name;
+ @Override
public String getName() {
return this.name;
}
Modified: bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/BootstrapTest.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/BootstrapTest.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/BootstrapTest.java (original)
+++ bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/BootstrapTest.java Wed Oct 19 16:50:55 2016
@@ -99,6 +99,7 @@ public class BootstrapTest extends TestC
builder = Validation.byDefaultProvider().configure();
builder.constraintValidatorFactory(new ConstraintValidatorFactory() {
+ @Override
public <T extends ConstraintValidator<?, ?>> T getInstance(Class<T> key) {
if (key == NotNullValidator.class) {
@SuppressWarnings("unchecked")
@@ -108,6 +109,7 @@ public class BootstrapTest extends TestC
return new DefaultConstraintValidatorFactory().getInstance(key);
}
+ @Override
public void releaseInstance(ConstraintValidator<?, ?> instance) {
// no-op
}
@@ -121,6 +123,7 @@ public class BootstrapTest extends TestC
public void testCustomResolverAndType() {
ValidationProviderResolver resolver = new ValidationProviderResolver() {
+ @Override
public List<ValidationProvider<?>> getValidationProviders() {
List<ValidationProvider<?>> list = new ArrayList<ValidationProvider<?>>(1);
list.add(new ApacheValidationProvider());
@@ -136,6 +139,7 @@ public class BootstrapTest extends TestC
public void testCustomResolver() {
ValidationProviderResolver resolver = new ValidationProviderResolver() {
+ @Override
public List<ValidationProvider<?>> getValidationProviders() {
return Collections.<ValidationProvider<?>> singletonList(new ApacheValidationProvider());
}
@@ -157,6 +161,7 @@ public class BootstrapTest extends TestC
public void testFailingCustomResolver() {
ValidationProviderResolver resolver = new ValidationProviderResolver() {
+ @Override
public List<ValidationProvider<?>> getValidationProviders() {
return Collections.emptyList();
}
Modified: bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintValidatorContextTest.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintValidatorContextTest.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintValidatorContextTest.java (original)
+++ bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintValidatorContextTest.java Wed Oct 19 16:50:55 2016
@@ -55,6 +55,7 @@ public class ConstraintValidatorContextT
MockitoAnnotations.initMocks(this);
Mockito.when(groupValidationContext.getPropertyPath()).thenAnswer(new Answer<PathImpl>() {
+ @Override
public PathImpl answer(InvocationOnMock invocation) throws Throwable {
return PathImpl.createPathFromString("");
}
Modified: bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/ContextConstraintValidatorFactoryTest.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/ContextConstraintValidatorFactoryTest.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/ContextConstraintValidatorFactoryTest.java (original)
+++ bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/ContextConstraintValidatorFactoryTest.java Wed Oct 19 16:50:55 2016
@@ -72,10 +72,12 @@ public class ContextConstraintValidatorF
this.requiredCollaborator = requiredCollaborator;
}
- public void initialize(Contrived constraintAnnotation) {
+ @Override
+ public void initialize(Contrived constraintAnnotation) {
}
- public boolean isValid(Object value, ConstraintValidatorContext context) {
+ @Override
+ public boolean isValid(Object value, ConstraintValidatorContext context) {
getRequiredCollaborator().toString();
return true;
}
@@ -91,7 +93,8 @@ public class ContextConstraintValidatorF
public void testContextBoundConstraintValidatorFactory() {
final ConstraintValidatorFactory constraintValidatorFactory = new ConstraintValidatorFactory() {
- public <T extends ConstraintValidator<?, ?>> T getInstance(Class<T> key) {
+ @Override
+ public <T extends ConstraintValidator<?, ?>> T getInstance(Class<T> key) {
if (key.equals(Contrived.Validator.class)) {
final Contrived.Validator result = new Contrived.Validator();
result.setRequiredCollaborator(new Object());
@@ -102,6 +105,7 @@ public class ContextConstraintValidatorF
return null;
}
+ @Override
public void releaseInstance(ConstraintValidator<?, ?> instance) {
// no-op
}
Modified: bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/CustomConstraintValidatorFactoryTest.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/CustomConstraintValidatorFactoryTest.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/CustomConstraintValidatorFactoryTest.java (original)
+++ bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/CustomConstraintValidatorFactoryTest.java Wed Oct 19 16:50:55 2016
@@ -62,6 +62,7 @@ public class CustomConstraintValidatorFa
return null; // always return null
}
+ @Override
public void releaseInstance(ConstraintValidator<?, ?> instance) {
// no-op
}
Modified: bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/CustomValidatorFactoryTest.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/CustomValidatorFactoryTest.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/CustomValidatorFactoryTest.java (original)
+++ bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/CustomValidatorFactoryTest.java Wed Oct 19 16:50:55 2016
@@ -53,34 +53,42 @@ public class CustomValidatorFactoryTest
public static class IncompatibleValidatorFactory implements ValidatorFactory {
+ @Override
public ConstraintValidatorFactory getConstraintValidatorFactory() {
return null;
}
+ @Override
public ParameterNameProvider getParameterNameProvider() {
return null;
}
+ @Override
public MessageInterpolator getMessageInterpolator() {
return null;
}
+ @Override
public TraversableResolver getTraversableResolver() {
return null;
}
+ @Override
public Validator getValidator() {
return null;
}
+ @Override
public <T> T unwrap(Class<T> type) {
return null;
}
+ @Override
public void close() {
}
+ @Override
public ValidatorContext usingContext() {
return null;
}
Modified: bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java (original)
+++ bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java Wed Oct 19 16:50:55 2016
@@ -60,15 +60,18 @@ public class DefaultMessageInterpolatorT
MessageInterpolator.Context ctx = new MessageInterpolator.Context() {
+ @Override
public ConstraintDescriptor<?> getConstraintDescriptor() {
- return (ConstraintDescriptor<?>) gvalidator.getConstraintsForClass(PreferredGuest.class)
+ return gvalidator.getConstraintsForClass(PreferredGuest.class)
.getConstraintsForProperty("guestCreditCardNumber").getConstraintDescriptors().iterator().next();
}
+ @Override
public Object getValidatedValue() {
return "12345678";
}
+ @Override
public <T> T unwrap(Class<T> type) {
return null;
}
@@ -77,15 +80,18 @@ public class DefaultMessageInterpolatorT
Assert.assertEquals("credit card is not valid", msg);
ctx = new MessageInterpolator.Context() {
+ @Override
public ConstraintDescriptor<?> getConstraintDescriptor() {
return gvalidator.getConstraintsForClass(Author.class).getConstraintsForProperty("lastName")
.getConstraintDescriptors().iterator().next();
}
+ @Override
public Object getValidatedValue() {
return "";
}
+ @Override
public <T> T unwrap(Class<T> type) {
return null;
}
@@ -107,15 +113,18 @@ public class DefaultMessageInterpolatorT
// Try to interpolate an annotation attribute containing $
ctx = new MessageInterpolator.Context() {
+ @Override
public ConstraintDescriptor<?> getConstraintDescriptor() {
- return (ConstraintDescriptor<?>) validator.getConstraintsForClass(Person.class)
+ return validator.getConstraintsForClass(Person.class)
.getConstraintsForProperty("idNumber").getConstraintDescriptors().iterator().next();
}
+ @Override
public Object getValidatedValue() {
return "12345678";
}
+ @Override
public <T> T unwrap(Class<T> type) {
return null;
}
@@ -128,15 +137,18 @@ public class DefaultMessageInterpolatorT
// Try to interpolate an annotation attribute containing \
ctx = new MessageInterpolator.Context() {
+ @Override
public ConstraintDescriptor<?> getConstraintDescriptor() {
- return (ConstraintDescriptor<?>) validator.getConstraintsForClass(Person.class)
+ return validator.getConstraintsForClass(Person.class)
.getConstraintsForProperty("otherId").getConstraintDescriptors().iterator().next();
}
+ @Override
public Object getValidatedValue() {
return "12345678";
}
+ @Override
public <T> T unwrap(Class<T> type) {
return null;
}
Modified: bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/ValidatorResolutionTest.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/ValidatorResolutionTest.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/ValidatorResolutionTest.java (original)
+++ bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/ValidatorResolutionTest.java Wed Oct 19 16:50:55 2016
@@ -107,10 +107,12 @@ public class ValidatorResolutionTest ext
}
public static class InvalidPersonNameValidator implements ConstraintValidator<NotNull, String> {
+ @Override
public void initialize(NotNull constraintAnnotation) {
// Nothing
}
+ @Override
public boolean isValid(String value, ConstraintValidatorContext context) {
return true;
}
Modified: bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/example/AccessTestBusinessObjectSub.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/example/AccessTestBusinessObjectSub.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/example/AccessTestBusinessObjectSub.java (original)
+++ bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/example/AccessTestBusinessObjectSub.java Wed Oct 19 16:50:55 2016
@@ -39,6 +39,7 @@ public class AccessTestBusinessObjectSub
}
// getVar1() is called on subclass, although annotated on superclass
+ @Override
public String getVar1() {
return var1;
}
Modified: bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/example/Address.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/example/Address.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/example/Address.java (original)
+++ bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/example/Address.java Wed Oct 19 16:50:55 2016
@@ -57,6 +57,7 @@ public class Address implements ZipCodeC
this.addressline2 = addressline2;
}
+ @Override
public String getZipCode() {
return zipCode;
}
@@ -65,6 +66,7 @@ public class Address implements ZipCodeC
this.zipCode = zipCode;
}
+ @Override
@Size(max = 30)
@NotNull
public String getCity() {
Modified: bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/example/Customer.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/example/Customer.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/example/Customer.java (original)
+++ bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/example/Customer.java Wed Oct 19 16:50:55 2016
@@ -44,6 +44,7 @@ public class Customer implements Person
this.emailAddress = emailAddress;
}
+ @Override
public String getFirstName() {
return firstName;
}
@@ -52,6 +53,7 @@ public class Customer implements Person
this.firstName = firstName;
}
+ @Override
public String getMiddleName() {
return middleName;
}
@@ -60,6 +62,7 @@ public class Customer implements Person
this.middleName = middleName;
}
+ @Override
public String getLastName() {
return lastName;
}
Modified: bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/example/Employee.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/example/Employee.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/example/Employee.java (original)
+++ bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/example/Employee.java Wed Oct 19 16:50:55 2016
@@ -29,14 +29,17 @@ public class Employee implements Person
this.lastName = lastN;
}
+ @Override
public String getFirstName() {
return firstName;
}
+ @Override
public String getMiddleName() {
return null; // not supported
}
+ @Override
public String getLastName() {
return lastName;
}
Modified: bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupValidationTest.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupValidationTest.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupValidationTest.java (original)
+++ bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupValidationTest.java Wed Oct 19 16:50:55 2016
@@ -32,6 +32,7 @@ import java.util.Set;
public class GroupValidationTest extends TestCase {
private Validator validator;
+ @Override
protected void setUp() {
validator = ApacheValidatorFactory.getDefault().getValidator();
}
Modified: bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupsComputerTest.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupsComputerTest.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupsComputerTest.java (original)
+++ bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupsComputerTest.java Wed Oct 19 16:50:55 2016
@@ -48,11 +48,13 @@ public class GroupsComputerTest extends
super(name);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
groupsComputer = new GroupsComputer();
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
}
Modified: bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/ImplicitGroupingTest.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/ImplicitGroupingTest.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/ImplicitGroupingTest.java (original)
+++ bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/ImplicitGroupingTest.java Wed Oct 19 16:50:55 2016
@@ -32,6 +32,7 @@ import java.util.Set;
public class ImplicitGroupingTest extends TestCase {
private Validator validator;
+ @Override
protected void setUp() {
validator = ApacheValidatorFactory.getDefault().getValidator();
}
Modified: bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/Order.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/Order.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/Order.java (original)
+++ bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/Order.java Wed Oct 19 16:50:55 2016
@@ -32,18 +32,22 @@ public class Order implements Auditable
private String orderNumber;
+ @Override
public String getCreationDate() {
return this.creationDate;
}
+ @Override
public String getLastUpdate() {
return this.lastUpdate;
}
+ @Override
public String getLastModifier() {
return this.lastModifier;
}
+ @Override
public String getLastReader() {
return this.lastReader;
}
Modified: bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/GroupInheritanceTest.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/GroupInheritanceTest.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/GroupInheritanceTest.java (original)
+++ bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/GroupInheritanceTest.java Wed Oct 19 16:50:55 2016
@@ -32,6 +32,7 @@ import java.util.Set;
public class GroupInheritanceTest extends TestCase {
private Validator validator;
+ @Override
protected void setUp() {
validator = ApacheValidatorFactory.getDefault().getValidator();
}
Modified: bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/Address.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/Address.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/Address.java (original)
+++ bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/Address.java Wed Oct 19 16:50:55 2016
@@ -66,6 +66,7 @@ public class Address implements ZipCodeC
this.street1 = street1;
}
+ @Override
public String getZipCode() {
return zipCode;
}
@@ -74,6 +75,7 @@ public class Address implements ZipCodeC
this.zipCode = zipCode;
}
+ @Override
public String getCity() {
return city;
}
Modified: bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/RedefiningDefaultGroupTest.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/RedefiningDefaultGroupTest.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/RedefiningDefaultGroupTest.java (original)
+++ bval/trunk/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/RedefiningDefaultGroupTest.java Wed Oct 19 16:50:55 2016
@@ -33,6 +33,7 @@ import java.util.Set;
public class RedefiningDefaultGroupTest extends TestCase {
private Validator validator;
+ @Override
protected void setUp() {
validator = ApacheValidatorFactory.getDefault().getValidator();
}
Modified: bval/trunk/bval-xstream/src/main/java/org/apache/bval/routines/EMailValidation.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-xstream/src/main/java/org/apache/bval/routines/EMailValidation.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-xstream/src/main/java/org/apache/bval/routines/EMailValidation.java (original)
+++ bval/trunk/bval-xstream/src/main/java/org/apache/bval/routines/EMailValidation.java Wed Oct 19 16:50:55 2016
@@ -30,6 +30,7 @@ public class EMailValidation implements
private java.util.regex.Pattern pattern = EMailValidationUtils.DEFAULT_EMAIL_PATTERN;
+ @Override
public <T extends ValidationListener> void validate(ValidationContext<T> context) {
if (context.getPropertyValue() == null) return;
if (!EMailValidationUtils.isValid(context.getPropertyValue(), getPattern())) {
Modified: bval/trunk/bval-xstream/src/main/java/org/apache/bval/routines/NOPValidation.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-xstream/src/main/java/org/apache/bval/routines/NOPValidation.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-xstream/src/main/java/org/apache/bval/routines/NOPValidation.java (original)
+++ bval/trunk/bval-xstream/src/main/java/org/apache/bval/routines/NOPValidation.java Wed Oct 19 16:50:55 2016
@@ -25,6 +25,7 @@ import org.apache.bval.model.ValidationL
*/
public class NOPValidation implements Validation {
+ @Override
public <T extends ValidationListener> void validate(ValidationContext<T> context) {
// do nothing
}
Modified: bval/trunk/bval-xstream/src/main/java/org/apache/bval/routines/StandardValidation.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-xstream/src/main/java/org/apache/bval/routines/StandardValidation.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-xstream/src/main/java/org/apache/bval/routines/StandardValidation.java (original)
+++ bval/trunk/bval-xstream/src/main/java/org/apache/bval/routines/StandardValidation.java Wed Oct 19 16:50:55 2016
@@ -48,6 +48,7 @@ public class StandardValidation implemen
return "standard";
}
+ @Override
public <T extends ValidationListener> void validate(ValidationContext<T> context) {
validateMandatory(context);
validateMaxLength(context);
Modified: bval/trunk/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanBuilder.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanBuilder.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanBuilder.java (original)
+++ bval/trunk/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanBuilder.java Wed Oct 19 16:50:55 2016
@@ -42,6 +42,7 @@ public class XMLMetaBeanBuilder extends
setFactories(new MetaBeanFactory[] { new IntrospectorMetaBeanFactory(), new XMLMetaBeanFactory() });
}
+ @Override
public void setFactories(MetaBeanFactory[] factories) {
super.setFactories(factories);
updateXmlFactory();
@@ -52,16 +53,19 @@ public class XMLMetaBeanBuilder extends
xmlFactory.addLoader(loader);
}
+ @Override
public MetaBean buildForId(String beanInfoId) throws Exception {
final XMLMetaBeanFactory.Visitor v;
assertXmlFactory();
xmlFactory.visitXMLBeanMeta(beanInfoId, v = new XMLMetaBeanFactory.Visitor() {
private MetaBean meta;
+ @Override
public MetaBean getMetaBean() {
return meta;
}
+ @Override
public void visit(XMLMetaBean xmlMeta, XMLMetaBeanInfos xmlInfos) throws Exception {
if (meta == null) {
meta = createMetaBean(xmlMeta);
@@ -76,10 +80,12 @@ public class XMLMetaBeanBuilder extends
return v.getMetaBean();
}
+ @Override
public Map<String, MetaBean> buildAll() throws Exception {
final Map<String, MetaBean> all = super.buildAll();
if (xmlFactory != null) {
xmlFactory.visitXMLBeanMeta(null, new XMLMetaBeanFactory.Visitor() {
+ @Override
public void visit(XMLMetaBean empty, XMLMetaBeanInfos xmlInfos) throws Exception {
if (xmlInfos.getBeans() == null)
return; // empty file, ignore
@@ -96,6 +102,7 @@ public class XMLMetaBeanBuilder extends
}
}
+ @Override
public MetaBean getMetaBean() {
return null; // do nothing
}
Modified: bval/trunk/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanFactory.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanFactory.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanFactory.java (original)
+++ bval/trunk/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanFactory.java Wed Oct 19 16:50:55 2016
@@ -70,14 +70,17 @@ public class XMLMetaBeanFactory implemen
}
}
+ @Override
public void buildMetaBean(final MetaBean metaBean) throws Exception {
if(metaBean.getId() == null) return;
visitXMLBeanMeta(metaBean.getId(), new Visitor() {
+ @Override
public void visit(XMLMetaBean xmlMeta, XMLMetaBeanInfos xmlInfos)
throws Exception {
enrichMetaBean(metaBean, new XMLResult(xmlMeta, xmlInfos));
}
+ @Override
public MetaBean getMetaBean() {
return metaBean;
}
Modified: bval/trunk/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanManager.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanManager.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanManager.java (original)
+++ bval/trunk/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanManager.java Wed Oct 19 16:50:55 2016
@@ -47,10 +47,12 @@ public class XMLMetaBeanManager extends
super(builder);
}
+ @Override
public void addResourceLoader(String resource) {
addLoader(new XMLMetaBeanURLLoader(Reflection.getClassLoader(getClass()).getResource(resource)));
}
+ @Override
public synchronized void addLoader(XMLMetaBeanLoader loader) {
((XMLMetaBeanBuilder) builder).addLoader(loader);
cache.clear(); // clear because new loaders can affect ALL MetaBeans
@@ -67,6 +69,7 @@ public class XMLMetaBeanManager extends
* returned by other loaders. The beans with patches for references
* to patched beans will be copied.
*/
+ @Override
public Map<String, MetaBean> enrichCopies(XMLMetaBeanInfos... infos) {
Map<String, MetaBean> cached = findAll();
try {
@@ -124,6 +127,7 @@ public class XMLMetaBeanManager extends
}
}
+ @Override
protected void computeRelatedMetaBean(MetaProperty prop, String beanRef) {
if (beanRef != null) {
prop.setMetaBean(findForId(beanRef));
Modified: bval/trunk/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanURLLoader.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanURLLoader.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanURLLoader.java (original)
+++ bval/trunk/bval-xstream/src/main/java/org/apache/bval/xml/XMLMetaBeanURLLoader.java Wed Oct 19 16:50:55 2016
@@ -31,6 +31,7 @@ public class XMLMetaBeanURLLoader implem
this.url = url;
}
+ @Override
public XMLMetaBeanInfos load() throws IOException {
InputStream stream = url.openStream();
try {
Modified: bval/trunk/bval-xstream/src/test/java/org/apache/bval/routines/StandardValidationTest.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-xstream/src/test/java/org/apache/bval/routines/StandardValidationTest.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-xstream/src/test/java/org/apache/bval/routines/StandardValidationTest.java (original)
+++ bval/trunk/bval-xstream/src/test/java/org/apache/bval/routines/StandardValidationTest.java Wed Oct 19 16:50:55 2016
@@ -21,6 +21,7 @@ import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.bval.BeanValidationContext;
import org.apache.bval.model.Features;
+import org.apache.bval.model.Features.Property;
import org.apache.bval.model.MetaProperty;
import org.apache.bval.model.ValidationContext;
import org.apache.bval.model.ValidationListener;
@@ -47,6 +48,7 @@ public class StandardValidationTest exte
super(name);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
validation = new StandardValidation();
@@ -56,6 +58,7 @@ public class StandardValidationTest exte
context.setMetaProperty(metaProperty);
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
}
@@ -77,7 +80,7 @@ public class StandardValidationTest exte
context.unknownValue();
stringValue = null;
validation.validateMandatory(context);
- assertTrue(reasons.contains(Reasons.MANDATORY));
+ assertTrue(reasons.contains(Property.MANDATORY));
// test null value that is NOT mandatory
context.unknownValue();
@@ -96,7 +99,7 @@ public class StandardValidationTest exte
context.unknownValue();
stringValue = "much too long";
validation.validateMaxLength(context);
- assertTrue(reasons.contains(Reasons.MAX_LENGTH));
+ assertTrue(reasons.contains(Property.MAX_LENGTH));
}
public void testValidateMinLength() {
@@ -108,7 +111,7 @@ public class StandardValidationTest exte
context.unknownValue();
stringValue = "123";
validation.validateMinLength(context);
- assertTrue(reasons.contains(Reasons.MIN_LENGTH));
+ assertTrue(reasons.contains(Property.MIN_LENGTH));
}
public void testValidateMaxValue() {
@@ -120,7 +123,7 @@ public class StandardValidationTest exte
context.unknownValue();
stringValue = "99999";
validation.validateMaxValue(context);
- assertTrue(reasons.contains(Reasons.MAX_VALUE));
+ assertTrue(reasons.contains(Property.MAX_VALUE));
}
public void testValidateMinValue() {
@@ -132,7 +135,7 @@ public class StandardValidationTest exte
context.unknownValue();
stringValue = "3333";
validation.validateMinValue(context);
- assertTrue(reasons.contains(Reasons.MIN_VALUE));
+ assertTrue(reasons.contains(Property.MIN_VALUE));
}
public int getIntValue() {
@@ -148,7 +151,7 @@ public class StandardValidationTest exte
context.unknownValue();
intValue = -1;
validation.validateMinValue(context);
- assertTrue(reasons.contains(Reasons.MIN_VALUE));
+ assertTrue(reasons.contains(Property.MIN_VALUE));
}
public void testValidateMinValue_Date_Timestamp() {
@@ -161,7 +164,7 @@ public class StandardValidationTest exte
context.unknownValue();
dateValue = new Timestamp(dt.getTime()-1000);
validation.validateMinValue(context);
- assertTrue(reasons.contains(Reasons.MIN_VALUE));
+ assertTrue(reasons.contains(Property.MIN_VALUE));
}
public void testValidateMaxValue_AlphabeticString() {
@@ -173,7 +176,7 @@ public class StandardValidationTest exte
context.unknownValue();
stringValue = "BBBC";
validation.validateMaxValue(context);
- assertTrue(reasons.contains(Reasons.MAX_VALUE));
+ assertTrue(reasons.contains(Property.MAX_VALUE));
}
public void testValidateRegExp() {
@@ -187,7 +190,7 @@ public class StandardValidationTest exte
context.unknownValue();
stringValue = "5355/7"; // invalid zip value
validation.validateRegExp(context);
- assertTrue(reasons.contains(Reasons.REG_EXP));
+ assertTrue(reasons.contains(Property.REG_EXP));
}
public Date getDateValue() {
@@ -204,7 +207,7 @@ public class StandardValidationTest exte
metaProperty.putFeature(Features.Property.TIME_LAG, XMLMetaValue.TIMELAG_Future);
validation.validateTimeLag(context);
- assertTrue(reasons.contains(Reasons.TIME_LAG));
+ assertTrue(reasons.contains(Property.TIME_LAG));
}
@@ -212,10 +215,12 @@ public class StandardValidationTest exte
return new TestSuite(StandardValidationTest.class);
}
+ @Override
public <T extends ValidationListener> void addError(String reason, ValidationContext<T> context) {
reasons.add(reason);
}
+ @Override
public <T extends ValidationListener> void addError(ValidationListener.Error error, ValidationContext<T> context) {
reasons.add(error.getReason());
}
Modified: bval/trunk/bval-xstream/src/test/java/org/apache/bval/xml/BeanValidatorTest.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-xstream/src/test/java/org/apache/bval/xml/BeanValidatorTest.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-xstream/src/test/java/org/apache/bval/xml/BeanValidatorTest.java (original)
+++ bval/trunk/bval-xstream/src/test/java/org/apache/bval/xml/BeanValidatorTest.java Wed Oct 19 16:50:55 2016
@@ -25,6 +25,7 @@ import org.apache.bval.ValidationResults
import org.apache.bval.example.BusinessObject;
import org.apache.bval.example.BusinessObjectAddress;
import org.apache.bval.model.Features;
+import org.apache.bval.model.Features.Property;
import org.apache.bval.model.MetaBean;
import org.apache.bval.routines.Reasons;
@@ -39,10 +40,12 @@ public class BeanValidatorTest extends T
super(name);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
}
@@ -84,7 +87,7 @@ public class BeanValidatorTest extends T
object.getAddress().setOwner(object);
BeanValidator<ValidationResults> validator = new BeanValidator<ValidationResults>();
ValidationResults results = validator.validate(object, info);
- assertTrue(results.hasErrorForReason(Reasons.MANDATORY));
+ assertTrue(results.hasErrorForReason(Property.MANDATORY));
assertTrue(results.hasError(object, null));
assertTrue(results.hasError(object.getAddress(), null));
Modified: bval/trunk/bval-xstream/src/test/java/org/apache/bval/xml/XMLMetaBeanInfosTest.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-xstream/src/test/java/org/apache/bval/xml/XMLMetaBeanInfosTest.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-xstream/src/test/java/org/apache/bval/xml/XMLMetaBeanInfosTest.java (original)
+++ bval/trunk/bval-xstream/src/test/java/org/apache/bval/xml/XMLMetaBeanInfosTest.java Wed Oct 19 16:50:55 2016
@@ -36,10 +36,12 @@ public class XMLMetaBeanInfosTest extend
super(name);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
}
Modified: bval/trunk/bval-xstream/src/test/java/org/apache/bval/xml/XMLMetaBeanManagerTest.java
URL: http://svn.apache.org/viewvc/bval/trunk/bval-xstream/src/test/java/org/apache/bval/xml/XMLMetaBeanManagerTest.java?rev=1765681&r1=1765680&r2=1765681&view=diff
==============================================================================
--- bval/trunk/bval-xstream/src/test/java/org/apache/bval/xml/XMLMetaBeanManagerTest.java (original)
+++ bval/trunk/bval-xstream/src/test/java/org/apache/bval/xml/XMLMetaBeanManagerTest.java Wed Oct 19 16:50:55 2016
@@ -38,11 +38,13 @@ public class XMLMetaBeanManagerTest exte
super(name);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
mbm.addLoader(new XMLMetaBeanURLLoader(BusinessObject.class.getResource("test-beanInfos.xml")));
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
}