http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultValidationProviderResolver.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultValidationProviderResolver.java b/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultValidationProviderResolver.java index 5ad55f0..671b0d9 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultValidationProviderResolver.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultValidationProviderResolver.java @@ -16,7 +16,6 @@ */ package org.apache.bval.jsr; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -37,8 +36,7 @@ import org.apache.commons.weaver.privilizer.Privilizing.CallTo; public class DefaultValidationProviderResolver implements ValidationProviderResolver { //TODO - Spec recommends caching per classloader - private static final String SPI_CFG = - "META-INF/services/javax.validation.spi.ValidationProvider"; + private static final String SPI_CFG = "META-INF/services/javax.validation.spi.ValidationProvider"; /** * {@inheritDoc} @@ -69,11 +67,12 @@ public class DefaultValidationProviderResolver implements ValidationProviderReso final Class<? extends ValidationProvider> providerType = cl.loadClass(line).asSubclass(ValidationProvider.class); // create an instance to return - providers.add(Reflection.newInstance(providerType.asSubclass(ValidationProvider.class))); + providers + .add(Reflection.newInstance(providerType.asSubclass(ValidationProvider.class))); } catch (ClassNotFoundException e) { - throw new ValidationException("Failed to load provider " + - line + " configured in file " + url, e); + throw new ValidationException( + "Failed to load provider " + line + " configured in file " + url, e); } } line = br.readLine();
http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/ElementDescriptorImpl.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/ElementDescriptorImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/ElementDescriptorImpl.java index 16dd24d..cfcf85b 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/ElementDescriptorImpl.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/ElementDescriptorImpl.java @@ -36,7 +36,8 @@ import java.util.concurrent.CopyOnWriteArraySet; * Description: MetaData class<br/> */ public abstract class ElementDescriptorImpl implements ElementDescriptor { - private final Set<GroupConversionDescriptor> groupConversions = new CopyOnWriteArraySet<GroupConversionDescriptor>(); + private final Set<GroupConversionDescriptor> groupConversions = + new CopyOnWriteArraySet<GroupConversionDescriptor>(); private boolean cascaded; private final Collection<Object> validated = new CopyOnWriteArraySet<Object>(); @@ -104,7 +105,7 @@ public abstract class ElementDescriptorImpl implements ElementDescriptor { * {@inheritDoc} */ @Override - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({ "unchecked", "rawtypes" }) public ElementDescriptor.ConstraintFinder findConstraints() { return new ConstraintFinderImpl(metaBean, new HashSet(constraintDescriptors)); } @@ -114,8 +115,8 @@ public abstract class ElementDescriptorImpl implements ElementDescriptor { */ @Override public Set<ConstraintDescriptor<?>> getConstraintDescriptors() { - return constraintDescriptors.isEmpty() ? Collections.<ConstraintDescriptor<?>> emptySet() : Collections - .unmodifiableSet(constraintDescriptors); + return constraintDescriptors.isEmpty() ? Collections.<ConstraintDescriptor<?>> emptySet() + : Collections.unmodifiableSet(constraintDescriptors); } /** http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/GraphBeanIdentity.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/GraphBeanIdentity.java b/bval-jsr/src/main/java/org/apache/bval/jsr/GraphBeanIdentity.java index 1292258..3ec666e 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/GraphBeanIdentity.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/GraphBeanIdentity.java @@ -34,7 +34,7 @@ package org.apache.bval.jsr; * @author Carlos Vara */ public class GraphBeanIdentity { - + private final Object bean; private final Class<?> group; private final Class<?> owner; @@ -50,7 +50,7 @@ public class GraphBeanIdentity { this.group = group; this.owner = owner; } - + /** * Get the bean. * @return Object @@ -104,11 +104,6 @@ public class GraphBeanIdentity { if (this.group != other.group) { return false; } - -// // Owner ref must be the same -// if (this.owner != other.owner) { -// return false; -// } return true; } @@ -120,14 +115,9 @@ public class GraphBeanIdentity { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result - + ((this.bean == null) ? 0 : this.bean.hashCode()); - result = prime * result - + ((this.group == null) ? 0 : this.group.hashCode()); -// result = prime * result -// + ((this.owner == null) ? 0 : this.owner.hashCode()); + result = prime * result + ((this.bean == null) ? 0 : this.bean.hashCode()); + result = prime * result + ((this.group == null) ? 0 : this.group.hashCode()); return result; } - } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/GroupValidationContext.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/GroupValidationContext.java b/bval-jsr/src/main/java/org/apache/bval/jsr/GroupValidationContext.java index 70a53f0..fecfd8d 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/GroupValidationContext.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/GroupValidationContext.java @@ -16,7 +16,6 @@ */ package org.apache.bval.jsr; - import org.apache.bval.jsr.groups.Group; import org.apache.bval.jsr.groups.Groups; import org.apache.bval.jsr.util.PathImpl; @@ -36,9 +35,8 @@ import java.lang.reflect.Method; /** * Description: JSR-303 {@link ValidationContext} extension. <br/> */ -public interface GroupValidationContext<T> - extends ValidationContext<ConstraintValidationListener<T>> { - +public interface GroupValidationContext<T> extends ValidationContext<ConstraintValidationListener<T>> { + /** * Get the groups of this {@link GroupValidationContext}. * @return the groups in their sequence for validation http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/GroupValidationContextImpl.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/GroupValidationContextImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/GroupValidationContextImpl.java index f16abf5..5477467 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/GroupValidationContextImpl.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/GroupValidationContextImpl.java @@ -44,8 +44,8 @@ import java.util.Set; /** * Description: instance per validation process, not thread-safe<br/> */ -final class GroupValidationContextImpl<T> extends BeanValidationContext<ConstraintValidationListener<T>> implements - GroupValidationContext<T>, MessageInterpolator.Context { +final class GroupValidationContextImpl<T> extends BeanValidationContext<ConstraintValidationListener<T>> + implements GroupValidationContext<T>, MessageInterpolator.Context { private final MessageInterpolator messageResolver; private final PathImpl path; @@ -88,9 +88,8 @@ final class GroupValidationContextImpl<T> extends BeanValidationContext<Constrai * @param rootMetaBean */ public GroupValidationContextImpl(ConstraintValidationListener<T> listener, MessageInterpolator aMessageResolver, - TraversableResolver traversableResolver, ParameterNameProvider parameterNameProvider, - ConstraintValidatorFactory constraintValidatorFactory, - MetaBean rootMetaBean) { + TraversableResolver traversableResolver, ParameterNameProvider parameterNameProvider, + ConstraintValidatorFactory constraintValidatorFactory, MetaBean rootMetaBean) { super(listener, new HashMap<GraphBeanIdentity, Set<PathImpl>>()); this.messageResolver = aMessageResolver; this.constraintValidatorFactory = constraintValidatorFactory; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/InvocableElementDescriptor.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/InvocableElementDescriptor.java b/bval-jsr/src/main/java/org/apache/bval/jsr/InvocableElementDescriptor.java index d9db2b2..f54b553 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/InvocableElementDescriptor.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/InvocableElementDescriptor.java @@ -31,13 +31,15 @@ import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; public class InvocableElementDescriptor extends ElementDescriptorImpl implements ProcedureDescriptor { - private static final CopyOnWriteArraySet<ConstraintValidation<?>> NO_CONSTRAINTS = new CopyOnWriteArraySet<ConstraintValidation<?>>(); + private static final CopyOnWriteArraySet<ConstraintValidation<?>> NO_CONSTRAINTS = + new CopyOnWriteArraySet<ConstraintValidation<?>>(); private ReturnValueDescriptor returnValueDescriptor; private CrossParameterDescriptor crossParameterDescriptor; private final List<ParameterDescriptor> parameterDescriptors = new ArrayList<ParameterDescriptor>(); - protected InvocableElementDescriptor(final MetaBean metaBean, final Class<?> elementClass, final Validation[] validations) { + protected InvocableElementDescriptor(final MetaBean metaBean, final Class<?> elementClass, + final Validation[] validations) { super(metaBean, elementClass, validations); } @@ -88,7 +90,8 @@ public class InvocableElementDescriptor extends ElementDescriptorImpl implements } protected boolean hasConstrainedReturnValue() { - return getReturnValueDescriptor().isCascaded() || !getReturnValueDescriptor().getConstraintDescriptors().isEmpty(); + return getReturnValueDescriptor().isCascaded() + || !getReturnValueDescriptor().getConstraintDescriptors().isEmpty(); } @Override http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/JsrFeatures.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/JsrFeatures.java b/bval-jsr/src/main/java/org/apache/bval/jsr/JsrFeatures.java index a06d39e..91687f9 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/JsrFeatures.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/JsrFeatures.java @@ -61,9 +61,6 @@ public interface JsrFeatures { **/ String GROUP_SEQUENCE = "GroupSequence"; -// INFO: cached sorted Array with ValidationEntries -// String VALIDATION_SEQUENCE = "ValidationSequence"; - /** * INFO: cached BeanDescriptorImpl of the bean */ http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/JsrMetaBeanFactory.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/JsrMetaBeanFactory.java b/bval-jsr/src/main/java/org/apache/bval/jsr/JsrMetaBeanFactory.java index cede3e1..97eece1 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/JsrMetaBeanFactory.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/JsrMetaBeanFactory.java @@ -121,12 +121,13 @@ public class JsrMetaBeanFactory implements MetaBeanFactory { * @throws IllegalAccessException * @throws InvocationTargetException */ - private void processClass(Class<?> beanClass, MetaBean metabean) throws IllegalAccessException, - InvocationTargetException { + private void processClass(Class<?> beanClass, MetaBean metabean) + throws IllegalAccessException, InvocationTargetException { // if NOT ignore class level annotations if (!factory.getAnnotationIgnores().isIgnoreAnnotations(beanClass)) { - annotationProcessor.processAnnotations(null, beanClass, beanClass, null, new AppendValidationToMeta(metabean)); + annotationProcessor.processAnnotations(null, beanClass, beanClass, null, + new AppendValidationToMeta(metabean)); } final Collection<String> missingValid = new ArrayList<String>(); @@ -198,15 +199,16 @@ public class JsrMetaBeanFactory implements MetaBeanFactory { * @throws IllegalAccessException * @throws InvocationTargetException */ - private void addXmlConstraints(Class<?> beanClass, MetaBean metabean) throws IllegalAccessException, - InvocationTargetException { + private void addXmlConstraints(Class<?> beanClass, MetaBean metabean) + throws IllegalAccessException, InvocationTargetException { for (final MetaConstraint<?, ? extends Annotation> metaConstraint : factory.getMetaConstraints(beanClass)) { Meta meta; AccessStrategy access = metaConstraint.getAccessStrategy(); boolean create = false; if (access == null) { // class level meta = null; - } else if (access.getElementType() == ElementType.METHOD && !metaConstraint.getMember().getName().startsWith("get")) { // TODO: better getter test + } else if (access.getElementType() == ElementType.METHOD + && !metaConstraint.getMember().getName().startsWith("get")) { // TODO: better getter test final Method method = Method.class.cast(metaConstraint.getMember()); meta = metabean.getMethod(method); final MetaMethod metaMethod; @@ -229,7 +231,7 @@ public class JsrMetaBeanFactory implements MetaBeanFactory { metaMethod.addAnnotation(metaConstraint.getAnnotation()); } continue; - } else if (access.getElementType() == ElementType.CONSTRUCTOR){ + } else if (access.getElementType() == ElementType.CONSTRUCTOR) { final Constructor<?> constructor = Constructor.class.cast(metaConstraint.getMember()); meta = metabean.getConstructor(constructor); final MetaConstructor metaConstructor; @@ -289,7 +291,8 @@ public class JsrMetaBeanFactory implements MetaBeanFactory { GroupSequence annotation = beanClass.getAnnotation(GroupSequence.class); List<Group> groupSeq = metabean.getFeature(key); if (groupSeq == null) { - groupSeq = metabean.initFeature(key, new ArrayList<Group>(annotation == null ? 1 : annotation.value().length)); + groupSeq = + metabean.initFeature(key, new ArrayList<Group>(annotation == null ? 1 : annotation.value().length)); } Class<?>[] groupClasses = factory.getDefaultSequence(beanClass); if (groupClasses == null || groupClasses.length == 0) { @@ -315,7 +318,8 @@ public class JsrMetaBeanFactory implements MetaBeanFactory { if (!containsDefault) { throw new GroupDefinitionException("Redefined default group sequence must contain " + beanClass.getName()); } - log.log(Level.FINEST, String.format("Default group sequence for bean %s is: %s", beanClass.getName(), groupSeq)); + log.log(Level.FINEST, + String.format("Default group sequence for bean %s is: %s", beanClass.getName(), groupSeq)); } /** http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/MethodDescriptorImpl.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/MethodDescriptorImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/MethodDescriptorImpl.java index 3eff561..f9b0247 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/MethodDescriptorImpl.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/MethodDescriptorImpl.java @@ -25,7 +25,8 @@ import java.lang.reflect.Method; /** * Description: {@link MethodDescriptor} implementation.<br/> */ -public class MethodDescriptorImpl extends InvocableElementDescriptor implements javax.validation.metadata.MethodDescriptor, ProcedureDescriptor { +public class MethodDescriptorImpl extends InvocableElementDescriptor + implements javax.validation.metadata.MethodDescriptor, ProcedureDescriptor { private static final Validation[] EMPTY_VALIDATION = new Validation[0]; private final String name; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/NodeBuilderCustomizableContextImpl.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/NodeBuilderCustomizableContextImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/NodeBuilderCustomizableContextImpl.java index 1c78fe7..07ed91a 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/NodeBuilderCustomizableContextImpl.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/NodeBuilderCustomizableContextImpl.java @@ -25,12 +25,14 @@ import org.apache.bval.jsr.util.PathImpl; import javax.validation.ConstraintValidatorContext; import javax.validation.ElementKind; -public class NodeBuilderCustomizableContextImpl implements ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext { +public class NodeBuilderCustomizableContextImpl + implements ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext { private final PathImpl path; private final ConstraintValidatorContextImpl context; private final String template; - public NodeBuilderCustomizableContextImpl(final ConstraintValidatorContextImpl parent, final String messageTemplate, final PathImpl propertyPath) { + public NodeBuilderCustomizableContextImpl(final ConstraintValidatorContextImpl parent, final String messageTemplate, + final PathImpl propertyPath) { context = parent; template = messageTemplate; path = propertyPath; @@ -49,7 +51,8 @@ public class NodeBuilderCustomizableContextImpl implements ConstraintValidatorCo } @Override - public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext addPropertyNode(String name) { + public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext addPropertyNode( + String name) { final NodeImpl node = new NodeImpl.PropertyNodeImpl(name); node.setKind(ElementKind.PROPERTY); path.addNode(node); http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/NodeContextBuilderImpl.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/NodeContextBuilderImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/NodeContextBuilderImpl.java index 5d53038..f686a92 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/NodeContextBuilderImpl.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/NodeContextBuilderImpl.java @@ -26,12 +26,14 @@ import org.apache.bval.jsr.util.PathImpl; import javax.validation.ConstraintValidatorContext; import javax.validation.ElementKind; -public class NodeContextBuilderImpl implements ConstraintValidatorContext.ConstraintViolationBuilder.NodeContextBuilder { +public class NodeContextBuilderImpl + implements ConstraintValidatorContext.ConstraintViolationBuilder.NodeContextBuilder { private final PathImpl path; private final String template; private final ConstraintValidatorContextImpl context; - public NodeContextBuilderImpl(final ConstraintValidatorContextImpl context, final String template, final PathImpl path) { + public NodeContextBuilderImpl(final ConstraintValidatorContextImpl context, final String template, + final PathImpl path) { this.context = context; this.template = template; this.path = path; @@ -55,7 +57,8 @@ public class NodeContextBuilderImpl implements ConstraintValidatorContext.Constr } @Override - public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext addPropertyNode(String name) { + public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext addPropertyNode( + String name) { return new NodeBuilderCustomizableContextImpl(context, template, path).addPropertyNode(name); } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/ParameterAccess.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/ParameterAccess.java b/bval-jsr/src/main/java/org/apache/bval/jsr/ParameterAccess.java index 36e6035..a9c16bb 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/ParameterAccess.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/ParameterAccess.java @@ -24,7 +24,6 @@ import org.apache.bval.util.AccessStrategy; import java.lang.annotation.ElementType; import java.lang.reflect.Type; - /** * Implementation of {@link org.apache.bval.util.AccessStrategy} for method parameters. * @@ -40,7 +39,7 @@ public class ParameterAccess extends AccessStrategy { * @param paramType * @param paramIdx */ - public ParameterAccess(Type paramType, int paramIdx ) { + public ParameterAccess(Type paramType, int paramIdx) { this.paramType = paramType; this.paramIdx = paramIdx; } @@ -79,8 +78,10 @@ public class ParameterAccess extends AccessStrategy { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; final ParameterAccess that = (ParameterAccess) o; return paramIdx == that.paramIdx && paramType.equals(that.paramType); http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/ParameterDescriptorImpl.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/ParameterDescriptorImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/ParameterDescriptorImpl.java index bbeeb6b..187fd7e 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/ParameterDescriptorImpl.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/ParameterDescriptorImpl.java @@ -26,12 +26,12 @@ import javax.validation.metadata.ParameterDescriptor; import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; - /** * Description: {@link javax.validation.metadata.ParameterDescriptor} implementation.<br/> */ public class ParameterDescriptorImpl extends ElementDescriptorImpl implements ParameterDescriptor { - private final Set<GroupConversionDescriptor> groupConversions = new CopyOnWriteArraySet<GroupConversionDescriptor>(); + private final Set<GroupConversionDescriptor> groupConversions = + new CopyOnWriteArraySet<GroupConversionDescriptor>(); private final String name; private int index; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/ProcedureDescriptor.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/ProcedureDescriptor.java b/bval-jsr/src/main/java/org/apache/bval/jsr/ProcedureDescriptor.java index 9c185b0..d85c703 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/ProcedureDescriptor.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/ProcedureDescriptor.java @@ -16,7 +16,6 @@ */ package org.apache.bval.jsr; - import org.apache.bval.jsr.groups.Group; import org.apache.bval.model.MetaBean; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/ReturnValueDescriptorImpl.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/ReturnValueDescriptorImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/ReturnValueDescriptorImpl.java index 9a2c0db..b1fc72d 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/ReturnValueDescriptorImpl.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/ReturnValueDescriptorImpl.java @@ -22,7 +22,8 @@ import javax.validation.metadata.ReturnValueDescriptor; import java.util.Collection; public class ReturnValueDescriptorImpl extends ElementDescriptorImpl implements ReturnValueDescriptor { - public ReturnValueDescriptorImpl(final MetaBean metaBean, Class<?> returnType, final Collection<ConstraintValidation<?>> list, boolean cascaded) { + public ReturnValueDescriptorImpl(final MetaBean metaBean, Class<?> returnType, + final Collection<ConstraintValidation<?>> list, boolean cascaded) { super(metaBean, returnType, list.toArray(new ConstraintValidation<?>[list.size()])); setCascaded(cascaded); } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/groups/Group.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/groups/Group.java b/bval-jsr/src/main/java/org/apache/bval/jsr/groups/Group.java index a5c595e..4f9d10a 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/groups/Group.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/groups/Group.java @@ -18,10 +18,8 @@ */ package org.apache.bval.jsr.groups; - import javax.validation.groups.Default; - /** * Immutable object that wraps an interface representing a single group. */ @@ -70,8 +68,12 @@ public final class Group { */ @Override public boolean equals(Object o) { - if (this == o) { return true; } - if (o == null || getClass() != o.getClass()) { return false; } + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } Group group1 = (Group) o; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/groups/Groups.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/groups/Groups.java b/bval-jsr/src/main/java/org/apache/bval/jsr/groups/Groups.java index 7d4f579..162bb66 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/groups/Groups.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/groups/Groups.java @@ -18,7 +18,6 @@ */ package org.apache.bval.jsr.groups; - import javax.validation.GroupDefinitionException; import java.util.LinkedList; import java.util.List; @@ -89,28 +88,26 @@ public class Groups { } } - private void ensureExpandable(List<Group> groupList, List<Group> defaultGroupList, - int defaultGroupIndex) { + private void ensureExpandable(List<Group> groupList, List<Group> defaultGroupList, int defaultGroupIndex) { for (int i = 0; i < defaultGroupList.size(); i++) { Group group = defaultGroupList.get(i); if (group.isDefault()) { continue; // the default group is the one we want to replace } - int index = groupList - .indexOf(group); // sequence contains group of default group sequence + int index = groupList.indexOf(group); // sequence contains group of default group sequence if (index == -1) { continue; // if group is not in the sequence } - if ((i == 0 && index == defaultGroupIndex - 1) || - (i == defaultGroupList.size() - 1 && index == defaultGroupIndex + 1)) { + if ((i == 0 && index == defaultGroupIndex - 1) + || (i == defaultGroupList.size() - 1 && index == defaultGroupIndex + 1)) { // if we are at the beginning or end of he defaultGroupSequence and the // matches are either directly before or after we can continue, // since we basically have two groups continue; } - throw new GroupDefinitionException("Unable to expand default group list" + - defaultGroupList + " into sequence " + groupList); + throw new GroupDefinitionException( + "Unable to expand default group list" + defaultGroupList + " into sequence " + groupList); } } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/groups/GroupsComputer.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/groups/GroupsComputer.java b/bval-jsr/src/main/java/org/apache/bval/jsr/groups/GroupsComputer.java index 0f3a4d7..398d6c3 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/groups/GroupsComputer.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/groups/GroupsComputer.java @@ -18,7 +18,6 @@ */ package org.apache.bval.jsr.groups; - import javax.validation.GroupDefinitionException; import javax.validation.GroupSequence; import javax.validation.ValidationException; @@ -38,7 +37,7 @@ import java.util.concurrent.ConcurrentHashMap; * Implementation is thread-safe. */ public class GroupsComputer { - public static final Class<?>[] DEFAULT_GROUP = new Class<?>[]{Default.class}; + public static final Class<?>[] DEFAULT_GROUP = new Class<?>[] { Default.class }; /** The default group array used in case any of the validate methods is called without a group. */ private static final Groups DEFAULT_GROUPS; @@ -121,7 +120,7 @@ public class GroupsComputer { } private List<Group> resolveSequence(Class<?> group, GroupSequence sequenceAnnotation, - Set<Class<?>> processedSequences) { + Set<Class<?>> processedSequences) { if (processedSequences.contains(group)) { throw new GroupDefinitionException("Cyclic dependency in groups definition"); } else { @@ -134,8 +133,7 @@ public class GroupsComputer { if (anno == null) { resolvedGroupSequence.add(new Group(clazz)); // group part of sequence } else { - List<Group> tmpSequence = - resolveSequence(clazz, anno, processedSequences); // recursion! + List<Group> tmpSequence = resolveSequence(clazz, anno, processedSequences); // recursion! resolvedGroupSequence.addAll(tmpSequence); } } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/CachingTraversableResolver.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/CachingTraversableResolver.java b/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/CachingTraversableResolver.java index b8f6de0..05639c7 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/CachingTraversableResolver.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/CachingTraversableResolver.java @@ -43,8 +43,7 @@ public class CachingTraversableResolver implements TraversableResolver, CachingR */ public static boolean needsCaching(TraversableResolver resolver) { // caching, if we do not know exactly - return !(resolver instanceof CachingRelevant) || - ((CachingRelevant) resolver).needsCaching(); + return !(resolver instanceof CachingRelevant) || ((CachingRelevant) resolver).needsCaching(); } /** @@ -73,20 +72,19 @@ public class CachingTraversableResolver implements TraversableResolver, CachingR * {@inheritDoc} */ @Override - public boolean isReachable(Object traversableObject, Path.Node traversableProperty, - Class<?> rootBeanType, Path pathToTraversableObject, - ElementType elementType) { - CacheEntry currentLH = new CacheEntry(traversableObject, traversableProperty, - rootBeanType, pathToTraversableObject, elementType); + public boolean isReachable(Object traversableObject, Path.Node traversableProperty, Class<?> rootBeanType, + Path pathToTraversableObject, ElementType elementType) { + CacheEntry currentLH = + new CacheEntry(traversableObject, traversableProperty, rootBeanType, pathToTraversableObject, elementType); CacheEntry cachedLH = cache.get(currentLH); if (cachedLH == null) { - currentLH.reachable = delegate.isReachable(traversableObject, traversableProperty, - rootBeanType, pathToTraversableObject, elementType); + currentLH.reachable = delegate.isReachable(traversableObject, traversableProperty, rootBeanType, + pathToTraversableObject, elementType); cache.put(currentLH, currentLH); cachedLH = currentLH; } else if (cachedLH.reachable == null) { - cachedLH.reachable = delegate.isReachable(traversableObject, traversableProperty, - rootBeanType, pathToTraversableObject, elementType); + cachedLH.reachable = delegate.isReachable(traversableObject, traversableProperty, rootBeanType, + pathToTraversableObject, elementType); } return cachedLH.reachable; } @@ -95,20 +93,19 @@ public class CachingTraversableResolver implements TraversableResolver, CachingR * {@inheritDoc} */ @Override - public boolean isCascadable(Object traversableObject, Path.Node traversableProperty, - Class<?> rootBeanType, Path pathToTraversableObject, - ElementType elementType) { - CacheEntry currentLH = new CacheEntry(traversableObject, traversableProperty, - rootBeanType, pathToTraversableObject, elementType); + public boolean isCascadable(Object traversableObject, Path.Node traversableProperty, Class<?> rootBeanType, + Path pathToTraversableObject, ElementType elementType) { + CacheEntry currentLH = + new CacheEntry(traversableObject, traversableProperty, rootBeanType, pathToTraversableObject, elementType); CacheEntry cachedLH = cache.get(currentLH); if (cachedLH == null) { - currentLH.cascadable = delegate.isCascadable(traversableObject, - traversableProperty, rootBeanType, pathToTraversableObject, elementType); + currentLH.cascadable = delegate.isCascadable(traversableObject, traversableProperty, rootBeanType, + pathToTraversableObject, elementType); cache.put(currentLH, currentLH); cachedLH = currentLH; } else if (cachedLH.cascadable == null) { - cachedLH.cascadable = delegate.isCascadable(traversableObject, traversableProperty, - rootBeanType, pathToTraversableObject, elementType); + cachedLH.cascadable = delegate.isCascadable(traversableObject, traversableProperty, rootBeanType, + pathToTraversableObject, elementType); } return cachedLH.cascadable; } @@ -118,7 +115,7 @@ public class CachingTraversableResolver implements TraversableResolver, CachingR */ @Override public boolean needsCaching() { - return false; // I am the cache. Do not need cache for cache + return false; // I am the cache. Do not need cache for cache } /** @@ -143,9 +140,8 @@ public class CachingTraversableResolver implements TraversableResolver, CachingR * @param pathToTraversableObject * @param elementType */ - private CacheEntry(Object traversableObject, Path.Node traversableProperty, - Class<?> rootBeanType, Path pathToTraversableObject, - ElementType elementType) { + private CacheEntry(Object traversableObject, Path.Node traversableProperty, Class<?> rootBeanType, + Path pathToTraversableObject, ElementType elementType) { this.object = traversableObject; this.node = traversableProperty; this.type = rootBeanType; @@ -168,10 +164,8 @@ public class CachingTraversableResolver implements TraversableResolver, CachingR CacheEntry that = (CacheEntry) o; - return elementType == that.elementType && path.equals(that.path) && - type.equals(that.type) && - !(object != null ? !object.equals(that.object) : that.object != null) && - node.equals(that.node); + return elementType == that.elementType && path.equals(that.path) && type.equals(that.type) + && !(object != null ? !object.equals(that.object) : that.object != null) && node.equals(that.node); } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/DefaultTraversableResolver.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/DefaultTraversableResolver.java b/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/DefaultTraversableResolver.java index e4cd2a2..d8b392e 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/DefaultTraversableResolver.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/DefaultTraversableResolver.java @@ -34,13 +34,11 @@ public class DefaultTraversableResolver implements TraversableResolver, CachingR private static final boolean LOG_FINEST = log.isLoggable(Level.FINEST); /** Class to load to check whether JPA 2 is on the classpath. */ - private static final String PERSISTENCE_UTIL_CLASSNAME = - "javax.persistence.PersistenceUtil"; + private static final String PERSISTENCE_UTIL_CLASSNAME = "javax.persistence.PersistenceUtil"; /** Class to instantiate in case JPA 2 is on the classpath. */ private static final String JPA_AWARE_TRAVERSABLE_RESOLVER_CLASSNAME = - "org.apache.bval.jsr.resolver.JPATraversableResolver"; - + "org.apache.bval.jsr.resolver.JPATraversableResolver"; private TraversableResolver jpaTR; @@ -55,22 +53,20 @@ public class DefaultTraversableResolver implements TraversableResolver, CachingR * {@inheritDoc} */ @Override - public boolean isReachable(Object traversableObject, Path.Node traversableProperty, - Class<?> rootBeanType, Path pathToTraversableObject, - ElementType elementType) { - return jpaTR == null || jpaTR.isReachable(traversableObject, traversableProperty, - rootBeanType, pathToTraversableObject, elementType); + public boolean isReachable(Object traversableObject, Path.Node traversableProperty, Class<?> rootBeanType, + Path pathToTraversableObject, ElementType elementType) { + return jpaTR == null || jpaTR.isReachable(traversableObject, traversableProperty, rootBeanType, + pathToTraversableObject, elementType); } /** * {@inheritDoc} */ @Override - public boolean isCascadable(Object traversableObject, Path.Node traversableProperty, - Class<?> rootBeanType, Path pathToTraversableObject, - ElementType elementType) { - return jpaTR == null || jpaTR.isCascadable(traversableObject, traversableProperty, - rootBeanType, pathToTraversableObject, elementType); + public boolean isCascadable(Object traversableObject, Path.Node traversableProperty, Class<?> rootBeanType, + Path pathToTraversableObject, ElementType elementType) { + return jpaTR == null || jpaTR.isCascadable(traversableObject, traversableProperty, rootBeanType, + pathToTraversableObject, elementType); } /** Tries to load detect and load JPA. */ @@ -83,19 +79,27 @@ public class DefaultTraversableResolver implements TraversableResolver, CachingR log.log(Level.FINEST, String.format("Found %s on classpath.", PERSISTENCE_UTIL_CLASSNAME)); } } catch (final Exception e) { - log.log(Level.FINEST, String.format("Cannot find %s on classpath. All properties will per default be traversable.", PERSISTENCE_UTIL_CLASSNAME)); + log.log(Level.FINEST, + String.format("Cannot find %s on classpath. All properties will per default be traversable.", + PERSISTENCE_UTIL_CLASSNAME)); return; } try { Class<? extends TraversableResolver> jpaAwareResolverClass = - (Class<? extends TraversableResolver>) Reflection.toClass(JPA_AWARE_TRAVERSABLE_RESOLVER_CLASSNAME, classLoader); + (Class<? extends TraversableResolver>) Reflection.toClass(JPA_AWARE_TRAVERSABLE_RESOLVER_CLASSNAME, + classLoader); jpaTR = jpaAwareResolverClass.newInstance(); if (LOG_FINEST) { - log.log(Level.FINEST, String.format("Instantiated an instance of %s.", JPA_AWARE_TRAVERSABLE_RESOLVER_CLASSNAME)); + log.log(Level.FINEST, + String.format("Instantiated an instance of %s.", JPA_AWARE_TRAVERSABLE_RESOLVER_CLASSNAME)); } } catch (final Exception e) { - log.log(Level.WARNING, String.format("Unable to load or instantiate JPA aware resolver %s. All properties will per default be traversable.", JPA_AWARE_TRAVERSABLE_RESOLVER_CLASSNAME), e); + log.log(Level.WARNING, + String.format( + "Unable to load or instantiate JPA aware resolver %s. All properties will per default be traversable.", + JPA_AWARE_TRAVERSABLE_RESOLVER_CLASSNAME), + e); } } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/JPATraversableResolver.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/JPATraversableResolver.java b/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/JPATraversableResolver.java index 1bae8b0..ecc0078 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/JPATraversableResolver.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/JPATraversableResolver.java @@ -21,7 +21,6 @@ import javax.validation.Path; import javax.validation.TraversableResolver; import java.lang.annotation.ElementType; - /** @see javax.validation.TraversableResolver */ public class JPATraversableResolver implements TraversableResolver, CachingRelevant { @@ -29,20 +28,18 @@ public class JPATraversableResolver implements TraversableResolver, CachingRelev * {@inheritDoc} */ @Override - public boolean isReachable(Object traversableObject, Path.Node traversableProperty, - Class<?> rootBeanType, Path pathToTraversableObject, - ElementType elementType) { - return traversableObject == null || Persistence.getPersistenceUtil() - .isLoaded(traversableObject, traversableProperty.getName()); + public boolean isReachable(Object traversableObject, Path.Node traversableProperty, Class<?> rootBeanType, + Path pathToTraversableObject, ElementType elementType) { + return traversableObject == null + || Persistence.getPersistenceUtil().isLoaded(traversableObject, traversableProperty.getName()); } /** * {@inheritDoc} */ @Override - public boolean isCascadable(Object traversableObject, Path.Node traversableProperty, - Class<?> rootBeanType, Path pathToTraversableObject, - ElementType elementType) { + public boolean isCascadable(Object traversableObject, Path.Node traversableProperty, Class<?> rootBeanType, + Path pathToTraversableObject, ElementType elementType) { return true; } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/SimpleTraversableResolver.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/SimpleTraversableResolver.java b/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/SimpleTraversableResolver.java index 4896552..316b2be 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/SimpleTraversableResolver.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/SimpleTraversableResolver.java @@ -31,9 +31,8 @@ public class SimpleTraversableResolver implements TraversableResolver, CachingRe * @return <code>true</code> */ @Override - public boolean isReachable(Object traversableObject, Path.Node traversableProperty, - Class<?> rootBeanType, Path pathToTraversableObject, - java.lang.annotation.ElementType elementType) { + public boolean isReachable(Object traversableObject, Path.Node traversableProperty, Class<?> rootBeanType, + Path pathToTraversableObject, java.lang.annotation.ElementType elementType) { return true; } @@ -42,9 +41,8 @@ public class SimpleTraversableResolver implements TraversableResolver, CachingRe * @return <code>true</code> */ @Override - public boolean isCascadable(Object traversableObject, Path.Node traversableProperty, - Class<?> rootBeanType, Path pathToTraversableObject, - ElementType elementType) { + public boolean isCascadable(Object traversableObject, Path.Node traversableProperty, Class<?> rootBeanType, + Path pathToTraversableObject, ElementType elementType) { return true; } @@ -54,6 +52,6 @@ public class SimpleTraversableResolver implements TraversableResolver, CachingRe */ @Override public boolean needsCaching() { - return false; // no + return false; // no } } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/util/IOs.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/IOs.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/IOs.java index 281e82b..611a9d6 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/IOs.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/IOs.java @@ -38,17 +38,17 @@ public class IOs { /*if (stream.markSupported()) { return stream; } else {*/ - try { - final ByteArrayOutputStream baos = new ByteArrayOutputStream(); - final byte[] buffer = new byte[1024]; - int length; - while ((length = stream.read(buffer)) != -1) { - baos.write(buffer, 0, length); - } - return new ByteArrayInputStream(baos.toByteArray()); - } catch (final IOException e) { - throw new RuntimeException(e); + try { + final ByteArrayOutputStream baos = new ByteArrayOutputStream(); + final byte[] buffer = new byte[1024]; + int length; + while ((length = stream.read(buffer)) != -1) { + baos.write(buffer, 0, length); } + return new ByteArrayInputStream(baos.toByteArray()); + } catch (final IOException e) { + throw new RuntimeException(e); + } /*}*/ } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/util/LeafNodeBuilderCustomizableContextImpl.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/LeafNodeBuilderCustomizableContextImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/LeafNodeBuilderCustomizableContextImpl.java index dc66e4c..fd66c86 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/LeafNodeBuilderCustomizableContextImpl.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/LeafNodeBuilderCustomizableContextImpl.java @@ -23,13 +23,15 @@ import org.apache.bval.jsr.ConstraintValidatorContextImpl; import javax.validation.ConstraintValidatorContext; import javax.validation.ElementKind; -public class LeafNodeBuilderCustomizableContextImpl implements ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderCustomizableContext { +public class LeafNodeBuilderCustomizableContextImpl + implements ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderCustomizableContext { private final ConstraintValidatorContextImpl context; private final PathImpl path; private final String template; private final NodeImpl node; - public LeafNodeBuilderCustomizableContextImpl(final ConstraintValidatorContextImpl parent, String messageTemplate, PathImpl propertyPath) { + public LeafNodeBuilderCustomizableContextImpl(final ConstraintValidatorContextImpl parent, String messageTemplate, + PathImpl propertyPath) { context = parent; template = messageTemplate; path = propertyPath; @@ -49,7 +51,8 @@ public class LeafNodeBuilderCustomizableContextImpl implements ConstraintValidat return context; } - private class LeafNodeContextBuilderImpl implements ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeContextBuilder { + private class LeafNodeContextBuilderImpl + implements ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeContextBuilder { @Override public ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderDefinedContext atKey(Object key) { path.getLeafNode().setKey(key); @@ -57,7 +60,8 @@ public class LeafNodeBuilderCustomizableContextImpl implements ConstraintValidat } @Override - public ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderDefinedContext atIndex(Integer index) { + public ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderDefinedContext atIndex( + Integer index) { path.getLeafNode().setIndex(index); return new LeafNodeBuilderDefinedContextImpl(context, template, path); } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/util/LeafNodeBuilderDefinedContextImpl.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/LeafNodeBuilderDefinedContextImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/LeafNodeBuilderDefinedContextImpl.java index de16703..75251fd 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/LeafNodeBuilderDefinedContextImpl.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/LeafNodeBuilderDefinedContextImpl.java @@ -22,12 +22,14 @@ import org.apache.bval.jsr.ConstraintValidatorContextImpl; import javax.validation.ConstraintValidatorContext; -public class LeafNodeBuilderDefinedContextImpl implements ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderDefinedContext { +public class LeafNodeBuilderDefinedContextImpl + implements ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderDefinedContext { private final ConstraintValidatorContextImpl context; private final String template; private final PathImpl path; - public LeafNodeBuilderDefinedContextImpl(final ConstraintValidatorContextImpl context, final String tpl, final PathImpl path) { + public LeafNodeBuilderDefinedContextImpl(final ConstraintValidatorContextImpl context, final String tpl, + final PathImpl path) { this.context = context; this.template = tpl; this.path = path; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderCustomizableContextImpl.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderCustomizableContextImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderCustomizableContextImpl.java index 72b53b1..1d33eb2 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderCustomizableContextImpl.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderCustomizableContextImpl.java @@ -18,7 +18,6 @@ */ package org.apache.bval.jsr.util; - import org.apache.bval.jsr.ConstraintValidatorContextImpl; import javax.validation.ConstraintValidatorContext; @@ -28,7 +27,7 @@ import javax.validation.ElementKind; * Description: implementation of {@link javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext}.<br/> */ final class NodeBuilderCustomizableContextImpl - implements ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext { + implements ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext { private final ConstraintValidatorContextImpl parent; private final String messageTemplate; private final PathImpl propertyPath; @@ -41,8 +40,8 @@ final class NodeBuilderCustomizableContextImpl * @param path * @param name */ - NodeBuilderCustomizableContextImpl(ConstraintValidatorContextImpl contextImpl, String template, - PathImpl path, String name) { + NodeBuilderCustomizableContextImpl(ConstraintValidatorContextImpl contextImpl, String template, PathImpl path, + String name) { parent = contextImpl; messageTemplate = template; propertyPath = path; @@ -71,7 +70,8 @@ final class NodeBuilderCustomizableContextImpl } @Override - public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext addPropertyNode(String name) { + public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext addPropertyNode( + String name) { propertyPath.addNode(node); node = new NodeImpl.PropertyNodeImpl(name); node.setKind(ElementKind.PROPERTY); @@ -96,5 +96,5 @@ final class NodeBuilderCustomizableContextImpl parent.addError(messageTemplate, propertyPath); return parent; } - + } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderDefinedContextImpl.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderDefinedContextImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderDefinedContextImpl.java index 3e1622a..7a4d131 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderDefinedContextImpl.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderDefinedContextImpl.java @@ -18,7 +18,6 @@ */ package org.apache.bval.jsr.util; - import org.apache.bval.jsr.ConstraintValidatorContextImpl; import javax.validation.ConstraintValidatorContext; @@ -28,7 +27,7 @@ import javax.validation.ElementKind; * Description: Implementation of {@link NodeBuilderDefinedContext}.<br/> */ public final class NodeBuilderDefinedContextImpl - implements ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderDefinedContext { + implements ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderDefinedContext { private final ConstraintValidatorContextImpl parent; private final String messageTemplate; private final PathImpl propertyPath; @@ -39,8 +38,7 @@ public final class NodeBuilderDefinedContextImpl * @param template * @param path */ - public NodeBuilderDefinedContextImpl(ConstraintValidatorContextImpl contextImpl, String template, - PathImpl path) { + public NodeBuilderDefinedContextImpl(ConstraintValidatorContextImpl contextImpl, String template, PathImpl path) { parent = contextImpl; messageTemplate = template; propertyPath = path; @@ -56,7 +54,8 @@ public final class NodeBuilderDefinedContextImpl } @Override - public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext addPropertyNode(String name) { + public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext addPropertyNode( + String name) { return new NodeBuilderCustomizableContextImpl(parent, messageTemplate, propertyPath, name); } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeContextBuilderImpl.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeContextBuilderImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeContextBuilderImpl.java index 2a50eff..1e0d6d4 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeContextBuilderImpl.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeContextBuilderImpl.java @@ -18,7 +18,6 @@ */ package org.apache.bval.jsr.util; - import org.apache.bval.jsr.ConstraintValidatorContextImpl; import javax.validation.ConstraintValidatorContext; @@ -27,8 +26,7 @@ import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.No /** * Description: Implementation of {@link NodeContextBuilder}.<br/> */ -final class NodeContextBuilderImpl - implements ConstraintValidatorContext.ConstraintViolationBuilder.NodeContextBuilder { +final class NodeContextBuilderImpl implements ConstraintValidatorContext.ConstraintViolationBuilder.NodeContextBuilder { private final ConstraintValidatorContextImpl parent; private final String messageTemplate; private final PathImpl propertyPath; @@ -42,8 +40,7 @@ final class NodeContextBuilderImpl * @param template * @param path */ - NodeContextBuilderImpl(ConstraintValidatorContextImpl contextImpl, - String template, PathImpl path, NodeImpl node) { + NodeContextBuilderImpl(ConstraintValidatorContextImpl contextImpl, String template, PathImpl path, NodeImpl node) { parent = contextImpl; messageTemplate = template; propertyPath = path; @@ -54,8 +51,7 @@ final class NodeContextBuilderImpl * {@inheritDoc} */ @Override - public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderDefinedContext atKey( - Object key) { + public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderDefinedContext atKey(Object key) { node.setKey(key); propertyPath.addNode(node); return new NodeBuilderDefinedContextImpl(parent, messageTemplate, propertyPath); @@ -65,8 +61,7 @@ final class NodeContextBuilderImpl * {@inheritDoc} */ @Override - public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderDefinedContext atIndex( - Integer index) { + public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderDefinedContext atIndex(Integer index) { node.setIndex(index); propertyPath.addNode(node); return new NodeBuilderDefinedContextImpl(parent, messageTemplate, propertyPath); @@ -76,14 +71,14 @@ final class NodeContextBuilderImpl * {@inheritDoc} */ @Override - public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext addNode( - String name) { + 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) { + public ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext addPropertyNode( + String name) { propertyPath.addProperty(name); return new NodeBuilderCustomizableContextImpl(parent, messageTemplate, propertyPath, node.getName()); } @@ -102,5 +97,5 @@ final class NodeContextBuilderImpl parent.addError(messageTemplate, propertyPath); return parent; } - + } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeImpl.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeImpl.java index 770b791..5a08f0e 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeImpl.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeImpl.java @@ -90,7 +90,7 @@ public class NodeImpl implements Path.Node, Serializable { * Create a new NodeImpl instance. * @param name */ - public NodeImpl(String name) { + public NodeImpl(String name) { this.name = name; } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathNavigation.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathNavigation.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathNavigation.java index 1975301..5a657fe 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathNavigation.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathNavigation.java @@ -129,14 +129,16 @@ public class PathNavigation { break; case '.': if (sep) { - throw new IllegalStateException(String.format("Position %s: expected property, index/key, or end of expression", here)); + throw new IllegalStateException( + String.format("Position %s: expected property, index/key, or end of expression", here)); } sep = true; pos.next(); // fall through: default: if (!sep) { - throw new IllegalStateException(String.format("Position %s: expected property path separator, index/key, or end of expression", here)); + throw new IllegalStateException(String.format( + "Position %s: expected property path separator, index/key, or end of expression", here)); } pos.handleProperty(parseProperty(path, pos)); } @@ -227,9 +229,9 @@ public class PathNavigation { pos.plus(Character.charCount(Character.codePointAt(path, pos.getIndex()))); } } - } - catch (Exception e) { - throw new RuntimeException("Java escaping in quotes is only supported with Apache commons-lang3 on the classpath!"); + } catch (Exception e) { + throw new RuntimeException( + "Java escaping in quotes is only supported with Apache commons-lang3 on the classpath!"); } } // if reached, reset due to no ending quote found @@ -318,7 +320,7 @@ public class PathNavigation { public boolean equals(Object obj) { return super.equals(obj); } - + /** * {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/util/Proxies.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/Proxies.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/Proxies.java index 6b83035..1fa033c 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/Proxies.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/Proxies.java @@ -28,7 +28,7 @@ public final class Proxies { static { final Set<String> s = new HashSet<String>(); s.add("org.jboss.weld.bean.proxy.ProxyObject"); - KNOWN_PROXY_CLASSNAMES = Collections.unmodifiableSet(s); + KNOWN_PROXY_CLASSNAMES = Collections.unmodifiableSet(s); } // get rid of proxies which probably contains wrong annotation metamodel http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/util/ValidationContextTraversal.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/ValidationContextTraversal.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/ValidationContextTraversal.java index 27b1ca8..f6e19c0 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/ValidationContextTraversal.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/ValidationContextTraversal.java @@ -165,11 +165,11 @@ public class ValidationContextTraversal extends CallbackProcedure { MetaProperty mp = validationContext.getMetaProperty(); if (mp != null) { if (mp.getMetaBean() == null) { - throw new UnknownPropertyException(String.format("Property %s.%s is not cascaded", mp - .getParentMetaBean().getId(), mp.getName())); + throw new UnknownPropertyException( + String.format("Property %s.%s is not cascaded", mp.getParentMetaBean().getId(), mp.getName())); } - validationContext.moveDown(mp, new NullSafePropertyAccess(validationContext.getMetaBean().getBeanClass(), - mp.getName())); + validationContext.moveDown(mp, + new NullSafePropertyAccess(validationContext.getMetaBean().getBeanClass(), mp.getName())); } } @@ -215,8 +215,8 @@ public class ValidationContextTraversal extends CallbackProcedure { return; } if (validationContext.getMetaBean() instanceof DynamicMetaBean) { - validationContext.setMetaBean(validationContext.getMetaBean().resolveMetaBean( - ObjectUtils.defaultIfNull(validationContext.getBean(), rawType))); + validationContext.setMetaBean(validationContext.getMetaBean() + .resolveMetaBean(ObjectUtils.defaultIfNull(validationContext.getBean(), rawType))); } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/xml/AnnotationIgnores.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/AnnotationIgnores.java b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/AnnotationIgnores.java index ecd3d3f..3ac39c4 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/AnnotationIgnores.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/AnnotationIgnores.java @@ -47,11 +47,13 @@ public final class AnnotationIgnores { * <code>true</code> in the configuration * for this class. */ - private final Map<Class<?>, Map<Member, Boolean>> ignoreAnnotationOnMember = new HashMap<Class<?>, Map<Member, Boolean>>(); + private final Map<Class<?>, Map<Member, Boolean>> ignoreAnnotationOnMember = + new HashMap<Class<?>, Map<Member, Boolean>>(); private final Map<Class<?>, Boolean> ignoreAnnotationOnClass = new HashMap<Class<?>, Boolean>(); - private final Map<Class<?>, Map<Member, Map<Integer, Boolean>>> ignoreAnnotationOnParameter = new HashMap<Class<?>, Map<Member, Map<Integer, Boolean>>>(); + private final Map<Class<?>, Map<Member, Map<Integer, Boolean>>> ignoreAnnotationOnParameter = + new HashMap<Class<?>, Map<Member, Map<Integer, Boolean>>>(); private final Map<Member, Boolean> ignoreAnnotationOnReturn = new HashMap<Member, Boolean>(); private final Map<Member, Boolean> ignoreAnnotationOnCrossParameter = new HashMap<Member, Boolean>(); @@ -70,8 +72,7 @@ public final class AnnotationIgnores { * @return boolean */ public boolean getDefaultIgnoreAnnotation(Class<?> clazz) { - return ignoreAnnotationDefaults.containsKey(clazz) - && ignoreAnnotationDefaults.get(clazz); + return ignoreAnnotationDefaults.containsKey(clazz) && ignoreAnnotationDefaults.get(clazz); } /** @@ -144,7 +145,8 @@ public final class AnnotationIgnores { } else { type = "Property"; } - log.log(Level.FINEST, String.format("%s level annotations are getting ignored for %s.%s", type, clazz.getName(), member.getName())); + log.log(Level.FINEST, String.format("%s level annotations are getting ignored for %s.%s", type, clazz.getName(), + member.getName())); } /** @@ -169,7 +171,7 @@ public final class AnnotationIgnores { ignoreAnnotation = getDefaultIgnoreAnnotation(clazz); } if (ignoreAnnotation) { - log.log(Level.FINEST, String.format("Class level annotation are getting ignored for %s", clazz.getName())); + log.log(Level.FINEST, String.format("Class level annotation are getting ignored for %s", clazz.getName())); } return ignoreAnnotation; } http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/xml/AnnotationProxy.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/AnnotationProxy.java b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/AnnotationProxy.java index af59c98..77aed70 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/AnnotationProxy.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/AnnotationProxy.java @@ -64,8 +64,7 @@ class AnnotationProxy implements Annotation, InvocationHandler, Serializable { throw new IllegalArgumentException("No value provided for " + m.getName()); } } - if (processedValuesFromDescriptor != descriptor.size() - && !Valid.class.equals(annotationType)) { + if (processedValuesFromDescriptor != descriptor.size() && !Valid.class.equals(annotationType)) { throw new RuntimeException("Trying to instanciate " + annotationType + " with unknown paramters."); } return result; http://git-wip-us.apache.org/repos/asf/bval/blob/8d2d29aa/bval-jsr/src/main/java/org/apache/bval/jsr/xml/MetaConstraint.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/MetaConstraint.java b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/MetaConstraint.java index 78f9c76..1826a55 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/MetaConstraint.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/MetaConstraint.java @@ -16,7 +16,6 @@ */ package org.apache.bval.jsr.xml; - import org.apache.bval.ConstructorAccess; import org.apache.bval.util.AccessStrategy; import org.apache.bval.util.FieldAccess;
