You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2021/10/06 09:24:08 UTC
[groovy] branch GROOVY-10286 updated: Trivial refactoring: move
`javaVersion` to `VMPlugin`
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY-10286
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY-10286 by this push:
new b61e5cb Trivial refactoring: move `javaVersion` to `VMPlugin`
b61e5cb is described below
commit b61e5cb226134ccde44127df03a6a140d43dae30
Author: Daniel Sun <su...@apache.org>
AuthorDate: Wed Oct 6 17:23:52 2021 +0800
Trivial refactoring: move `javaVersion` to `VMPlugin`
---
.../org/codehaus/groovy/control/CompilerConfiguration.java | 13 ++-----------
src/main/java/org/codehaus/groovy/vmplugin/VMPlugin.java | 10 ++++++++++
.../java/org/codehaus/groovy/vmplugin/VMPluginFactory.java | 3 +--
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
index 3a3c0d9..ee1fe5c 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -22,6 +22,7 @@ import org.apache.groovy.util.Maps;
import org.codehaus.groovy.control.customizers.CompilationCustomizer;
import org.codehaus.groovy.control.io.NullWriter;
import org.codehaus.groovy.control.messages.WarningMessage;
+import org.codehaus.groovy.vmplugin.VMPlugin;
import org.objectweb.asm.Opcodes;
import java.io.File;
@@ -995,7 +996,7 @@ public class CompilerConfiguration {
* @since 4.0.0
*/
private static String defaultTargetBytecode() {
- final String javaVersion = javaVersion();
+ final String javaVersion = VMPlugin.getJavaVersion();
if (JDK_TO_BYTECODE_VERSION_MAP.containsKey(javaVersion)) {
return javaVersion;
}
@@ -1003,16 +1004,6 @@ public class CompilerConfiguration {
}
/**
- * Returns java version, e.g. 1.8, 9, 11, 17
- *
- * @return java version
- * @since 4.0.0
- */
- public static String javaVersion() {
- return System.getProperty("java.specification.version");
- }
-
- /**
* Whether the bytecode version has preview features enabled (JEP 12)
*
* @return preview features
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/VMPlugin.java b/src/main/java/org/codehaus/groovy/vmplugin/VMPlugin.java
index 10b94b4..85cbe36 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/VMPlugin.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/VMPlugin.java
@@ -67,6 +67,16 @@ public interface VMPlugin {
int getVersion();
/**
+ * Returns java version, e.g. 1.8, 9, 11, 17
+ *
+ * @return java version
+ * @since 4.0.0
+ */
+ static String getJavaVersion() {
+ return System.getProperty("java.specification.version");
+ }
+
+ /**
* Check whether invoking {@link AccessibleObject#setAccessible(boolean)} on the accessible object will be completed successfully
*
* @param accessibleObject the accessible object to check
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/VMPluginFactory.java b/src/main/java/org/codehaus/groovy/vmplugin/VMPluginFactory.java
index 434934c..e8d46d4 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/VMPluginFactory.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/VMPluginFactory.java
@@ -19,7 +19,6 @@
package org.codehaus.groovy.vmplugin;
import org.apache.groovy.util.Maps;
-import org.codehaus.groovy.control.CompilerConfiguration;
import org.codehaus.groovy.runtime.DefaultGroovyMethods;
import java.math.BigDecimal;
@@ -58,7 +57,7 @@ public class VMPluginFactory {
private static VMPlugin createPlugin() {
return AccessController.doPrivileged((PrivilegedAction<VMPlugin>) () -> {
- final BigDecimal specVer = new BigDecimal(CompilerConfiguration.javaVersion());
+ final BigDecimal specVer = new BigDecimal(VMPlugin.getJavaVersion());
ClassLoader loader = VMPluginFactory.class.getClassLoader();
for (Map.Entry<BigDecimal, String> entry : PLUGIN_MAP.entrySet()) {
if (isAtLeast(specVer, entry.getKey())) {