Skip to content

Commit

Permalink
Merge pull request #20 from jGauravGupta/ECOSYS-14-2
Browse files Browse the repository at this point in the history 
ECOSYS-14 Parsing Java version with text suffix causes NumberFormatException
  • Loading branch information
@jGauravGupta
jGauravGupta authored Dec 19, 2019
2 parents 86c12d4 + 805c46d commit 5ab7785
Show file tree
Hide file tree
Showing 6 changed files with 198 additions and 158 deletions.
9 changes: 5 additions & 4 deletions plugins/org.eclipse.payara.tools/.classpath
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="test"/>
<classpathentry kind="output" path="bin"/>
</classpath>
11 changes: 10 additions & 1 deletion plugins/org.eclipse.payara.tools/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,16 @@ Require-Bundle: org.apache.xerces,
org.eclipse.jst.j2ee.core,
org.eclipse.jst.server.generic.core,
org.eclipse.sapphire.platform,
org.eclipse.jem.util
org.eclipse.jem.util,
org.junit,
org.junit.platform.commons,
org.junit.platform.engine,
org.junit.platform.launcher,
org.junit.platform.runner,
org.junit.platform.suite.api,
org.hamcrest.core,
org.opentest4j,
org.apiguardian
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.payara.tools;
uses:="org.eclipse.debug.core,
Expand Down
243 changes: 105 additions & 138 deletions plugins/org.eclipse.payara.tools/src/org/eclipse/payara/tools/sdk/server/JDK.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,25 @@

package org.eclipse.payara.tools.sdk.server;

import java.util.Arrays;
import java.util.Optional;

