You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bval.apache.org by rm...@apache.org on 2013/08/26 15:59:20 UTC
svn commit: r1517540 [4/15] - in /bval/branches/bval-11/bval-jsr: ./ src/
src/main/ src/main/appended-resources/
src/main/appended-resources/META-INF/ src/main/java/ src/main/java/org/
src/main/java/org/apache/ src/main/java/org/apache/bval/ src/main/j...
Added: bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/AppendValidationToList.java
URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/AppendValidationToList.java?rev=1517540&view=auto
==============================================================================
--- bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/AppendValidationToList.java (added)
+++ bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/AppendValidationToList.java Mon Aug 26 13:59:15 2013
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.bval.jsr;
+
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Description: {@link org.apache.bval.jsr.AppendValidation} implementation that acts as an intermediate
+ * cache of validations for further processing.<br/>
+ */
+public class AppendValidationToList extends BaseAppendValidation {
+ private final List<ConstraintValidation<?>> validations = new ArrayList<ConstraintValidation<?>>();
+
+ /**
+ * Create a new AppendValidationToList instance.
+ */
+ public AppendValidationToList() {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public <T extends Annotation> void performAppend(ConstraintValidation<T> validation) {
+ validations.add(validation);
+ }
+
+ /**
+ * Get the list of cached validations.
+ * @return {@link java.util.List} of {@link org.apache.bval.jsr.ConstraintValidation}
+ */
+ public List<ConstraintValidation<?>> getValidations() {
+ return validations;
+ }
+}
Added: bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/AppendValidationToMeta.java
URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/AppendValidationToMeta.java?rev=1517540&view=auto
==============================================================================
--- bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/AppendValidationToMeta.java (added)
+++ bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/AppendValidationToMeta.java Mon Aug 26 13:59:15 2013
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.bval.jsr;
+
+import org.apache.bval.model.FeaturesCapable;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * Description: adapt any {@link FeaturesCapable} from the core meta-model to the {@link AppendValidation} interface.<br/>
+ */
+public class AppendValidationToMeta extends BaseAppendValidation {
+ private final FeaturesCapable feature;
+
+ /**
+ * Create a new AppendValidationToMeta instance.
+ * @param meta
+ */
+ public AppendValidationToMeta(FeaturesCapable meta) {
+ this.feature = meta;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public <T extends Annotation> void performAppend(ConstraintValidation<T> validation) {
+ feature.addValidation(validation);
+ }
+}
Added: bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/BaseAppendValidation.java
URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/BaseAppendValidation.java?rev=1517540&view=auto
==============================================================================
--- bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/BaseAppendValidation.java (added)
+++ bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/BaseAppendValidation.java Mon Aug 26 13:59:15 2013
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.bval.jsr;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * Abstract base validation appender that initializes the
+ * {@link ConstraintValidation#getValidator()} on post-processing.
+ *
+ * @author Carlos Vara
+ */
+public abstract class BaseAppendValidation implements AppendValidation {
+
+ /**
+ * {@inheritDoc}
+ *
+ * Append operation divided in 3 stages: pre & post processing and the
+ * "real" append process.
+ */
+ public final <T extends Annotation> void append(final ConstraintValidation<T> validation) {
+ preProcessValidation(validation);
+ performAppend(validation);
+ postProcessValidation(validation);
+ }
+
+ /**
+ * Performs the actual "appending" operation to the underlying data
+ * structure that holds the validations. Implementations shouldn't try to do
+ * more than that in this step.
+ *
+ * @param <T>
+ * The type of the validation.
+ * @param validation
+ * The validation to be appended.
+ */
+ public abstract <T extends Annotation> void performAppend(final ConstraintValidation<T> validation);
+
+ /**
+ * Pre-process the validation before appending it.
+ *
+ * @param <T>
+ * The type of the validation.
+ * @param validation
+ * The validation to be appended.
+ */
+ public <T extends Annotation> void preProcessValidation(final ConstraintValidation<T> validation) {
+ // No generic pre-processing
+ }
+
+ /**
+ * Post-process the validation once it postProcessValidationhas been appended.
+ *
+ * @param <T>
+ * The type of the validation.
+ * @param validation
+ * The validation to be appended.
+ */
+ public <T extends Annotation> void postProcessValidation(final ConstraintValidation<T> validation) {
+ // done lazily to ensure CDI is available
+ // validation.initialize();
+ }
+
+}
Added: bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/BeanDescriptorImpl.java
URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/BeanDescriptorImpl.java?rev=1517540&view=auto
==============================================================================
--- bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/BeanDescriptorImpl.java (added)
+++ bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/BeanDescriptorImpl.java Mon Aug 26 13:59:15 2013
@@ -0,0 +1,849 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.bval.jsr;
+
+import org.apache.bval.Validate;
+import org.apache.bval.jsr.groups.Group;
+import org.apache.bval.jsr.groups.GroupConversionDescriptorImpl;
+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.MetaBean;
+import org.apache.bval.model.MetaConstructor;
+import org.apache.bval.model.MetaMethod;
+import org.apache.bval.model.MetaParameter;
+import org.apache.bval.model.MetaProperty;
+import org.apache.bval.model.Validation;
+import org.apache.bval.util.AccessStrategy;
+import org.apache.bval.util.reflection.Reflection;
+import org.apache.commons.lang3.ClassUtils;
+
+import javax.validation.Constraint;
+import javax.validation.ConstraintDeclarationException;
+import javax.validation.ConstraintTarget;
+import javax.validation.Valid;
+import javax.validation.groups.ConvertGroup;
+import javax.validation.metadata.BeanDescriptor;
+import javax.validation.metadata.ConstraintDescriptor;
+import javax.validation.metadata.ConstructorDescriptor;
+import javax.validation.metadata.ExecutableDescriptor;
+import javax.validation.metadata.GroupConversionDescriptor;
+import javax.validation.metadata.MethodDescriptor;
+import javax.validation.metadata.MethodType;
+import javax.validation.metadata.ParameterDescriptor;
+import javax.validation.metadata.PropertyDescriptor;
+import javax.validation.metadata.ReturnValueDescriptor;
+import java.beans.Introspector;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+/**
+ * Description: Implements {@link BeanDescriptor}.<br/>
+ */
+public class BeanDescriptorImpl extends ElementDescriptorImpl implements BeanDescriptor {
+ private static final CopyOnWriteArraySet<ConstraintValidation<?>> NO_CONSTRAINTS = new CopyOnWriteArraySet<ConstraintValidation<?>>();
+ private static final Validation[] EMPTY_VALIDATION = new Validation[0];
+
+ /**
+ * The {@link ApacheFactoryContext} (not) used by this
+ * {@link BeanDescriptorImpl}
+ */
+ private final Set<ConstructorDescriptor> constrainedConstructors;
+ private final Set<MethodDescriptor> containedMethods;
+ private final ExecutableMeta meta;
+ private final Boolean isBeanConstrained;
+ private final Set<PropertyDescriptor> validatedProperties;
+
+ protected BeanDescriptorImpl(final ApacheFactoryContext factoryContext, final MetaBean metaBean) {
+ super(metaBean, metaBean.getBeanClass(), metaBean.getValidations());
+
+ Set<PropertyDescriptor> procedureDescriptors = metaBean.getFeature(JsrFeatures.Bean.PROPERTIES);
+ if (procedureDescriptors == null) {
+ procedureDescriptors = new HashSet<PropertyDescriptor>();
+ for (final MetaProperty prop : metaBean.getProperties()) {
+ if (prop.getValidations().length > 0
+ || (prop.getMetaBean() != null || prop.getFeature(Features.Property.REF_CASCADE) != null)) {
+ procedureDescriptors.add(getPropertyDescriptor(prop));
+ }
+ }
+ procedureDescriptors = metaBean.initFeature(JsrFeatures.Bean.PROPERTIES, procedureDescriptors);
+ }
+
+ ExecutableMeta executables = metaBean.getFeature(JsrFeatures.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);
+ }
+
+ validatedProperties = Collections.unmodifiableSet(procedureDescriptors);
+ meta = executables;
+ isBeanConstrained = meta.isBeanConstrained;
+ containedMethods = toConstrained(meta.methodConstraints.values());
+ constrainedConstructors = toConstrained(meta.contructorConstraints.values());
+ }
+
+ private static void addGroupConvertion(final MetaProperty prop, final PropertyDescriptorImpl edesc) {
+ boolean fieldFound = false;
+ boolean methodFound = false;
+ Class<?> current = prop.getParentMetaBean().getBeanClass();
+ while (current != null && current != Object.class && (!methodFound || !fieldFound)) {
+ if (!fieldFound) {
+ final Field field = Reflection.INSTANCE.getDeclaredField(current, prop.getName());
+ if (field != null) {
+ processConvertGroup(edesc, field);
+ fieldFound = true;
+ }
+ }
+
+ if (!methodFound) {
+ final String name = Character.toUpperCase(prop.getName().charAt(0)) + prop.getName().substring(1);
+ Method m = Reflection.INSTANCE.getDeclaredMethod(current, "get" + name);
+ if (m != null) {
+ processConvertGroup(edesc, m);
+ methodFound = true;
+ } else {
+ m = Reflection.INSTANCE.getDeclaredMethod(current, "is" + name);
+ if (m != null) {
+ processConvertGroup(edesc, m);
+ methodFound = true;
+ }
+ }
+ }
+
+ current = current.getSuperclass();
+ }
+
+ final Collection<Annotation> annotations = prop.getFeature(JsrFeatures.Property.ANNOTATIONS_TO_PROCESS);
+ if (annotations != null) {
+ for (final Annotation a : annotations) {
+ if (ConvertGroup.List.class.isInstance(a)) {
+ for (final ConvertGroup convertGroup : ConvertGroup.List.class.cast(a).value()) {
+ edesc.addGroupConversion(new GroupConversionDescriptorImpl(new Group(convertGroup.from()), new Group(convertGroup.to())));
+ }
+ }
+
+ if (ConvertGroup.class.isInstance(a)) {
+ final ConvertGroup convertGroup = ConvertGroup.class.cast(a);
+ edesc.addGroupConversion(new GroupConversionDescriptorImpl(new Group(convertGroup.from()), new Group(convertGroup.to())));
+ }
+ }
+ annotations.clear();
+ }
+
+ if (!edesc.getGroupConversions().isEmpty() && !edesc.isCascaded()) {
+ throw new ConstraintDeclarationException("@Valid is needed for group conversion");
+ }
+ }
+
+ private static void processConvertGroup(final ElementDescriptorImpl edesc, final AccessibleObject accessible) {
+ final ConvertGroup.List convertGroupList = accessible.getAnnotation(ConvertGroup.List.class);
+ if (convertGroupList != null) {
+ for (final ConvertGroup convertGroup : convertGroupList.value()) {
+ edesc.addGroupConversion(new GroupConversionDescriptorImpl(new Group(convertGroup.from()), new Group(convertGroup.to())));
+ }
+ }
+
+ final ConvertGroup convertGroup = accessible.getAnnotation(ConvertGroup.class);
+ if (convertGroup != null) {
+ edesc.addGroupConversion(new GroupConversionDescriptorImpl(new Group(convertGroup.from()), new Group(convertGroup.to())));
+ }
+ }
+
+ /**
+ * Returns true if the bean involves validation:
+ * <ul>
+ * <li>a constraint is hosted on the bean itself</li>
+ * <li>a constraint is hosted on one of the bean properties, OR</li>
+ * <li>a bean property is marked for cascade (<code>@Valid</code>)</li>
+ * </ul>
+ *
+ * @return true if the bean involves validation
+ */
+ public boolean isBeanConstrained() {
+ return isBeanConstrained;
+ }
+
+ /**
+ * Return the property level constraints for a given propertyName or {@code null} if
+ * either the property does not exist or has no constraint. The returned
+ * object (and associated objects including ConstraintDescriptors) are
+ * immutable.
+ *
+ * @param propertyName property evaluated
+ */
+ public PropertyDescriptor getConstraintsForProperty(String propertyName) {
+ if (propertyName == null || propertyName.trim().length() == 0) {
+ throw new IllegalArgumentException("propertyName cannot be null or empty");
+ }
+ MetaProperty prop = metaBean.getProperty(propertyName);
+ if (prop == null)
+ return null;
+ // If no constraints and not cascaded, return null
+ if (prop.getValidations().length == 0 && prop.getFeature(Features.Property.REF_CASCADE) == null) {
+ return null;
+ }
+ return getPropertyDescriptor(prop);
+ }
+
+ private PropertyDescriptor getPropertyDescriptor(final MetaProperty prop) {
+ PropertyDescriptorImpl edesc = prop.getFeature(JsrFeatures.Property.PropertyDescriptor);
+ if (edesc == null) {
+ edesc = new PropertyDescriptorImpl(prop);
+ addGroupConvertion(prop, edesc);
+ prop.putFeature(JsrFeatures.Property.PropertyDescriptor, edesc);
+ }
+ return edesc;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @return the property descriptors having at least a constraint defined
+ */
+ public Set<PropertyDescriptor> getConstrainedProperties() {
+ return Collections.unmodifiableSet(validatedProperties);
+ }
+
+ public MethodDescriptor getConstraintsForMethod(final String methodName, final Class<?>... parameterTypes) {
+ if (methodName == null) {
+ throw new IllegalArgumentException("Method name can't be null");
+ }
+ final MethodDescriptor methodDescriptor = meta.methodConstraints.get(methodName + Arrays.toString(parameterTypes));
+ if (methodDescriptor != null && (methodDescriptor.hasConstrainedParameters() || methodDescriptor.hasConstrainedReturnValue())) {
+ return methodDescriptor;
+ }
+ return null;
+ }
+
+ public Set<MethodDescriptor> getConstrainedMethods(MethodType methodType, MethodType... methodTypes) {
+ final Set<MethodDescriptor> desc = new HashSet<MethodDescriptor>();
+ desc.addAll(filter(containedMethods, methodType));
+ if (methodTypes != null) {
+ for (final MethodType type : methodTypes) {
+ desc.addAll(filter(containedMethods, type));
+ }
+ }
+ return desc;
+ }
+
+ private static Collection<MethodDescriptor> filter(final Set<MethodDescriptor> containedMethods, final MethodType type) {
+ final Collection<MethodDescriptor> list = new ArrayList<MethodDescriptor>();
+ for (final MethodDescriptor d : containedMethods) {
+ final boolean getter = d.getName().startsWith("get") && d.getParameterDescriptors().isEmpty();
+
+ switch (type) {
+ case GETTER:
+ if (getter) {
+ list.add(d);
+ }
+ break;
+
+ case NON_GETTER:
+ if (!getter) {
+ list.add(d);
+ }
+ }
+ }
+ return list;
+ }
+
+ public ConstructorDescriptor getConstraintsForConstructor(final Class<?>... parameterTypes) {
+ final ConstructorDescriptor descriptor = meta.contructorConstraints.get(Arrays.toString(parameterTypes));
+ if (descriptor != null && (descriptor.hasConstrainedParameters() || descriptor.hasConstrainedReturnValue())) {
+ return descriptor;
+ }
+
+ return null;
+ }
+
+ public Set<ConstructorDescriptor> getConstrainedConstructors() {
+ return constrainedConstructors;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toString() {
+ return "BeanDescriptorImpl{" + "returnType=" + elementClass + '}';
+ }
+
+ private static <A extends ExecutableDescriptor> Set<A> toConstrained(final Collection<A> src) {
+ final Set<A> dest = new HashSet<A>();
+ for (final A d : src) {
+ if (d.hasConstrainedParameters() || d.hasConstrainedReturnValue()) {
+ dest.add(d);
+ }
+ }
+ return Collections.unmodifiableSet(dest);
+ }
+
+ private static class ExecutableMeta {
+ private final ApacheFactoryContext factoryContext;
+ private final AnnotationProcessor annotationProcessor;
+ private final MetaBean metaBean;
+ private final Map<String, MethodDescriptor> methodConstraints = new HashMap<String, MethodDescriptor>();
+ private final Map<String, ConstructorDescriptor> contructorConstraints = new HashMap<String, ConstructorDescriptor>();
+ private Boolean isBeanConstrained = null;
+
+ private ExecutableMeta(final ApacheFactoryContext factoryContext, final MetaBean metaBean1, final Collection<ConstraintDescriptor<?>> constraintDescriptors) {
+ this.metaBean = metaBean1;
+ this.factoryContext = factoryContext;
+ this.annotationProcessor = new AnnotationProcessor(factoryContext);
+
+ buildExecutableDescriptors();
+
+ boolean hasAnyContraints;
+ if (!constraintDescriptors.isEmpty()) {
+ hasAnyContraints = true;
+ } else {
+ hasAnyContraints = false;
+ for (final MetaProperty mprop : metaBean.getProperties()) {
+ if (getConstraintDescriptors(mprop.getValidations()).size() > 0) {
+ hasAnyContraints = true;
+ break;
+ }
+ }
+ }
+
+ // cache isBeanConstrained
+ if (hasAnyContraints) {
+ isBeanConstrained = true;
+ } else {
+ isBeanConstrained = false;
+ for (final MetaProperty mprop : metaBean.getProperties()) {
+ if (mprop.getMetaBean() != null || mprop.getFeature(Features.Property.REF_CASCADE) != null) {
+ isBeanConstrained = true;
+ break;
+ }
+ }
+ }
+ }
+
+ private void buildConstructorConstraints() throws InvocationTargetException, IllegalAccessException {
+ for (final Constructor<?> cons : Reflection.INSTANCE.getDeclaredConstructors(metaBean.getBeanClass())) {
+ final ConstructorDescriptorImpl consDesc = new ConstructorDescriptorImpl(metaBean, EMPTY_VALIDATION);
+ contructorConstraints.put(Arrays.toString(cons.getParameterTypes()), consDesc);
+
+ final List<String> names = factoryContext.getParameterNameProvider().getParameterNames(cons);
+ final boolean isInnerClass = cons.getDeclaringClass().getEnclosingClass() != null && !Modifier.isStatic(cons.getDeclaringClass().getModifiers());
+
+ final AnnotationIgnores annotationIgnores = factoryContext.getFactory().getAnnotationIgnores();
+
+ {
+ final Annotation[][] paramsAnnos = cons.getParameterAnnotations();
+
+ int idx = 0;
+ if (isInnerClass) { // paramsAnnos.length = parameterTypes.length - 1 in this case
+ final ParameterDescriptorImpl paramDesc = new ParameterDescriptorImpl(metaBean, EMPTY_VALIDATION, names.get(idx));
+ consDesc.getParameterDescriptors().add(paramDesc);
+ idx++;
+ }
+
+ for (final Annotation[] paramAnnos : paramsAnnos) {
+ if (annotationIgnores.isIgnoreAnnotationOnParameter(cons, idx)) {
+ consDesc.getParameterDescriptors().add(new ParameterDescriptorImpl(metaBean, EMPTY_VALIDATION, names.get(idx)));
+ } else if (cons.getParameterTypes().length > idx) {
+ ParameterAccess access = new ParameterAccess(cons.getParameterTypes()[idx], idx);
+ consDesc.addValidations(processAnnotations(consDesc, paramAnnos, access, idx, names.get(idx)).getValidations());
+ } // else anonymous class so that's fine
+ idx++;
+ }
+
+ if (!annotationIgnores.isIgnoreAnnotations(cons)) {
+ for (final Annotation anno : cons.getAnnotations()) {
+ if (!Valid.class.isInstance(anno)) {
+ processAnnotations(null, consDesc, cons.getDeclaringClass(), anno);
+ } else {
+ consDesc.setCascaded(true);
+ }
+ }
+ }
+ }
+
+ if (annotationIgnores.isIgnoreAnnotationOnCrossParameter(cons) && consDesc.getCrossParameterDescriptor() != null) {
+ consDesc.setCrossParameterDescriptor(null);
+ }
+ if (annotationIgnores.isIgnoreAnnotationOnReturn(cons) && consDesc.getReturnValueDescriptor() != null) {
+ consDesc.setReturnValueDescriptor(null);
+ }
+
+ final MetaConstructor metaConstructor = metaBean.getConstructor(cons);
+ if (metaConstructor != null) {
+ for (final Annotation anno : metaConstructor.getAnnotations()) {
+ if (!Valid.class.isInstance(anno)) {
+ processAnnotations(null, consDesc, cons.getDeclaringClass(), anno);
+ } else {
+ consDesc.setCascaded(true);
+ }
+ }
+
+ // parameter validations
+ final Collection<MetaParameter> paramsAnnos = metaConstructor.getParameters();
+ for (final MetaParameter paramAnnos : paramsAnnos) {
+ final int idx = paramAnnos.getIndex();
+ final ParameterAccess access = new ParameterAccess(cons.getParameterTypes()[idx], idx);
+ processAnnotations(consDesc, paramAnnos.getAnnotations(), access, idx, names.get(idx));
+ }
+ }
+
+ if (!consDesc.getGroupConversions().isEmpty() && !consDesc.isCascaded()) {
+ throw new ConstraintDeclarationException("@Valid is needed to define a group conversion");
+ }
+
+ ensureNotNullDescriptors(cons.getDeclaringClass(), consDesc);
+ }
+ }
+
+ private void ensureNotNullDescriptors(final Class<?> returnType, final InvocableElementDescriptor consDesc) {
+ // can't be null
+ if (consDesc.getCrossParameterDescriptor() == null) {
+ consDesc.setCrossParameterDescriptor(new CrossParameterDescriptorImpl(metaBean, NO_CONSTRAINTS));
+ }
+ if (consDesc.getReturnValueDescriptor() == null) {
+ consDesc.setReturnValueDescriptor(new ReturnValueDescriptorImpl(metaBean, returnType, NO_CONSTRAINTS, consDesc.isCascaded()));
+ }
+ // enforce it since ReturnValueDescriptor can be created before cascaded is set to true
+ final ReturnValueDescriptorImpl returnValueDescriptor = ReturnValueDescriptorImpl.class.cast(consDesc.getReturnValueDescriptor());
+ returnValueDescriptor.setCascaded(consDesc.isCascaded());
+ if (returnValueDescriptor.getGroupConversions().isEmpty()) {
+ // loop to not forget to map calling addGroupConversion()
+ for (final GroupConversionDescriptor c : consDesc.getGroupConversions()) {
+ returnValueDescriptor.addGroupConversion(c);
+ }
+ }
+
+ }
+
+ private void processAnnotations(final Method mtd, final InvocableElementDescriptor consDesc, final Class<?> clazz, final Annotation anno) throws InvocationTargetException, IllegalAccessException {
+ if (mtd == null || !factoryContext.getFactory().getAnnotationIgnores().isIgnoreAnnotationOnReturn(mtd)) {
+ final ReturnAccess returnAccess = new ReturnAccess(clazz);
+ final AppendValidationToList validations = new AppendValidationToList();
+ processAnnotation(anno, consDesc, returnAccess, validations);
+ final List<ConstraintValidation<?>> list = removeFromListValidationAppliesTo(validations.getValidations(), ConstraintTarget.PARAMETERS);
+ consDesc.addValidations(list);
+
+ ReturnValueDescriptorImpl returnValueDescriptor = ReturnValueDescriptorImpl.class.cast(consDesc.getReturnValueDescriptor());
+ if (consDesc.getReturnValueDescriptor() != null) {
+ returnValueDescriptor.getMutableConstraintDescriptors().addAll(list);
+ } else {
+ returnValueDescriptor = new ReturnValueDescriptorImpl(metaBean, clazz, list, consDesc.isCascaded());
+ consDesc.setReturnValueDescriptor(returnValueDescriptor);
+ }
+ }
+
+ if (mtd == null || !factoryContext.getFactory().getAnnotationIgnores().isIgnoreAnnotationOnCrossParameter(mtd)) {
+ final ParametersAccess parametersAccess = new ParametersAccess();
+ final AppendValidationToList validations = new AppendValidationToList();
+ processAnnotation(anno, consDesc, parametersAccess, validations);
+ final List<ConstraintValidation<?>> list = removeFromListValidationAppliesTo(validations.getValidations(), ConstraintTarget.RETURN_VALUE);
+ consDesc.addValidations(list);
+ if (consDesc.getCrossParameterDescriptor() != null) {
+ CrossParameterDescriptorImpl.class.cast(consDesc.getCrossParameterDescriptor()).getMutableConstraintDescriptors().addAll(list);
+ } else {
+ consDesc.setCrossParameterDescriptor(new CrossParameterDescriptorImpl(metaBean, list));
+ }
+ }
+ }
+
+ private static List<ConstraintValidation<?>> removeFromListValidationAppliesTo(final List<ConstraintValidation<?>> validations, final ConstraintTarget constraint) {
+ final Iterator<ConstraintValidation<?>> i = validations.iterator();
+ while (i.hasNext()) {
+ if (constraint.equals(i.next().getValidationAppliesTo())) {
+ i.remove();
+ }
+ }
+ return validations;
+ }
+
+ private void buildMethodConstraints() throws InvocationTargetException, IllegalAccessException {
+
+ final Class<?> current = metaBean.getBeanClass();
+ final List<Class<?>> classHierarchy = ClassHelper.fillFullClassHierarchyAsList(new ArrayList<Class<?>>(), current);
+ classHierarchy.remove(current);
+
+ for (final Method method : Reflection.INSTANCE.getDeclaredMethods(current)) {
+ if (Modifier.isStatic(method.getModifiers()) || method.isSynthetic()) {
+ continue;
+ }
+
+ final boolean getter = (method.getName().startsWith("get") || method.getName().startsWith("is")) && method.getParameterTypes().length == 0 && method.getReturnType() != Void.TYPE;
+
+ final String key = method.getName() + Arrays.toString(method.getParameterTypes());
+ MethodDescriptorImpl methodDesc = MethodDescriptorImpl.class.cast(methodConstraints.get(key));
+ if (methodDesc == null) {
+ methodDesc = new MethodDescriptorImpl(metaBean, EMPTY_VALIDATION, method);
+ methodConstraints.put(key, methodDesc);
+ } else {
+ continue;
+ }
+
+ final Collection<Method> parents = new ArrayList<Method>();
+ for (final Class<?> clazz : classHierarchy) {
+ final Method overriden = Reflection.INSTANCE.getDeclaredMethod(clazz, method.getName(), method.getParameterTypes());
+ if (overriden != null) {
+ parents.add(overriden);
+ processMethod(overriden, methodDesc);
+ }
+ }
+
+ processMethod(method, methodDesc);
+
+ ensureNotNullDescriptors(method.getReturnType(), methodDesc);
+
+ if (parents != null) {
+ if (parents.size() > 1) {
+ for (final Method parent : parents) {
+ final MethodDescriptor parentDec = factoryContext.getValidator().getConstraintsForClass(parent.getDeclaringClass()).getConstraintsForMethod(parent.getName(), parent.getParameterTypes());
+ if (parentDec != null) {
+ ensureNoParameterConstraint(InvocableElementDescriptor.class.cast(parentDec), "Parameter constraints can't be defined for parallel interfaces/parents");
+ } else {
+ ensureMethodDoesntDefineParameterConstraint(methodDesc);
+ }
+ ensureNoReturnValueAddedInChild(methodDesc.getReturnValueDescriptor(), parentDec, "Return value constraints should be the same for parent and children");
+ }
+ } else if (!parents.isEmpty()) {
+ final Method parent = parents.iterator().next();
+ final MethodDescriptor parentDesc = factoryContext.getValidator().getConstraintsForClass(parent.getDeclaringClass()).getConstraintsForMethod(parent.getName(), parent.getParameterTypes());
+ ensureNoReturnValueAddedInChild(methodDesc.getReturnValueDescriptor(), parentDesc, "Return value constraints should be at least the same for parent and children");
+
+ if (parentDesc != null) {
+ final Iterator<ParameterDescriptor> parentPd = parentDesc.getParameterDescriptors().iterator();
+ for (final ParameterDescriptor pd : methodDesc.getParameterDescriptors()) {
+ final ParameterDescriptor next = parentPd.next();
+ if (pd.getConstraintDescriptors().size() != next.getConstraintDescriptors().size()) {
+ throw new ConstraintDeclarationException("child shouldn't get more constraint than parent");
+ }
+ if (pd.isCascaded() != next.isCascaded()) { // @Valid
+ throw new ConstraintDeclarationException("child shouldn't get more constraint than parent");
+ }
+ }
+ } else {
+ ensureMethodDoesntDefineParameterConstraint(methodDesc);
+ }
+ }
+
+ final Class<?>[] interfaces = method.getDeclaringClass().getInterfaces();
+ final Collection<Method> itfWithThisMethod = new ArrayList<Method>();
+ for (final Class<?> i : interfaces) {
+ final Method m = Reflection.INSTANCE.getDeclaredMethod(i, method.getName(), method.getParameterTypes());
+ if (m != null) {
+ itfWithThisMethod.add(m);
+ }
+ }
+ if (itfWithThisMethod.size() > 1) {
+ for (final Method m : itfWithThisMethod) {
+ ensureNoConvertGroup(m, "ConvertGroup can't be used in parallel interfaces");
+ }
+ } else if (itfWithThisMethod.size() == 1) {
+ ensureNoConvertGroup(itfWithThisMethod.iterator().next(), "ConvertGroup can't be used in interface AND parent class");
+ }
+
+ int returnValid = 0;
+ if (method.getAnnotation(Valid.class) != null) {
+ returnValid++;
+ }
+ for (final Class<?> clazz : classHierarchy) {
+ final Method overriden = Reflection.INSTANCE.getDeclaredMethod(clazz, method.getName(), method.getParameterTypes());
+ if (overriden != null) {
+ if (overriden.getAnnotation(Valid.class) != null) {
+ returnValid++;
+ }
+ }
+ }
+ if (returnValid > 1 && !(interfaces.length == returnValid && method.getAnnotation(Valid.class) == null)) {
+ throw new ConstraintDeclarationException("@Valid on returned value can't be set more than once");
+ }
+ }
+
+ if (getter) {
+ final MetaProperty prop = metaBean.getProperty(Introspector.decapitalize(method.getName().substring(3)));
+ if (prop != null && prop.getFeature(Features.Property.REF_CASCADE) != null) {
+ methodDesc.setCascaded(true);
+ }
+ }
+
+ if (!methodDesc.getGroupConversions().isEmpty() && !methodDesc.isCascaded()) {
+ throw new ConstraintDeclarationException("@Valid is needed to define a group conversion");
+ }
+ }
+
+ for (final Class<?> parent : classHierarchy) {
+ final BeanDescriptorImpl desc = BeanDescriptorImpl.class.cast(factoryContext.getValidator().getConstraintsForClass(parent));
+ for (final String s : desc.meta.methodConstraints.keySet()) {
+ if (!methodConstraints.containsKey(s)) { // method from the parent only
+ methodConstraints.put(s, desc.meta.methodConstraints.get(s));
+ }
+ }
+ }
+ }
+
+ private void ensureMethodDoesntDefineParameterConstraint(MethodDescriptorImpl methodDesc) {
+ for (final ParameterDescriptor pd : methodDesc.getParameterDescriptors()) {
+ if (!pd.getConstraintDescriptors().isEmpty()) {
+ throw new ConstraintDeclarationException("child shouldn't get more constraint than parent");
+ }
+ if (pd.isCascaded()) { // @Valid
+ throw new ConstraintDeclarationException("child shouldn't get more constraint than parent");
+ }
+ }
+ }
+
+ private void ensureNoReturnValueAddedInChild(final ReturnValueDescriptor returnValueDescriptor, final MethodDescriptor parentMtdDesc, final String msg) {
+ if (parentMtdDesc == null) {
+ return;
+ }
+
+ final ReturnValueDescriptor parentReturnDesc = parentMtdDesc.getReturnValueDescriptor();
+ if (parentReturnDesc.isCascaded() && !returnValueDescriptor.isCascaded() || parentReturnDesc.getConstraintDescriptors().size() > returnValueDescriptor.getConstraintDescriptors().size()) {
+ throw new ConstraintDeclarationException(msg);
+ }
+ }
+
+ private static void ensureNoParameterConstraint(final InvocableElementDescriptor constraintsForMethod, final String msg) {
+ for (final ParameterDescriptor parameterDescriptor : constraintsForMethod.getParameterDescriptors()) {
+ if (!parameterDescriptor.getConstraintDescriptors().isEmpty() || parameterDescriptor.isCascaded()) {
+ throw new ConstraintDeclarationException(msg);
+ }
+ }
+ }
+
+ private static void ensureNoConvertGroup(final Method method, final String msg) {
+ for (final Annotation[] annotations : method.getParameterAnnotations()) {
+ for (final Annotation a : annotations) {
+ if (ConvertGroup.class.isInstance(a)) {
+ throw new ConstraintDeclarationException(msg);
+ }
+ }
+ }
+ if (method.getAnnotation(ConvertGroup.class) != null) {
+ throw new ConstraintDeclarationException(msg);
+ }
+ }
+
+ private void processMethod(final Method method, final MethodDescriptorImpl methodDesc) throws InvocationTargetException, IllegalAccessException {
+ final AnnotationIgnores annotationIgnores = factoryContext.getFactory().getAnnotationIgnores();
+
+
+ { // reflection
+ if (!annotationIgnores.isIgnoreAnnotations(method)) {
+ // return value validations and/or cross-parameter validation
+ for (final Annotation anno : method.getAnnotations()) {
+ if (anno instanceof Valid || anno instanceof Validate) {
+ methodDesc.setCascaded(true);
+ } else {
+ processAnnotations(method, methodDesc, method.getReturnType(), anno);
+ }
+ }
+ }
+
+ // parameter validations
+ final Annotation[][] paramsAnnos = method.getParameterAnnotations();
+ int idx = 0;
+ final List<String> names = factoryContext.getParameterNameProvider().getParameterNames(method);
+ for (final Annotation[] paramAnnos : paramsAnnos) {
+ if (!annotationIgnores.isIgnoreAnnotationOnParameter(method, idx)) {
+ final ParameterAccess access = new ParameterAccess(method.getParameterTypes()[idx], idx);
+ processAnnotations(methodDesc, paramAnnos, access, idx, names.get(idx));
+ } else {
+ final ParameterDescriptorImpl parameterDescriptor = new ParameterDescriptorImpl(metaBean, EMPTY_VALIDATION, names.get(idx));
+ parameterDescriptor.setIndex(idx);
+ methodDesc.getParameterDescriptors().add(parameterDescriptor);
+ }
+ idx++;
+ }
+ }
+
+ if (annotationIgnores.isIgnoreAnnotationOnCrossParameter(method) && methodDesc.getCrossParameterDescriptor() != null) {
+ methodDesc.setCrossParameterDescriptor(null);
+ }
+ if (annotationIgnores.isIgnoreAnnotationOnReturn(method) && methodDesc.getReturnValueDescriptor() != null) {
+ methodDesc.setReturnValueDescriptor(null);
+ }
+
+ final MetaMethod metaMethod = metaBean.getMethod(method);
+ if (metaMethod != null) {
+ for (final Annotation anno : metaMethod.getAnnotations()) {
+ if (anno instanceof Valid) {
+ methodDesc.setCascaded(true);
+ } else {
+ // set first param as null to force it to be read
+ processAnnotations(null, methodDesc, method.getReturnType(), anno);
+ }
+ }
+
+ // parameter validations
+ final Collection<MetaParameter> paramsAnnos = metaMethod.getParameters();
+ final List<String> names = factoryContext.getParameterNameProvider().getParameterNames(method);
+ for (final MetaParameter paramAnnos : paramsAnnos) {
+ final int idx = paramAnnos.getIndex();
+ final ParameterAccess access = new ParameterAccess(method.getParameterTypes()[idx], idx);
+ processAnnotations(methodDesc, paramAnnos.getAnnotations(), access, idx, names.get(idx));
+ }
+
+ }
+
+ }
+
+ private AppendValidationToList processAnnotations(InvocableElementDescriptor methodDesc, Annotation[] paramAnnos, AccessStrategy access, int idx, String name)
+ throws InvocationTargetException, IllegalAccessException {
+ final AppendValidationToList validations = new AppendValidationToList();
+ boolean cascaded = false;
+
+ Group[] from = null;
+ Group[] to = null;
+
+ for (final Annotation anno : paramAnnos) {
+ if (anno instanceof Valid || anno instanceof Validate) {
+ cascaded = true;
+ } else if (ConvertGroup.class.isInstance(anno)) {
+ final ConvertGroup cg = ConvertGroup.class.cast(anno);
+ from = new Group[]{new Group(cg.from())};
+ to = new Group[]{new Group(cg.to())};
+ } else if (ConvertGroup.List.class.isInstance(anno)) {
+ final ConvertGroup.List cgl = ConvertGroup.List.class.cast(anno);
+ final ConvertGroup[] groups = cgl.value();
+ from = new Group[groups.length];
+ to = new Group[groups.length];
+ for (int i = 0; i < to.length; i++) {
+ from[i] = new Group(groups[i].from());
+ to[i] = new Group(groups[i].to());
+ }
+ } else {
+ processConstraint(anno, methodDesc, access, validations);
+ }
+ }
+
+ ParameterDescriptorImpl paramDesc = null;
+ for (final ParameterDescriptor pd : methodDesc.getParameterDescriptors()) {
+ if (pd.getIndex() == idx) {
+ paramDesc = ParameterDescriptorImpl.class.cast(pd);
+ }
+ }
+
+ if (paramDesc == null) {
+ paramDesc = new ParameterDescriptorImpl(Class.class.cast(access.getJavaType()), // set from getParameterTypes() so that's a Class<?>
+ validations.getValidations().toArray(new Validation[validations.getValidations().size()]), name);
+ paramDesc.setIndex(idx);
+ final List<ParameterDescriptor> parameterDescriptors = methodDesc.getParameterDescriptors();
+ if (!parameterDescriptors.contains(paramDesc)) {
+ parameterDescriptors.add(paramDesc);
+ }
+ paramDesc.setCascaded(cascaded);
+ } else {
+ final List<ConstraintValidation<?>> newValidations = validations.getValidations();
+ for (final ConstraintValidation<?> validation : newValidations) { // don't add it if exactly the same is already here
+ boolean alreadyHere = false;
+ for (final ConstraintDescriptor<?> existing : paramDesc.getMutableConstraintDescriptors()) {
+ if (existing.getAnnotation().annotationType().equals(validation.getAnnotation().annotationType())) { // TODO: make it a bit finer
+ alreadyHere = true;
+ break;
+ }
+ }
+ if (!alreadyHere) {
+ paramDesc.getMutableConstraintDescriptors().add(validation);
+ }
+ }
+
+ if (cascaded) {
+ paramDesc.setCascaded(true);
+ } // else keep previous config
+ }
+ if (paramDesc.isCascaded() && from != null) {
+ for (int i = 0; i < from.length; i++) {
+ paramDesc.addGroupConversion(new GroupConversionDescriptorImpl(from[i], to[i]));
+ }
+ } else if (from != null) {
+ throw new ConstraintDeclarationException("Group conversion is only relevant for @Valid cases");
+ }
+
+ return validations;
+ }
+
+ private <A extends Annotation> void processAnnotation(final A annotation, final InvocableElementDescriptor desc,
+ final AccessStrategy access, final AppendValidation validations) throws InvocationTargetException, IllegalAccessException {
+ if (annotation.annotationType().getName().startsWith("java.lang.annotation.")) {
+ return;
+ }
+
+ if (annotation instanceof Valid || annotation instanceof Validate) {
+ desc.setCascaded(true);
+ } else if (ConvertGroup.class.isInstance(annotation) && ReturnAccess.class.isInstance(access)) { // access is just tested to ensure to not read it twice with cross parameter
+ final ConvertGroup cg = ConvertGroup.class.cast(annotation);
+ desc.addGroupConversion(new GroupConversionDescriptorImpl(new Group(cg.from()), new Group(cg.to())));
+ } else if (ConvertGroup.List.class.isInstance(annotation) && ReturnAccess.class.isInstance(access)) {
+ final ConvertGroup.List cgl = ConvertGroup.List.class.cast(annotation);
+ for (final ConvertGroup cg : cgl.value()) {
+ desc.addGroupConversion(new GroupConversionDescriptorImpl(new Group(cg.from()), new Group(cg.to())));
+ }
+ } else {
+ processConstraint(annotation, desc, access, validations);
+ }
+ }
+
+ private <A extends Annotation> void processConstraint(final A annotation, final InvocableElementDescriptor desc,
+ final AccessStrategy access, final AppendValidation validations) throws IllegalAccessException, InvocationTargetException {
+ Constraint vcAnno = annotation.annotationType().getAnnotation(Constraint.class);
+ if (vcAnno != null) {
+ annotationProcessor.processAnnotation(annotation, null, ClassUtils.primitiveToWrapper((Class<?>) access.getJavaType()), access, validations, true);
+ } else {
+ /**
+ * Multi-valued constraints
+ */
+ final ConstraintAnnotationAttributes.Worker<? extends Annotation> worker = ConstraintAnnotationAttributes.VALUE.analyze(annotation.annotationType());
+ if (worker.isValid()) {
+ Annotation[] children = Annotation[].class.cast(worker.read(annotation));
+ if (children != null) {
+ for (Annotation child : children) {
+ processAnnotation(child, desc, access, validations); // recursion
+ }
+ }
+ }
+ }
+ }
+
+ private void buildExecutableDescriptors() {
+ try {
+ buildMethodConstraints();
+ buildConstructorConstraints();
+ } catch (final Exception ex) {
+ if (RuntimeException.class.isInstance(ex)) {
+ throw RuntimeException.class.cast(ex);
+ }
+
+ throw new IllegalArgumentException(ex.getMessage(), ex);
+ }
+ }
+ }
+}
Added: bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/BootstrapConfigurationImpl.java
URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/BootstrapConfigurationImpl.java?rev=1517540&view=auto
==============================================================================
--- bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/BootstrapConfigurationImpl.java (added)
+++ bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/BootstrapConfigurationImpl.java Mon Aug 26 13:59:15 2013
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.bval.jsr;
+
+import javax.validation.BootstrapConfiguration;
+import javax.validation.executable.ExecutableType;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+public class BootstrapConfigurationImpl implements BootstrapConfiguration {
+ private Map<String, String> properties;
+ private Set<ExecutableType> defaultValidatedExecutableTypes;
+ private boolean executableValidationEnabled;
+ private Set<String> constraintMappingResourcePaths;
+ private String parameterNameProviderClassName;
+ private String traversableResolverClassName;
+ private String messageInterpolatorClassName;
+ private String constraintValidatorFactoryClassName;
+ private String defaultProviderClassName;
+
+ public BootstrapConfigurationImpl(final String defaultProviderClassName,
+ final String constraintValidatorFactoryClassName,
+ final String messageInterpolatorClassName,
+ final String traversableResolverClassName,
+ final String parameterNameProviderClassName,
+ final Set<String> constraintMappingResourcePaths,
+ final boolean executableValidationEnabled,
+ final Set<ExecutableType> defaultValidatedExecutableTypes,
+ final Map<String, String> properties) {
+ this.properties = Collections.unmodifiableMap(properties);
+ this.defaultValidatedExecutableTypes = Collections.unmodifiableSet(defaultValidatedExecutableTypes);
+ this.executableValidationEnabled = executableValidationEnabled;
+ this.constraintMappingResourcePaths = Collections.unmodifiableSet(constraintMappingResourcePaths);
+ this.parameterNameProviderClassName = parameterNameProviderClassName;
+ this.traversableResolverClassName = traversableResolverClassName;
+ this.messageInterpolatorClassName = messageInterpolatorClassName;
+ this.constraintValidatorFactoryClassName = constraintValidatorFactoryClassName;
+ this.defaultProviderClassName = defaultProviderClassName;
+ }
+
+ public String getDefaultProviderClassName() {
+ return defaultProviderClassName;
+ }
+
+ public String getConstraintValidatorFactoryClassName() {
+ return constraintValidatorFactoryClassName;
+ }
+
+ public String getMessageInterpolatorClassName() {
+ return messageInterpolatorClassName;
+ }
+
+ public String getTraversableResolverClassName() {
+ return traversableResolverClassName;
+ }
+
+ public String getParameterNameProviderClassName() {
+ return parameterNameProviderClassName;
+ }
+
+ public Set<String> getConstraintMappingResourcePaths() {
+ return constraintMappingResourcePaths;
+ }
+
+ public boolean isExecutableValidationEnabled() {
+ return executableValidationEnabled;
+ }
+
+ public Set<ExecutableType> getDefaultValidatedExecutableTypes() {
+ return defaultValidatedExecutableTypes;
+ }
+
+ public Map<String, String> getProperties() {
+ return properties;
+ }
+}
Added: bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/CascadingPropertyValidator.java
URL: http://svn.apache.org/viewvc/bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/CascadingPropertyValidator.java?rev=1517540&view=auto
==============================================================================
--- bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/CascadingPropertyValidator.java (added)
+++ bval/branches/bval-11/bval-jsr/src/main/java/org/apache/bval/jsr/CascadingPropertyValidator.java Mon Aug 26 13:59:15 2013
@@ -0,0 +1,68 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.bval.jsr;
+
+import javax.validation.ConstraintViolation;
+import javax.validation.Valid;
+import javax.validation.Validator;
+import java.util.Set;
+
+/**
+ * Per the bean validation spec, {@link Valid} is not honored by the
+ * {@link #validateProperty(Object, String, Class...)} and
+ * {@link #validateValue(Class, String, Object, Class...)} methods. The
+ * {@link CascadingPropertyValidator} interface thus defines a {@link Validator} that
+ * provides corresponding methods that <em>may</em> honor {@link Valid}.
+ * It should be noted that {@link Validator#validateProperty(Object, String, Class...)}
+ * and {@link Validator#validateValue(Class, String, Object, Class...)} are assumed
+ * semantically equivalent to calling the {@link CascadingPropertyValidator}-defined
+ * methods with <code>cascade == false</code>.
+ *
+ * @version $Rev: 993539 $ $Date: 2010-09-07 16:27:50 -0500 (Tue, 07 Sep 2010) $
+ */
+public interface CascadingPropertyValidator extends Validator {
+
+ /**
+ * Validates all constraints placed on <code>object</code>'s
+ * <code>propertyName</code> property, with optional validation cascading.
+ *
+ * @param <T>
+ * @param object
+ * @param propertyName
+ * @param cascade
+ * @param groups
+ * @return the resulting {@link Set} of {@link ConstraintViolation}s.
+ */
+ <T extends Object> java.util.Set<javax.validation.ConstraintViolation<T>> validateProperty(T object,
+ String propertyName, boolean cascade, java.lang.Class<?>... groups);
+
+ /**
+ * Validates all constraints placed on <code>object</code>'s
+ * <code>propertyName</code> property, with optional validation cascading,
+ * given a hypothetical property <code>value</code>.
+ *
+ * @param <T>
+ * @param beanType
+ * @param propertyName
+ * @param value
+ * @param cascade
+ * @param groups
+ * @return the resulting {@link Set} of {@link ConstraintViolation}s.
+ */
+ <T extends Object> java.util.Set<javax.validation.ConstraintViolation<T>> validateValue(
+ java.lang.Class<T> beanType, String propertyName, Object value, boolean cascade, java.lang.Class<?>... groups);
+}