github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-24 10:01:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replaced private method with ObjectUtils.compare().

Browse Source 
Former-commit-id: 16c4a5a7ed74819351bab55528442183a3244a0c
This commit is contained in:
Dale Visser
2015-06-24 15:19:24 -04:00
parent 723ba740e0
commit 414912de67
1 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Evidence.java
View File

@@ -226,7 +226,7 @@ public class Evidence implements Serializable, Comparable<Evidence> {
if (ObjectUtils.equals(confidence, o.confidence)) { if (ObjectUtils.equals(confidence, o.confidence)) {
return 0; //they are equal return 0; //they are equal
} else { } else {
return compareToWithNullCheck(confidence, o.confidence); return ObjectUtils.compare(confidence, o.confidence);
} }
} else { } else {
return compareToIgnoreCaseWithNullCheck(value, o.value); return compareToIgnoreCaseWithNullCheck(value, o.value);
@@ -258,25 +258,6 @@ public class Evidence implements Serializable, Comparable<Evidence> {
return me.compareToIgnoreCase(other); return me.compareToIgnoreCase(other);
} }
/**
* Wrapper around {@link java.lang.Enum#compareTo(java.lang.Enum) Enum.compareTo} with an exhaustive, possibly duplicative,
* check against nulls.
*
* @param me the value to be compared
* @param other the other value to be compared
* @return true if the values are equal; otherwise false
*/
private int compareToWithNullCheck(Confidence me, Confidence other) {
if (me == null && other == null) {
return 0;
} else if (me == null) {
return -1; //the other string is greater then me
} else if (other == null) {
return 1; //me is greater then the other string
}
return me.compareTo(other);
}
/** /**
* Standard toString() implementation. * Standard toString() implementation.
* *