/**
* A simple class that fills a hole in the JDK. It parses out the version numbers
* of the JDK we are running.
*
* A simple class that fills a hole in the JDK. It parses out the version
* numbers of the JDK we are running.
*
* <p>
* Example: <br>
*
*
* 1.6.0_u14 == major = 1 minor = 6, subminor = 0, update = 14
*
* @author bnevins
*/
public final class JDK {

/**
* See if the current JDK is legal for running GlassFish

/**
* See if the current JDK is legal for running Payara
*
* @return true if the JDK is >= 1.6.0
*/
public static boolean ok() {
Expand All @@ -51,6 +53,7 @@ public static boolean ok() {
public static int getMajor() {
return major;
}

public static int getMinor() {
return minor;
}
Expand All @@ -62,62 +65,51 @@ public static int getSubMinor() {
public static int getUpdate() {
return update;
}

public static String getVendor() {
return vendor;
}

public static class Version {

private final Optional<String> vendor;
private final int major;

private final int major;
private final Optional<Integer> minor;
private final Optional<Integer> subminor;
private final Optional<Integer> update;

private Version(String version) {
// Split java version into its constituent parts, i.e.
// 1.2.3.4 -> [ 1, 2, 3, 4]
// 1.2.3u4 -> [ 1, 2, 3, 4]
// 1.2.3_4 -> [ 1, 2, 3, 4]
if (version.contains("-")) {
String[] versionSplit = version.split("-");
this.vendor = versionSplit.length > 0 ? Optional.of(versionSplit[0]) : Optional.empty();
version = versionSplit.length > 1 ? versionSplit[1] : "";
} else {
this.vendor = Optional.empty();
}
String[] split = version.split("[\\._u\\-]+");

major = split.length > 0 ? Integer.parseInt(split[0]) : 0;
minor = split.length > 1 ? Optional.of(Integer.parseInt(split[1])) : Optional.empty();
subminor = split.length > 2 ? Optional.of(Integer.parseInt(split[2])) : Optional.empty();
update = split.length > 3 ? Optional.of(Integer.parseInt(split[3])) : Optional.empty();
private final Optional<String> vendor;

private Version(String version, String vendor) {
int[] versions = parseVersions(version);
this.major = versions[MAJOR_INDEX];
this.minor = Optional.ofNullable(versions[MINOR_INDEX]);
this.subminor = Optional.ofNullable(versions[SUBMINOR_INDEX]);
this.update = Optional.ofNullable(versions[UPDATE_INDEX]);
this.vendor = Optional.ofNullable(vendor);
}
private Version(int major, int minor, int subminor, int update, String vendor) {

Version(int major, int minor, int subminor, int update, String vendor) {
this.major = major;
this.minor = Optional.of(minor);
this.subminor = Optional.of(subminor);
this.update = Optional.of(update);
this.vendor = Optional.of(vendor);
this.minor = Optional.ofNullable(minor);
this.subminor = Optional.ofNullable(subminor);
this.update = Optional.ofNullable(update);
this.vendor = Optional.ofNullable(vendor);
}

public boolean newerThan(Version version) {
if (major > version.major) {
return true;
}

if (major == version.major) {
if (greaterThan(minor, version.minor)) {
return true;
}

if (equals(minor, version.minor)) {
if (greaterThan(subminor, version.subminor)) {
return true;
}

if (equals(subminor, version.subminor)) {
if (greaterThan(update, version.update)) {
return true;
Expand Down Expand Up @@ -165,7 +157,7 @@ private static boolean lessThan(Optional<Integer> leftHandSide, Optional<Integer
* @return true if equals, otherwise false
*/
private static boolean equals(Optional<Integer> leftHandSide, Optional<Integer> rightHandSide) {
if(!leftHandSide.isPresent() || !rightHandSide.isPresent()) {
if (!leftHandSide.isPresent() || !rightHandSide.isPresent()) {
return true;
}
return leftHandSide.orElse(0).equals(rightHandSide.orElse(0));
Expand Down Expand Up @@ -236,58 +228,56 @@ public String toString() {
public static Version getVersion(String string) {
return getVersion(string, null);
}
public static Version getVersion(String string, String vendor) {
if (string != null && string.matches("([0-9]+[\\._u\\-]+)*[0-9]+")) {

public static Version getVersion(String version, String vendor) {
if (version != null && version.matches(VERSION_MATCHER)) {
// Make sure the string is a valid JDK version, i.e.
// 1.8.0_162 or something that is returned by "java -version"
return new Version(string);
return new Version(version, vendor);
}

return null;
}

public static Version getVersion(String jv, String javaSpecificationVersion, String vendor) {
int[] versions = parseVersions(jv, javaSpecificationVersion);

return new Version(versions[MAJOR], versions[MINOR], versions[SUBMINOR], versions[UPDATE], vendor);
return null;
}

public static Version getVersion() {
return new Version(major, minor, subminor, update, vendor);
}

public static boolean isCorrectJDK(Optional<Version> minVersion, Optional<Version> maxVersion) {
return isCorrectJDK(JDK_VERSION, Optional.empty(), minVersion, maxVersion);
return isCorrectJDK(JDK_VERSION, Optional.empty(), minVersion, maxVersion);
}
public static boolean isCorrectJDK(Version JDKversion, Optional<String> vendor, Optional<Version> minVersion, Optional<Version> maxVersion) {

public static boolean isCorrectJDK(Version version, Optional<String> vendor, Optional<Version> minVersion, Optional<Version> maxVersion) {
boolean correctJDK = true;

if (vendor.isPresent()) {
correctJDK = JDKversion.vendor.get().contains(vendor.get());
if (version.vendor.isPresent()) {
correctJDK = version.vendor.get().contains(vendor.get());
} else {
correctJDK = false;
}
}
if (correctJDK && minVersion.isPresent()) {
correctJDK = JDKversion.newerOrEquals(minVersion.get());
if (correctJDK && minVersion.isPresent()) {
correctJDK = version.newerOrEquals(minVersion.get());
}
if (correctJDK && maxVersion.isPresent()) {
correctJDK = JDKversion.olderOrEquals(maxVersion.get());
correctJDK = version.olderOrEquals(maxVersion.get());
}

return correctJDK;
}


/**
* No instances are allowed so it is pointless to override toString
*
* @return Parsed version numbers
*/
public static String toStringStatic() {
return "major: " + JDK.getMajor() +
"\nminor: " + JDK.getMinor() +
"\nsubminor: " + JDK.getSubMinor() +
"\nupdate: " + JDK.getUpdate() +
"\nOK ==>" + JDK.ok();
return "major: " + JDK.getMajor()
+ "\nminor: " + JDK.getMinor()
+ "\nsubminor: " + JDK.getSubMinor()
+ "\nupdate: " + JDK.getUpdate()
+ "\nOK ==>" + JDK.ok();
}

static {
Expand All @@ -300,23 +290,24 @@ public static String toStringStatic() {
private static int subminor;
private static int update;
private static String vendor;

// DO initialize these variables. You'll be sorry if you don't!
private final static int MAJOR = 0;
private final static int MINOR = 1;
private final static int SUBMINOR = 2;
private final static int UPDATE = 3;
private final static int MAJOR_INDEX = 0;
private final static int MINOR_INDEX = 1;
private final static int SUBMINOR_INDEX = 2;
private final static int UPDATE_INDEX = 3;

// DO NOT initialize this variable. You'll again be sorry if you do!
public static Version JDK_VERSION;

private static final String VERSION_MATCHER = "(\\d+(\\.\\d+)*)([_u\\-]+[\\S]+)*";

private static void initialize() {

// Silently fall back to ridiculous defaults if something is crazily wrong...
major = 1;
minor = subminor = update = 0;

try {

String javaVersion = System.getProperty("java.version");
vendor = System.getProperty("java.vendor");
/*In JEP 223 java.specification.version will be a single number versioning , not a dotted versioning . So if we get a single
Expand All @@ -327,77 +318,53 @@ private static void initialize() {
For JDK 9:
java.specification.version 9
java.version 9.1.2
*/
String javaSpecificationVersion = System.getProperty("java.specification.version");
int[] versions = parseVersions(javaVersion, javaSpecificationVersion);

major = versions[MAJOR];
minor = versions[MINOR];
subminor = versions[SUBMINOR];
update = versions[UPDATE];
}
catch(Exception e) {
// ignore -- use defaults
}

JDK_VERSION = new Version(major, minor, subminor, update, vendor);
*/
int[] versions = parseVersions(javaVersion);

major = versions[MAJOR_INDEX];
minor = versions[MINOR_INDEX];
subminor = versions[SUBMINOR_INDEX];
update = versions[UPDATE_INDEX];

JDK_VERSION = new Version(
major,
minor,
subminor,
update,
vendor
);
}

static int[] parseVersions(String jv, String javaSpecificationVersion) {

int[] versions = {1, 0, 0, 0};

String[] jsvSplit = javaSpecificationVersion.split("\\.");
if (jsvSplit.length == 1) {

// This is handle early access builds. For example "9-ea"

String[] jvSplit = jv.split("-");
String jvReal = jvSplit[0];
String[] split = jvReal.split("[\\.]+");

if (split.length > 0) {
if (split.length > 0) {
versions[MAJOR] = Integer.parseInt(split[0]);
}
if (split.length > 1) {
versions[MINOR] = Integer.parseInt(split[1]);
}
if (split.length > 2) {
versions[SUBMINOR] = Integer.parseInt(split[2]);
}
if (split.length > 3) {
versions[UPDATE] = Integer.parseInt(split[3]);
}
}
} else {
if (jv == null || jv.length() <= 0) {
return versions; // not likely!!
}
/**
*
* @param javaVersion the Java Version e.g 1.8.0u222,
* 1.8.0_232-ea-8u232-b09-0ubuntu1-b09, 11.0.5
* @return
*/
static int[] parseVersions(String javaVersion) {

String[] ss = jv.split("\\.");
int[] versions = {1, 0, 0, 0};
if (javaVersion == null || javaVersion.length() <= 0) {
return versions; // not likely!!
}
String[] javaVersionSplit = javaVersion.split("-");
String[] split = javaVersionSplit[0].split("\\.");

if (ss.length < 3 || !ss[0].equals("1")) {
return versions;
if (split.length > 0) {
if (split.length > 0) {
versions[MAJOR_INDEX] = Short.parseShort(split[0]);
}

versions[MAJOR] = Integer.parseInt(ss[0]);
versions[MINOR] = Integer.parseInt(ss[1]);


ss = ss[2].split("_");
if (ss.length < 1) {
return versions;
if (split.length > 1) {
versions[MINOR_INDEX] = Short.parseShort(split[1]);
}

versions[SUBMINOR] = Integer.parseInt(ss[0]);

if (ss.length > 1) {
versions[UPDATE] = Integer.parseInt(ss[1]);
if (split.length > 2) {
split = split[2].split("[_u]");
versions[SUBMINOR_INDEX] = Short.parseShort(split[0]);
if (split.length > 1) {
versions[UPDATE_INDEX] = Short.parseShort(split[1]);
}
}
}

return versions;
}
}
Loading

0 comments on commit 5ab7785

Please sign in to comment.