Merge generated-src and generated

Author: idegtiarenko

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/StringTemplatePluginTest.groovy

@@ -75,6 +75,40 @@ class StringTemplatePluginTest extends AbstractGradleFuncTest {
           """.stripIndent().stripTrailing()
     }
 
+    def "test custom generated directory"() {
+        given:
+        internalBuild()
+        file('src/main/src/X-SomeFile.txt.st') << """
+          Just some random data
+        """
+        file('src/main/generated/leftover.txt') << """
+          Just some random data
+        """
+
+        buildFile << """
+          apply plugin: 'elasticsearch.build'
+          apply plugin: 'elasticsearch.string-templates'
+
+          tasks.named("stringTemplates").configure {
+            it.outputFolder = file("src/main/generated")
+            template {
+              it.properties = [:]
+              it.inputFile = file("src/main/src/X-SomeFile.txt.st")
+              it.outputFile = "SomeFile.txt"
+            }
+          }
+        """
+
+        when:
+        def result = gradleRunner("stringTemplates", '-g', gradleUserHome).build()
+
+        then:
+        result.task(":stringTemplates").outcome == TaskOutcome.SUCCESS
+        file("src/main/generated/SomeFile.txt").exists()
+        file("src/main/generated-src/SomeFile.txt").exists() == false
+        file("src/main/generated/leftover.txt").exists() == false
+    }
+
     def "test basic conditional"() {
         given:
         internalBuild()

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/StringTemplateTask.java

@@ -42,8 +42,8 @@ public abstract class StringTemplateTask extends DefaultTask {
 
     @Inject
     public StringTemplateTask(ObjectFactory objectFactory, FileSystemOperations fileSystemOperations) {
-        templateSpecListProperty = objectFactory.listProperty(TemplateSpec.class);
-        outputFolder = objectFactory.directoryProperty();
+        this.templateSpecListProperty = objectFactory.listProperty(TemplateSpec.class);
+        this.outputFolder = objectFactory.directoryProperty();
         this.fileSystemOperations = fileSystemOperations;
     }
 

x-pack/plugin/esql/build.gradle

@@ -69,8 +69,6 @@ def projectDirectory = project.layout.projectDirectory
 def generatedSourceDir = projectDirectory.dir(generatedPath)
 tasks.named("compileJava").configure {
   options.compilerArgumentProviders.add(new SourceDirectoryCommandLineArgumentProvider(generatedSourceDir))
-  // IntelliJ sticks generated files here and we can't stop it....
-  exclude { normalize(it.file.toString()).contains("src/main/generated-src/generated") }
 }
 
 idea.module {
@@ -177,8 +175,7 @@ pluginManager.withPlugin('com.diffplug.spotless') {
       // for some reason "${outputPath}/EsqlBaseParser*.java" does not match the same files...
       targetExclude "src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer*.java",
         "src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser*.java",
-        "src/main/generated/**/*.java",
-        "src/main/generated-src/generated/**/*.java"
+        "src/main/generated/**/*.java"
     }
   }
 }
@@ -227,7 +224,7 @@ tasks.register("regenParser", JavaExec) {
 }
 
 tasks.register("regen") {
-  dependsOn "regenParser"
+  dependsOn "regenParser", "stringTemplates"
   doLast {
     // moves token files to grammar directory for use with IDE's
     ant.move(file: "${outputPath}/EsqlBaseLexer.tokens", toDir: grammarPath)
@@ -276,10 +273,8 @@ tasks.register("regen") {
   }
 }
 
-tasks.named("spotlessJava") { dependsOn stringTemplates }
 tasks.named('checkstyleMain').configure {
   excludes = [ "**/*.java.st" ]
-  exclude { normalize(it.file.toString()).contains("src/main/generated-src/generated") }
   exclude { normalize(it.file.toString()).contains("src/main/generated") }
 }
 
@@ -306,6 +301,8 @@ tasks.named('stringTemplates').configure {
   var bytesRefProperties = prop("BytesRef", "BytesRef", "BYTES_REF", "org.apache.lucene.util.RamUsageEstimator.NUM_BYTES_OBJECT_REF", "")
   var booleanProperties = prop("Boolean", "boolean", "BOOLEAN", "Byte.BYTES", "BitArray")
 
+  it.outputFolder = file(generatedPath)
+
   File inInputFile = file("src/main/java/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/X-InEvaluator.java.st")
   template {
     it.properties = booleanProperties