From 09cb2f8436fefc3352c793a2dae3779977051c46 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Sat, 18 May 2013 19:54:20 +0100
Subject: [PATCH] [bs-76] Implement plugin model for cli support

* Because Spring is not on the classpath we don't particularly
want to use SpringFactoriesLoader
* Adopted the JDK (>=6) ServiceLoader model instead

[Fixes #48789783]
---
 .../cli/compiler/GroovyCompiler.java          | 25 ++++++++-----------
 ...rap.cli.compiler.CompilerAutoConfiguration |  5 ++++
 2 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 spring-bootstrap-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.compiler.CompilerAutoConfiguration

diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompiler.java b/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompiler.java
index fefdbcaf94..e04da2a77a 100644
--- a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompiler.java
+++ b/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompiler.java
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.ServiceLoader;
 
 import org.codehaus.groovy.ast.ClassNode;
 import org.codehaus.groovy.classgen.GeneratorContext;
@@ -35,16 +36,14 @@ import org.codehaus.groovy.control.Phases;
 import org.codehaus.groovy.control.SourceUnit;
 import org.codehaus.groovy.control.customizers.CompilationCustomizer;
 import org.codehaus.groovy.control.customizers.ImportCustomizer;
-import org.springframework.bootstrap.cli.compiler.autoconfigure.SpringBatchCompilerAutoConfiguration;
-import org.springframework.bootstrap.cli.compiler.autoconfigure.SpringBootstrapCompilerAutoConfiguration;
-import org.springframework.bootstrap.cli.compiler.autoconfigure.SpringIntegrationCompilerAutoConfiguration;
-import org.springframework.bootstrap.cli.compiler.autoconfigure.SpringMvcCompilerAutoConfiguration;
 
 /**
  * Compiler for Groovy source files. Primarily a simple Facade for
  * {@link GroovyClassLoader#parseClass(File)} with the following additional features:
  * <ul>
- * <li>{@link CompilerAutoConfiguration} strategies will de applied during compilation</li>
+ * <li>{@link CompilerAutoConfiguration} strategies will be read from
+ * <code>META-INF/services/org.springframework.bootstrap.cli.compiler.CompilerAutoConfiguration</code>
+ * (per the standard java {@link ServiceLoader} contract) and applied during compilation</li>
  * 
  * <li>Multiple classes can be returned if the Groovy source defines more than one Class</li>
  * 
@@ -57,14 +56,6 @@ import org.springframework.bootstrap.cli.compiler.autoconfigure.SpringMvcCompile
  */
 public class GroovyCompiler {
 
-	// FIXME could be a strategy
-	private static final CompilerAutoConfiguration[] COMPILER_AUTO_CONFIGURATIONS = {
-			new SpringBootstrapCompilerAutoConfiguration(),
-			new SpringMvcCompilerAutoConfiguration(),
-			new SpringBatchCompilerAutoConfiguration(),
-			new SpringIntegrationCompilerAutoConfiguration(),
-			new SpringBootstrapCompilerAutoConfiguration() };
-
 	private GroovyCompilerConfiguration configuration;
 
 	private ExtendedGroovyClassLoader loader;
@@ -146,10 +137,14 @@ public class GroovyCompiler {
 				throws CompilationFailedException {
 			ImportCustomizer importCustomizer = new ImportCustomizer();
 
+			ServiceLoader<CompilerAutoConfiguration> customizers = ServiceLoader.load(
+					CompilerAutoConfiguration.class,
+					GroovyCompiler.class.getClassLoader());
+
 			// Early sweep to get dependencies
 			DependencyCustomizer dependencyCustomizer = new DependencyCustomizer(
 					GroovyCompiler.this.loader);
-			for (CompilerAutoConfiguration autoConfiguration : COMPILER_AUTO_CONFIGURATIONS) {
+			for (CompilerAutoConfiguration autoConfiguration : customizers) {
 				if (autoConfiguration.matches(classNode)) {
 					if (GroovyCompiler.this.configuration.isGuessDependencies()) {
 						autoConfiguration.applyDependencies(dependencyCustomizer);
@@ -159,7 +154,7 @@ public class GroovyCompiler {
 			dependencyCustomizer.call();
 
 			// Additional auto configuration
-			for (CompilerAutoConfiguration autoConfiguration : COMPILER_AUTO_CONFIGURATIONS) {
+			for (CompilerAutoConfiguration autoConfiguration : customizers) {
 				if (autoConfiguration.matches(classNode)) {
 					if (GroovyCompiler.this.configuration.isGuessImports()) {
 						autoConfiguration.applyImports(importCustomizer);
diff --git a/spring-bootstrap-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.compiler.CompilerAutoConfiguration b/spring-bootstrap-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.compiler.CompilerAutoConfiguration
new file mode 100644
index 0000000000..e6cae9858a
--- /dev/null
+++ b/spring-bootstrap-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.compiler.CompilerAutoConfiguration
@@ -0,0 +1,5 @@
+org.springframework.bootstrap.cli.compiler.autoconfigure.SpringBootstrapCompilerAutoConfiguration
+org.springframework.bootstrap.cli.compiler.autoconfigure.SpringMvcCompilerAutoConfiguration
+org.springframework.bootstrap.cli.compiler.autoconfigure.SpringBatchCompilerAutoConfiguration
+org.springframework.bootstrap.cli.compiler.autoconfigure.SpringIntegrationCompilerAutoConfiguration
+