elastic#34459 replace groovy build-tools with java for AntTask

Author: fblacutt

build-tools-internal/src/main/groovy/org/elasticsearch/gradle/internal/test/AntFixture.groovy

@@ -15,6 +15,7 @@ import org.elasticsearch.gradle.internal.test.Fixture
 import org.gradle.api.GradleException
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskProvider
+import org.gradle.api.AntBuilder
 
 /**
  * A fixture for integration tests which runs in a separate process launched by Ant.

build-tools-internal/src/main/groovy/org/elasticsearch/gradle/internal/AntTask.groovy renamed to build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/AntTask.java

@@ -6,20 +6,25 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle.internal
-
-import org.apache.tools.ant.BuildListener
-import org.apache.tools.ant.BuildLogger
-import org.apache.tools.ant.DefaultLogger
-import org.apache.tools.ant.Project
-import org.gradle.api.DefaultTask
-import org.gradle.api.GradleException
-import org.gradle.api.file.FileSystemOperations
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.TaskAction
-
-import javax.inject.Inject
-import java.nio.charset.Charset
+package org.elasticsearch.gradle.internal;
+
+import org.apache.tools.ant.BuildListener;
+import org.apache.tools.ant.BuildLogger;
+import org.apache.tools.ant.DefaultLogger;
+import org.apache.tools.ant.Project;
+import org.gradle.api.AntBuilder;
+import org.gradle.api.DefaultTask;
+import org.gradle.api.file.FileSystemOperations;
+import org.gradle.api.tasks.TaskAction;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
 
 /**
  * A task which will run ant commands.
@@ -32,66 +37,66 @@ public abstract class AntTask extends DefaultTask {
      * A buffer that will contain the output of the ant code run,
      * if the output was not already written directly to stdout.
      */
-    public final ByteArrayOutputStream outputBuffer = new ByteArrayOutputStream()
+    public final ByteArrayOutputStream outputBuffer = new ByteArrayOutputStream();
 
     @Inject
     protected FileSystemOperations getFileSystemOperations() {
         throw new UnsupportedOperationException();
     }
 
     @TaskAction
-    final void executeTask() {
-        AntBuilder ant = new AntBuilder()
+    final void executeTask() throws UnsupportedEncodingException {
+        AntBuilder ant = getAnt();
 
         // remove existing loggers, we add our own
         List<BuildLogger> toRemove = new ArrayList<>();
-        for (BuildListener listener : ant.project.getBuildListeners()) {
+        for (BuildListener listener : ant.getProject().getBuildListeners()) {
             if (listener instanceof BuildLogger) {
-                toRemove.add(listener);
+                toRemove.add((BuildLogger) listener);
             }
         }
         for (BuildLogger listener : toRemove) {
-            ant.project.removeBuildListener(listener)
+            ant.getProject().removeBuildListener(listener);
         }
 
         // otherwise groovy replaces System.out, and you have no chance to debug
         // ant.saveStreams = false
 
-        final int outputLevel = logger.isDebugEnabled() ? Project.MSG_DEBUG : Project.MSG_INFO
-        final PrintStream stream = useStdout() ? System.out : new PrintStream(outputBuffer, true, Charset.defaultCharset().name())
-        BuildLogger antLogger = makeLogger(stream, outputLevel)
+        final int outputLevel = getLogger().isDebugEnabled() ? Project.MSG_DEBUG : Project.MSG_INFO;
+        final PrintStream stream = useStdout() ? System.out : new PrintStream(outputBuffer, true, Charset.defaultCharset().name());
+        BuildLogger antLogger = makeLogger(stream, outputLevel);
 
-        ant.project.addBuildListener(antLogger)
+        ant.getProject().addBuildListener(antLogger);
         try {
-            runAnt(ant)
+            runAnt(ant);
         } catch (Exception e) {
             // ant failed, so see if we have buffered output to emit, then rethrow the failure
-            String buffer = outputBuffer.toString()
+            String buffer = outputBuffer.toString();
             if (buffer.isEmpty() == false) {
-                logger.error("=== Ant output ===\n${buffer}")
+                getLogger().error("=== Ant output ===\n${buffer}");
             }
-            throw e
+            throw e;
         }
     }
 
     /** Runs the doAnt closure. This can be overridden by subclasses instead of having to set a closure. */
-    protected abstract void runAnt(AntBuilder ant)
+    protected abstract void runAnt(AntBuilder ant);
 
     /** Create the logger the ant runner will use, with the given stream for error/output. */
     protected BuildLogger makeLogger(PrintStream stream, int outputLevel) {
-        return new DefaultLogger(
-            errorPrintStream: stream,
-            outputPrintStream: stream,
-            messageOutputLevel: outputLevel)
+        DefaultLogger logger = new DefaultLogger();
+        logger.setErrorPrintStream(stream);
+        logger.setOutputPrintStream(stream);
+        logger.setMessageOutputLevel(outputLevel);
+        return logger;
     }
 
     /**
      * Returns true if the ant logger should write to stdout, or false if to the buffer.
      * The default implementation writes to the buffer when gradle info logging is disabled.
      */
     protected boolean useStdout() {
-        return logger.isInfoEnabled()
+        return getLogger().isInfoEnabled();
     }
 
-
 }