rename Metas->Meta as planned
Project: http://git-wip-us.apache.org/repos/asf/bval/repo Commit: http://git-wip-us.apache.org/repos/asf/bval/commit/0e874301 Tree: http://git-wip-us.apache.org/repos/asf/bval/tree/0e874301 Diff: http://git-wip-us.apache.org/repos/asf/bval/diff/0e874301 Branch: refs/heads/bv2 Commit: 0e874301a11cfc013cbb5249bde68c7e50f08ee4 Parents: 731c8ef Author: Matt Benson <[email protected]> Authored: Sun Feb 25 14:21:45 2018 -0600 Committer: Matt Benson <[email protected]> Committed: Sun Feb 25 14:21:45 2018 -0600 ---------------------------------------------------------------------- .../apache/bval/jsr/descriptor/ConstraintD.java | 6 +- .../bval/jsr/descriptor/MetadataReader.java | 34 +++++------ .../apache/bval/jsr/descriptor/ParameterD.java | 4 +- .../bval/jsr/job/ValidateReturnValue.java | 8 +-- .../bval/jsr/metadata/CompositeBuilder.java | 32 +++++------ .../apache/bval/jsr/metadata/DualBuilder.java | 26 ++++----- .../apache/bval/jsr/metadata/EmptyBuilder.java | 26 ++++----- .../bval/jsr/metadata/HierarchyBuilder.java | 26 ++++----- .../java/org/apache/bval/jsr/metadata/Meta.java | 25 ++++---- .../bval/jsr/metadata/MetadataBuilder.java | 28 ++++----- .../bval/jsr/metadata/ReflectionBuilder.java | 60 ++++++++++---------- .../apache/bval/jsr/metadata/XmlBuilder.java | 26 ++++----- .../bval/jsr/util/AnnotationsManager.java | 4 +- 13 files changed, 152 insertions(+), 153 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bval/blob/0e874301/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ConstraintD.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ConstraintD.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ConstraintD.java index c5000e2..bea951d 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ConstraintD.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ConstraintD.java @@ -52,7 +52,7 @@ import org.apache.bval.jsr.ApacheValidatorFactory; import org.apache.bval.jsr.ConstraintAnnotationAttributes; import org.apache.bval.jsr.ConstraintAnnotationAttributes.Worker; import org.apache.bval.jsr.metadata.ContainerElementKey; -import org.apache.bval.jsr.metadata.Metas; +import org.apache.bval.jsr.metadata.Meta; import org.apache.bval.jsr.util.AnnotationsManager; import org.apache.bval.jsr.util.ToUnmodifiable; import org.apache.bval.jsr.valueextraction.ValueExtractors; @@ -75,7 +75,7 @@ public class ConstraintD<A extends Annotation> implements ConstraintDescriptor<A private final A annotation; private final Scope scope; - private final Metas<?> meta; + private final Meta<?> meta; private final Set<Class<? extends Payload>> payload; private final Class<?> validatedType; @@ -89,7 +89,7 @@ public class ConstraintD<A extends Annotation> implements ConstraintDescriptor<A private final List<Class<? extends ConstraintValidator<A, ?>>> constraintValidatorClasses; private final Class<? extends ConstraintValidator<A, ?>> constraintValidatorClass; - public ConstraintD(A annotation, Scope scope, Metas<?> meta, ApacheValidatorFactory validatorFactory) { + public ConstraintD(A annotation, Scope scope, Meta<?> meta, ApacheValidatorFactory validatorFactory) { this.annotation = Validate.notNull(annotation, "annotation"); this.scope = Validate.notNull(scope, "scope"); this.meta = Validate.notNull(meta, "meta"); http://git-wip-us.apache.org/repos/asf/bval/blob/0e874301/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/MetadataReader.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/MetadataReader.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/MetadataReader.java index 6f00495..77cf9fc 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/MetadataReader.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/MetadataReader.java @@ -51,7 +51,7 @@ import org.apache.bval.jsr.groups.GroupConversion; import org.apache.bval.jsr.metadata.ContainerElementKey; import org.apache.bval.jsr.metadata.EmptyBuilder; import org.apache.bval.jsr.metadata.MetadataBuilder; -import org.apache.bval.jsr.metadata.Metas; +import org.apache.bval.jsr.metadata.Meta; import org.apache.bval.jsr.metadata.Signature; import org.apache.bval.jsr.util.Methods; import org.apache.bval.jsr.util.ToUnmodifiable; @@ -62,10 +62,10 @@ import org.apache.bval.util.reflection.Reflection; class MetadataReader { class ForElement<E extends AnnotatedElement, B extends MetadataBuilder.ForElement<E>> { - final Metas<E> meta; + final Meta<E> meta; protected final B builder; - ForElement(Metas<E> meta, B builder) { + ForElement(Meta<E> meta, B builder) { super(); this.meta = Validate.notNull(meta, "meta"); this.builder = Validate.notNull(builder, "builder"); @@ -76,7 +76,7 @@ class MetadataReader { .flatMap(e -> describe(e.getValue(), e.getKey(), meta)).collect(ToUnmodifiable.set()); } - private Stream<ConstraintD<?>> describe(Annotation[] constraints, Scope scope, Metas<?> meta) { + private Stream<ConstraintD<?>> describe(Annotation[] constraints, Scope scope, Meta<?> meta) { return Stream.of(constraints).map(c -> new ConstraintD<>(c, scope, meta, validatorFactory)); } } @@ -84,7 +84,7 @@ class MetadataReader { class ForBean extends MetadataReader.ForElement<Class<?>, MetadataBuilder.ForClass> { private final MetadataBuilder.ForBean beanBuilder; - ForBean(Metas<Class<?>> meta, MetadataBuilder.ForBean builder) { + ForBean(Meta<Class<?>> meta, MetadataBuilder.ForBean builder) { super(meta, Validate.notNull(builder, "builder").getClass(meta)); this.beanBuilder = builder; } @@ -96,7 +96,7 @@ class MetadataReader { beanBuilder.getFields(meta).forEach((f, builder) -> { final Field fld = Reflection.find(meta.getHost(), t -> Reflection.getDeclaredField(t, f)); properties.computeIfAbsent(f, descriptorList).add(new PropertyD.ForField( - new MetadataReader.ForContainer<>(new Metas.ForField(fld), builder), parent)); + new MetadataReader.ForContainer<>(new Meta.ForField(fld), builder), parent)); }); beanBuilder.getGetters(meta).forEach((g, builder) -> { @@ -108,7 +108,7 @@ class MetadataReader { "Getter method for property %s not found", g); properties.computeIfAbsent(g, descriptorList).add(new PropertyD.ForMethod( - new MetadataReader.ForContainer<>(new Metas.ForMethod(getter), builder), parent)); + new MetadataReader.ForContainer<>(new Meta.ForMethod(getter), builder), parent)); }); return properties.entrySet().stream().collect(ToUnmodifiable.map(Map.Entry::getKey, e -> { final List<PropertyD<?>> delegates = e.getValue(); @@ -139,7 +139,7 @@ class MetadataReader { final Method m = Reflection.find(meta.getHost(), t -> Reflection.getDeclaredMethod(t, sig.getName(), sig.getParameterTypes())); - result.put(sig, new MethodD(new MetadataReader.ForMethod(new Metas.ForMethod(m), builder), parent)); + result.put(sig, new MethodD(new MetadataReader.ForMethod(new Meta.ForMethod(m), builder), parent)); }); return Collections.unmodifiableMap(result); } @@ -156,7 +156,7 @@ class MetadataReader { ctorBuilders.forEach((sig, builder) -> { final Constructor<?> c = Reflection.getDeclaredConstructor(meta.getHost(), sig.getParameterTypes()); result.put(sig, - new ConstructorD(new MetadataReader.ForConstructor(new Metas.ForConstructor(c), builder), parent)); + new ConstructorD(new MetadataReader.ForConstructor(new Meta.ForConstructor(c), builder), parent)); }); return Collections.unmodifiableMap(result); } @@ -190,7 +190,7 @@ class MetadataReader { class ForContainer<E extends AnnotatedElement> extends ForElement<E, MetadataBuilder.ForContainer<E>> { - ForContainer(Metas<E> meta, MetadataBuilder.ForContainer<E> builder) { + ForContainer(Meta<E> meta, MetadataBuilder.ForContainer<E> builder) { super(meta, builder); } @@ -214,7 +214,7 @@ class MetadataReader { containerElementTypes.forEach((k, builder) -> { result.add(new ContainerElementTypeD(k, - new MetadataReader.ForContainer<>(new Metas.ForContainerElement(meta, k), builder), parent)); + new MetadataReader.ForContainer<>(new Meta.ForContainerElement(meta, k), builder), parent)); }); return Collections.unmodifiableSet(result); } @@ -224,7 +224,7 @@ class MetadataReader { extends ForElement<E, MetadataBuilder.ForElement<E>> { private final MetadataBuilder.ForExecutable<E> executableBuilder; - ForExecutable(Metas<E> meta, MetadataBuilder.ForExecutable<E> executableBuilder) { + ForExecutable(Meta<E> meta, MetadataBuilder.ForExecutable<E> executableBuilder) { super(meta, EmptyBuilder.instance().forElement()); this.executableBuilder = Validate.notNull(executableBuilder, "executableBuilder"); } @@ -238,13 +238,13 @@ class MetadataReader { final List<MetadataBuilder.ForContainer<Parameter>> builders = executableBuilder.getParameters(meta); return IntStream.range(0, parameters.length).mapToObj(i -> { - final Metas.ForParameter param = new Metas.ForParameter(parameters[i], parameterNames.get(i)); + final Meta.ForParameter param = new Meta.ForParameter(parameters[i], parameterNames.get(i)); return new ParameterD<>(param, i, new MetadataReader.ForContainer<>(param, builders.get(i)), parent); }).collect(ToUnmodifiable.list()); } <X extends ExecutableD<E, SELF, X>> CrossParameterD<X, E> getCrossParameterDescriptor(X parent) { - final Metas.ForCrossParameter<E> cp = new Metas.ForCrossParameter<>(meta); + final Meta.ForCrossParameter<E> cp = new Meta.ForCrossParameter<>(meta); return new CrossParameterD<>(new MetadataReader.ForElement<>(cp, executableBuilder.getCrossParameter(cp)), parent); } @@ -258,7 +258,7 @@ class MetadataReader { } class ForMethod extends ForExecutable<Method, ForMethod> { - ForMethod(Metas<Method> meta, MetadataBuilder.ForExecutable<Method> builder) { + ForMethod(Meta<Method> meta, MetadataBuilder.ForExecutable<Method> builder) { super(meta, builder); } @@ -270,7 +270,7 @@ class MetadataReader { class ForConstructor extends ForExecutable<Constructor<?>, ForConstructor> { - ForConstructor(Metas<Constructor<?>> meta, MetadataBuilder.ForExecutable<Constructor<?>> builder) { + ForConstructor(Meta<Constructor<?>> meta, MetadataBuilder.ForExecutable<Constructor<?>> builder) { super(meta, builder); } @@ -288,6 +288,6 @@ class MetadataReader { } MetadataReader.ForBean forBean(Class<?> beanClass, MetadataBuilder.ForBean builder) { - return new MetadataReader.ForBean(new Metas.ForClass(beanClass), builder); + return new MetadataReader.ForBean(new Meta.ForClass(beanClass), builder); } } http://git-wip-us.apache.org/repos/asf/bval/blob/0e874301/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ParameterD.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ParameterD.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ParameterD.java index e041275..52e3040 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ParameterD.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ParameterD.java @@ -22,7 +22,7 @@ import java.lang.reflect.Parameter; import javax.validation.metadata.ParameterDescriptor; -import org.apache.bval.jsr.metadata.Metas; +import org.apache.bval.jsr.metadata.Meta; import org.apache.bval.util.Validate; import org.apache.bval.util.reflection.TypeUtils; @@ -33,7 +33,7 @@ public class ParameterD<P extends ExecutableD<?, ?, P>> extends CascadableContai private final String name; private final Class<?> type; - ParameterD(Metas.ForParameter meta, int index, MetadataReader.ForContainer<Parameter> reader, P parent) { + ParameterD(Meta.ForParameter meta, int index, MetadataReader.ForContainer<Parameter> reader, P parent) { super(reader, parent); Validate.isTrue(index >= 0 && index < meta.getHost().getDeclaringExecutable().getParameterCount(), http://git-wip-us.apache.org/repos/asf/bval/blob/0e874301/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateReturnValue.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateReturnValue.java b/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateReturnValue.java index 51e5fc3..52f64da 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateReturnValue.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateReturnValue.java @@ -29,7 +29,7 @@ import org.apache.bval.jsr.GraphContext; import org.apache.bval.jsr.descriptor.ConstraintD; import org.apache.bval.jsr.descriptor.ExecutableD; import org.apache.bval.jsr.descriptor.ReturnValueD; -import org.apache.bval.jsr.metadata.Metas; +import org.apache.bval.jsr.metadata.Meta; import org.apache.bval.jsr.util.NodeImpl; import org.apache.bval.jsr.util.PathImpl; import org.apache.bval.util.Exceptions; @@ -43,7 +43,7 @@ public abstract class ValidateReturnValue<E extends Executable, T> extends Valid ForMethod(ApacheFactoryContext validatorContext, T object, Method method, Object returnValue, Class<?>[] groups) { super(validatorContext, - new Metas.ForMethod(Validate.notNull(method, IllegalArgumentException::new, "method")), returnValue, + new Meta.ForMethod(Validate.notNull(method, IllegalArgumentException::new, "method")), returnValue, groups); this.object = Validate.notNull(object, IllegalArgumentException::new, "object"); } @@ -73,7 +73,7 @@ public abstract class ValidateReturnValue<E extends Executable, T> extends Valid ForConstructor(ApacheFactoryContext validatorContext, Constructor<? extends T> ctor, Object returnValue, Class<?>[] groups) { super(validatorContext, - new Metas.ForConstructor(Validate.notNull(ctor, IllegalArgumentException::new, "ctor")), returnValue, + new Meta.ForConstructor(Validate.notNull(ctor, IllegalArgumentException::new, "ctor")), returnValue, groups); } @@ -100,7 +100,7 @@ public abstract class ValidateReturnValue<E extends Executable, T> extends Valid protected final E executable; private final Object returnValue; - ValidateReturnValue(ApacheFactoryContext validatorContext, Metas<E> meta, Object returnValue, Class<?>[] groups) { + ValidateReturnValue(ApacheFactoryContext validatorContext, Meta<E> meta, Object returnValue, Class<?>[] groups) { super(validatorContext, groups); final Type type = Validate.notNull(meta, "meta").getType(); http://git-wip-us.apache.org/repos/asf/bval/blob/0e874301/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/CompositeBuilder.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/CompositeBuilder.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/CompositeBuilder.java index 0090790..3aed1d0 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/CompositeBuilder.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/CompositeBuilder.java @@ -81,28 +81,28 @@ public class CompositeBuilder { } @Override - public MetadataBuilder.ForClass getClass(Metas<Class<?>> meta) { + public MetadataBuilder.ForClass getClass(Meta<Class<?>> meta) { return new CompositeBuilder.ForClass( delegates.stream().map(d -> d.getClass(meta)).collect(Collectors.toList())); } @Override - public Map<String, MetadataBuilder.ForContainer<Field>> getFields(Metas<Class<?>> meta) { + public Map<String, MetadataBuilder.ForContainer<Field>> getFields(Meta<Class<?>> meta) { return merge(b -> b.getFields(meta), CompositeBuilder.ForContainer::new); } @Override - public Map<String, MetadataBuilder.ForContainer<Method>> getGetters(Metas<Class<?>> meta) { + public Map<String, MetadataBuilder.ForContainer<Method>> getGetters(Meta<Class<?>> meta) { return merge(b -> b.getGetters(meta), CompositeBuilder.ForContainer::new); } @Override - public Map<Signature, MetadataBuilder.ForExecutable<Constructor<?>>> getConstructors(Metas<Class<?>> meta) { + public Map<Signature, MetadataBuilder.ForExecutable<Constructor<?>>> getConstructors(Meta<Class<?>> meta) { return merge(b -> b.getConstructors(meta), CompositeBuilder.ForExecutable::new); } @Override - public Map<Signature, MetadataBuilder.ForExecutable<Method>> getMethods(Metas<Class<?>> meta) { + public Map<Signature, MetadataBuilder.ForExecutable<Method>> getMethods(Meta<Class<?>> meta) { return merge(b -> b.getMethods(meta), CompositeBuilder.ForExecutable::new); } } @@ -115,12 +115,12 @@ public class CompositeBuilder { } @Override - public Map<Scope, Annotation[]> getConstraintsByScope(Metas<E> meta) { + public Map<Scope, Annotation[]> getConstraintsByScope(Meta<E> meta) { return CompositeBuilder.this.getConstraintsByScope(this, meta); } @Override - public final Annotation[] getDeclaredConstraints(Metas<E> meta) { + public final Annotation[] getDeclaredConstraints(Meta<E> meta) { return delegates.stream().map(d -> d.getDeclaredConstraints(meta)).flatMap(Stream::of) .toArray(Annotation[]::new); } @@ -133,7 +133,7 @@ public class CompositeBuilder { } @Override - public List<Class<?>> getGroupSequence(Metas<Class<?>> meta) { + public List<Class<?>> getGroupSequence(Meta<Class<?>> meta) { return CompositeBuilder.this.getGroupSequence(this, meta); } } @@ -146,19 +146,19 @@ public class CompositeBuilder { } @Override - public final boolean isCascade(Metas<E> meta) { + public final boolean isCascade(Meta<E> meta) { return delegates.stream().anyMatch(d -> d.isCascade(meta)); } @Override - public final Set<GroupConversion> getGroupConversions(Metas<E> meta) { + public final Set<GroupConversion> getGroupConversions(Meta<E> meta) { return delegates.stream().map(d -> d.getGroupConversions(meta)).flatMap(Collection::stream) .collect(ToUnmodifiable.set()); } @Override public final Map<ContainerElementKey, MetadataBuilder.ForContainer<AnnotatedType>> getContainerElementTypes( - Metas<E> meta) { + Meta<E> meta) { return merge(b -> b.getContainerElementTypes(meta), CompositeBuilder.ForContainer::new); } } @@ -171,13 +171,13 @@ public class CompositeBuilder { } @Override - public MetadataBuilder.ForContainer<E> getReturnValue(Metas<E> meta) { + public MetadataBuilder.ForContainer<E> getReturnValue(Meta<E> meta) { return new CompositeBuilder.ForContainer<>( delegates.stream().map(d -> d.getReturnValue(meta)).collect(Collectors.toList())); } @Override - public List<MetadataBuilder.ForContainer<Parameter>> getParameters(Metas<E> meta) { + public List<MetadataBuilder.ForContainer<Parameter>> getParameters(Meta<E> meta) { final List<List<MetadataBuilder.ForContainer<Parameter>>> parameterLists = delegates.stream().map(d -> d.getParameters(meta)).collect(Collectors.toList()); @@ -192,7 +192,7 @@ public class CompositeBuilder { } @Override - public MetadataBuilder.ForElement<E> getCrossParameter(Metas<E> meta) { + public MetadataBuilder.ForElement<E> getCrossParameter(Meta<E> meta) { return new CompositeBuilder.ForElement<MetadataBuilder.ForElement<E>, E>( delegates.stream().map(d -> d.getCrossParameter(meta)).collect(Collectors.toList())); } @@ -215,11 +215,11 @@ public class CompositeBuilder { } protected <E extends AnnotatedElement> Map<Scope, Annotation[]> getConstraintsByScope( - CompositeBuilder.ForElement<? extends MetadataBuilder.ForElement<E>, E> composite, Metas<E> meta) { + CompositeBuilder.ForElement<? extends MetadataBuilder.ForElement<E>, E> composite, Meta<E> meta) { return Collections.singletonMap(Scope.LOCAL_ELEMENT, composite.getDeclaredConstraints(meta)); } - protected List<Class<?>> getGroupSequence(CompositeBuilder.ForClass composite, Metas<Class<?>> meta) { + protected List<Class<?>> getGroupSequence(CompositeBuilder.ForClass composite, Meta<Class<?>> meta) { final List<List<Class<?>>> groupSequence = composite.delegates.stream().map(d -> d.getGroupSequence(meta)).collect(Collectors.toList()); Validate.validState(groupSequence.size() <= 1, http://git-wip-us.apache.org/repos/asf/bval/blob/0e874301/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/DualBuilder.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/DualBuilder.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/DualBuilder.java index 9524889..831bc38 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/DualBuilder.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/DualBuilder.java @@ -114,30 +114,30 @@ public class DualBuilder { } @Override - public MetadataBuilder.ForClass getClass(Metas<Class<?>> meta) { + public MetadataBuilder.ForClass getClass(Meta<Class<?>> meta) { return new DualBuilder.ForClass(this, primaryDelegate.getClass(meta), customDelegate.getClass(meta)); } @Override - public Map<String, MetadataBuilder.ForContainer<Field>> getFields(Metas<Class<?>> meta) { + public Map<String, MetadataBuilder.ForContainer<Field>> getFields(Meta<Class<?>> meta) { return merge(b -> b.getFields(meta), (t, u) -> new DualBuilder.ForContainer<>(this, t, u), EmptyBuilder.instance()::forContainer); } @Override - public Map<String, MetadataBuilder.ForContainer<Method>> getGetters(Metas<Class<?>> meta) { + public Map<String, MetadataBuilder.ForContainer<Method>> getGetters(Meta<Class<?>> meta) { return merge(b -> b.getGetters(meta), (t, u) -> new DualBuilder.ForContainer<>(this, t, u), EmptyBuilder.instance()::forContainer); } @Override - public Map<Signature, MetadataBuilder.ForExecutable<Constructor<?>>> getConstructors(Metas<Class<?>> meta) { + public Map<Signature, MetadataBuilder.ForExecutable<Constructor<?>>> getConstructors(Meta<Class<?>> meta) { return merge(b -> b.getConstructors(meta), (t, u) -> new DualBuilder.ForExecutable<>(this, t, u), EmptyBuilder.instance()::forExecutable); } @Override - public Map<Signature, MetadataBuilder.ForExecutable<Method>> getMethods(Metas<Class<?>> meta) { + public Map<Signature, MetadataBuilder.ForExecutable<Method>> getMethods(Meta<Class<?>> meta) { return merge(b -> b.getMethods(meta), (t, u) -> new DualBuilder.ForExecutable<>(this, t, u), EmptyBuilder.instance()::forExecutable); } @@ -151,7 +151,7 @@ public class DualBuilder { } @Override - public final Annotation[] getDeclaredConstraints(Metas<E> meta) { + public final Annotation[] getDeclaredConstraints(Meta<E> meta) { return activeDelegates().map(d -> d.getDeclaredConstraints(meta)).flatMap(Stream::of) .toArray(Annotation[]::new); } @@ -166,7 +166,7 @@ public class DualBuilder { } @Override - public List<Class<?>> getGroupSequence(Metas<Class<?>> meta) { + public List<Class<?>> getGroupSequence(Meta<Class<?>> meta) { final List<Class<?>> customGroupSequence = customDelegate.getGroupSequence(meta); if (customGroupSequence != null) { return customGroupSequence; @@ -184,19 +184,19 @@ public class DualBuilder { } @Override - public final boolean isCascade(Metas<E> meta) { + public final boolean isCascade(Meta<E> meta) { return activeDelegates().anyMatch(d -> d.isCascade(meta)); } @Override - public final Set<GroupConversion> getGroupConversions(Metas<E> meta) { + public final Set<GroupConversion> getGroupConversions(Meta<E> meta) { return activeDelegates().map(d -> d.getGroupConversions(meta)).flatMap(Collection::stream) .collect(ToUnmodifiable.set()); } @Override public final Map<ContainerElementKey, MetadataBuilder.ForContainer<AnnotatedType>> getContainerElementTypes( - Metas<E> meta) { + Meta<E> meta) { return merge(b -> b.getContainerElementTypes(meta), (t, u) -> new DualBuilder.ForContainer<>(this, t, u), EmptyBuilder.instance()::forContainer); } @@ -210,13 +210,13 @@ public class DualBuilder { } @Override - public MetadataBuilder.ForContainer<E> getReturnValue(Metas<E> meta) { + public MetadataBuilder.ForContainer<E> getReturnValue(Meta<E> meta) { return new DualBuilder.ForContainer<>(this, primaryDelegate.getReturnValue(meta), customDelegate.getReturnValue(meta)); } @Override - public List<MetadataBuilder.ForContainer<Parameter>> getParameters(Metas<E> meta) { + public List<MetadataBuilder.ForContainer<Parameter>> getParameters(Meta<E> meta) { final List<MetadataBuilder.ForContainer<Parameter>> primaries = primaryDelegate.getParameters(meta); final List<MetadataBuilder.ForContainer<Parameter>> customs = customDelegate.getParameters(meta); @@ -230,7 +230,7 @@ public class DualBuilder { } @Override - public MetadataBuilder.ForElement<E> getCrossParameter(Metas<E> meta) { + public MetadataBuilder.ForElement<E> getCrossParameter(Meta<E> meta) { return new DualBuilder.ForElement<MetadataBuilder.ForElement<E>, E>(this, primaryDelegate.getCrossParameter(meta), customDelegate.getCrossParameter(meta)); } http://git-wip-us.apache.org/repos/asf/bval/blob/0e874301/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/EmptyBuilder.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/EmptyBuilder.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/EmptyBuilder.java index 7321784..759176b 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/EmptyBuilder.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/EmptyBuilder.java @@ -58,27 +58,27 @@ public class EmptyBuilder { private final Lazy<EmptyBuilder.ForClass> forClass = new Lazy<>(EmptyBuilder.ForClass::new); @Override - public MetadataBuilder.ForClass getClass(Metas<Class<?>> meta) { + public MetadataBuilder.ForClass getClass(Meta<Class<?>> meta) { return forClass.get(); } @Override - public Map<String, MetadataBuilder.ForContainer<Field>> getFields(Metas<Class<?>> meta) { + public Map<String, MetadataBuilder.ForContainer<Field>> getFields(Meta<Class<?>> meta) { return Collections.emptyMap(); } @Override - public Map<String, MetadataBuilder.ForContainer<Method>> getGetters(Metas<Class<?>> meta) { + public Map<String, MetadataBuilder.ForContainer<Method>> getGetters(Meta<Class<?>> meta) { return Collections.emptyMap(); } @Override - public Map<Signature, MetadataBuilder.ForExecutable<Constructor<?>>> getConstructors(Metas<Class<?>> meta) { + public Map<Signature, MetadataBuilder.ForExecutable<Constructor<?>>> getConstructors(Meta<Class<?>> meta) { return Collections.emptyMap(); } @Override - public Map<Signature, MetadataBuilder.ForExecutable<Method>> getMethods(Metas<Class<?>> meta) { + public Map<Signature, MetadataBuilder.ForExecutable<Method>> getMethods(Meta<Class<?>> meta) { return Collections.emptyMap(); } @@ -91,7 +91,7 @@ public class EmptyBuilder { private class ForElement<E extends AnnotatedElement> extends Level implements MetadataBuilder.ForElement<E> { @Override - public final Annotation[] getDeclaredConstraints(Metas<E> meta) { + public final Annotation[] getDeclaredConstraints(Meta<E> meta) { return ObjectUtils.EMPTY_ANNOTATION_ARRAY; } } @@ -99,7 +99,7 @@ public class EmptyBuilder { private class ForClass extends ForElement<Class<?>> implements MetadataBuilder.ForClass { @Override - public List<Class<?>> getGroupSequence(Metas<Class<?>> meta) { + public List<Class<?>> getGroupSequence(Meta<Class<?>> meta) { return null; } } @@ -108,18 +108,18 @@ public class EmptyBuilder { implements MetadataBuilder.ForContainer<E> { @Override - public boolean isCascade(Metas<E> meta) { + public boolean isCascade(Meta<E> meta) { return false; } @Override - public Set<GroupConversion> getGroupConversions(Metas<E> meta) { + public Set<GroupConversion> getGroupConversions(Meta<E> meta) { return Collections.emptySet(); } @Override public Map<ContainerElementKey, MetadataBuilder.ForContainer<AnnotatedType>> getContainerElementTypes( - Metas<E> meta) { + Meta<E> meta) { return Collections.emptyMap(); } } @@ -128,18 +128,18 @@ public class EmptyBuilder { @SuppressWarnings("unchecked") @Override - public MetadataBuilder.ForElement<E> getCrossParameter(Metas<E> meta) { + public MetadataBuilder.ForElement<E> getCrossParameter(Meta<E> meta) { return forElement.get(); } @Override - public List<MetadataBuilder.ForContainer<Parameter>> getParameters(Metas<E> meta) { + public List<MetadataBuilder.ForContainer<Parameter>> getParameters(Meta<E> meta) { return Collections.emptyList(); } @SuppressWarnings("unchecked") @Override - public MetadataBuilder.ForContainer<E> getReturnValue(Metas<E> meta) { + public MetadataBuilder.ForContainer<E> getReturnValue(Meta<E> meta) { return forContainer.get(); } } http://git-wip-us.apache.org/repos/asf/bval/blob/0e874301/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/HierarchyBuilder.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/HierarchyBuilder.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/HierarchyBuilder.java index 693c065..9cac057 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/HierarchyBuilder.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/HierarchyBuilder.java @@ -50,38 +50,38 @@ public class HierarchyBuilder extends CompositeBuilder { } static class ForBean extends HierarchyDelegate<MetadataBuilder.ForBean> implements MetadataBuilder.ForBean { - final Metas<Class<?>> hierarchyType; + final Meta<Class<?>> hierarchyType; ForBean(MetadataBuilder.ForBean delegate, Class<?> hierarchyType) { super(delegate); - this.hierarchyType = new Metas.ForClass(hierarchyType); + this.hierarchyType = new Meta.ForClass(hierarchyType); } @Override - public MetadataBuilder.ForClass getClass(Metas<Class<?>> meta) { + public MetadataBuilder.ForClass getClass(Meta<Class<?>> meta) { return new HierarchyDelegate.ForClass(delegate.getClass(hierarchyType), hierarchyType); } @Override - public Map<String, MetadataBuilder.ForContainer<Field>> getFields(Metas<Class<?>> meta) { + public Map<String, MetadataBuilder.ForContainer<Field>> getFields(Meta<Class<?>> meta) { return delegate.getFields(hierarchyType); } @Override - public Map<String, MetadataBuilder.ForContainer<Method>> getGetters(Metas<Class<?>> meta) { + public Map<String, MetadataBuilder.ForContainer<Method>> getGetters(Meta<Class<?>> meta) { return delegate.getGetters(hierarchyType); } @SuppressWarnings("unlikely-arg-type") @Override - public Map<Signature, MetadataBuilder.ForExecutable<Constructor<?>>> getConstructors(Metas<Class<?>> meta) { + public Map<Signature, MetadataBuilder.ForExecutable<Constructor<?>>> getConstructors(Meta<Class<?>> meta) { // suppress hierarchical ctors: return hierarchyType.equals(meta.getHost()) ? delegate.getConstructors(hierarchyType) : Collections.emptyMap(); } @Override - public Map<Signature, MetadataBuilder.ForExecutable<Method>> getMethods(Metas<Class<?>> meta) { + public Map<Signature, MetadataBuilder.ForExecutable<Method>> getMethods(Meta<Class<?>> meta) { final Map<Signature, MetadataBuilder.ForExecutable<Method>> m = delegate.getMethods(hierarchyType); return m; @@ -90,20 +90,20 @@ public class HierarchyBuilder extends CompositeBuilder { static class ForClass extends HierarchyDelegate<MetadataBuilder.ForClass> implements MetadataBuilder.ForClass { - final Metas<Class<?>> hierarchyType; + final Meta<Class<?>> hierarchyType; - ForClass(MetadataBuilder.ForClass delegate, Metas<Class<?>> hierarchyType) { + ForClass(MetadataBuilder.ForClass delegate, Meta<Class<?>> hierarchyType) { super(delegate); this.hierarchyType = hierarchyType; } @Override - public Annotation[] getDeclaredConstraints(Metas<Class<?>> meta) { + public Annotation[] getDeclaredConstraints(Meta<Class<?>> meta) { return delegate.getDeclaredConstraints(hierarchyType); } @Override - public List<Class<?>> getGroupSequence(Metas<Class<?>> meta) { + public List<Class<?>> getGroupSequence(Meta<Class<?>> meta) { return delegate.getGroupSequence(hierarchyType); } } @@ -147,7 +147,7 @@ public class HierarchyBuilder extends CompositeBuilder { @Override protected <E extends AnnotatedElement> Map<Scope, Annotation[]> getConstraintsByScope( - CompositeBuilder.ForElement<? extends MetadataBuilder.ForElement<E>, E> composite, Metas<E> meta) { + CompositeBuilder.ForElement<? extends MetadataBuilder.ForElement<E>, E> composite, Meta<E> meta) { final Iterator<? extends MetadataBuilder.ForElement<E>> iter = composite.delegates.iterator(); @@ -163,7 +163,7 @@ public class HierarchyBuilder extends CompositeBuilder { } @Override - protected List<Class<?>> getGroupSequence(CompositeBuilder.ForClass composite, Metas<Class<?>> meta) { + protected List<Class<?>> getGroupSequence(CompositeBuilder.ForClass composite, Meta<Class<?>> meta) { return composite.delegates.get(0).getGroupSequence(meta); } } http://git-wip-us.apache.org/repos/asf/bval/blob/0e874301/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/Meta.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/Meta.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/Meta.java index 60267c1..dbcaeeb 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/Meta.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/Meta.java @@ -44,10 +44,9 @@ import org.apache.bval.util.Validate; * * @param <E> */ -// TODO rename to Meta; delete old type of that name -public abstract class Metas<E extends AnnotatedElement> { +public abstract class Meta<E extends AnnotatedElement> { - public static class ForClass extends Metas<Class<?>> { + public static class ForClass extends Meta<Class<?>> { public ForClass(Class<?> host) { super(host, ElementType.TYPE); @@ -95,7 +94,7 @@ public abstract class Metas<E extends AnnotatedElement> { } } - public static abstract class ForMember<M extends Member & AnnotatedElement> extends Metas<M> { + public static abstract class ForMember<M extends Member & AnnotatedElement> extends Meta<M> { protected ForMember(M host, ElementType elementType) { super(host, elementType); @@ -175,9 +174,9 @@ public abstract class Metas<E extends AnnotatedElement> { } } - public static class ForCrossParameter<E extends Executable> extends Metas.ForExecutable<E> { + public static class ForCrossParameter<E extends Executable> extends Meta.ForExecutable<E> { - public ForCrossParameter(Metas<E> parent) { + public ForCrossParameter(Meta<E> parent) { super(parent.getHost(), parent.getElementType()); } @@ -202,7 +201,7 @@ public abstract class Metas<E extends AnnotatedElement> { } } - public static class ForParameter extends Metas<Parameter> { + public static class ForParameter extends Meta<Parameter> { private final String name; @@ -236,12 +235,12 @@ public abstract class Metas<E extends AnnotatedElement> { } } - public static class ForContainerElement extends Metas<AnnotatedType> { + public static class ForContainerElement extends Meta<AnnotatedType> { - private final Metas<?> parent; + private final Meta<?> parent; private final ContainerElementKey key; - public ForContainerElement(Metas<?> parent, ContainerElementKey key) { + public ForContainerElement(Meta<?> parent, ContainerElementKey key) { super(key.getAnnotatedType(), ElementType.TYPE_USE); this.parent = Validate.notNull(parent, "parent"); this.key = Validate.notNull(key, "key"); @@ -280,7 +279,7 @@ public abstract class Metas<E extends AnnotatedElement> { private final E host; private final ElementType elementType; - protected Metas(E host, ElementType elementType) { + protected Meta(E host, ElementType elementType) { super(); this.host = Validate.notNull(host, "host"); this.elementType = Validate.notNull(elementType, "elementType"); @@ -317,7 +316,7 @@ public abstract class Metas<E extends AnnotatedElement> { } protected String getStringPrefix() { - return Metas.class.getSimpleName() + '.' + getClass().getSimpleName(); + return Meta.class.getSimpleName() + '.' + getClass().getSimpleName(); } @Override @@ -328,7 +327,7 @@ public abstract class Metas<E extends AnnotatedElement> { if (!obj.getClass().equals(getClass())) { return false; } - return Objects.equals(((Metas<?>) obj).getHost(), getHost()); + return Objects.equals(((Meta<?>) obj).getHost(), getHost()); } @Override http://git-wip-us.apache.org/repos/asf/bval/blob/0e874301/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/MetadataBuilder.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/MetadataBuilder.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/MetadataBuilder.java index ac6cc1a..512daca 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/MetadataBuilder.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/MetadataBuilder.java @@ -40,9 +40,9 @@ import org.apache.bval.jsr.groups.GroupConversion; public final class MetadataBuilder { public interface ForBean extends HasAnnotationBehavior { - MetadataBuilder.ForClass getClass(Metas<Class<?>> meta); + MetadataBuilder.ForClass getClass(Meta<Class<?>> meta); - Map<String, ForContainer<Field>> getFields(Metas<Class<?>> meta); + Map<String, ForContainer<Field>> getFields(Meta<Class<?>> meta); /** * Returned keys are property names per XML mapping spec. @@ -50,11 +50,11 @@ public final class MetadataBuilder { * @param meta * @return {@link Map} */ - Map<String, ForContainer<Method>> getGetters(Metas<Class<?>> meta); + Map<String, ForContainer<Method>> getGetters(Meta<Class<?>> meta); - Map<Signature, ForExecutable<Constructor<?>>> getConstructors(Metas<Class<?>> meta); + Map<Signature, ForExecutable<Constructor<?>>> getConstructors(Meta<Class<?>> meta); - Map<Signature, ForExecutable<Method>> getMethods(Metas<Class<?>> meta); + Map<Signature, ForExecutable<Method>> getMethods(Meta<Class<?>> meta); default boolean isEmpty() { return false; @@ -63,34 +63,34 @@ public final class MetadataBuilder { public interface ForElement<E extends AnnotatedElement> extends HasAnnotationBehavior { - Annotation[] getDeclaredConstraints(Metas<E> meta); + Annotation[] getDeclaredConstraints(Meta<E> meta); - default Map<Scope, Annotation[]> getConstraintsByScope(Metas<E> meta) { + default Map<Scope, Annotation[]> getConstraintsByScope(Meta<E> meta) { return Collections.singletonMap(Scope.LOCAL_ELEMENT, getDeclaredConstraints(meta)); } } public interface ForClass extends ForElement<Class<?>> { - List<Class<?>> getGroupSequence(Metas<Class<?>> meta); + List<Class<?>> getGroupSequence(Meta<Class<?>> meta); } public interface ForContainer<E extends AnnotatedElement> extends MetadataBuilder.ForElement<E> { - boolean isCascade(Metas<E> meta); + boolean isCascade(Meta<E> meta); - Set<GroupConversion> getGroupConversions(Metas<E> meta); + Set<GroupConversion> getGroupConversions(Meta<E> meta); - Map<ContainerElementKey, ForContainer<AnnotatedType>> getContainerElementTypes(Metas<E> meta); + Map<ContainerElementKey, ForContainer<AnnotatedType>> getContainerElementTypes(Meta<E> meta); } public interface ForExecutable<E extends Executable> extends HasAnnotationBehavior { - MetadataBuilder.ForContainer<E> getReturnValue(Metas<E> meta); + MetadataBuilder.ForContainer<E> getReturnValue(Meta<E> meta); - MetadataBuilder.ForElement<E> getCrossParameter(Metas<E> meta); + MetadataBuilder.ForElement<E> getCrossParameter(Meta<E> meta); - List<ForContainer<Parameter>> getParameters(Metas<E> meta); + List<ForContainer<Parameter>> getParameters(Meta<E> meta); } private MetadataBuilder() { http://git-wip-us.apache.org/repos/asf/bval/blob/0e874301/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ReflectionBuilder.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ReflectionBuilder.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ReflectionBuilder.java index ea1a9bf..d9722ec 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ReflectionBuilder.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ReflectionBuilder.java @@ -63,81 +63,81 @@ import org.apache.commons.weaver.privilizer.Privilizing.CallTo; public class ReflectionBuilder { private class ForBean implements MetadataBuilder.ForBean { - private final Metas<Class<?>> meta; + private final Meta<Class<?>> meta; - ForBean(Metas<Class<?>> meta) { + ForBean(Meta<Class<?>> meta) { super(); this.meta = Validate.notNull(meta, "meta"); } @Override - public MetadataBuilder.ForClass getClass(Metas<Class<?>> ignored) { + public MetadataBuilder.ForClass getClass(Meta<Class<?>> ignored) { return new ReflectionBuilder.ForClass(meta); } @Override - public Map<String, MetadataBuilder.ForContainer<Field>> getFields(Metas<Class<?>> ignored) { + public Map<String, MetadataBuilder.ForContainer<Field>> getFields(Meta<Class<?>> ignored) { final Field[] declaredFields = Reflection.getDeclaredFields(meta.getHost()); if (declaredFields.length == 0) { return Collections.emptyMap(); } return Stream.of(declaredFields).collect( - Collectors.toMap(Field::getName, f -> new ReflectionBuilder.ForContainer<>(new Metas.ForField(f)))); + Collectors.toMap(Field::getName, f -> new ReflectionBuilder.ForContainer<>(new Meta.ForField(f)))); } @Override - public Map<String, MetadataBuilder.ForContainer<Method>> getGetters(Metas<Class<?>> ignored) { + public Map<String, MetadataBuilder.ForContainer<Method>> getGetters(Meta<Class<?>> ignored) { return Stream.of(Reflection.getDeclaredMethods(meta.getHost())).filter(Methods::isGetter) .collect(ToUnmodifiable.map(Methods::propertyName, - g -> new ReflectionBuilder.ForContainer<>(new Metas.ForMethod(g)))); + g -> new ReflectionBuilder.ForContainer<>(new Meta.ForMethod(g)))); } @Override - public Map<Signature, MetadataBuilder.ForExecutable<Constructor<?>>> getConstructors(Metas<Class<?>> ignored) { + public Map<Signature, MetadataBuilder.ForExecutable<Constructor<?>>> getConstructors(Meta<Class<?>> ignored) { final Constructor<?>[] declaredConstructors = Reflection.getDeclaredConstructors(meta.getHost()); if (declaredConstructors.length == 0) { return Collections.emptyMap(); } return Stream.of(declaredConstructors).collect( - Collectors.toMap(Signature::of, c -> new ReflectionBuilder.ForExecutable<>(new Metas.ForConstructor(c), + Collectors.toMap(Signature::of, c -> new ReflectionBuilder.ForExecutable<>(new Meta.ForConstructor(c), validatorFactory.getParameterNameProvider()::getParameterNames))); } @Override - public Map<Signature, MetadataBuilder.ForExecutable<Method>> getMethods(Metas<Class<?>> ignored) { + public Map<Signature, MetadataBuilder.ForExecutable<Method>> getMethods(Meta<Class<?>> ignored) { final Method[] declaredMethods = Reflection.getDeclaredMethods(meta.getHost()); if (declaredMethods.length == 0) { return Collections.emptyMap(); } // we can't filter the getters since they can be validated, todo: read the config to know if we need or not return Stream.of(declaredMethods).collect( - Collectors.toMap(Signature::of, m -> new ReflectionBuilder.ForExecutable<>(new Metas.ForMethod(m), + Collectors.toMap(Signature::of, m -> new ReflectionBuilder.ForExecutable<>(new Meta.ForMethod(m), validatorFactory.getParameterNameProvider()::getParameterNames))); } } private abstract class ForElement<E extends AnnotatedElement> implements MetadataBuilder.ForElement<E> { - final Metas<E> meta; + final Meta<E> meta; - ForElement(Metas<E> meta) { + ForElement(Meta<E> meta) { super(); this.meta = Validate.notNull(meta, "meta"); } @Override - public Annotation[] getDeclaredConstraints(Metas<E> ignored) { + public Annotation[] getDeclaredConstraints(Meta<E> ignored) { return AnnotationsManager.getDeclaredConstraints(meta); } } private class ForClass extends ForElement<Class<?>> implements MetadataBuilder.ForClass { - ForClass(Metas<Class<?>> meta) { + ForClass(Meta<Class<?>> meta) { super(meta); } @Override - public List<Class<?>> getGroupSequence(Metas<Class<?>> ignored) { + public List<Class<?>> getGroupSequence(Meta<Class<?>> ignored) { final GroupSequence groupSequence = meta.getHost().getAnnotation(GroupSequence.class); return groupSequence == null ? null : Collections.unmodifiableList(Arrays.asList(groupSequence.value())); } @@ -146,13 +146,13 @@ public class ReflectionBuilder { private class ForContainer<E extends AnnotatedElement> extends ReflectionBuilder.ForElement<E> implements MetadataBuilder.ForContainer<E> { - ForContainer(Metas<E> meta) { + ForContainer(Meta<E> meta) { super(meta); } @Override public Map<ContainerElementKey, MetadataBuilder.ForContainer<AnnotatedType>> getContainerElementTypes( - Metas<E> ignored) { + Meta<E> ignored) { final AnnotatedType annotatedType = meta.getAnnotatedType(); if (annotatedType instanceof AnnotatedParameterizedType) { @@ -163,7 +163,7 @@ public class ReflectionBuilder { final AnnotatedType[] typeArgs = container.getAnnotatedActualTypeArguments(); for (int i = 0; i < typeArgs.length; i++) { ContainerElementKey key = new ContainerElementKey(container, i); - result.put(key, new ReflectionBuilder.ForContainer<>(new Metas.ForContainerElement(meta, key))); + result.put(key, new ReflectionBuilder.ForContainer<>(new Meta.ForContainerElement(meta, key))); } return result; } @@ -171,12 +171,12 @@ public class ReflectionBuilder { } @Override - public boolean isCascade(Metas<E> ignored) { + public boolean isCascade(Meta<E> ignored) { return meta.getHost().isAnnotationPresent(Valid.class); } @Override - public Set<GroupConversion> getGroupConversions(Metas<E> ignored) { + public Set<GroupConversion> getGroupConversions(Meta<E> ignored) { return Stream.of(meta.getHost().getDeclaredAnnotationsByType(ConvertGroup.class)) .map(cg -> GroupConversion.from(cg.from()).to(cg.to())).collect(ToUnmodifiable.set()); } @@ -184,17 +184,17 @@ public class ReflectionBuilder { private class ForExecutable<E extends Executable> implements MetadataBuilder.ForExecutable<E> { - final Metas<E> meta; + final Meta<E> meta; final Function<E, List<String>> getParameterNames; - ForExecutable(Metas<E> meta, Function<E, List<String>> getParameterNames) { + ForExecutable(Meta<E> meta, Function<E, List<String>> getParameterNames) { super(); this.meta = Validate.notNull(meta, "meta"); this.getParameterNames = Validate.notNull(getParameterNames, "getParameterNames"); } @Override - public List<MetadataBuilder.ForContainer<Parameter>> getParameters(Metas<E> ignored) { + public List<MetadataBuilder.ForContainer<Parameter>> getParameters(Meta<E> ignored) { final Parameter[] parameters = meta.getHost().getParameters(); if (parameters.length == 0) { return Collections.emptyList(); @@ -202,26 +202,26 @@ public class ReflectionBuilder { final List<String> parameterNames = getParameterNames.apply(meta.getHost()); return IntStream.range(0, parameters.length).mapToObj( - n -> new ReflectionBuilder.ForContainer<>(new Metas.ForParameter(parameters[n], parameterNames.get(n)))) + n -> new ReflectionBuilder.ForContainer<>(new Meta.ForParameter(parameters[n], parameterNames.get(n)))) .collect(ToUnmodifiable.list()); } @Override - public ForContainer<E> getReturnValue(Metas<E> ignored) { + public ForContainer<E> getReturnValue(Meta<E> ignored) { return new ReflectionBuilder.ForContainer<E>(meta) { @Override - public Annotation[] getDeclaredConstraints(Metas<E> meta) { + public Annotation[] getDeclaredConstraints(Meta<E> meta) { return getConstraints(ConstraintTarget.RETURN_VALUE); } }; } @Override - public MetadataBuilder.ForElement<E> getCrossParameter(Metas<E> ignored) { + public MetadataBuilder.ForElement<E> getCrossParameter(Meta<E> ignored) { return new ReflectionBuilder.ForElement<E>(meta) { @Override - public Annotation[] getDeclaredConstraints(Metas<E> meta) { + public Annotation[] getDeclaredConstraints(Meta<E> meta) { return getConstraints(ConstraintTarget.PARAMETERS); } }; @@ -299,6 +299,6 @@ public class ReflectionBuilder { } public <T> MetadataBuilder.ForBean forBean(Class<?> beanClass) { - return new ReflectionBuilder.ForBean(new Metas.ForClass(beanClass)); + return new ReflectionBuilder.ForBean(new Meta.ForClass(beanClass)); } } http://git-wip-us.apache.org/repos/asf/bval/blob/0e874301/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/XmlBuilder.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/XmlBuilder.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/XmlBuilder.java index aef162d..382bab7 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/XmlBuilder.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/XmlBuilder.java @@ -112,26 +112,26 @@ public class XmlBuilder { } @Override - public MetadataBuilder.ForClass getClass(Metas<Class<?>> meta) { + public MetadataBuilder.ForClass getClass(Meta<Class<?>> meta) { final ClassType classType = descriptor.getClassType(); return classType == null ? EmptyBuilder.instance().forBean().getClass(meta) : new XmlBuilder.ForClass(classType); } @Override - public Map<String, MetadataBuilder.ForContainer<Field>> getFields(Metas<Class<?>> meta) { + public Map<String, MetadataBuilder.ForContainer<Field>> getFields(Meta<Class<?>> meta) { return descriptor.getField().stream() .collect(ToUnmodifiable.map(FieldType::getName, XmlBuilder.ForField::new)); } @Override - public Map<String, MetadataBuilder.ForContainer<Method>> getGetters(Metas<Class<?>> meta) { + public Map<String, MetadataBuilder.ForContainer<Method>> getGetters(Meta<Class<?>> meta) { return descriptor.getGetter().stream() .collect(ToUnmodifiable.map(GetterType::getName, XmlBuilder.ForGetter::new)); } @Override - public Map<Signature, MetadataBuilder.ForExecutable<Constructor<?>>> getConstructors(Metas<Class<?>> meta) { + public Map<Signature, MetadataBuilder.ForExecutable<Constructor<?>>> getConstructors(Meta<Class<?>> meta) { if (!atLeast(Version.v11)) { return Collections.emptyMap(); } @@ -146,7 +146,7 @@ public class XmlBuilder { } @Override - public Map<Signature, MetadataBuilder.ForExecutable<Method>> getMethods(Metas<Class<?>> meta) { + public Map<Signature, MetadataBuilder.ForExecutable<Method>> getMethods(Meta<Class<?>> meta) { if (!atLeast(Version.v11)) { return Collections.emptyMap(); } @@ -198,7 +198,7 @@ public class XmlBuilder { } @Override - public final Annotation[] getDeclaredConstraints(Metas<E> meta) { + public final Annotation[] getDeclaredConstraints(Meta<E> meta) { return lazy(getDeclaredConstraints, "getDeclaredConstraints"); } @@ -222,7 +222,7 @@ public class XmlBuilder { } @Override - public List<Class<?>> getGroupSequence(Metas<Class<?>> meta) { + public List<Class<?>> getGroupSequence(Meta<Class<?>> meta) { final GroupSequenceType groupSequence = descriptor.getGroupSequence(); return groupSequence == null ? null : groupSequence.getValue().stream().map(XmlBuilder.this::resolveClass).collect(ToUnmodifiable.list()); @@ -241,18 +241,18 @@ public class XmlBuilder { } @Override - public boolean isCascade(Metas<E> meta) { + public boolean isCascade(Meta<E> meta) { return lazy(isCascade, "isCascade").booleanValue(); } @Override - public Set<GroupConversion> getGroupConversions(Metas<E> meta) { + public Set<GroupConversion> getGroupConversions(Meta<E> meta) { return lazy(getGroupConversions, "getGroupConversions"); } @Override public Map<ContainerElementKey, MetadataBuilder.ForContainer<AnnotatedType>> getContainerElementTypes( - Metas<E> meta) { + Meta<E> meta) { if (!atLeast(Version.v20)) { return Collections.emptyMap(); } @@ -355,17 +355,17 @@ public class XmlBuilder { } @Override - public MetadataBuilder.ForElement<E> getCrossParameter(Metas<E> meta) { + public MetadataBuilder.ForElement<E> getCrossParameter(Meta<E> meta) { return new XmlBuilder.ForCrossParameter<>(lazy(getCrossParameter, "getCrossParameter")); } @Override - public MetadataBuilder.ForContainer<E> getReturnValue(Metas<E> meta) { + public MetadataBuilder.ForContainer<E> getReturnValue(Meta<E> meta) { return new XmlBuilder.ForReturnValue<>(lazy(getReturnValue, "getReturnValue")); } @Override - public List<MetadataBuilder.ForContainer<Parameter>> getParameters(Metas<E> meta) { + public List<MetadataBuilder.ForContainer<Parameter>> getParameters(Meta<E> meta) { return lazy(getParameters, "getParameters").stream().map(XmlBuilder.ForParameter::new) .collect(Collectors.toList()); } http://git-wip-us.apache.org/repos/asf/bval/blob/0e874301/bval-jsr/src/main/java/org/apache/bval/jsr/util/AnnotationsManager.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/AnnotationsManager.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/AnnotationsManager.java index b53b513..4436bb7 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/AnnotationsManager.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/AnnotationsManager.java @@ -53,7 +53,7 @@ import org.apache.bval.jsr.ConstraintCached.ConstraintValidatorInfo; import org.apache.bval.jsr.groups.Group; import org.apache.bval.jsr.groups.Groups; import org.apache.bval.jsr.groups.GroupsComputer; -import org.apache.bval.jsr.metadata.Metas; +import org.apache.bval.jsr.metadata.Meta; import org.apache.bval.jsr.xml.AnnotationProxyBuilder; import org.apache.bval.util.Exceptions; import org.apache.bval.util.Lazy; @@ -239,7 +239,7 @@ public class AnnotationsManager { * @param meta * @return Annotation[] */ - public static Annotation[] getDeclaredConstraints(Metas<?> meta) { + public static Annotation[] getDeclaredConstraints(Meta<?> meta) { final Annotation[] result = getDeclaredConstraints(meta.getHost()); final Class<?> dc = meta.getDeclaringClass(); if (dc.isInterface()) {
