This is an automated email from the ASF dual-hosted git repository.
gitgabrio pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-runtimes.git
The following commit(s) were added to refs/heads/main by this push:
new 5d93ca348c [incubator-kie-issues#1812] Restore source dumping from
kogito-maven-plugin (#3841)
5d93ca348c is described below
commit 5d93ca348cfe3c456df551912e838f8a8e883381
Author: Gabriele Cardosi <[email protected]>
AuthorDate: Fri Feb 7 16:10:27 2025 +0100
[incubator-kie-issues#1812] Restore source dumping from kogito-maven-plugin
(#3841)
Co-authored-by: Gabriele-Cardosi <[email protected]>
---
.../org/kie/kogito/maven/plugin/AbstractKieMojo.java | 16 ----------------
.../org/kie/kogito/maven/plugin/util/CompilerHelper.java | 10 +++++++---
2 files changed, 7 insertions(+), 19 deletions(-)
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
index 4027685cbf..1833ae35c0 100644
---
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
@@ -23,7 +23,6 @@ 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;
import java.util.Optional;
@@ -37,7 +36,6 @@ import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
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;
@@ -268,20 +266,6 @@ public abstract class AbstractKieMojo extends AbstractMojo
{
}
}
- protected void writeGeneratedFiles(Collection<GeneratedFile>
generatedFiles) {
- GeneratedFileWriter writer = getGeneratedFileWriter();
- generatedFiles.forEach(generatedFile ->
writeGeneratedFile(generatedFile, writer));
- }
-
- protected void writeGeneratedFile(GeneratedFile generatedFile) {
- writeGeneratedFile(generatedFile, getGeneratedFileWriter());
- }
-
- protected void writeGeneratedFile(GeneratedFile generatedFile,
GeneratedFileWriter writer) {
- getLog().info("Generating: " + generatedFile.relativePath());
- writer.write(generatedFile);
- }
-
protected File getSourcesPath() {
// using runtime BT instead of static AppPaths.MAVEN to allow
// invocation from GRADLE
diff --git
a/kogito-maven-plugin/src/main/java/org/kie/kogito/maven/plugin/util/CompilerHelper.java
b/kogito-maven-plugin/src/main/java/org/kie/kogito/maven/plugin/util/CompilerHelper.java
index ca658d6037..58d32a1b44 100644
---
a/kogito-maven-plugin/src/main/java/org/kie/kogito/maven/plugin/util/CompilerHelper.java
+++
b/kogito-maven-plugin/src/main/java/org/kie/kogito/maven/plugin/util/CompilerHelper.java
@@ -58,16 +58,20 @@ public class CompilerHelper {
File pathFile = new File(path);
settings.addClasspath(pathFile);
}
- // Compile and write persistence files
compileAndWriteClasses(generatedSources, classLoader, settings,
getGeneratedFileWriter(baseDir), log);
+ writeFiles(generatedSources, baseDir, log);
} catch (Exception e) {
throw new MojoExecutionException("Error during processing model
classes", e);
}
}
- public static void dumpResources(Collection<GeneratedFile> generatedFiles,
File baseDir, Log log) {
+ public static void dumpResources(Collection<GeneratedFile> resources, File
baseDir, Log log) {
+ writeFiles(resources, baseDir, log);
+ }
+
+ static void writeFiles(Collection<GeneratedFile> toWrite, File baseDir,
Log log) {
GeneratedFileWriter writer = getGeneratedFileWriter(baseDir);
- generatedFiles.forEach(generatedFile ->
writeGeneratedFile(generatedFile, writer, log));
+ toWrite.forEach(generatedFile -> writeGeneratedFile(generatedFile,
writer, log));
}
static void writeGeneratedFile(GeneratedFile generatedFile,
GeneratedFileWriter writer, Log log) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
