Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfLong.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfLong.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfLong.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfLong.java Wed Oct 19 16:50:55 2016 @@ -34,6 +34,7 @@ public class SizeValidatorForArrayOfLong * <code>array</code> is between the specified <code>min</code> and <code>max</code> values (inclusive), * <code>false</code> otherwise. */ + @Override public boolean isValid(long[] array, ConstraintValidatorContext context) { if (array == null) { return true;
Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfObject.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfObject.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfObject.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfObject.java Wed Oct 19 16:50:55 2016 @@ -34,6 +34,7 @@ public class SizeValidatorForArrayOfObje * <code>array</code> is between the specified <code>min</code> and <code>max</code> values (inclusive), * <code>false</code> otherwise. */ + @Override public boolean isValid(Object[] array, ConstraintValidatorContext context) { if (array == null) { return true; Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfShort.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfShort.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfShort.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForArrayOfShort.java Wed Oct 19 16:50:55 2016 @@ -34,6 +34,7 @@ public class SizeValidatorForArrayOfShor * <code>array</code> is between the specified <code>min</code> and <code>max</code> values (inclusive), * <code>false</code> otherwise. */ + @Override public boolean isValid(short[] array, ConstraintValidatorContext context) { if (array == null) { return true; Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForCharSequence.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForCharSequence.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForCharSequence.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForCharSequence.java Wed Oct 19 16:50:55 2016 @@ -32,6 +32,7 @@ public class SizeValidatorForCharSequenc * @return Returns <code>true</code> if the string is <code>null</code> or the length of <code>s</code> between the specified * <code>min</code> and <code>max</code> values (inclusive), <code>false</code> otherwise. */ + @Override public boolean isValid(CharSequence s, ConstraintValidatorContext context) { if (s == null) { return true; Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForCollection.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForCollection.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForCollection.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForCollection.java Wed Oct 19 16:50:55 2016 @@ -35,6 +35,7 @@ public class SizeValidatorForCollection * <code>collection</code> is between the specified <code>min</code> and <code>max</code> values (inclusive), * <code>false</code> otherwise. */ + @Override public boolean isValid(Collection<?> collection, ConstraintValidatorContext context) { if (collection == null) { return true; Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForMap.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForMap.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForMap.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidatorForMap.java Wed Oct 19 16:50:55 2016 @@ -34,6 +34,7 @@ public class SizeValidatorForMap extends * is between the specified <code>min</code> and <code>max</code> values (inclusive), * <code>false</code> otherwise. */ + @Override public boolean isValid(Map<?, ?> map, ConstraintValidatorContext context) { if (map == null) { return true; Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/el/ELFacade.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/el/ELFacade.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/el/ELFacade.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/el/ELFacade.java Wed Oct 19 16:50:55 2016 @@ -47,6 +47,7 @@ public final class ELFacade implements M } private static final ELResolver RESOLVER = initResolver(); + @Override public String interpolate(final String message, final Map<String, Object> annotationParameters, final Object validatedValue) { try { if (EXPRESSION_FACTORY != null) { Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheFactoryContext.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheFactoryContext.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheFactoryContext.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheFactoryContext.java Wed Oct 19 16:50:55 2016 @@ -91,6 +91,7 @@ public class ApacheFactoryContext implem /** * {@inheritDoc} */ + @Override public ValidatorContext messageInterpolator(MessageInterpolator messageInterpolator) { this.messageInterpolator = messageInterpolator; return this; @@ -99,6 +100,7 @@ public class ApacheFactoryContext implem /** * {@inheritDoc} */ + @Override public ValidatorContext traversableResolver(TraversableResolver traversableResolver) { this.traversableResolver = traversableResolver; return this; @@ -107,11 +109,13 @@ public class ApacheFactoryContext implem /** * {@inheritDoc} */ + @Override public ValidatorContext constraintValidatorFactory(ConstraintValidatorFactory constraintValidatorFactory) { this.constraintValidatorFactory = constraintValidatorFactory; return this; } + @Override public ValidatorContext parameterNameProvider(ParameterNameProvider parameterNameProvider) { this.parameterNameProvider = parameterNameProvider; resetMeta(); // needed since parameter names are a component of validation metadata @@ -131,6 +135,7 @@ public class ApacheFactoryContext implem /** * {@inheritDoc} */ + @Override public Validator getValidator() { return new ClassValidator(this); } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidationProvider.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidationProvider.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidationProvider.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidationProvider.java Wed Oct 19 16:50:55 2016 @@ -52,6 +52,7 @@ public class ApacheValidationProvider im /** * {@inheritDoc} */ + @Override public ApacheValidatorConfiguration createSpecializedConfiguration(BootstrapState state) { return new ConfigurationImpl(state, this); } @@ -59,6 +60,7 @@ public class ApacheValidationProvider im /** * {@inheritDoc} */ + @Override public Configuration<?> createGenericConfiguration(BootstrapState state) { return new ConfigurationImpl(state, null); } @@ -69,6 +71,7 @@ public class ApacheValidationProvider im * @throws javax.validation.ValidationException * if the ValidatorFactory cannot be built */ + @Override public ValidatorFactory buildValidatorFactory(final ConfigurationState configuration) { final Class<? extends ValidatorFactory> validatorFactoryClass; try { Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidatorConfiguration.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidatorConfiguration.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidatorConfiguration.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidatorConfiguration.java Wed Oct 19 16:50:55 2016 @@ -58,6 +58,7 @@ public interface ApacheValidatorConfigur * we keep it as long as we support both: jsr and xstream-xml meta data at * the same time (and potentially for the same domain classes) */ + @Deprecated String ENABLE_METABEANS_XML = "apache.bval.enable-metabeans-xml"; /** Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidatorFactory.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidatorFactory.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidatorFactory.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidatorFactory.java Wed Oct 19 16:50:55 2016 @@ -211,6 +211,7 @@ public class ApacheValidatorFactory impl * * @return the new validator instance */ + @Override public Validator getValidator() { return usingContext().getValidator(); } @@ -220,6 +221,7 @@ public class ApacheValidatorFactory impl * * @return the validator factory's context */ + @Override public ApacheFactoryContext usingContext() { return new ApacheFactoryContext(this, defaultMetaBeanFinder); } @@ -250,6 +252,7 @@ public class ApacheValidatorFactory impl /** * {@inheritDoc} */ + @Override public MessageInterpolator getMessageInterpolator() { return messageResolver; } @@ -275,6 +278,7 @@ public class ApacheValidatorFactory impl /** * {@inheritDoc} */ + @Override public TraversableResolver getTraversableResolver() { return traversableResolver; } @@ -297,14 +301,17 @@ public class ApacheValidatorFactory impl /** * {@inheritDoc} */ + @Override public ConstraintValidatorFactory getConstraintValidatorFactory() { return constraintValidatorFactory; } + @Override public ParameterNameProvider getParameterNameProvider() { return parameterNameProvider; } + @Override public void close() { try { for (final Closeable c : toClose) { @@ -325,6 +332,7 @@ public class ApacheValidatorFactory impl * @return an instance of the specified class * @throws ValidationException if the provider does not support the call. */ + @Override public <T> T unwrap(final Class<T> type) { if (type.isInstance(this)) { @SuppressWarnings("unchecked") Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/AppendValidationToBuilder.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/AppendValidationToBuilder.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/AppendValidationToBuilder.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/AppendValidationToBuilder.java Wed Oct 19 16:50:55 2016 @@ -39,6 +39,7 @@ public class AppendValidationToBuilder e /** * {@inheritDoc} */ + @Override public <T extends Annotation> void preProcessValidation(ConstraintValidation<T> validation) { // JSR-303 2.3: // Groups from the main constraint annotation are inherited by the composing annotations. @@ -66,6 +67,7 @@ public class AppendValidationToBuilder e /** * {@inheritDoc} */ + @Override public <T extends Annotation> void performAppend(ConstraintValidation<T> validation) { builder.addComposed(validation); } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/AppendValidationToList.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/AppendValidationToList.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/AppendValidationToList.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/AppendValidationToList.java Wed Oct 19 16:50:55 2016 @@ -30,6 +30,7 @@ public class AppendValidationToList exte /** * {@inheritDoc} */ + @Override public <T extends Annotation> void performAppend(ConstraintValidation<T> validation) { validations.add(validation); } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/AppendValidationToMeta.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/AppendValidationToMeta.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/AppendValidationToMeta.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/AppendValidationToMeta.java Wed Oct 19 16:50:55 2016 @@ -37,6 +37,7 @@ public class AppendValidationToMeta exte /** * {@inheritDoc} */ + @Override public <T extends Annotation> void performAppend(ConstraintValidation<T> validation) { feature.addValidation(validation); } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/BaseAppendValidation.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/BaseAppendValidation.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/BaseAppendValidation.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/BaseAppendValidation.java Wed Oct 19 16:50:55 2016 @@ -34,6 +34,7 @@ public abstract class BaseAppendValidati * Append operation divided in 3 stages: pre & post processing and the * "real" append process. */ + @Override public final <T extends Annotation> void append(final ConstraintValidation<T> validation) { preProcessValidation(validation); performAppend(validation); Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/BeanDescriptorImpl.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/BeanDescriptorImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/BeanDescriptorImpl.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/BeanDescriptorImpl.java Wed Oct 19 16:50:55 2016 @@ -24,6 +24,7 @@ import org.apache.bval.jsr.groups.GroupC import org.apache.bval.jsr.util.ClassHelper; import org.apache.bval.jsr.xml.AnnotationIgnores; import org.apache.bval.model.Features; +import org.apache.bval.model.Features.Bean; import org.apache.bval.model.MetaBean; import org.apache.bval.model.MetaConstructor; import org.apache.bval.model.MetaMethod; @@ -92,7 +93,7 @@ public class BeanDescriptorImpl extends protected BeanDescriptorImpl(final ApacheFactoryContext factoryContext, final MetaBean metaBean) { super(metaBean, metaBean.getBeanClass(), metaBean.getValidations()); - Set<PropertyDescriptor> procedureDescriptors = metaBean.getFeature(JsrFeatures.Bean.PROPERTIES); + Set<PropertyDescriptor> procedureDescriptors = metaBean.getFeature(Bean.PROPERTIES); if (procedureDescriptors == null) { procedureDescriptors = new HashSet<PropertyDescriptor>(); for (final MetaProperty prop : metaBean.getProperties()) { @@ -101,13 +102,13 @@ public class BeanDescriptorImpl extends procedureDescriptors.add(getPropertyDescriptor(prop)); } } - procedureDescriptors = metaBean.initFeature(JsrFeatures.Bean.PROPERTIES, procedureDescriptors); + procedureDescriptors = metaBean.initFeature(Bean.PROPERTIES, procedureDescriptors); } - ExecutableMeta executables = metaBean.getFeature(JsrFeatures.Bean.EXECUTABLES); + ExecutableMeta executables = metaBean.getFeature(Bean.EXECUTABLES); if (executables == null) { // caching the result of it is important to avoid to compute it for each Validator executables = new ExecutableMeta(factoryContext, metaBean, getConstraintDescriptors()); - executables = metaBean.initFeature(JsrFeatures.Bean.EXECUTABLES, executables); + executables = metaBean.initFeature(Bean.EXECUTABLES, executables); } validatedProperties = Collections.unmodifiableSet(procedureDescriptors); @@ -189,6 +190,7 @@ public class BeanDescriptorImpl extends * * @return true if the bean involves validation */ + @Override public boolean isBeanConstrained() { return isBeanConstrained; } @@ -201,6 +203,7 @@ public class BeanDescriptorImpl extends * * @param propertyName property evaluated */ + @Override public PropertyDescriptor getConstraintsForProperty(String propertyName) { if (propertyName == null || propertyName.trim().length() == 0) { throw new IllegalArgumentException("propertyName cannot be null or empty"); @@ -231,6 +234,7 @@ public class BeanDescriptorImpl extends * * @return the property descriptors having at least a constraint defined */ + @Override public Set<PropertyDescriptor> getConstrainedProperties() { return Collections.unmodifiableSet(validatedProperties); } @@ -242,6 +246,7 @@ public class BeanDescriptorImpl extends return meta.methodConstraints.get(methodName + Arrays.toString(parameterTypes)); } + @Override public MethodDescriptor getConstraintsForMethod(final String methodName, final Class<?>... parameterTypes) { if (methodName == null) { throw new IllegalArgumentException("Method name can't be null"); @@ -253,6 +258,7 @@ public class BeanDescriptorImpl extends return null; } + @Override public Set<MethodDescriptor> getConstrainedMethods(MethodType methodType, MethodType... methodTypes) { final Set<MethodDescriptor> desc = new HashSet<MethodDescriptor>(); desc.addAll(filter(containedMethods, methodType)); @@ -288,6 +294,7 @@ public class BeanDescriptorImpl extends return list; } + @Override public ConstructorDescriptor getConstraintsForConstructor(final Class<?>... parameterTypes) { final ConstructorDescriptor descriptor = meta.contructorConstraints.get(Arrays.toString(parameterTypes)); if (descriptor != null && (descriptor.hasConstrainedParameters() || descriptor.hasConstrainedReturnValue())) { @@ -296,6 +303,7 @@ public class BeanDescriptorImpl extends return null; } + @Override public Set<ConstructorDescriptor> getConstrainedConstructors() { return constrainedConstructors; } @@ -303,6 +311,7 @@ public class BeanDescriptorImpl extends /** * {@inheritDoc} */ + @Override public String toString() { return "BeanDescriptorImpl{" + "returnType=" + elementClass + '}'; } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/BootstrapConfigurationImpl.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/BootstrapConfigurationImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/BootstrapConfigurationImpl.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/BootstrapConfigurationImpl.java Wed Oct 19 16:50:55 2016 @@ -55,38 +55,47 @@ public class BootstrapConfigurationImpl this.defaultProviderClassName = defaultProviderClassName; } + @Override public String getDefaultProviderClassName() { return defaultProviderClassName; } + @Override public String getConstraintValidatorFactoryClassName() { return constraintValidatorFactoryClassName; } + @Override public String getMessageInterpolatorClassName() { return messageInterpolatorClassName; } + @Override public String getTraversableResolverClassName() { return traversableResolverClassName; } + @Override public String getParameterNameProviderClassName() { return parameterNameProviderClassName; } + @Override public Set<String> getConstraintMappingResourcePaths() { return constraintMappingResourcePaths; } + @Override public boolean isExecutableValidationEnabled() { return executableValidationEnabled; } + @Override public Set<ExecutableType> getDefaultValidatedExecutableTypes() { return defaultValidatedExecutableTypes; } + @Override public Map<String, String> getProperties() { return properties; } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ClassValidator.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ClassValidator.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ClassValidator.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ClassValidator.java Wed Oct 19 16:50:55 2016 @@ -86,6 +86,7 @@ import org.apache.commons.weaver.privili @Privilizing(@CallTo(Reflection.class)) public class ClassValidator implements CascadingPropertyValidator, ExecutableValidator { private static final Object VALIDATE_PROPERTY = new Object() { + @Override public String toString() { return "VALIDATE_PROPERTY"; } @@ -196,6 +197,7 @@ public class ClassValidator implements C /** * {@inheritDoc} */ + @Override public <T> Set<ConstraintViolation<T>> validateProperty(T object, String propertyName, boolean cascade, Class<?>... groups) { notNull("validated object", object); @@ -234,6 +236,7 @@ public class ClassValidator implements C /** * {@inheritDoc} */ + @Override public <T> Set<ConstraintViolation<T>> validateValue(Class<T> beanType, String propertyName, Object value, boolean cascade, Class<?>... groups) { return validateValueImpl(notNull("bean type", beanType), null, propertyName, value, cascade, groups); @@ -304,6 +307,7 @@ public class ClassValidator implements C throw new ValidationException("Type " + type + " not supported"); } + @Override public ExecutableValidator forExecutables() { return this; } @@ -494,6 +498,7 @@ public class ClassValidator implements C ValidationHelper.validateContext(context, new JsrValidationCallback(context), factoryContext.isTreatMapsLikeBeans()); } else { ValidationHelper.validateContext(context, new ValidationHelper.ValidateCallback() { + @Override public void validate() { validateBeanWithGroups(context, groups); } @@ -592,6 +597,7 @@ public class ClassValidator implements C if (context.getMetaProperty() == null) { helper = new Runnable() { + @Override public void run() { ValidationHelper.validateBean(context); } @@ -599,6 +605,7 @@ public class ClassValidator implements C } else { helper = new Runnable() { + @Override public void run() { ValidationHelper.validateProperty(context); } @@ -693,6 +700,7 @@ public class ClassValidator implements C } } + @Override public <T> Set<ConstraintViolation<T>> validateConstructorParameters(Constructor<? extends T> constructor, Object[] parameterValues, Class<?>... gps) { notNull("Constructor", constructor); notNull("Groups", gps); @@ -902,6 +910,7 @@ public class ClassValidator implements C } } + @Override public <T> Set<ConstraintViolation<T>> validateConstructorReturnValue(final Constructor<? extends T> constructor, final T createdObject, final Class<?>... gps) { notNull("Constructor", constructor); notNull("Returned value", createdObject); @@ -988,6 +997,7 @@ public class ClassValidator implements C return context.getListener().getConstraintViolations(); } + @Override public <T> Set<ConstraintViolation<T>> validateParameters(T object, Method method, Object[] parameterValues, Class<?>... groups) { notNull("Object", object); notNull("Parameters", parameterValues); @@ -1028,6 +1038,7 @@ public class ClassValidator implements C /** * {@inheritDoc} */ + @Override public <T> Set<ConstraintViolation<T>> validateReturnValue(T object, Method method, Object returnValue, Class<?>... groups) { notNull("object", object); notNull("method", method); @@ -1090,6 +1101,7 @@ public class ClassValidator implements C this.context = context; } + @Override public void validate() { validateBeanNet(context); } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConfigurationImpl.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConfigurationImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConfigurationImpl.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConfigurationImpl.java Wed Oct 19 16:50:55 2016 @@ -138,6 +138,7 @@ public class ConfigurationImpl implement /** * {@inheritDoc} */ + @Override public ApacheValidatorConfiguration traversableResolver(TraversableResolver resolver) { if (resolver == null) { return this; @@ -156,6 +157,7 @@ public class ConfigurationImpl implement * * @return this */ + @Override public ApacheValidatorConfiguration ignoreXmlConfiguration() { ignoreXmlConfiguration = true; return this; @@ -164,6 +166,7 @@ public class ConfigurationImpl implement /** * {@inheritDoc} */ + @Override public ConfigurationImpl messageInterpolator(MessageInterpolator resolver) { if (resolver == null) { return this; @@ -178,6 +181,7 @@ public class ConfigurationImpl implement /** * {@inheritDoc} */ + @Override public ConfigurationImpl constraintValidatorFactory( ConstraintValidatorFactory constraintFactory) { if (constraintFactory == null) { @@ -190,6 +194,7 @@ public class ConfigurationImpl implement return this; } + @Override public ApacheValidatorConfiguration parameterNameProvider(ParameterNameProvider parameterNameProvider) { if (parameterNameProvider == null) { return this; @@ -206,6 +211,7 @@ public class ConfigurationImpl implement * * @return this */ + @Override public ApacheValidatorConfiguration addMapping(InputStream stream) { if (stream == null) { return this; @@ -222,6 +228,7 @@ public class ConfigurationImpl implement * * @return this */ + @Override public ApacheValidatorConfiguration addProperty(String name, String value) { if ("bval.before.cdi".equals(name)) { beforeCdi = Boolean.parseBoolean(value); @@ -231,18 +238,22 @@ public class ConfigurationImpl implement return this; } + @Override public MessageInterpolator getDefaultMessageInterpolator() { return defaultMessageInterpolator; } + @Override public TraversableResolver getDefaultTraversableResolver() { return defaultTraversableResolver; } + @Override public ConstraintValidatorFactory getDefaultConstraintValidatorFactory() { return defaultConstraintValidatorFactory; } + @Override public ParameterNameProvider getDefaultParameterNameProvider() { return defaultParameterNameProvider; } @@ -253,6 +264,7 @@ public class ConfigurationImpl implement * * @return null */ + @Override public Map<String, String> getProperties() { return properties; } @@ -264,6 +276,7 @@ public class ConfigurationImpl implement * * @return true */ + @Override public boolean isIgnoreXmlConfiguration() { return ignoreXmlConfiguration; } @@ -271,6 +284,7 @@ public class ConfigurationImpl implement /** * {@inheritDoc} */ + @Override public Set<InputStream> getMappingStreams() { return mappingStreams; } @@ -278,6 +292,7 @@ public class ConfigurationImpl implement /** * {@inheritDoc} */ + @Override public MessageInterpolator getMessageInterpolator() { if (beforeCdi) { return defaultMessageInterpolator; @@ -293,6 +308,7 @@ public class ConfigurationImpl implement return messageInterpolator; } + @Override public BootstrapConfiguration getBootstrapConfiguration() { return createBootstrapConfiguration(); } @@ -303,6 +319,7 @@ public class ConfigurationImpl implement * * @throws ValidationException if the ValidatorFactory cannot be built */ + @Override public ValidatorFactory buildValidatorFactory() { return doBuildValidatorFactory(); } @@ -344,6 +361,7 @@ public class ConfigurationImpl implement * {@inheritDoc} * @return the constraint validator factory of this configuration. */ + @Override public ConstraintValidatorFactory getConstraintValidatorFactory() { if (beforeCdi) { return constraintValidatorFactory; @@ -362,6 +380,7 @@ public class ConfigurationImpl implement /** * {@inheritDoc} */ + @Override public TraversableResolver getTraversableResolver() { if (beforeCdi) { return defaultTraversableResolver; @@ -377,6 +396,7 @@ public class ConfigurationImpl implement return traversableResolver; } + @Override public ParameterNameProvider getParameterNameProvider() { if (beforeCdi) { return defaultParameterNameProvider; @@ -430,6 +450,7 @@ public class ConfigurationImpl implement public Closeable getClosable() { return new Closeable() { + @Override public void close() throws IOException { for (final BValExtension.Releasable<?> releasable : releasables) { releasable.release(); Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintDescriptorImpl.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintDescriptorImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintDescriptorImpl.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintDescriptorImpl.java Wed Oct 19 16:50:55 2016 @@ -95,10 +95,12 @@ public class ConstraintDescriptorImpl<T /** * {@inheritDoc} */ + @Override public T getAnnotation() { return annotation; } + @Override public String getMessageTemplate() { return template; } @@ -106,6 +108,7 @@ public class ConstraintDescriptorImpl<T /** * {@inheritDoc} */ + @Override public Set<Class<?>> getGroups() { return groups; } @@ -113,10 +116,12 @@ public class ConstraintDescriptorImpl<T /** * {@inheritDoc} */ + @Override public Set<Class<? extends Payload>> getPayload() { return payload; } + @Override public ConstraintTarget getValidationAppliesTo() { return validationAppliesTo; } @@ -124,6 +129,7 @@ public class ConstraintDescriptorImpl<T /** * {@inheritDoc} */ + @Override public List<java.lang.Class<? extends javax.validation.ConstraintValidator<T, ?>>> getConstraintValidatorClasses() { return constraintValidatorClasses; } @@ -131,6 +137,7 @@ public class ConstraintDescriptorImpl<T /** * {@inheritDoc} */ + @Override public Map<String, Object> getAttributes() { return attributes; } @@ -138,6 +145,7 @@ public class ConstraintDescriptorImpl<T /** * {@inheritDoc} */ + @Override public Set<ConstraintDescriptor<?>> getComposingConstraints() { return composingConstraints; } @@ -145,6 +153,7 @@ public class ConstraintDescriptorImpl<T /** * {@inheritDoc} */ + @Override public boolean isReportAsSingleViolation() { return reportAsSingleViolation; } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintFinderImpl.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintFinderImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintFinderImpl.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintFinderImpl.java Wed Oct 19 16:50:55 2016 @@ -58,6 +58,7 @@ final class ConstraintFinderImpl impleme /** * {@inheritDoc} */ + @Override public ElementDescriptor.ConstraintFinder unorderedAndMatchingGroups(Class<?>... groups) { final Set<ConstraintValidation<?>> matchingDescriptors = new HashSet<ConstraintValidation<?>>(constraintDescriptors.size()); @@ -86,6 +87,7 @@ final class ConstraintFinderImpl impleme /** * {@inheritDoc} */ + @Override public ElementDescriptor.ConstraintFinder lookingAt(Scope scope) { if (scope == Scope.LOCAL_ELEMENT) { findInScopes.remove(Scope.HIERARCHY); @@ -101,6 +103,7 @@ final class ConstraintFinderImpl impleme /** * {@inheritDoc} */ + @Override public ElementDescriptor.ConstraintFinder declaredOn(ElementType... elementTypes) { final Set<ConstraintValidation<?>> matchingDescriptors = new HashSet<ConstraintValidation<?>>(constraintDescriptors.size()); @@ -155,6 +158,7 @@ final class ConstraintFinderImpl impleme /** * {@inheritDoc} */ + @Override public Set<ConstraintDescriptor<?>> getConstraintDescriptors() { if (constraintDescriptors.isEmpty()) { return Collections.emptySet(); @@ -165,6 +169,7 @@ final class ConstraintFinderImpl impleme /** * {@inheritDoc} */ + @Override public boolean hasConstraints() { return !constraintDescriptors.isEmpty(); } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintValidation.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintValidation.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintValidation.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintValidation.java Wed Oct 19 16:50:55 2016 @@ -121,6 +121,7 @@ public class ConstraintValidation<T exte /** * {@inheritDoc} */ + @Override public boolean isReportAsSingleViolation() { return reportFromComposite; } @@ -140,6 +141,7 @@ public class ConstraintValidation<T exte /** * {@inheritDoc} */ + @Override public <L extends ValidationListener> void validate(ValidationContext<L> context) { validateGroupContext((GroupValidationContext<?>) context); } @@ -460,6 +462,7 @@ public class ConstraintValidation<T exte /** * {@inheritDoc} */ + @Override public String toString() { return "ConstraintValidation{" + validator + '}'; } @@ -469,6 +472,7 @@ public class ConstraintValidation<T exte * * @return String */ + @Override public String getMessageTemplate() { return ConstraintAnnotationAttributes.MESSAGE.get(attributes); } @@ -485,6 +489,7 @@ public class ConstraintValidation<T exte return owner; } + @Override public T getAnnotation() { return annotation; } @@ -502,6 +507,7 @@ public class ConstraintValidation<T exte /** * {@inheritDoc} */ + @Override public Map<String, Object> getAttributes() { return attributes; } @@ -509,6 +515,7 @@ public class ConstraintValidation<T exte /** * {@inheritDoc} */ + @Override @SuppressWarnings("unchecked") public Set<ConstraintDescriptor<?>> getComposingConstraints() { return composedConstraints == null ? Collections.EMPTY_SET : composedConstraints; @@ -528,6 +535,7 @@ public class ConstraintValidation<T exte /** * {@inheritDoc} */ + @Override public Set<Class<?>> getGroups() { return groups; } @@ -535,10 +543,12 @@ public class ConstraintValidation<T exte /** * {@inheritDoc} */ + @Override public Set<Class<? extends Payload>> getPayload() { return payload; } + @Override public ConstraintTarget getValidationAppliesTo() { return validationAppliesTo; } @@ -546,6 +556,7 @@ public class ConstraintValidation<T exte /** * {@inheritDoc} */ + @Override public List<Class<? extends ConstraintValidator<T, ?>>> getConstraintValidatorClasses() { return validatorClasses == null ? Collections.<Class<? extends ConstraintValidator<T, ?>>> emptyList() : Arrays.asList(validatorClasses); } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintValidationListener.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintValidationListener.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintValidationListener.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintValidationListener.java Wed Oct 19 16:50:55 2016 @@ -57,6 +57,7 @@ public final class ConstraintValidationL /** * {@inheritDoc} */ + @Override public <VL extends ValidationListener> void addError(String reason, ValidationContext<VL> context) { addError(reason, null, context); } @@ -64,6 +65,7 @@ public final class ConstraintValidationL /** * {@inheritDoc} */ + @Override public <VL extends ValidationListener> void addError(Error error, ValidationContext<VL> context) { if (error.getOwner() instanceof Path) { addError(error.getReason(), (Path) error.getOwner(), context); Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintValidatorContextImpl.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintValidatorContextImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintValidatorContextImpl.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintValidatorContextImpl.java Wed Oct 19 16:50:55 2016 @@ -62,6 +62,7 @@ public class ConstraintValidatorContextI /** * {@inheritDoc} */ + @Override public void disableDefaultConstraintViolation() { defaultDisabled = true; } @@ -69,6 +70,7 @@ public class ConstraintValidatorContextI /** * {@inheritDoc} */ + @Override public String getDefaultConstraintMessageTemplate() { return constraintDescriptor.getMessageTemplate(); } @@ -76,11 +78,13 @@ public class ConstraintValidatorContextI /** * {@inheritDoc} */ + @Override public ConstraintViolationBuilder buildConstraintViolationWithTemplate( String messageTemplate) { return new ConstraintViolationBuilderImpl(this, messageTemplate, validationContext.getPropertyPath()); } + @Override public <T> T unwrap(Class<T> type) { if (type.isInstance(this)) { return type.cast(this); @@ -110,6 +114,7 @@ public class ConstraintValidatorContextI /** * {@inheritDoc} */ + @Override public NodeBuilderDefinedContext addNode(String name) { PathImpl path; if (propertyPath.isRootPath()) { @@ -122,6 +127,7 @@ public class ConstraintValidatorContextI return new NodeBuilderDefinedContextImpl(parent, messageTemplate, path); } + @Override public NodeBuilderCustomizableContext addPropertyNode(String name) { final NodeImpl node; if (!propertyPath.isRootPath()) { @@ -140,6 +146,7 @@ public class ConstraintValidatorContextI return new NodeBuilderCustomizableContextImpl(parent, messageTemplate, propertyPath); } + @Override public LeafNodeBuilderCustomizableContext addBeanNode() { final NodeImpl node = new NodeImpl.BeanNodeImpl(); node.setKind(ElementKind.BEAN); @@ -147,6 +154,7 @@ public class ConstraintValidatorContextI return new LeafNodeBuilderCustomizableContextImpl(parent, messageTemplate, propertyPath); } + @Override public NodeBuilderDefinedContext addParameterNode(int index) { final Method method = parent.validationContext.getMethod(); final List<String> parameters = parent.validationContext.getParameterNameProvider().getParameterNames(method); @@ -163,6 +171,7 @@ public class ConstraintValidatorContextI /** * {@inheritDoc} */ + @Override public ConstraintValidatorContext addConstraintViolation() { parent.addError(messageTemplate, propertyPath); return parent; Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintViolationImpl.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintViolationImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintViolationImpl.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintViolationImpl.java Wed Oct 19 16:50:55 2016 @@ -84,6 +84,7 @@ class ConstraintViolationImpl<T> impleme * former name getInterpolatedMessage() * @return The interpolated error message for this constraint violation. */ + @Override public String getMessage() { return message; } @@ -91,6 +92,7 @@ class ConstraintViolationImpl<T> impleme /** * {@inheritDoc} */ + @Override public String getMessageTemplate() { return messageTemplate; } @@ -99,6 +101,7 @@ class ConstraintViolationImpl<T> impleme * {@inheritDoc} * @return Root bean being validated */ + @Override public T getRootBean() { return rootBean; } @@ -106,6 +109,7 @@ class ConstraintViolationImpl<T> impleme /** * {@inheritDoc} */ + @Override public Class<T> getRootBeanClass() { return rootBeanClass; } @@ -113,14 +117,17 @@ class ConstraintViolationImpl<T> impleme /** * {@inheritDoc} */ + @Override public Object getLeafBean() { return leafBean; } + @Override public Object[] getExecutableParameters() { return parameters; } + @Override public Object getExecutableReturnValue() { return returnValue; } @@ -129,6 +136,7 @@ class ConstraintViolationImpl<T> impleme * {@inheritDoc} * @return The value failing to pass the constraint */ + @Override public Object getInvalidValue() { return value; } @@ -138,6 +146,7 @@ class ConstraintViolationImpl<T> impleme * @return the property path to the value from <code>rootBean</code> * Null if the value is the rootBean itself */ + @Override public Path getPropertyPath() { return propertyPath; } @@ -145,10 +154,12 @@ class ConstraintViolationImpl<T> impleme /** * {@inheritDoc} */ + @Override public ConstraintDescriptor<?> getConstraintDescriptor() { return constraintDescriptor; } + @Override public <U> U unwrap(Class<U> type) { if (type.isInstance(this)) { return type.cast(this); Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstructorDescriptorImpl.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstructorDescriptorImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstructorDescriptorImpl.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ConstructorDescriptorImpl.java Wed Oct 19 16:50:55 2016 @@ -42,6 +42,7 @@ public class ConstructorDescriptorImpl e setCascaded(false); } + @Override public String getName() { return elementClass.getSimpleName(); } @@ -51,10 +52,12 @@ public class ConstructorDescriptorImpl e return false; } + @Override public boolean hasConstrainedParameters() { return super.hasConstrainedParameters(); } + @Override public boolean hasConstrainedReturnValue() { return super.hasConstrainedReturnValue(); } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/CrossParameterDescriptorImpl.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/CrossParameterDescriptorImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/CrossParameterDescriptorImpl.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/CrossParameterDescriptorImpl.java Wed Oct 19 16:50:55 2016 @@ -28,6 +28,7 @@ public class CrossParameterDescriptorImp super(bean, Object[].class, list.toArray(new ConstraintValidation<?>[list.size()])); } + @Override public boolean hasConstraints() { return !getConstraintDescriptors().isEmpty(); } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultConstraintValidatorFactory.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultConstraintValidatorFactory.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultConstraintValidatorFactory.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultConstraintValidatorFactory.java Wed Oct 19 16:50:55 2016 @@ -42,6 +42,7 @@ public class DefaultConstraintValidatorF * @return Returns a new Constraint instance * The ConstraintFactory is <b>not</b> responsible for calling Constraint#initialize */ + @Override public <T extends ConstraintValidator<?, ?>> T getInstance(final Class<T> constraintClass) { if (useCdi == null) { synchronized (this) { @@ -80,10 +81,12 @@ public class DefaultConstraintValidatorF } } + @Override public void releaseInstance(final ConstraintValidator<?, ?> instance) { // no-op } + @Override public void close() throws IOException { for (final BValExtension.Releasable<?> releasable : releasables) { // ensure to call this callback Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultMessageInterpolator.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultMessageInterpolator.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultMessageInterpolator.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultMessageInterpolator.java Wed Oct 19 16:50:55 2016 @@ -94,6 +94,7 @@ public class DefaultMessageInterpolator } /** {@inheritDoc} */ + @Override public String interpolate(String message, Context context) { // probably no need for caching, but it could be done by parameters since the map // is immutable and uniquely built per Validation definition, the comparison has to be based on == and not equals though @@ -101,6 +102,7 @@ public class DefaultMessageInterpolator } /** {@inheritDoc} */ + @Override public String interpolate(String message, Context context, Locale locale) { return interpolateMessage(message, context.getConstraintDescriptor().getAttributes(), locale, context.getValidatedValue()); Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultValidationProviderResolver.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultValidationProviderResolver.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultValidationProviderResolver.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultValidationProviderResolver.java Wed Oct 19 16:50:55 2016 @@ -43,6 +43,7 @@ public class DefaultValidationProviderRe /** * {@inheritDoc} */ + @Override public List<ValidationProvider<?>> getValidationProviders() { List<ValidationProvider<?>> providers = new ArrayList<ValidationProvider<?>>(); try { Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ElementDescriptorImpl.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ElementDescriptorImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ElementDescriptorImpl.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ElementDescriptorImpl.java Wed Oct 19 16:50:55 2016 @@ -95,6 +95,7 @@ public abstract class ElementDescriptorI * * @return Statically defined returned type. */ + @Override public Class<?> getElementClass() { return elementClass; } @@ -102,14 +103,16 @@ public abstract class ElementDescriptorI /** * {@inheritDoc} */ + @Override @SuppressWarnings({"unchecked", "rawtypes"}) public ElementDescriptor.ConstraintFinder findConstraints() { - return new ConstraintFinderImpl(metaBean, new HashSet((Set) constraintDescriptors)); + return new ConstraintFinderImpl(metaBean, new HashSet(constraintDescriptors)); } /** * {@inheritDoc} */ + @Override public Set<ConstraintDescriptor<?>> getConstraintDescriptors() { return constraintDescriptors.isEmpty() ? Collections.<ConstraintDescriptor<?>> emptySet() : Collections .unmodifiableSet(constraintDescriptors); @@ -128,6 +131,7 @@ public abstract class ElementDescriptorI * {@inheritDoc} return true if at least one constraint declaration is * present on the element. */ + @Override public boolean hasConstraints() { return !getConstraintDescriptors().isEmpty(); } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/GroupValidationContextImpl.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/GroupValidationContextImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/GroupValidationContextImpl.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/GroupValidationContextImpl.java Wed Oct 19 16:50:55 2016 @@ -126,6 +126,7 @@ final class GroupValidationContextImpl<T } } + @Override public void setKind(final ElementKind type) { path.getLeafNode().setKind(type); } @@ -144,6 +145,7 @@ final class GroupValidationContextImpl<T path.addProperty(prop); } + @Override public void moveDown(final Path.Node node) { path.addNode(node); } @@ -194,6 +196,7 @@ final class GroupValidationContextImpl<T /** * {@inheritDoc} */ + @Override public boolean collectValidated(ConstraintValidator<?, ?> constraint) { ConstraintValidatorIdentity cvi = new ConstraintValidatorIdentity(getBean(), getPropertyPath(), constraint); return this.validatedConstraints.add(cvi); @@ -214,6 +217,7 @@ final class GroupValidationContextImpl<T * * @return the path in dot notation */ + @Override public PathImpl getPropertyPath() { PathImpl currentPath = PathImpl.copy(path); if (getMetaProperty() != null) { @@ -225,6 +229,7 @@ final class GroupValidationContextImpl<T /** * {@inheritDoc} */ + @Override public MetaBean getRootMetaBean() { return rootMetaBean; } @@ -241,10 +246,12 @@ final class GroupValidationContextImpl<T /** * {@inheritDoc} */ + @Override public Groups getGroups() { return groups; } + @Override public void setCurrentGroups(final Groups g) { groups = g; } @@ -252,6 +259,7 @@ final class GroupValidationContextImpl<T /** * {@inheritDoc} */ + @Override public Group getCurrentGroup() { return currentGroup; } @@ -259,6 +267,7 @@ final class GroupValidationContextImpl<T /** * {@inheritDoc} */ + @Override public void setCurrentGroup(Group currentGroup) { this.currentGroup = currentGroup; } @@ -266,6 +275,7 @@ final class GroupValidationContextImpl<T /** * {@inheritDoc} */ + @Override public void setConstraintValidation(ConstraintValidation<?> constraint) { constraintValidation = constraint; } @@ -273,6 +283,7 @@ final class GroupValidationContextImpl<T /** * {@inheritDoc} */ + @Override public ConstraintValidation<?> getConstraintValidation() { return constraintValidation; } @@ -280,6 +291,7 @@ final class GroupValidationContextImpl<T /** * {@inheritDoc} */ + @Override public ConstraintDescriptor<?> getConstraintDescriptor() { return constraintValidation; } @@ -287,6 +299,7 @@ final class GroupValidationContextImpl<T /** * {@inheritDoc} */ + @Override public Object getValidatedValue() { if (getMetaProperty() != null) { return getPropertyValue(constraintValidation.getAccess()); @@ -295,6 +308,7 @@ final class GroupValidationContextImpl<T } } + @Override public <T> T unwrap(Class<T> type) { if (type.isInstance(this)) { return type.cast(this); @@ -305,6 +319,7 @@ final class GroupValidationContextImpl<T /** * {@inheritDoc} */ + @Override public MessageInterpolator getMessageResolver() { return messageResolver; } @@ -312,6 +327,7 @@ final class GroupValidationContextImpl<T /** * {@inheritDoc} */ + @Override public TraversableResolver getTraversableResolver() { return traversableResolver; } @@ -324,6 +340,7 @@ final class GroupValidationContextImpl<T /** * {@inheritDoc} */ + @Override public Class<?> getCurrentOwner() { return this.currentOwner; } @@ -331,46 +348,57 @@ final class GroupValidationContextImpl<T /** * {@inheritDoc} */ + @Override public void setCurrentOwner(Class<?> currentOwner) { this.currentOwner = currentOwner; } + @Override public ElementKind getElementKind() { return path.getLeafNode().getKind(); } + @Override public Object getReturnValue() { return returnValue; } + @Override public Object[] getParameters() { return parameters; } + @Override public void setParameters(final Object[] parameters) { this.parameters = parameters; } + @Override public void setReturnValue(final Object returnValue) { this.returnValue = returnValue; } + @Override public ParameterNameProvider getParameterNameProvider() { return parameterNameProvider; } + @Override public void setMethod(final Method method) { this.method = method; } + @Override public Method getMethod() { return method; } + @Override public Constructor<?> getConstructor() { return constructor; } + @Override public void setConstructor(final Constructor<?> constructor) { this.constructor = constructor; } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/InvocableElementDescriptor.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/InvocableElementDescriptor.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/InvocableElementDescriptor.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/InvocableElementDescriptor.java Wed Oct 19 16:50:55 2016 @@ -48,6 +48,7 @@ public class InvocableElementDescriptor /** * {@inheritDoc} */ + @Override public List<ParameterDescriptor> getParameterDescriptors() { // index aligned return parameterDescriptors; Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/JsrMetaBeanFactory.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/JsrMetaBeanFactory.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/JsrMetaBeanFactory.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/JsrMetaBeanFactory.java Wed Oct 19 16:50:55 2016 @@ -22,6 +22,7 @@ import org.apache.bval.MetaBeanFactory; import org.apache.bval.jsr.groups.Group; import org.apache.bval.jsr.util.ClassHelper; import org.apache.bval.jsr.xml.MetaConstraint; +import org.apache.bval.model.Features.Property; import org.apache.bval.model.Meta; import org.apache.bval.model.MetaBean; import org.apache.bval.model.MetaConstructor; @@ -84,6 +85,7 @@ public class JsrMetaBeanFactory implemen /** * {@inheritDoc} Add the validation features to the metabean that come from JSR303 annotations in the beanClass. */ + @Override public void buildMetaBean(MetaBean metabean) { try { final Class<?> beanClass = metabean.getBeanClass(); @@ -181,7 +183,7 @@ public class JsrMetaBeanFactory implemen for (final String name : missingValid) { final MetaProperty metaProperty = metabean.getProperty(name); - if (metaProperty != null && metaProperty.getFeature(JsrFeatures.Property.REF_CASCADE) == null) { + if (metaProperty != null && metaProperty.getFeature(Property.REF_CASCADE) == null) { throw new ConstraintDeclarationException("@ConvertGroup needs @Valid"); } } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/MethodDescriptorImpl.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/MethodDescriptorImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/MethodDescriptorImpl.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/MethodDescriptorImpl.java Wed Oct 19 16:50:55 2016 @@ -41,14 +41,17 @@ public class MethodDescriptorImpl extend this.name = metaMethod.getMethod().getName(); } + @Override public String getName() { return name; } + @Override public boolean hasConstrainedParameters() { return super.hasConstrainedParameters(); } + @Override public boolean hasConstrainedReturnValue() { return super.hasConstrainedReturnValue(); } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/NodeBuilderCustomizableContextImpl.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/NodeBuilderCustomizableContextImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/NodeBuilderCustomizableContextImpl.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/NodeBuilderCustomizableContextImpl.java Wed Oct 19 16:50:55 2016 @@ -36,16 +36,19 @@ public class NodeBuilderCustomizableCont path = propertyPath; } + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.NodeContextBuilder inIterable() { path.getLeafNode().setInIterable(true); return new NodeContextBuilderImpl(context, template, path); } + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext addNode(String name) { path.addNode(new NodeImpl(name)); return this; } + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext addPropertyNode(String name) { final NodeImpl node = new NodeImpl.PropertyNodeImpl(name); node.setKind(ElementKind.PROPERTY); @@ -53,6 +56,7 @@ public class NodeBuilderCustomizableCont return this; } + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderCustomizableContext addBeanNode() { final NodeImpl node = new NodeImpl.BeanNodeImpl(); node.setKind(ElementKind.BEAN); @@ -60,6 +64,7 @@ public class NodeBuilderCustomizableCont return new LeafNodeBuilderCustomizableContextImpl(context, template, path); } + @Override public ConstraintValidatorContext addConstraintViolation() { context.addError(template, path); return context; Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/NodeContextBuilderImpl.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/NodeContextBuilderImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/NodeContextBuilderImpl.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/NodeContextBuilderImpl.java Wed Oct 19 16:50:55 2016 @@ -37,24 +37,29 @@ public class NodeContextBuilderImpl impl this.path = path; } + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderDefinedContext atKey(Object key) { path.getLeafNode().setKey(key); return new NodeBuilderDefinedContextImpl(context, template, path); } + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderDefinedContext atIndex(Integer index) { path.getLeafNode().setIndex(index); return new NodeBuilderDefinedContextImpl(context, template, path); } + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext addNode(String name) { return new NodeBuilderCustomizableContextImpl(context, template, path).addNode(name); } + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext addPropertyNode(String name) { return new NodeBuilderCustomizableContextImpl(context, template, path).addPropertyNode(name); } + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderCustomizableContext addBeanNode() { final NodeImpl node = new NodeImpl.BeanNodeImpl(); node.setKind(ElementKind.BEAN); @@ -62,6 +67,7 @@ public class NodeContextBuilderImpl impl return new LeafNodeBuilderCustomizableContextImpl(context, template, path); } + @Override public ConstraintValidatorContext addConstraintViolation() { context.addError(template, path); return context; Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ParameterDescriptorImpl.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ParameterDescriptorImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ParameterDescriptorImpl.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ParameterDescriptorImpl.java Wed Oct 19 16:50:55 2016 @@ -55,6 +55,7 @@ public class ParameterDescriptorImpl ext this.name = name; } + @Override public Set<GroupConversionDescriptor> getGroupConversions() { return groupConversions; } @@ -62,10 +63,12 @@ public class ParameterDescriptorImpl ext /** * {@inheritDoc} */ + @Override public int getIndex() { return index; } + @Override public String getName() { return name; } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/PropertyDescriptorImpl.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/PropertyDescriptorImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/PropertyDescriptorImpl.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/PropertyDescriptorImpl.java Wed Oct 19 16:50:55 2016 @@ -54,6 +54,7 @@ class PropertyDescriptorImpl extends Ele /** * {@inheritDoc} */ + @Override public String getPropertyName() { return propertyPath; } @@ -61,6 +62,7 @@ class PropertyDescriptorImpl extends Ele /** * {@inheritDoc} */ + @Override public String toString() { return "PropertyDescriptorImpl{" + "returnType=" + elementClass + ", propertyPath='" + propertyPath + '\'' + '}'; Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ReturnValueDescriptorImpl.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ReturnValueDescriptorImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ReturnValueDescriptorImpl.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/ReturnValueDescriptorImpl.java Wed Oct 19 16:50:55 2016 @@ -27,6 +27,7 @@ public class ReturnValueDescriptorImpl e setCascaded(cascaded); } + @Override public boolean hasConstraints() { return false; } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/groups/GroupConversionDescriptorImpl.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/groups/GroupConversionDescriptorImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/groups/GroupConversionDescriptorImpl.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/groups/GroupConversionDescriptorImpl.java Wed Oct 19 16:50:55 2016 @@ -33,10 +33,12 @@ public class GroupConversionDescriptorIm this.to = to.getGroup(); } + @Override public Class<?> getFrom() { return from; } + @Override public Class<?> getTo() { return to; } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/parameter/DefaultParameterNameProvider.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/parameter/DefaultParameterNameProvider.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/parameter/DefaultParameterNameProvider.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/parameter/DefaultParameterNameProvider.java Wed Oct 19 16:50:55 2016 @@ -27,10 +27,12 @@ import java.util.List; public class DefaultParameterNameProvider implements ParameterNameProvider { private static final String ARG = "arg"; + @Override public List<String> getParameterNames(Constructor<?> constructor) { return names(constructor.getParameterTypes().length); } + @Override public List<String> getParameterNames(Method method) { return names(method.getParameterTypes().length); } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/CachingTraversableResolver.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/CachingTraversableResolver.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/CachingTraversableResolver.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/CachingTraversableResolver.java Wed Oct 19 16:50:55 2016 @@ -72,6 +72,7 @@ public class CachingTraversableResolver /** * {@inheritDoc} */ + @Override public boolean isReachable(Object traversableObject, Path.Node traversableProperty, Class<?> rootBeanType, Path pathToTraversableObject, ElementType elementType) { @@ -93,6 +94,7 @@ public class CachingTraversableResolver /** * {@inheritDoc} */ + @Override public boolean isCascadable(Object traversableObject, Path.Node traversableProperty, Class<?> rootBeanType, Path pathToTraversableObject, ElementType elementType) { @@ -114,6 +116,7 @@ public class CachingTraversableResolver /** * {@inheritDoc} */ + @Override public boolean needsCaching() { return false; // I am the cache. Do not need cache for cache } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/DefaultTraversableResolver.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/DefaultTraversableResolver.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/DefaultTraversableResolver.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/DefaultTraversableResolver.java Wed Oct 19 16:50:55 2016 @@ -55,6 +55,7 @@ public class DefaultTraversableResolver /** * {@inheritDoc} */ + @Override public boolean isReachable(Object traversableObject, Path.Node traversableProperty, Class<?> rootBeanType, Path pathToTraversableObject, ElementType elementType) { @@ -65,6 +66,7 @@ public class DefaultTraversableResolver /** * {@inheritDoc} */ + @Override public boolean isCascadable(Object traversableObject, Path.Node traversableProperty, Class<?> rootBeanType, Path pathToTraversableObject, ElementType elementType) { @@ -102,6 +104,7 @@ public class DefaultTraversableResolver /** * {@inheritDoc} */ + @Override public boolean needsCaching() { return jpaTR != null && CachingTraversableResolver.needsCaching(jpaTR); } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/JPATraversableResolver.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/JPATraversableResolver.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/JPATraversableResolver.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/JPATraversableResolver.java Wed Oct 19 16:50:55 2016 @@ -28,6 +28,7 @@ public class JPATraversableResolver impl /** * {@inheritDoc} */ + @Override public boolean isReachable(Object traversableObject, Path.Node traversableProperty, Class<?> rootBeanType, Path pathToTraversableObject, ElementType elementType) { @@ -38,6 +39,7 @@ public class JPATraversableResolver impl /** * {@inheritDoc} */ + @Override public boolean isCascadable(Object traversableObject, Path.Node traversableProperty, Class<?> rootBeanType, Path pathToTraversableObject, ElementType elementType) { @@ -47,6 +49,7 @@ public class JPATraversableResolver impl /** * {@inheritDoc} */ + @Override public boolean needsCaching() { return true; // yes } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/SimpleTraversableResolver.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/SimpleTraversableResolver.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/SimpleTraversableResolver.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/SimpleTraversableResolver.java Wed Oct 19 16:50:55 2016 @@ -30,6 +30,7 @@ public class SimpleTraversableResolver i * {@inheritDoc} * @return <code>true</code> */ + @Override public boolean isReachable(Object traversableObject, Path.Node traversableProperty, Class<?> rootBeanType, Path pathToTraversableObject, java.lang.annotation.ElementType elementType) { @@ -40,6 +41,7 @@ public class SimpleTraversableResolver i * {@inheritDoc} * @return <code>true</code> */ + @Override public boolean isCascadable(Object traversableObject, Path.Node traversableProperty, Class<?> rootBeanType, Path pathToTraversableObject, ElementType elementType) { @@ -50,6 +52,7 @@ public class SimpleTraversableResolver i * {@inheritDoc} * @return <code>false</code> */ + @Override public boolean needsCaching() { return false; // no } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/EnumerationConverter.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/EnumerationConverter.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/EnumerationConverter.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/EnumerationConverter.java Wed Oct 19 16:50:55 2016 @@ -51,6 +51,7 @@ public final class EnumerationConverter /** * {@inheritDoc} */ + @Override @SuppressWarnings({ "unchecked", "rawtypes" }) public Object convert(Class type, Object value) { if (!type.isEnum()) { @@ -67,7 +68,7 @@ public final class EnumerationConverter String stringValue = (String) value; - final Class<Enum> enumClass = (Class<Enum>) type; + final Class<Enum> enumClass = type; return Enum.valueOf(enumClass, stringValue); } Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/LeafNodeBuilderCustomizableContextImpl.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/LeafNodeBuilderCustomizableContextImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/LeafNodeBuilderCustomizableContextImpl.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/LeafNodeBuilderCustomizableContextImpl.java Wed Oct 19 16:50:55 2016 @@ -37,27 +37,32 @@ public class LeafNodeBuilderCustomizable node.setKind(ElementKind.BEAN); } + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeContextBuilder inIterable() { path.getLeafNode().setInIterable(true); return new LeafNodeContextBuilderImpl(); } + @Override public ConstraintValidatorContext addConstraintViolation() { context.addError(template, path); return context; } private class LeafNodeContextBuilderImpl implements ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeContextBuilder { + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderDefinedContext atKey(Object key) { path.getLeafNode().setKey(key); return new LeafNodeBuilderDefinedContextImpl(context, template, path); } + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderDefinedContext atIndex(Integer index) { path.getLeafNode().setIndex(index); return new LeafNodeBuilderDefinedContextImpl(context, template, path); } + @Override public ConstraintValidatorContext addConstraintViolation() { context.addError(template, path); return context; Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/LeafNodeBuilderDefinedContextImpl.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/LeafNodeBuilderDefinedContextImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/LeafNodeBuilderDefinedContextImpl.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/LeafNodeBuilderDefinedContextImpl.java Wed Oct 19 16:50:55 2016 @@ -33,6 +33,7 @@ public class LeafNodeBuilderDefinedConte this.path = path; } + @Override public ConstraintValidatorContext addConstraintViolation() { context.addError(template, path); return context; Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderCustomizableContextImpl.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderCustomizableContextImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderCustomizableContextImpl.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderCustomizableContextImpl.java Wed Oct 19 16:50:55 2016 @@ -53,6 +53,7 @@ final class NodeBuilderCustomizableConte /** * {@inheritDoc} */ + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.NodeContextBuilder inIterable() { // Modifies the "previous" node in the path node.setInIterable(true); @@ -62,12 +63,14 @@ final class NodeBuilderCustomizableConte /** * {@inheritDoc} */ + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext addNode(String name) { propertyPath.addNode(node); node = new NodeImpl(name); return this; // Re-use this instance } + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext addPropertyNode(String name) { propertyPath.addNode(node); node = new NodeImpl.PropertyNodeImpl(name); @@ -75,6 +78,7 @@ final class NodeBuilderCustomizableConte return null; } + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderCustomizableContext addBeanNode() { propertyPath.addNode(node); node = new NodeImpl((String) null); @@ -85,6 +89,7 @@ final class NodeBuilderCustomizableConte /** * {@inheritDoc} */ + @Override public ConstraintValidatorContext addConstraintViolation() { propertyPath.addNode(node); node = null; Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderDefinedContextImpl.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderDefinedContextImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderDefinedContextImpl.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderDefinedContextImpl.java Wed Oct 19 16:50:55 2016 @@ -49,15 +49,18 @@ public final class NodeBuilderDefinedCon /** * {@inheritDoc} */ + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext addNode(String name) { // Node not yet added, wait until more information is provided return new NodeBuilderCustomizableContextImpl(parent, messageTemplate, propertyPath, name); } + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext addPropertyNode(String name) { return new NodeBuilderCustomizableContextImpl(parent, messageTemplate, propertyPath, name); } + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderCustomizableContext addBeanNode() { final NodeImpl node = new NodeImpl((String) null); node.setKind(ElementKind.BEAN); @@ -68,6 +71,7 @@ public final class NodeBuilderDefinedCon /** * {@inheritDoc} */ + @Override public ConstraintValidatorContext addConstraintViolation() { parent.addError(messageTemplate, propertyPath); return parent; Modified: bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeContextBuilderImpl.java URL: http://svn.apache.org/viewvc/bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeContextBuilderImpl.java?rev=1765681&r1=1765680&r2=1765681&view=diff ============================================================================== --- bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeContextBuilderImpl.java (original) +++ bval/trunk/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeContextBuilderImpl.java Wed Oct 19 16:50:55 2016 @@ -53,6 +53,7 @@ final class NodeContextBuilderImpl /** * {@inheritDoc} */ + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderDefinedContext atKey( Object key) { node.setKey(key); @@ -63,6 +64,7 @@ final class NodeContextBuilderImpl /** * {@inheritDoc} */ + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderDefinedContext atIndex( Integer index) { node.setIndex(index); @@ -73,17 +75,20 @@ final class NodeContextBuilderImpl /** * {@inheritDoc} */ + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext addNode( String name) { propertyPath.addNode(node); return new NodeBuilderCustomizableContextImpl(parent, messageTemplate, propertyPath, name); } + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext addPropertyNode(String name) { propertyPath.addProperty(name); return new NodeBuilderCustomizableContextImpl(parent, messageTemplate, propertyPath, node.getName()); } + @Override public ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderCustomizableContext addBeanNode() { return new LeafNodeBuilderCustomizableContextImpl(parent, messageTemplate, propertyPath); } @@ -91,6 +96,7 @@ final class NodeContextBuilderImpl /** * {@inheritDoc} */ + @Override public ConstraintValidatorContext addConstraintViolation() { propertyPath.addNode(node); parent.addError(messageTemplate, propertyPath);
