honeymoose/org.hl7.fhir.core
1
0
Fork 0
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git synced 2025-02-13 08:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve numeric comparison

Browse Source
This commit is contained in:
jamesagnew 2020-11-01 17:00:22 -05:00 committed by James Agnew
parent 6cd0af3b8c
commit 0c01404a4f
2 changed files with 68 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java
View File

@ -3,6 +3,7 @@ package org.hl7.fhir.utilities;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.utilities.npm.NpmPackage; import org.hl7.fhir.utilities.npm.NpmPackage;
@ -216,13 +217,17 @@ public class VersionUtilities {
} }
/** /**
* return true if the current version equals test, or later * return true if the current version equals test, or later,
* * so if a feature is defined in 4.0, if (VersionUtilities.isThisOrLater("4.0", version))
* so if a feature is defined in 4.0, if (VersionUtilities.isThisOrLater("4.0", version))... * <p>
* This method tries to perform a numeric parse, so that <code>0.9</code> will be considered below <code>0.10</code>
* in accordance with SemVer. If either side contains a non-numeric character in a version string, a simple text
* compare will be done instead.
* </p>
* *
* @param test * @param test The value to compare to
* @param current * @param current The value being compared
* @return * @return Is {@literal current} later or equal to {@literal test}? For example, if <code>this = 0.5</code> and <code>current = 0.6</code> this method will return true
*/ */
public static boolean isThisOrLater(String test, String current) { public static boolean isThisOrLater(String test, String current) {
String t = getMajMin(test); String t = getMajMin(test);
@ -230,8 +235,29 @@ public class VersionUtilities {
if (c.compareTo(t) == 0) { if (c.compareTo(t) == 0) {
return isMajMinOrLaterPatch(test, current); return isMajMinOrLaterPatch(test, current);
} }
boolean ok = c.compareTo(t) >= 0;
return ok; String[] testParts = t.split("\\.");
String[] currentParts = c.split("\\.");
for (int i = 0; i < Math.max(testParts.length, currentParts.length); i++) {
if (i == testParts.length) {
return true;
} else if (i == currentParts.length) {
return false;
}
String testPart = testParts[i];
String currentPart = currentParts[i];
if (testPart.equals(currentPart)) {
continue;
}
if (StringUtils.isNumeric(testPart) && StringUtils.isNumeric(currentPart)) {
return Integer.parseInt(currentPart) - Integer.parseInt(testPart) > 0;
} else {
return currentPart.compareTo(testPart) >= 0;
}
}
return true;
} }
/** /**

34
org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/VersionUtilitiesTest.java Normal file
View File

@ -0,0 +1,34 @@
package org.hl7.fhir.utilities;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
public class VersionUtilitiesTest {
@Test
public void isThisOrLater_Simple() {
assertTrue(VersionUtilities.isThisOrLater("0.1", "0.2"));
assertFalse(VersionUtilities.isThisOrLater("0.2", "0.1"));
}
@Test
public void isThisOrLater_NeedNumericComparison() {
assertTrue(VersionUtilities.isThisOrLater("0.9", "0.10"));
assertFalse(VersionUtilities.isThisOrLater("0.10", "0.9"));
}
@Test
public void isThisOrLater_DifferentLengths() {
assertTrue(VersionUtilities.isThisOrLater("0.9", "0.9.1"));
assertFalse(VersionUtilities.isThisOrLater("0.9.1", "0.9"));
}
@Test
public void isThisOrLater_NonNumeric() {
assertTrue(VersionUtilities.isThisOrLater("0.A", "0.B"));
assertFalse(VersionUtilities.isThisOrLater("0.B", "0.A"));
}
}