Skip to content

Use Long #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Use Long #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d25fa2
Use Long (over Integer) for major/minor/patch and numeric parts of pr…
yalinhuang Nov 13, 2019
bb5d877
Test valid version strings
yalinhuang Nov 13, 2019
d1e65de
Remove unused dependency
yalinhuang Nov 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ repositories {

dependencies {
testCompile 'junit:junit:4.12'
compile 'org.eclipse.jgit:org.eclipse.jgit:3.2.0.201312181205-r'
}

ext {
Expand Down
35 changes: 17 additions & 18 deletions src/main/java/com/github/yuchi/semver/Range.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.github.yuchi.semver;

import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -282,14 +281,14 @@ else if (isX(fromPatch)) {
}
else if (isX(toMinor)) {
sb.append("<");
sb.append(Integer.parseInt(toMajor) + 1);
sb.append(Long.parseLong(toMajor) + 1);
sb.append(".0.0");
}
else if (isX(toPatch)) {
sb.append("<");
sb.append(toMajor);
sb.append(".");
sb.append(Integer.parseInt(toMinor) + 1);
sb.append(Long.parseLong(toMinor) + 1);
sb.append(".0");
}
else if ((toPR != null) && !toPR.isEmpty()) {
Expand Down Expand Up @@ -347,7 +346,7 @@ else if (isX(minor)) {
sb.append(">=");
sb.append(major);
sb.append(".0.0 <");
sb.append(Integer.parseInt(major) + 1);
sb.append(Long.parseLong(major) + 1);
sb.append(".0.0");
}
else if (isX(patch)) {
Expand All @@ -359,7 +358,7 @@ else if (isX(patch)) {
sb.append(".0 <"); // SPACE!
sb.append(major);
sb.append(".");
sb.append(Integer.parseInt(minor) + 1);
sb.append(Long.parseLong(minor) + 1);
sb.append(".0");
}
else {
Expand All @@ -368,7 +367,7 @@ else if (isX(patch)) {
sb.append(".");
sb.append(minor);
sb.append(".0 <");
sb.append(Integer.parseInt(minor) + 1);
sb.append(Long.parseLong(minor) + 1);
sb.append(".0.0");
}
}
Expand Down Expand Up @@ -398,17 +397,17 @@ else if (isX(patch)) {
sb.append(".");
sb.append(minor);
sb.append(".");
sb.append(Integer.parseInt(patch) + 1);
sb.append(Long.parseLong(patch) + 1);
}
else {
sb.append(major);
sb.append(".");
sb.append(Integer.parseInt(minor) + 1);
sb.append(Long.parseLong(minor) + 1);
sb.append(".0");
}
}
else {
sb.append(Integer.parseInt(major) + 1);
sb.append(Long.parseLong(major) + 1);
sb.append(".0.0");
}
}
Expand All @@ -435,7 +434,7 @@ else if (isX(minor)) {
sb.append(">=");
sb.append(major);
sb.append(".0.0 <"); // SPACE!
sb.append(Integer.parseInt(major) + 1);
sb.append(Long.parseLong(major) + 1);
sb.append(".0.0");
}
else if (isX(patch)) {
Expand All @@ -447,7 +446,7 @@ else if (isX(patch)) {
sb.append(".0 <"); // SPACE!
sb.append(major);
sb.append(".");
sb.append(Integer.parseInt(minor) + 1);
sb.append(Long.parseLong(minor) + 1);
sb.append(".0");
}
else {
Expand All @@ -469,7 +468,7 @@ else if (isX(patch)) {
sb.append(" <");
sb.append(major);
sb.append(".");
sb.append(Integer.parseInt(minor) + 1);
sb.append(Long.parseLong(minor) + 1);
sb.append(".0");
}

Expand Down Expand Up @@ -525,12 +524,12 @@ else if ((gtlt != null) && !gtlt.isEmpty() && xAny) {
gtlt = ">=";

if (xMinor) {
major = String.valueOf(Integer.parseInt(major) + 1);
major = String.valueOf(Long.parseLong(major) + 1);
minor = "0";
patch = "0";
}
else if (xPatch) {
minor = String.valueOf(Integer.parseInt(minor) + 1);
minor = String.valueOf(Long.parseLong(minor) + 1);
patch = "0";
}
}
Expand All @@ -541,10 +540,10 @@ else if (gtlt.equals("<=")) {
gtlt = "<";

if (xMinor) {
major = String.valueOf(Integer.parseInt(major) + 1);
major = String.valueOf(Long.parseLong(major) + 1);
}
else {
minor = String.valueOf(Integer.parseInt(minor) + 1);
minor = String.valueOf(Long.parseLong(minor) + 1);
}
}

Expand All @@ -559,7 +558,7 @@ else if (xMinor) {
sb.append(">=");
sb.append(major);
sb.append(".0.0 <");
sb.append(Integer.parseInt(major) + 1);
sb.append(Long.parseLong(major) + 1);
sb.append(".0.0");
}
else if (xPatch) {
Expand All @@ -570,7 +569,7 @@ else if (xPatch) {
sb.append(".0 <");
sb.append(major);
sb.append(".");
sb.append(Integer.parseInt(minor) + 1);
sb.append(Long.parseLong(minor) + 1);
sb.append(".0");
}
else {
Expand Down
32 changes: 16 additions & 16 deletions src/main/java/com/github/yuchi/semver/Version.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,21 @@ public Version(String raw, boolean loose)
throw new IllegalArgumentException("Invalid Version: " + raw);
}

this.major = Integer.parseInt(m.group(1));
this.major = Long.parseLong(m.group(1));

if ((this.major < 0) || (this.major == Integer.MAX_VALUE)) {
if ((this.major < 0) || (this.major == Long.MAX_VALUE)) {
throw new IllegalArgumentException("Invalid Major Version");
}

this.minor = Integer.parseInt(m.group(2));
this.minor = Long.parseLong(m.group(2));

if ((this.minor < 0) || (this.minor == Integer.MAX_VALUE)) {
if ((this.minor < 0) || (this.minor == Long.MAX_VALUE)) {
throw new IllegalArgumentException("Invalid Minor Version");
}

this.patch = Integer.parseInt(m.group(3));
this.patch = Long.parseLong(m.group(3));

if ((this.patch < 0) || (this.patch == Integer.MAX_VALUE)) {
if ((this.patch < 0) || (this.patch == Long.MAX_VALUE)) {
throw new IllegalArgumentException("Invalid Patch Version");
}

Expand All @@ -78,7 +78,7 @@ public Version(String raw, boolean loose)
String part = parts[i];

if (Constants.NUMERIC.matches(part)) {
this.prerelease[i] = Integer.parseInt(part);
this.prerelease[i] = Long.parseLong(part);
}
else {
this.prerelease[i] = part;
Expand Down Expand Up @@ -119,15 +119,15 @@ public Version(String raw, boolean loose)
this.version = sb.toString();
}

public int getMajor() {
public long getMajor() {
return this.major;
}

public int getMinor() {
public long getMinor() {
return this.minor;
}

public int getPatch() {
public long getPatch() {
return this.patch;
}

Expand Down Expand Up @@ -232,11 +232,11 @@ public String toString() {
}

protected static int compareIdentifiers(Object a, Object b) {
boolean anumeric = a instanceof Integer;
boolean bnumeric = b instanceof Integer;
boolean anumeric = a instanceof Long;
boolean bnumeric = b instanceof Long;

if (anumeric && bnumeric) {
return ((Integer)a).compareTo((Integer)b);
return ((Long)a).compareTo((Long)b);
}
else if (!anumeric && !bnumeric) {
return ((String)a).compareTo((String)b);
Expand All @@ -249,9 +249,9 @@ else if (anumeric) {
}
}

protected final int major;
protected final int minor;
protected final int patch;
protected final long major;
protected final long minor;
protected final long patch;
protected final Object[] prerelease;
protected final String[] build;
protected final String raw;
Expand Down
40 changes: 40 additions & 0 deletions src/test/java/com/github/yuchi/semver/ValidVersionStrings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package com.github.yuchi.semver;

import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;

import java.util.Arrays;
import java.util.Collection;

@RunWith(Parameterized.class)
public class ValidVersionStrings {

protected String version;

@Test
public void valid() {
new Version(this.version);
}

public ValidVersionStrings(String version) {
this.version = version;
}

@Parameterized.Parameters
public static Collection<Object[]> getParameters() {
return Arrays.asList(new Object[][] {
{"1.2.3"},
{"1000000000000.2000000000000.30000000000000"},
{"1.2.3-alpha"},
{"1.2.3-alpha.1234567890"},
{"1.2.3-beta.1234567890123"},
{"1.2.3-4.5.6"},
{"1.2.3-x.4.y.5.z"},
{"1.2.3-alpha+1"},
{"1.2.3-beta+1234567890123"},
{"1.2.3-gamma+x.y.z.1234567890"},
{"1.2.3+1234567890123"}
});
}
}