You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bval.apache.org by mb...@apache.org on 2018/02/28 16:12:38 UTC
bval git commit: remove unnecessary type
Repository: bval
Updated Branches:
refs/heads/bv2 b22b007bd -> 3a5c61609
remove unnecessary type
Project: http://git-wip-us.apache.org/repos/asf/bval/repo
Commit: http://git-wip-us.apache.org/repos/asf/bval/commit/3a5c6160
Tree: http://git-wip-us.apache.org/repos/asf/bval/tree/3a5c6160
Diff: http://git-wip-us.apache.org/repos/asf/bval/diff/3a5c6160
Branch: refs/heads/bv2
Commit: 3a5c61609e00ce4a3b33acd098ed4d35a76d0770
Parents: b22b007
Author: Matt Benson <mb...@apache.org>
Authored: Wed Feb 28 10:12:31 2018 -0600
Committer: Matt Benson <mb...@apache.org>
Committed: Wed Feb 28 10:12:31 2018 -0600
----------------------------------------------------------------------
.../bval/jsr/metadata/CompositeBuilder.java | 35 ++------------------
1 file changed, 3 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bval/blob/3a5c6160/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 56dd1f8..f96b37b 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
@@ -186,35 +186,6 @@ public class CompositeBuilder {
}
}
- class ForReturnValue<E extends Executable> implements MetadataBuilder.ForContainer<E> {
- private final MetadataBuilder.ForContainer<E> delegate;
-
- ForReturnValue(MetadataBuilder.ForContainer<E> delegate) {
- this.delegate = delegate;
- }
-
- @Override
- public Annotation[] getDeclaredConstraints(Meta<E> meta) {
- return delegate.getDeclaredConstraints(meta);
- }
-
- @Override
- public boolean isCascade(Meta<E> meta) {
- return delegate.isCascade(meta);
- }
-
- @Override
- public Set<GroupConversion> getGroupConversions(Meta<E> meta) {
- return delegate.getGroupConversions(meta);
- }
-
- @Override
- public Map<ContainerElementKey, MetadataBuilder.ForContainer<AnnotatedType>> getContainerElementTypes(
- Meta<E> meta) {
- return delegate.getContainerElementTypes(meta);
- }
- }
-
class ForExecutable<DELEGATE extends MetadataBuilder.ForExecutable<E>, E extends Executable>
extends Delegator<DELEGATE> implements MetadataBuilder.ForExecutable<E> {
@@ -226,10 +197,10 @@ public class CompositeBuilder {
}
@Override
- public ForReturnValue<E> getReturnValue(Meta<E> meta) {
- return new ForReturnValue<>(CompositeBuilder.this.forContainer(
+ public MetadataBuilder.ForContainer<E> getReturnValue(Meta<E> meta) {
+ return CompositeBuilder.this.forContainer(
delegates.stream().map(d -> d.getReturnValue(meta)).collect(Collectors.toList()), meta,
- ElementKind.RETURN_VALUE));
+ ElementKind.RETURN_VALUE);
}
@Override