[incubator-kie-issues#1068] Fix gradle build output (#3471)

* [test-gradle-target] WIP * [incubator-kie-issues#1068] Enhancing dual build-system management. Locally working * [incubator-kie-issues#1068] Fix classes path for multimodule project * [incubator-kie-issues#1068] Restored kogito.codegen.sources.directory usage. Unified GeneratedFileWriter instantiation and usage * [incubator-kie-issues#1068] REmove duplicated class. REstored test * [incubator-kie-issues#1068] Remove unused parameter * [incubator-kie-issues#1068] Fixed formatting * [incubator-kie-issues#1068] Fixed formatting --------- Co-authored-by: Gabriele-Cardosi <[email protected]>
apache · Apr 17, 2024 · a795aac · a795aac
1 parent 1065a30
commit a795aac
Show file tree

Hide file tree

Showing 13 changed files with 98 additions and 244 deletions.
diff --git a/...ion/src/main/java/org/kogito/scenariosimulation/runner/KogitoDMNScenarioRunnerHelper.java b/...ion/src/main/java/org/kogito/scenariosimulation/runner/KogitoDMNScenarioRunnerHelper.java
@@ -28,6 +28,7 @@
 import java.util.Map;
 import java.util.stream.Stream;
 
+import org.drools.codegen.common.AppPaths;
 import org.drools.io.FileSystemResource;
 import org.drools.scenariosimulation.api.model.ScenarioSimulationModel;
 import org.drools.scenariosimulation.api.model.ScesimModelDescriptor;
@@ -53,7 +54,7 @@ public class KogitoDMNScenarioRunnerHelper extends DMNScenarioRunnerHelper {
 
     private DMNRuntime dmnRuntime = initDmnRuntime();
 
-    private static final String targetFolder = File.separator + "target" + File.separator;
+    private static final String targetFolder = File.separator + AppPaths.TARGET_DIR + File.separator;
     private static final String generatedResourcesFolder = targetFolder + "generated-resources" + File.separator;
 
     @Override

diff --git a/...api/src/main/java/org/kie/kogito/codegen/api/context/impl/AbstractKogitoBuildContext.java b/...api/src/main/java/org/kie/kogito/codegen/api/context/impl/AbstractKogitoBuildContext.java
@@ -21,7 +21,6 @@
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
-import java.nio.file.Path;
 import java.text.MessageFormat;
 import java.util.Collection;
 import java.util.Collections;
@@ -258,7 +257,7 @@ protected abstract static class AbstractBuilder implements Builder {
         protected Predicate<String> classAvailabilityResolver = this::hasClass;
         protected Predicate<Class<?>> classSubTypeAvailabilityResolver = c -> false;
         // default fallback value (usually overridden)
-        protected AppPaths appPaths = AppPaths.fromProjectDir(new File(".").toPath(), Path.of(".", AppPaths.TARGET_DIR));
+        protected AppPaths appPaths = AppPaths.fromProjectDir(new File(".").toPath());
         protected KogitoGAV gav;
 
         protected AbstractBuilder() {

diff --git a/...ito-codegen-core/src/main/java/org/kie/kogito/codegen/core/utils/GeneratedFileWriter.java b/...ito-codegen-core/src/main/java/org/kie/kogito/codegen/core/utils/GeneratedFileWriter.java
diff --git a/...ctions/src/test/java/org/kie/kogito/codegen/prediction/PMMLRestResourceGeneratorTest.java b/...ctions/src/test/java/org/kie/kogito/codegen/prediction/PMMLRestResourceGeneratorTest.java
@@ -22,6 +22,7 @@
 import java.util.NoSuchElementException;
 import java.util.Optional;
 
+import org.drools.codegen.common.AppPaths;
 import org.drools.codegen.common.di.impl.CDIDependencyInjectionAnnotator;
 import org.drools.util.StringUtils;
 import org.junit.jupiter.api.AfterAll;
@@ -80,7 +81,7 @@ public static void setup() {
         String filePrefix = URLEncoder.encode(getSanitizedClassName(KIE_PMML_MODEL.getFileName().replace(".pmml", "")));
         String classPrefix = URLEncoder.encode(getSanitizedClassName(KIE_PMML_MODEL.getName()));
         expectedUrl = String.format("/%s/%s", filePrefix, classPrefix);
-        System.setProperty(INDEXFILE_DIRECTORY_PROPERTY, "target/test-classes");
+        System.setProperty(INDEXFILE_DIRECTORY_PROPERTY, String.format("%s/test-classes", AppPaths.TARGET_DIR));
     }
 
     @AfterAll

diff --git a/...ictions/src/test/java/org/kie/kogito/codegen/prediction/PredictionCodegenFactoryTest.java b/...ictions/src/test/java/org/kie/kogito/codegen/prediction/PredictionCodegenFactoryTest.java
@@ -21,6 +21,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.drools.codegen.common.AppPaths;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -46,7 +47,7 @@ class PredictionCodegenFactoryTest {
 
     @BeforeAll
     public static void setup() {
-        System.setProperty(INDEXFILE_DIRECTORY_PROPERTY, "target/test-classes");
+        System.setProperty(INDEXFILE_DIRECTORY_PROPERTY, String.format("%s/test-classes", AppPaths.TARGET_DIR));
     }
 
     @AfterAll

diff --git a/...ctions/src/test/java/org/kie/kogito/codegen/prediction/PredictionCodegenGenerateTest.java b/...ctions/src/test/java/org/kie/kogito/codegen/prediction/PredictionCodegenGenerateTest.java
@@ -29,6 +29,7 @@
 import java.util.function.Function;
 import java.util.stream.Stream;
 
+import org.drools.codegen.common.AppPaths;
 import org.drools.codegen.common.GeneratedFile;
 import org.drools.codegen.common.GeneratedFileType;
 import org.junit.jupiter.api.AfterAll;
@@ -68,7 +69,7 @@ class PredictionCodegenGenerateTest {
 
     @BeforeAll
     public static void setup() {
-        System.setProperty(INDEXFILE_DIRECTORY_PROPERTY, "target/test-classes");
+        System.setProperty(INDEXFILE_DIRECTORY_PROPERTY, String.format("%s/test-classes", AppPaths.TARGET_DIR));
     }
 
     @AfterAll

diff --git a/...rc/test/java/org/kie/kogito/codegen/prediction/PredictionCodegenInternalGenerateTest.java b/...rc/test/java/org/kie/kogito/codegen/prediction/PredictionCodegenInternalGenerateTest.java
@@ -25,6 +25,7 @@
 import java.util.function.Function;
 import java.util.stream.Stream;
 
+import org.drools.codegen.common.AppPaths;
 import org.drools.codegen.common.GeneratedFile;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -51,7 +52,7 @@ class PredictionCodegenInternalGenerateTest {
 
     @BeforeAll
     public static void setup() {
-        System.setProperty(INDEXFILE_DIRECTORY_PROPERTY, "target/test-classes");
+        System.setProperty(INDEXFILE_DIRECTORY_PROPERTY, String.format("%s/test-classes", AppPaths.TARGET_DIR));
     }
 
     @AfterAll

diff --git a/kogito-maven-plugin/src/main/java/org/kie/kogito/maven/plugin/AbstractKieMojo.java b/kogito-maven-plugin/src/main/java/org/kie/kogito/maven/plugin/AbstractKieMojo.java
@@ -22,6 +22,7 @@
 import java.lang.reflect.Modifier;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
@@ -37,13 +38,13 @@
 import org.drools.codegen.common.AppPaths;
 import org.drools.codegen.common.DroolsModelBuildContext;
 import org.drools.codegen.common.GeneratedFile;
+import org.drools.codegen.common.GeneratedFileWriter;
 import org.kie.kogito.KogitoGAV;
 import org.kie.kogito.codegen.api.Generator;
 import org.kie.kogito.codegen.api.context.KogitoBuildContext;
 import org.kie.kogito.codegen.api.context.impl.JavaKogitoBuildContext;
 import org.kie.kogito.codegen.api.context.impl.QuarkusKogitoBuildContext;
 import org.kie.kogito.codegen.api.context.impl.SpringBootKogitoBuildContext;
-import org.kie.kogito.codegen.core.utils.GeneratedFileWriter;
 import org.kie.kogito.codegen.decision.DecisionCodegen;
 import org.kie.kogito.codegen.prediction.PredictionCodegen;
 import org.kie.kogito.codegen.process.ProcessCodegen;
@@ -55,6 +56,8 @@
 
 public abstract class AbstractKieMojo extends AbstractMojo {
 
+    protected static final GeneratedFileWriter.Builder generatedFileWriterBuilder = GeneratedFileWriter.builder("kogito", "kogito.codegen.resources.directory", "kogito.codegen.sources.directory");
+
     @Parameter(required = true, defaultValue = "${project.basedir}")
     protected File projectDir;
 
@@ -67,11 +70,8 @@ public abstract class AbstractKieMojo extends AbstractMojo {
     @Parameter(required = true, defaultValue = "${project.build.outputDirectory}")
     protected File outputDirectory;
 
-    @Parameter(defaultValue = "${project.build.directory}/" + GeneratedFileWriter.DEFAULT_SOURCES_DIR)
-    protected File generatedSources;
-
-    @Parameter(defaultValue = "${project.build.directory}/" + GeneratedFileWriter.DEFAULT_RESOURCE_PATH)
-    protected File generatedResources;
+    @Parameter(required = true, defaultValue = "${project.basedir}")
+    protected File baseDir;
 
     @Parameter(property = "kogito.codegen.persistence", defaultValue = "true")
     protected boolean persistence;
@@ -102,7 +102,7 @@ protected void setSystemProperties(Map<String, String> properties) {
     }
 
     protected KogitoBuildContext discoverKogitoRuntimeContext(ClassLoader classLoader) {
-        AppPaths appPaths = AppPaths.fromProjectDir(projectDir.toPath(), outputDirectory.toPath());
+        AppPaths appPaths = AppPaths.fromProjectDir(projectDir.toPath());
         KogitoBuildContext context = contextBuilder()
                 .withClassAvailabilityResolver(this::hasClassOnClasspath)
                 .withClassSubTypeAvailabilityResolver(classSubTypeAvailabilityResolver())
@@ -250,20 +250,27 @@ private boolean hasClassOnClasspath(String className) {
     }
 
     protected void writeGeneratedFiles(Collection<GeneratedFile> generatedFiles) {
-        generatedFiles.forEach(this::writeGeneratedFile);
+        GeneratedFileWriter writer = getGeneratedFileWriter();
+        generatedFiles.forEach(generatedFile -> writeGeneratedFile(generatedFile, writer));
     }
 
     protected void writeGeneratedFile(GeneratedFile generatedFile) {
-        GeneratedFileWriter writer = new GeneratedFileWriter(outputDirectory.toPath(),
-                generatedSources.toPath(),
-                generatedResources.toPath(),
-                getSourcesPath().toPath());
+        writeGeneratedFile(generatedFile, getGeneratedFileWriter());
+    }
 
+    protected void writeGeneratedFile(GeneratedFile generatedFile, GeneratedFileWriter writer) {
         getLog().info("Generating: " + generatedFile.relativePath());
         writer.write(generatedFile);
     }
 
     protected File getSourcesPath() {
-        return generatedSources;
+        // using runtime BT instead of static AppPaths.MAVEN to allow
+        // invocation from GRADLE
+        return Path.of(baseDir.getAbsolutePath(), AppPaths.BT.GENERATED_SOURCES_PATH.toString()).toFile();
+    }
+
+    protected GeneratedFileWriter getGeneratedFileWriter() {
+        return generatedFileWriterBuilder
+                .build(Path.of(baseDir.getAbsolutePath()));
     }
 }