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 2019/02/16 19:45:03 UTC
[bval] branch master updated: BVAL-170: minor performance
improvements by Thomas Andraschko
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bval.git
The following commit(s) were added to refs/heads/master by this push:
new 0ac9e6f BVAL-170: minor performance improvements by Thomas Andraschko
0ac9e6f is described below
commit 0ac9e6fce5f77b64571f9bfbe60c51ac0fe11e2d
Author: Matt Benson <mb...@apache.org>
AuthorDate: Sat Feb 16 13:44:56 2019 -0600
BVAL-170: minor performance improvements by Thomas Andraschko
---
.../main/java/org/apache/bval/jsr/DefaultMessageInterpolator.java | 2 +-
.../src/main/java/org/apache/bval/jsr/groups/GroupsComputer.java | 6 +++++-
bval-jsr/src/main/java/org/apache/bval/jsr/metadata/Meta.java | 3 ++-
bval-jsr/src/main/java/org/apache/bval/jsr/util/PathNavigation.java | 2 +-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultMessageInterpolator.java b/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultMessageInterpolator.java
index ca3e8ab..d94187a 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultMessageInterpolator.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultMessageInterpolator.java
@@ -325,7 +325,7 @@ public class DefaultMessageInterpolator implements MessageInterpolator {
final Class<?> variableClass = variable.getClass();
Method method = toStringMethods.get(variableClass);
if (method == null) {
- method = Reflection.getDeclaredMethod(Arrays.class, "toString", variableClass);;
+ method = Reflection.getDeclaredMethod(Arrays.class, "toString", variableClass);
toStringMethods.putIfAbsent(variableClass, method);
}
return method;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/groups/GroupsComputer.java b/bval-jsr/src/main/java/org/apache/bval/jsr/groups/GroupsComputer.java
index b6b7a3a..7d5e9bf 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/groups/GroupsComputer.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/groups/GroupsComputer.java
@@ -70,6 +70,10 @@ public class GroupsComputer {
@SafeVarargs
public final Groups computeGroups(Class<?>... groups) {
Exceptions.raiseIf(groups == null, IllegalArgumentException::new, "null validation groups specified");
+
+ if (groups.length == 0 || (groups.length == 1 && groups[0] == Default.class)) {
+ return DEFAULT_GROUPS;
+ }
return computeGroups(Arrays.asList(groups));
}
@@ -131,7 +135,7 @@ public class GroupsComputer {
public Groups computeGroups(Collection<Class<?>> groups) {
Validate.notNull(groups, "groups");
- if (groups.isEmpty() || Arrays.asList(DEFAULT_GROUP).equals(new ArrayList<>(groups))) {
+ if (groups.isEmpty() || (groups.size() == 1 && groups.contains(Default.class))) {
return DEFAULT_GROUPS;
}
return computeGroups(groups.stream());
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 dcdf0a6..b12b541 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
@@ -231,6 +231,7 @@ public abstract class Meta<E extends AnnotatedElement> {
return getHost().getAnnotatedType();
}
+ @Override
public String getName() {
return name;
}
@@ -290,7 +291,7 @@ public abstract class Meta<E extends AnnotatedElement> {
}
public Integer getTypeArgumentIndex() {
- return Integer.valueOf(key.getTypeArgumentIndex());
+ return key.getTypeArgumentIndex();
}
@Override
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathNavigation.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathNavigation.java
index 6a6497a..70faa3b 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathNavigation.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathNavigation.java
@@ -94,7 +94,7 @@ public class PathNavigation {
private final List<Callback<?>> delegates;
public CompositeCallbackProcedure(Callback<?>... delegates) {
- this(new ArrayList<>(Arrays.asList(delegates)));
+ this(Arrays.asList(delegates.clone()));
}
public CompositeCallbackProcedure(List<Callback<?>> delegates) {