EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 05:06:44 +01:00
Code Issues Projects Releases Wiki Activity

Make JavaVersionCheck private

Browse Source
This commit is contained in:
N0tMyFaultOG 2020-12-04 16:00:18 +01:00
parent 62690c2a53
commit 34e02e9f3a
No known key found for this signature in database
GPG Key ID: 823348042DA95A81
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Bukkit/src/main/java/com/plotsquared/bukkit/util/JavaVersionCheck.java
View File

@ -28,11 +28,16 @@ package com.plotsquared.bukkit.util;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class JavaVersionCheck { public class JavaVersionCheck {
private static final Logger logger = LoggerFactory.getLogger("P2/" + JavaVersionCheck.class.getSimpleName()); private static final Logger logger = LoggerFactory.getLogger("P2/" + JavaVersionCheck.class.getSimpleName());
private final static Pattern NUM_PATTERN = Pattern.compile("\\d+");
public JavaVersionCheck() {} private JavaVersionCheck() {
}
public static void checkJavaVersion() { public static void checkJavaVersion() {
final String javaVersion = System.getProperty("java.version"); final String javaVersion = System.getProperty("java.version");
@ -48,7 +53,12 @@ public class JavaVersionCheck {
final int javaVersionNumber; final int javaVersionNumber;
try { try {
javaVersionNumber = Integer.parseInt(version); Matcher versionMatcher = NUM_PATTERN.matcher(version);
if (!versionMatcher.find()) {
JavaVersionCheck.notify(javaVersion, logger);
return;
}
javaVersionNumber = Integer.parseInt(versionMatcher.group());
} catch (final NumberFormatException e) { } catch (final NumberFormatException e) {
logger.error("Failed to determine Java version. Could not parse {}", version, e); logger.error("Failed to determine Java version. Could not parse {}", version, e);
JavaVersionCheck.notify(javaVersion, logger); JavaVersionCheck.notify(javaVersion, logger);
@ -59,7 +69,7 @@ public class JavaVersionCheck {
JavaVersionCheck.notify(javaVersion, logger); JavaVersionCheck.notify(javaVersion, logger);
} }
} }
public static void notify(final String version, final Logger logger) { public static void notify(final String version, final Logger logger) {
logger.error("************************************************************"); logger.error("************************************************************");
logger.error("* WARNING - YOU ARE RUNNING AN OUTDATED VERSION OF JAVA."); logger.error("* WARNING - YOU ARE RUNNING AN OUTDATED VERSION OF JAVA.");