[groovy] branch master updated: Tweak memory stub setting

[su...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new 01f6515  Tweak memory stub setting
01f6515 is described below

commit 01f65154912dbda8baa6a0624ba27e5b614bf457
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Nov 28 17:20:48 2021 +0800

    Tweak memory stub setting
---
 .../org/codehaus/groovy/control/CompilerConfiguration.java     |  1 +
 .../codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java  | 10 +++-------
 .../org/codehaus/groovy/tools/javac/JavacJavaCompiler.java     |  4 +++-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
index 8a631e3..42e91ed 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -480,6 +480,7 @@ public class CompilerConfiguration {
         handleOptimizationOption(GROOVYDOC, getSystemPropertySafe("groovy.attach.groovydoc"));
         handleOptimizationOption(RUNTIME_GROOVYDOC, getSystemPropertySafe("groovy.attach.runtime.groovydoc"));
         handleOptimizationOption(PARALLEL_PARSE, getSystemPropertySafe("groovy.parallel.parse", "true"));
+        handleOptimizationOption(MEM_STUB, getSystemPropertySafe("groovy.mem.stub", "false"));
     }
 
     private void handleOptimizationOption(String key, String val) {
diff --git a/src/main/java/org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java b/src/main/java/org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java
index 4d8f679..dcfe14d 100644
--- a/src/main/java/org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java
+++ b/src/main/java/org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java
@@ -19,7 +19,6 @@
 package org.codehaus.groovy.tools.javac;
 
 import groovy.lang.GroovyClassLoader;
-import org.apache.groovy.util.SystemUtil;
 import org.codehaus.groovy.ast.ClassNode;
 import org.codehaus.groovy.ast.GroovyClassVisitor;
 import org.codehaus.groovy.ast.ModuleNode;
@@ -40,6 +39,8 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+import static org.codehaus.groovy.control.CompilerConfiguration.MEM_STUB;
+
 /**
  * Compilation Unit capable of compiling Java source files.
  */
@@ -70,14 +71,9 @@ public class JavaAwareCompilationUnit extends CompilationUnit {
         {
             Map<String, Object> options = this.configuration.getJointCompilationOptions();
             String sourceEncoding = this.configuration.getSourceEncoding();
-            Object memStub = options.get(CompilerConfiguration.MEM_STUB);
-            if (memStub == null) {
-                memStub = Boolean.parseBoolean(SystemUtil.getSystemPropertySafe("groovy.mem.stub", "false"));
-                options.put(CompilerConfiguration.MEM_STUB, memStub);
-            }
 
             this.keepStubs = Boolean.TRUE.equals(options.get("keepStubs"));
-            this.memStubEnabled = Boolean.TRUE.equals(memStub);
+            this.memStubEnabled = Boolean.TRUE.equals(options.get(MEM_STUB));
             this.generationGoal = memStubEnabled ? null : (File) options.get("stubDir");
             this.stubGenerator = new JavaStubGenerator(generationGoal, false, sourceEncoding);
         }
diff --git a/src/main/java/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java b/src/main/java/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java
index b6f298b..c654cdf 100644
--- a/src/main/java/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java
+++ b/src/main/java/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java
@@ -46,6 +46,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static org.codehaus.groovy.control.CompilerConfiguration.MEM_STUB;
+
 public class JavacJavaCompiler implements JavaCompiler {
 
     private static final Locale DEFAULT_LOCALE = Locale.ENGLISH;
@@ -97,7 +99,7 @@ public class JavacJavaCompiler implements JavaCompiler {
             Set<javax.tools.JavaFileObject> compilationUnitSet = cu.getJavaCompilationUnitSet(); // java stubs already added
 
             Map<String, Object> options = this.config.getJointCompilationOptions();
-            if (!Boolean.parseBoolean(options.get(CompilerConfiguration.MEM_STUB).toString())) {
+            if (!Boolean.TRUE.equals(options.get(MEM_STUB))) {
                 // clear the java stubs in the source set of Java compilation
                 compilationUnitSet = new HashSet<>();