Gradle - cleanup ProjectConnection handling

Author: graemerocher

grails-shell/src/main/groovy/org/grails/cli/GrailsCli.groovy

@@ -29,6 +29,7 @@ import jline.console.UserInterruptException
 import jline.console.completer.ArgumentCompleter
 import jline.console.completer.Completer
 import jline.internal.NonBlockingInputStream
+import org.gradle.impldep.org.apache.commons.io.output.NullOutputStream
 import org.gradle.tooling.BuildActionExecuter
 import org.gradle.tooling.BuildCancelledException
 import org.gradle.tooling.ProjectConnection
@@ -374,7 +375,6 @@ class GrailsCli {
                         console.updateStatus("Initializing application. Please wait...")
                         try {
                             initializeApplication(context.commandLine)
-                            GradleUtil.prepareConnection(projectContext.baseDir)
                             setupCompleters()
                         } finally {
                             tiggerAppLoad = false
@@ -434,9 +434,6 @@ class GrailsCli {
         boolean firstRun = true
         while(keepRunning) {
             try {
-                if(integrateGradle) {
-                    GradleUtil.prepareConnection(projectContext.baseDir)
-                }
                 if(firstRun) {
                     console.addStatus("Enter a command name to run. Use TAB for completion:")
                     firstRun = false
@@ -537,9 +534,13 @@ class GrailsCli {
                     @Override
                     Map<String, List<URL>> readFromGradle(ProjectConnection connection) {
                         def config = applicationConfig
-                        GrailsClasspath grailsClasspath = GradleUtil.runBuildActionWithConsoleOutput(connection, projectContext, new ClasspathBuildAction()) { BuildActionExecuter<GrailsClasspath> executer ->
-                            executer.withArguments("-Dgrails.profile=${config.navigate("grails", "profile")}")
-                        }
+
+                        BuildActionExecuter buildActionExecuter = connection.action(new ClasspathBuildAction())
+                        buildActionExecuter.standardOutput = new NullOutputStream()
+                        buildActionExecuter.standardError  = new NullOutputStream()
+                        buildActionExecuter.withArguments("-Dgrails.profile=${config.navigate("grails", "profile")}")
+
+                        def grailsClasspath = buildActionExecuter.run()
                         if(grailsClasspath.error) {
                             GrailsConsole.instance.error("${grailsClasspath.error} Type 'gradle dependencies' for more information")
                             exit 1

grails-shell/src/main/groovy/org/grails/cli/gradle/GradleUtil.groovy

@@ -41,50 +41,6 @@ import org.grails.cli.profile.ProjectContext
 @CompileStatic
 class GradleUtil {
     private static final boolean DEFAULT_SUPPRESS_OUTPUT = true
-    private static ProjectConnection preparedConnection = null
-    private static File preparedConnectionBaseDir = null
-
-    public static ProjectConnection refreshConnection(File baseDir) {
-        preparedConnection = openGradleConnection(baseDir)
-        preparedConnectionBaseDir = baseDir.getAbsoluteFile()
-
-        try {
-            Runtime.addShutdownHook {
-                try {
-                    Thread.start {
-                        clearPreparedConnection()
-                    }.join(1000)
-                } catch (Throwable e) {
-                    // ignore
-                }
-
-            }
-        } catch (e) {
-            // ignore
-        }
-        return preparedConnection
-    }
-
-    public static ProjectConnection prepareConnection(File baseDir) {
-        if (preparedConnection == null || preparedConnectionBaseDir != baseDir.getAbsoluteFile()) {
-            refreshConnection(baseDir)
-        }
-        return preparedConnection
-    }
-
-    public static clearPreparedConnection() {
-        if (preparedConnection != null) {
-            try {
-                Thread.start {
-                    preparedConnection?.close()
-                }.join(2000)
-            } catch (Throwable e) {
-            }
-
-            preparedConnection = null
-            preparedConnectionBaseDir = null
-        }
-    }
 
     public static ProjectConnection openGradleConnection(File baseDir) {
         DefaultGradleConnector gradleConnector = (DefaultGradleConnector)GradleConnector.newConnector().forProjectDirectory(baseDir)
@@ -98,8 +54,7 @@ class GradleUtil {
 
     public static <T> T withProjectConnection(File baseDir, boolean suppressOutput = DEFAULT_SUPPRESS_OUTPUT,
                                               @ClosureParams(value = SimpleType.class, options = "org.gradle.tooling.ProjectConnection") Closure<T> closure) {
-        boolean preparedConnectionExisted = preparedConnection != null
-        ProjectConnection projectConnection = prepareConnection(baseDir)
+        ProjectConnection projectConnection = openGradleConnection(baseDir)
         try {
             if (suppressOutput) {
                 SystemOutErrCapturer.withNullOutput {
@@ -111,8 +66,7 @@ class GradleUtil {
                 }
             }
         } finally {
-            if (!preparedConnectionExisted)
-                clearPreparedConnection()
+            projectConnection.close();
         }
     }
 

grails-shell/src/main/groovy/org/grails/cli/gradle/cache/CachedGradleOperation.groovy

@@ -15,9 +15,13 @@
  */
 package org.grails.cli.gradle.cache
 
+import grails.io.support.SystemOutErrCapturer
 import grails.util.BuildSettings
 import groovy.transform.CompileStatic
+import org.gradle.tooling.GradleConnector
 import org.gradle.tooling.ProjectConnection
+import org.gradle.tooling.internal.consumer.ConnectorServices
+import org.gradle.tooling.internal.consumer.DefaultGradleConnector
 import org.grails.cli.gradle.GradleUtil
 import org.grails.cli.profile.ProjectContext
 
@@ -38,7 +42,6 @@ abstract class CachedGradleOperation<T> implements Callable<T> {
     CachedGradleOperation(ProjectContext projectContext, String fileName) {
         this.fileName = fileName
         this.projectContext = projectContext
-        GradleUtil.refreshConnection(projectContext.baseDir)
     }
 
     abstract T readFromCached(File f)
@@ -62,9 +65,25 @@ abstract class CachedGradleOperation<T> implements Callable<T> {
             throw e
         }
 
-        def data = GradleUtil.withProjectConnection(projectContext.baseDir, true) { ProjectConnection projectConnection -> readFromGradle(projectConnection) }
-        storeData(data)
-        return data
+        try {
+            DefaultGradleConnector dgc = (DefaultGradleConnector)GradleConnector.newConnector()
+                                                                                .forProjectDirectory(projectContext.baseDir)
+
+            dgc.embedded(true)
+            def projectConnection = dgc.connect()
+            try {
+                def data = SystemOutErrCapturer.withNullOutput {
+                    readFromGradle(projectConnection)
+                }
+                storeData(data)
+                return data
+            } finally {
+                projectConnection.close()
+            }
+        } finally {
+            DefaultGradleConnector.close()
+            ConnectorServices.reset()
+        }
     }
 
     protected void storeData(T data) {