Consistent support for CompilationCustomizers as well as custom CompilerConfiguration

Issue: SPR-14585

spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptEvaluator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,8 @@ import java.util.Map;
 import groovy.lang.Binding;
 import groovy.lang.GroovyRuntimeException;
 import groovy.lang.GroovyShell;
+import org.codehaus.groovy.control.CompilerConfiguration;
+import org.codehaus.groovy.control.customizers.CompilationCustomizer;
 
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.scripting.ScriptCompilationException;
@@ -40,6 +42,8 @@ public class GroovyScriptEvaluator implements ScriptEvaluator, BeanClassLoaderAw
 
 	private ClassLoader classLoader;
 
+	private CompilerConfiguration compilerConfiguration = new CompilerConfiguration();
+
 
 	/**
 	 * Construct a new GroovyScriptEvaluator.
@@ -56,6 +60,35 @@ public class GroovyScriptEvaluator implements ScriptEvaluator, BeanClassLoaderAw
 	}
 
 
+	/**
+	 * Set a custom compiler configuration for this evaluator.
+	 * @since 4.3.3
+	 * @see #setCompilationCustomizers
+	 */
+	public void setCompilerConfiguration(CompilerConfiguration compilerConfiguration) {
+		this.compilerConfiguration =
+				(compilerConfiguration != null ? compilerConfiguration : new CompilerConfiguration());
+	}
+
+	/**
+	 * Return this evaluator's compiler configuration (never {@code null}).
+	 * @since 4.3.3
+	 * @see #setCompilerConfiguration
+	 */
+	public CompilerConfiguration getCompilerConfiguration() {
+		return this.compilerConfiguration;
+	}
+
+	/**
+	 * Set one or more customizers to be applied to this evaluator's compiler configuration.
+	 * <p>Note that this modifies the shared compiler configuration held by this evaluator.
+	 * @since 4.3.3
+	 * @see #setCompilerConfiguration
+	 */
+	public void setCompilationCustomizers(CompilationCustomizer... compilationCustomizers) {
+		this.compilerConfiguration.addCompilationCustomizers(compilationCustomizers);
+	}
+
 	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
 		this.classLoader = classLoader;
@@ -69,7 +102,8 @@ public class GroovyScriptEvaluator implements ScriptEvaluator, BeanClassLoaderAw
 
 	@Override
 	public Object evaluate(ScriptSource script, Map<String, Object> arguments) {
-		GroovyShell groovyShell = new GroovyShell(this.classLoader, new Binding(arguments));
+		GroovyShell groovyShell = new GroovyShell(
+				this.classLoader, new Binding(arguments), this.compilerConfiguration);
 		try {
 			String filename = (script instanceof ResourceScriptSource ?
 					((ResourceScriptSource) script).getResource().getFilename() : null);

spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java

@@ -36,6 +36,7 @@ import org.springframework.scripting.ScriptFactory;
 import org.springframework.scripting.ScriptSource;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.ReflectionUtils;
 
 /**
@@ -104,23 +105,39 @@ public class GroovyScriptFactory implements ScriptFactory, BeanFactoryAware, Bea
 		this.groovyObjectCustomizer = groovyObjectCustomizer;
 	}
 
+	/**
+	 * Create a new GroovyScriptFactory for the given script source,
+	 * specifying a strategy interface that can create a custom MetaClass
+	 * to supply missing methods and otherwise change the behavior of the object.
+	 * @param scriptSourceLocator a locator that points to the source of the script.
+	 * Interpreted by the post-processor that actually creates the script.
+	 * @param compilerConfiguration a custom compiler configuration to be applied
+	 * to the GroovyClassLoader (may be {@code null})
+	 * @since 4.3.3
+	 * @see GroovyClassLoader#GroovyClassLoader(ClassLoader, CompilerConfiguration)
+	 */
+	public GroovyScriptFactory(String scriptSourceLocator, CompilerConfiguration compilerConfiguration) {
+		this(scriptSourceLocator);
+		this.compilerConfiguration = compilerConfiguration;
+	}
+
 	/**
 	 * Create a new GroovyScriptFactory for the given script source,
 	 * specifying a strategy interface that can customize Groovy's compilation
 	 * process within the underlying GroovyClassLoader.
 	 * @param scriptSourceLocator a locator that points to the source of the script.
 	 * Interpreted by the post-processor that actually creates the script.
-	 * @param compilationCustomizer a customizer to be applied to the GroovyClassLoader
-	 * compiler configuration (may be {@code null})
+	 * @param compilationCustomizers one or more customizers to be applied to the
+	 * GroovyClassLoader compiler configuration
 	 * @since 4.3.3
 	 * @see CompilerConfiguration#addCompilationCustomizers
 	 * @see org.codehaus.groovy.control.customizers.ImportCustomizer
 	 */
-	public GroovyScriptFactory(String scriptSourceLocator, CompilationCustomizer compilationCustomizer) {
+	public GroovyScriptFactory(String scriptSourceLocator, CompilationCustomizer... compilationCustomizers) {
 		this(scriptSourceLocator);
-		if (compilationCustomizer != null) {
+		if (!ObjectUtils.isEmpty(compilationCustomizers)) {
 			this.compilerConfiguration = new CompilerConfiguration();
-			this.compilerConfiguration.addCompilationCustomizers(compilationCustomizer);
+			this.compilerConfiguration.addCompilationCustomizers(compilationCustomizers);
 		}
 	}