Permalink
Show file tree
Hide file tree
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
6 changed files
with
604 additions
and
378 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -1,128 +1,128 @@ | ||
| /* | ||
| * 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.descriptor; | ||
|
|
||
| import java.lang.annotation.ElementType; | ||
| import java.lang.reflect.AnnotatedElement; | ||
| import java.lang.reflect.Type; | ||
| import java.lang.reflect.TypeVariable; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
|
|
||
| import javax.validation.metadata.ConstraintDescriptor; | ||
| import javax.validation.metadata.ElementDescriptor; | ||
|
|
||
| import org.apache.bval.jsr.groups.GroupStrategy; | ||
| import org.apache.bval.jsr.groups.GroupsComputer; | ||
| import org.apache.bval.jsr.metadata.Meta; | ||
| import org.apache.bval.util.Validate; | ||
| import org.apache.bval.util.reflection.TypeUtils; | ||
|
|
||
| public abstract class ElementD<E extends AnnotatedElement, R extends MetadataReader.ForElement<E, ?>> | ||
| implements ElementDescriptor { | ||
|
|
||
| public static abstract class NonRoot<P extends ElementD<?, ?>, E extends AnnotatedElement, R extends MetadataReader.ForElement<E, ?>> | ||
| extends ElementD<E, R> { | ||
|
|
||
| protected final P parent; | ||
|
|
||
| protected NonRoot(R reader, P parent) { | ||
| super(reader); | ||
| this.parent = Validate.notNull(parent, "parent"); | ||
| } | ||
|
|
||
| public P getParent() { | ||
| return parent; | ||
| } | ||
|
|
||
| @Override | ||
| public final Type getGenericType() { | ||
| if (TypeUtils.containsTypeVariables(genericType)) { | ||
| final Map<TypeVariable<?>, Type> args = | ||
| TypeUtils.getTypeArguments(parent.getGenericType(), Object.class); | ||
| return TypeUtils.unrollVariables(args, genericType); | ||
| } | ||
| return genericType; | ||
| } | ||
|
|
||
| @Override | ||
| final protected BeanD<?> getBean() { | ||
| return parent.getBean(); | ||
| } | ||
|
|
||
| @Override | ||
| public final GroupStrategy getGroupStrategy() { | ||
| return getBean().getGroupStrategy(); | ||
| } | ||
| } | ||
|
|
||
| protected final Type genericType; | ||
| final GroupsComputer groupsComputer; | ||
|
|
||
| private final Meta<E> meta; | ||
| private final Set<ConstraintD<?>> constraints; | ||
|
|
||
| protected ElementD(R reader) { | ||
| super(); | ||
| Validate.notNull(reader, "reader"); | ||
| this.meta = reader.meta; | ||
| this.genericType = reader.meta.getType(); | ||
| this.constraints = reader.getConstraints(); | ||
| this.groupsComputer = reader.getValidatorFactory().getGroupsComputer(); | ||
| } | ||
|
|
||
| @Override | ||
| public final boolean hasConstraints() { | ||
| return !constraints.isEmpty(); | ||
| } | ||
|
|
||
| @SuppressWarnings({ "unchecked", "rawtypes" }) | ||
| @Override | ||
| public final Set<ConstraintDescriptor<?>> getConstraintDescriptors() { | ||
| return (Set) constraints; | ||
| } | ||
|
|
||
| @Override | ||
| public final ConstraintFinder findConstraints() { | ||
| return new Finder(groupsComputer, this); | ||
| } | ||
|
|
||
| public final ElementType getElementType() { | ||
| return meta.getElementType(); | ||
| } | ||
|
|
||
| public final E getTarget() { | ||
| return meta.getHost(); | ||
| } | ||
|
|
||
| public final Class<?> getDeclaringClass() { | ||
| return meta.getDeclaringClass(); | ||
| } | ||
|
|
||
| public abstract Type getGenericType(); | ||
|
|
||
| public abstract GroupStrategy getGroupStrategy(); | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return String.format("%s: %s", getClass().getSimpleName(), meta.describeHost()); | ||
| } | ||
|
|
||
| protected abstract BeanD<?> getBean(); | ||
| } | ||
| /* | ||
| * 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.descriptor; | ||
|
|
||
| import java.lang.annotation.ElementType; | ||
| import java.lang.reflect.AnnotatedElement; | ||
| import java.lang.reflect.Type; | ||
| import java.lang.reflect.TypeVariable; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
|
|
||
| import javax.validation.metadata.ConstraintDescriptor; | ||
| import javax.validation.metadata.ElementDescriptor; | ||
|
|
||
| import org.apache.bval.jsr.groups.GroupStrategy; | ||
| import org.apache.bval.jsr.groups.GroupsComputer; | ||
| import org.apache.bval.jsr.metadata.Meta; | ||
| import org.apache.bval.util.Validate; | ||
| import org.apache.bval.util.reflection.TypeUtils; | ||
|
|
||
| public abstract class ElementD<E extends AnnotatedElement, R extends MetadataReader.ForElement<E, ?>> | ||
| implements ElementDescriptor { | ||
|
|
||
| public static abstract class NonRoot<P extends ElementD<?, ?>, E extends AnnotatedElement, R extends MetadataReader.ForElement<E, ?>> | ||
| extends ElementD<E, R> { | ||
|
|
||
| protected final P parent; | ||
|
|
||
| protected NonRoot(R reader, P parent) { | ||
| super(reader); | ||
| this.parent = Validate.notNull(parent, "parent"); | ||
| } | ||
|
|
||
| public P getParent() { | ||
| return parent; | ||
| } | ||
|
|
||
| @Override | ||
| public final Type getGenericType() { | ||
| if (TypeUtils.containsTypeVariables(genericType)) { | ||
| final Map<TypeVariable<?>, Type> args = | ||
| TypeUtils.getTypeArguments(parent.getGenericType(), Object.class); | ||
| return TypeUtils.unrollVariables(args, genericType); | ||
| } | ||
| return genericType; | ||
| } | ||
|
|
||
| @Override | ||
| final protected BeanD<?> getBean() { | ||
| return parent.getBean(); | ||
| } | ||
|
|
||
| @Override | ||
| public final GroupStrategy getGroupStrategy() { | ||
| return getBean().getGroupStrategy(); | ||
| } | ||
| } | ||
|
|
||
| protected final Type genericType; | ||
| final GroupsComputer groupsComputer; | ||
|
|
||
| private final Meta<E> meta; | ||
| private final Set<ConstraintD<?>> constraints; | ||
|
|
||
| protected ElementD(R reader) { | ||
| super(); | ||
| Validate.notNull(reader, "reader"); | ||
| this.meta = reader.meta; | ||
| this.genericType = reader.meta.getType(); | ||
| this.constraints = reader.getConstraints(); | ||
| this.groupsComputer = reader.getValidatorFactory().getGroupsComputer(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasConstraints() { | ||
| return !constraints.isEmpty(); | ||
| } | ||
|
|
||
| @SuppressWarnings({ "unchecked", "rawtypes" }) | ||
| @Override | ||
| public Set<ConstraintDescriptor<?>> getConstraintDescriptors() { | ||
| return (Set) constraints; | ||
| } | ||
|
|
||
| @Override | ||
| public final ConstraintFinder findConstraints() { | ||
| return new Finder(groupsComputer, this); | ||
| } | ||
|
|
||
| public final ElementType getElementType() { | ||
| return meta.getElementType(); | ||
| } | ||
|
|
||
| public final E getTarget() { | ||
| return meta.getHost(); | ||
| } | ||
|
|
||
| public final Class<?> getDeclaringClass() { | ||
| return meta.getDeclaringClass(); | ||
| } | ||
|
|
||
| public abstract Type getGenericType(); | ||
|
|
||
| public abstract GroupStrategy getGroupStrategy(); | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return String.format("%s: %s", getClass().getSimpleName(), meta.describeHost()); | ||
| } | ||
|
|
||
| protected abstract BeanD<?> getBean(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -1,36 +1,98 @@ | ||
| /* | ||
| * 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.descriptor; | ||
|
|
||
| import java.lang.reflect.Executable; | ||
|
|
||
| import javax.validation.metadata.ReturnValueDescriptor; | ||
|
|
||
| public class ReturnValueD<P extends ExecutableD<?, ?, P>, E extends Executable> extends CascadableContainerD<P, E> | ||
| implements ReturnValueDescriptor { | ||
|
|
||
| ReturnValueD(MetadataReader.ForContainer<E> reader, P parent) { | ||
| super(reader, parent); | ||
| } | ||
|
|
||
| @Override | ||
| public Class<?> getElementClass() { | ||
| return parent.getElementClass(); | ||
| } | ||
| } | ||
| /* | ||
| * 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.descriptor; | ||
|
|
||
| import java.lang.reflect.Constructor; | ||
| import java.lang.reflect.Executable; | ||
| import java.lang.reflect.Method; | ||
| import java.util.HashSet; | ||
| import java.util.Set; | ||
| import javax.validation.ConstraintValidator; | ||
| import javax.validation.UnexpectedTypeException; | ||
| import javax.validation.metadata.ConstraintDescriptor; | ||
|
|
||
| import javax.validation.metadata.ReturnValueDescriptor; | ||
| import org.apache.bval.util.ValidatorUtils; | ||
| import org.apache.bval.util.reflection.TypeUtils; | ||
|
|
||
| public class ReturnValueD<P extends ExecutableD<?, ?, P>, E extends Executable> extends CascadableContainerD<P, E> | ||
| implements ReturnValueDescriptor { | ||
|
|
||
| private final Set<ConstraintD<?>> constraints; | ||
|
|
||
| ReturnValueD(MetadataReader.ForContainer<E> reader, P parent) { | ||
| super(reader, parent); | ||
| this.constraints = new HashSet<>(reader.getConstraints()); | ||
|
|
||
| Class<?> validatedType; | ||
| if (reader.meta.getHost() instanceof Constructor) | ||
| { | ||
| validatedType = reader.meta.getDeclaringClass(); | ||
| } | ||
| else | ||
| { | ||
| validatedType = ((Method) reader.meta.getHost()).getReturnType(); | ||
| } | ||
|
|
||
| for (ConstraintDescriptor<?> c : constraints) | ||
| { | ||
| if (!hasValidatorForType(validatedType, c) | ||
| && (!c.getConstraintValidatorClasses().isEmpty() || !c.getComposingConstraints().isEmpty())) | ||
| { | ||
| String msg = "No validator found for (composition) constraint @" | ||
| + c.getAnnotation().annotationType().getSimpleName() | ||
| + " declared on \"" + reader.meta.getHost().toString() | ||
| + "\" for validated type \"" + validatedType.getName() + "\""; | ||
| throw new UnexpectedTypeException(msg); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private boolean hasValidatorForType(Class<?> validatedType, ConstraintDescriptor<?> c) | ||
| { | ||
| for (Class<? extends ConstraintValidator<?, ?>> validatorClass : c.getConstraintValidatorClasses()) | ||
| { | ||
| if (TypeUtils.isAssignable(validatedType, ValidatorUtils.getValidatedType(validatorClass))) | ||
| { | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
| for (ConstraintDescriptor<?> composite : c.getComposingConstraints()) | ||
| { | ||
| if (hasValidatorForType(validatedType, composite)) | ||
| { | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasConstraints() { | ||
| return !constraints.isEmpty(); | ||
| } | ||
|
|
||
| @SuppressWarnings({ "unchecked", "rawtypes" }) | ||
| @Override | ||
| public Set<ConstraintDescriptor<?>> getConstraintDescriptors() { | ||
| return (Set) constraints; | ||
| } | ||
| } |
Oops, something went wrong.