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/04/02 16:54:07 UTC
bval git commit: fix ContainerElementKey comparison
Repository: bval
Updated Branches:
refs/heads/bv2 d211bf058 -> 005b7d83e
fix ContainerElementKey comparison
Project: http://git-wip-us.apache.org/repos/asf/bval/repo
Commit: http://git-wip-us.apache.org/repos/asf/bval/commit/005b7d83
Tree: http://git-wip-us.apache.org/repos/asf/bval/tree/005b7d83
Diff: http://git-wip-us.apache.org/repos/asf/bval/diff/005b7d83
Branch: refs/heads/bv2
Commit: 005b7d83e7328bfddadaf5db22c74452e2a15edd
Parents: d211bf0
Author: Matt Benson <mb...@apache.org>
Authored: Mon Apr 2 11:48:49 2018 -0500
Committer: Matt Benson <mb...@apache.org>
Committed: Mon Apr 2 11:48:49 2018 -0500
----------------------------------------------------------------------
.../apache/bval/jsr/metadata/ContainerElementKey.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bval/blob/005b7d83/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ContainerElementKey.java
----------------------------------------------------------------------
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ContainerElementKey.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ContainerElementKey.java
index 2d7102b..ed45601 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ContainerElementKey.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ContainerElementKey.java
@@ -16,6 +16,10 @@
*/
package org.apache.bval.jsr.metadata;
+import static java.util.Comparator.comparing;
+import static java.util.Comparator.naturalOrder;
+import static java.util.Comparator.nullsFirst;
+
import java.lang.reflect.AnnotatedParameterizedType;
import java.lang.reflect.AnnotatedType;
import java.lang.reflect.ParameterizedType;
@@ -46,6 +50,9 @@ import org.apache.bval.util.Validate;
import org.apache.bval.util.reflection.TypeUtils;
public class ContainerElementKey implements Comparable<ContainerElementKey> {
+ public static final Comparator<ContainerElementKey> COMPARATOR =
+ nullsFirst(comparing(ContainerElementKey::containerClassName)
+ .thenComparing(ContainerElementKey::getTypeArgumentIndex, nullsFirst(naturalOrder())));
private static Logger log = Logger.getLogger(ContainerElementKey.class.getName());
@@ -161,10 +168,7 @@ public class ContainerElementKey implements Comparable<ContainerElementKey> {
@Override
public int compareTo(ContainerElementKey o) {
- return Comparator
- .nullsFirst(Comparator.comparing(ContainerElementKey::containerClassName)
- .thenComparing(Comparator.nullsFirst(Comparator.comparing(ContainerElementKey::getTypeArgumentIndex))))
- .compare(this, o);
+ return COMPARATOR.compare(this, o);
}
public Set<ContainerElementKey> getAssignableKeys() {