Refactor OOM detection in DecompilerExecute; introduce OOMDetectorStream and update error handling

Author: marchermans

common/src/main/java/net/neoforged/gradle/common/runtime/tasks/DecompilerExecute.java

@@ -5,6 +5,7 @@
 import org.gradle.api.GradleException;
 import org.gradle.api.problems.Problems;
 import org.gradle.api.tasks.CacheableTask;
+import org.gradle.api.tasks.Internal;
 
 import javax.inject.Inject;
 import java.io.ByteArrayOutputStream;
@@ -22,10 +23,16 @@ public OutputStream createErrorOutputStream()
     {
         return new BifurcatingOutputStream(
             super.createErrorOutputStream(),
-            this.detector
+            new OOMDetectorStream(this.detector)
         );
     }
 
+    @Internal
+    public OOMDetector getDetector()
+    {
+        return detector;
+    }
+
     @Override
     public void doExecute() throws Exception
     {
@@ -41,7 +48,7 @@ public void doExecute() throws Exception
 
     private void detectError(boolean throwError)
     {
-        if (detector.failed()) {
+        if (getDetector().failed()) {
             //We failed, so we can access the project now, to get the reporter
             //We should not need to care about the config cache here,
             getProject().getExtensions().getByType(IProblemReporter.class)
@@ -59,35 +66,47 @@ private void detectError(boolean throwError)
         }
     }
 
-    private static final class OOMDetector extends OutputStream {
-        private final ByteArrayOutputStream collectionDelegate = new ByteArrayOutputStream();
+    public static final class OOMDetector {
         private final StringBuilder resultBuilder = new StringBuilder();
 
         private OOMDetector() {
         }
 
+        private void addLog(String log) {
+            resultBuilder.append(log);
+        }
+
+        public boolean failed() {
+            return this.resultBuilder.toString().contains("java.lang.OutOfMemoryError");
+        }
+    }
+
+    public static final class OOMDetectorStream extends OutputStream {
+        private final OOMDetector detector;
+        private final ByteArrayOutputStream collectionDelegate = new ByteArrayOutputStream();
+
+        public OOMDetectorStream(final OOMDetector detector) {this.detector = detector;}
+
         @Override
-        public void write(final int b)
+        public void write(final int b) throws IOException
         {
-            this.collectionDelegate.write(b);
+            collectionDelegate.write(b);
         }
 
         @Override
         public void flush() throws IOException
         {
-            this.collectionDelegate.flush();
+            super.flush();
+            collectionDelegate.flush();
         }
 
         @Override
         public void close() throws IOException
         {
-            this.collectionDelegate.close();
+            super.close();
+            collectionDelegate.close();
 
-            this.resultBuilder.append(this.collectionDelegate);
-        }
-
-        public boolean failed() {
-            return this.resultBuilder.toString().contains("java.lang.OutOfMemoryError");
+            this.detector.addLog(collectionDelegate.toString());
         }
     }
 }

common/src/main/java/net/neoforged/gradle/common/runtime/tasks/RecompileSourceJar.java

@@ -46,10 +46,6 @@ public abstract class RecompileSourceJar extends JavaCompile implements Runtime
     public RecompileSourceJar() {
         super();
 
-        //We use a custom instance here that marks the sourcepath as an incremental field, allowing us to provide the compiler
-        //with all required elements directly while keeping incremental compile support for II.
-        ReflectionUtils.setFinalFieldUncheckedWithAlternatives(this, getObjectFactory().newInstance(RecompileOptions.class), "compileOptions", "__options__");
-
         arguments = getObjectFactory().newInstance(RuntimeArgumentsImpl.class, getProviderFactory());
         multiArguments = getObjectFactory().newInstance(RuntimeMultiArgumentsImpl.class, getProviderFactory());
 
@@ -90,8 +86,8 @@ public RecompileSourceJar() {
         getOptions().setWarnings(false);
         getOptions().setVerbose(false);
         getOptions().setDeprecation(false);
-        getOptions().setIncremental(true);
-        getOptions().getIncrementalAfterFailure().set(true);
+        getOptions().setIncremental(false);
+        getOptions().getIncrementalAfterFailure().set(false);
 
         setSource(getCompileFileRoot());
 
@@ -230,25 +226,4 @@ public Provider<FileTree> getOutputAsTree()
     {
         return getOutput().map(it -> getArchiveOperations().zipTree(it));
     }
-
-    public static abstract class RecompileOptions extends CompileOptions {
-
-        @Inject
-        public RecompileOptions(final ObjectFactory objectFactory)
-        {
-            super(objectFactory);
-        }
-
-        @Incremental
-        @Optional
-        @IgnoreEmptyDirectories
-        @PathSensitive(PathSensitivity.RELATIVE)
-        @InputFiles
-        @ToBeReplacedByLazyProperty
-        @Override
-        public @Nullable FileCollection getSourcepath()
-        {
-            return super.getSourcepath();
-        }
-    }
 }

userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/ConfigurationCacheTests.groovy

@@ -30,7 +30,6 @@ class ConfigurationCacheTests extends BuilderBasedTestSpecification {
             it.withGlobalCacheDirectory(tempDir)
             it.enableLocalBuildCache()
             it.enableConfigurationCache()
-            it.enableBuildScan()
         })
 
         when: