You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2020/06/13 13:26:08 UTC
[groovy] branch GROOVY_2_5_X updated (eef4209 -> 439fab4)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from eef4209 GROOVY-9485: fix regression of GROOVY-3456 after refactor
new 362bec8 minor refactor (rename private field)
new 439fab4 GROOVY-9585 preparatory work plus fix typo
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/codehaus/groovy/control/CompilerConfiguration.java | 2 ++
src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java | 6 +++++-
.../test/java/org/codehaus/groovy/jsr223/JSR223SecurityTest.java | 6 +++---
3 files changed, 10 insertions(+), 4 deletions(-)
[groovy] 02/02: GROOVY-9585 preparatory work plus fix typo
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 439fab4ae08793b8ea3654958ce456cebb633c99
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sat Jun 13 19:36:01 2020 +1000
GROOVY-9585 preparatory work plus fix typo
---
.../java/org/codehaus/groovy/control/CompilerConfiguration.java | 2 ++
src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
index 89f6ae0..d96ad5d 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -477,6 +477,8 @@ public class CompilerConfiguration {
if (jointCompilationOptions != null) {
jointCompilationOptions = new HashMap<String, Object>(jointCompilationOptions);
}
+ // TODO GROOVY-9585: add line below once gradle build issues fixed
+// compilationCustomizers.addAll(configuration.getCompilationCustomizers());
setJointCompilationOptions(jointCompilationOptions);
setPluginFactory(configuration.getPluginFactory());
setDisabledGlobalASTTransformations(configuration.getDisabledGlobalASTTransformations());
diff --git a/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
index 851fdc6..a00f4d2 100644
--- a/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
+++ b/src/test/org/codehaus/groovy/control/CompilerConfigurationTest.java
@@ -19,6 +19,7 @@
package org.codehaus.groovy.control;
import groovy.util.GroovyTestCase;
+import org.codehaus.groovy.control.customizers.ImportCustomizer;
import org.codehaus.groovy.control.messages.WarningMessage;
import java.io.File;
@@ -128,6 +129,7 @@ public class CompilerConfigurationTest extends GroovyTestCase {
final Map initJoint = new HashMap();
initJoint.put("somekey", "somevalue");
init.setJointCompilationOptions(initJoint);
+ init.addCompilationCustomizers(new ImportCustomizer().addStarImports("groovy.transform"));
final ParserPluginFactory initPPF = ParserPluginFactory.newInstance();
init.setPluginFactory(initPPF);
@@ -151,6 +153,7 @@ public class CompilerConfigurationTest extends GroovyTestCase {
assertEquals(".jpp", init.getDefaultScriptExtension());
assertEquals(initJoint, init.getJointCompilationOptions());
assertEquals(initPPF, init.getPluginFactory());
+ assertEquals(1, init.getCompilationCustomizers().size());
final CompilerConfiguration config = new CompilerConfiguration(init);
@@ -172,7 +175,8 @@ public class CompilerConfigurationTest extends GroovyTestCase {
assertEquals(".jpp", config.getDefaultScriptExtension());
assertEquals(initJoint, config.getJointCompilationOptions());
assertEquals(initPPF, config.getPluginFactory());
-
+ // TODO GROOVY-9585: re-enable below assertion once prod code is fixed
+// assertEquals(1, config.getCompilationCustomizers().size());
}
public void testCopyConstructor2() {
[groovy] 01/02: minor refactor (rename private field)
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 362bec8ca036a744a77dbd9219665e3ebda58b98
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Jun 11 08:41:16 2020 +1000
minor refactor (rename private field)
---
.../test/java/org/codehaus/groovy/jsr223/JSR223SecurityTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/subprojects/groovy-jsr223/src/test/java/org/codehaus/groovy/jsr223/JSR223SecurityTest.java b/subprojects/groovy-jsr223/src/test/java/org/codehaus/groovy/jsr223/JSR223SecurityTest.java
index 52b98a3..e82b1c4 100644
--- a/subprojects/groovy-jsr223/src/test/java/org/codehaus/groovy/jsr223/JSR223SecurityTest.java
+++ b/subprojects/groovy-jsr223/src/test/java/org/codehaus/groovy/jsr223/JSR223SecurityTest.java
@@ -99,7 +99,7 @@ class GroovySecurityManager {
private static GroovySecurityManager instance = new GroovySecurityManager();
- private Set<String> blacklist = new HashSet<String>();
+ private Set<String> forbiddenList = new HashSet<String>();
private GroovySecurityManager() { }
@@ -122,11 +122,11 @@ class GroovySecurityManager {
}
public void forbid(String instruction) {
- blacklist.add(instruction);
+ forbiddenList.add(instruction);
}
public boolean isForbidden(String instruction) {
- for (String forbidden : blacklist)
+ for (String forbidden : forbiddenList)
if (instruction.startsWith(forbidden))
return true;