summaryrefslogtreecommitdiff
path: root/src/main/java/sevenUnits/utils/SemanticVersionNumber.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/sevenUnits/utils/SemanticVersionNumber.java')
-rw-r--r--src/main/java/sevenUnits/utils/SemanticVersionNumber.java116
1 files changed, 54 insertions, 62 deletions
diff --git a/src/main/java/sevenUnits/utils/SemanticVersionNumber.java b/src/main/java/sevenUnits/utils/SemanticVersionNumber.java
index cde3d37..4bb7ce5 100644
--- a/src/main/java/sevenUnits/utils/SemanticVersionNumber.java
+++ b/src/main/java/sevenUnits/utils/SemanticVersionNumber.java
@@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
-import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
@@ -136,7 +135,7 @@ public final class SemanticVersionNumber
return true;
if (!(obj instanceof Builder))
return false;
- final Builder other = (Builder) obj;
+ final var other = (Builder) obj;
return Objects.equals(this.buildMetadata, other.buildMetadata)
&& this.major == other.major && this.minor == other.minor
&& this.patch == other.patch && Objects.equals(
@@ -249,12 +248,11 @@ public final class SemanticVersionNumber
public int compare(SemanticVersionNumber o1, SemanticVersionNumber o2) {
Objects.requireNonNull(o1, "o1 may not be null");
Objects.requireNonNull(o2, "o2 may not be null");
- final int naturalComparison = o1.compareTo(o2);
+ final var naturalComparison = o1.compareTo(o2);
if (naturalComparison == 0)
return SemanticVersionNumber.compareIdentifiers(o1.buildMetadata,
o2.buildMetadata);
- else
- return naturalComparison;
+ return naturalComparison;
};
};
@@ -283,8 +281,8 @@ public final class SemanticVersionNumber
* @since 2022-02-19
* @since v0.4.0
*/
- public static final SemanticVersionNumber.Builder builder(int major,
- int minor, int patch) {
+ public static SemanticVersionNumber.Builder builder(int major, int minor,
+ int patch) {
if (major < 0)
throw new IllegalArgumentException(
"Major version must be non-negative.");
@@ -307,57 +305,54 @@ public final class SemanticVersionNumber
* @since 2022-02-20
* @since v0.4.0
*/
- private static final int compareIdentifiers(List<String> a, List<String> b) {
+ private static int compareIdentifiers(List<String> a, List<String> b) {
// test pre-release size
- final int aSize = a.size();
- final int bSize = b.size();
+ final var aSize = a.size();
+ final var bSize = b.size();
// no identifiers is greater than any identifiers
if (aSize != 0 && bSize == 0)
return -1;
- else if (aSize == 0 && bSize != 0)
+ if (aSize == 0 && bSize != 0)
return 1;
// test identifiers one by one
- for (int i = 0; i < Math.min(aSize, bSize); i++) {
- final String aElement = a.get(i);
- final String bElement = b.get(i);
+ for (var i = 0; i < Math.min(aSize, bSize); i++) {
+ final var aElement = a.get(i);
+ final var bElement = b.get(i);
if (NUMERIC_IDENTIFER.matcher(aElement).matches()) {
- if (NUMERIC_IDENTIFER.matcher(bElement).matches()) {
- // both are numbers, compare them
- final int aNumber = Integer.parseInt(aElement);
- final int bNumber = Integer.parseInt(bElement);
-
- if (aNumber < bNumber)
- return -1;
- else if (aNumber > bNumber)
- return 1;
- } else
+ if (!NUMERIC_IDENTIFER.matcher(bElement).matches())
// aElement is a number and bElement is not a number
// by the rules, a goes before b
return -1;
- } else {
- if (NUMERIC_IDENTIFER.matcher(bElement).matches())
- // aElement is not a number but bElement is
- // by the rules, a goes after b
+ // both are numbers, compare them
+ final var aNumber = Integer.parseInt(aElement);
+ final var bNumber = Integer.parseInt(bElement);
+
+ if (aNumber < bNumber)
+ return -1;
+ if (aNumber > bNumber)
return 1;
- else {
- // both are not numbers, compare them
- final int comparison = aElement.compareTo(bElement);
- if (comparison != 0)
- return comparison;
- }
+ } else if (NUMERIC_IDENTIFER.matcher(bElement).matches())
+ // aElement is not a number but bElement is
+ // by the rules, a goes after b
+ return 1;
+ else {
+ // both are not numbers, compare them
+ final var comparison = aElement.compareTo(bElement);
+ if (comparison != 0)
+ return comparison;
}
}
-
- // we just tested the stuff that's in common, maybe someone has more
if (aSize < bSize)
return -1;
- else if (aSize > bSize)
+ if (aSize > bSize)
return 1;
- else
- return 0;
+ return 0;
+
+ // we just tested the stuff that's in common, maybe someone has more
+
}
/**
@@ -369,19 +364,19 @@ public final class SemanticVersionNumber
* @since v0.4.0
* @see #toString
*/
- public static final SemanticVersionNumber fromString(String versionString) {
+ public static SemanticVersionNumber fromString(String versionString) {
// parse & validate version string
Objects.requireNonNull(versionString, "versionString may not be null");
- final Matcher m = VERSION_NUMBER.matcher(versionString);
+ final var m = VERSION_NUMBER.matcher(versionString);
if (!m.matches())
throw new IllegalArgumentException(
String.format("Provided string \"%s\" is not a version number",
versionString));
// main parts
- final int major = Integer.parseInt(m.group(1));
- final int minor = Integer.parseInt(m.group(2));
- final int patch = Integer.parseInt(m.group(3));
+ final var major = Integer.parseInt(m.group(1));
+ final var minor = Integer.parseInt(m.group(2));
+ final var patch = Integer.parseInt(m.group(3));
// pre release
final List<String> preRelease;
@@ -406,13 +401,13 @@ public final class SemanticVersionNumber
/**
* Tests whether a string is a valid Semantic Version string
- *
+ *
* @param versionString string to test
* @return true iff string is valid
* @since 2022-02-19
* @since v0.4.0
*/
- public static final boolean isValidVersionString(String versionString) {
+ public static boolean isValidVersionString(String versionString) {
return VERSION_NUMBER.matcher(versionString).matches();
}
@@ -432,7 +427,7 @@ public final class SemanticVersionNumber
* @since 2022-02-19
* @since v0.4.0
*/
- public static final SemanticVersionNumber preRelease(int major, int minor,
+ public static SemanticVersionNumber preRelease(int major, int minor,
int patch, String preReleaseType, int preReleaseNumber) {
if (major < 0)
throw new IllegalArgumentException(
@@ -470,7 +465,7 @@ public final class SemanticVersionNumber
* @since 2022-02-19
* @since v0.4.0
*/
- public static final SemanticVersionNumber stableVersion(int major, int minor,
+ public static SemanticVersionNumber stableVersion(int major, int minor,
int patch) {
if (major < 0)
throw new IllegalArgumentException(
@@ -536,17 +531,17 @@ public final class SemanticVersionNumber
// test the three big numbers in order first
if (this.major < o.major)
return -1;
- else if (this.major > o.major)
+ if (this.major > o.major)
return 1;
if (this.minor < o.minor)
return -1;
- else if (this.minor > o.minor)
+ if (this.minor > o.minor)
return 1;
if (this.patch < o.patch)
return -1;
- else if (this.patch > o.patch)
+ if (this.patch > o.patch)
return 1;
// now we just compare pre-release identifiers
@@ -569,7 +564,7 @@ public final class SemanticVersionNumber
* </ul>
* If this function returns <b>false</b>, you may have to change your code to
* upgrade it to {@code other}
- *
+ *
* <p>
* Two version numbers that are identical (ignoring build metadata) are
* always compatible. Different version numbers are compatible as long as:
@@ -601,17 +596,14 @@ public final class SemanticVersionNumber
return true;
if (!(obj instanceof SemanticVersionNumber))
return false;
- final SemanticVersionNumber other = (SemanticVersionNumber) obj;
+ final var other = (SemanticVersionNumber) obj;
if (this.buildMetadata == null) {
if (other.buildMetadata != null)
return false;
} else if (!this.buildMetadata.equals(other.buildMetadata))
return false;
- if (this.major != other.major)
- return false;
- if (this.minor != other.minor)
- return false;
- if (this.patch != other.patch)
+ if ((this.major != other.major) || (this.minor != other.minor)
+ || (this.patch != other.patch))
return false;
if (this.preReleaseIdentifiers == null) {
if (other.preReleaseIdentifiers != null)
@@ -624,8 +616,8 @@ public final class SemanticVersionNumber
@Override
public int hashCode() {
- final int prime = 31;
- int result = 1;
+ final var prime = 31;
+ var result = 1;
result = prime * result
+ (this.buildMetadata == null ? 0 : this.buildMetadata.hashCode());
result = prime * result + this.major;
@@ -697,13 +689,13 @@ public final class SemanticVersionNumber
* For example, the version with major number 3, minor number 2, patch number
* 1, pre-release identifiers "alpha" and "1" and build metadata "2022-02-19"
* has a string representation "3.2.1-alpha.1+2022-02-19".
- *
+ *
* @since v0.4.0
* @see <a href="https://semver.org">The official SemVer specification</a>
*/
@Override
public String toString() {
- String versionString = String.format("%d.%d.%d", this.major, this.minor,
+ var versionString = String.format("%d.%d.%d", this.major, this.minor,
this.patch);
if (!this.preReleaseIdentifiers.isEmpty()) {
versionString += "-" + String.join(".", this.preReleaseIdentifiers);
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-02 22:54:22 +0000