This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0fb5aa31ae590eb042a1664ff18b6d5c44acc5c4
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Thu Mar 14 08:10:29 2024 +0100
Clean up updateResource usage
---
.../maven/packaging/AbstractGenerateConfigurerMojo.java | 4 ++--
.../apache/camel/maven/packaging/AllDslKotlinMojo.java | 17 ++---------------
.../apache/camel/maven/packaging/ComponentDslMojo.java | 15 +++++++--------
.../camel/maven/packaging/PrepareComponentMojo.java | 4 ++--
4 files changed, 13 insertions(+), 27 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
index 5e6eb68deda..96ba2caf708 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
@@ -450,7 +450,7 @@ public abstract class AbstractGenerateConfigurerMojo
extends AbstractGeneratorMo
String fileName = pn.replace('.', '/') + "/" + cn + ".java";
outputDir.mkdirs();
- boolean updated = updateResource(buildContext,
outputDir.toPath().resolve(fileName), source);
+ boolean updated = updateResource(outputDir.toPath(), fileName, source);
if (updated) {
getLog().info("Updated " + fileName);
}
@@ -464,7 +464,7 @@ public abstract class AbstractGenerateConfigurerMojo
extends AbstractGeneratorMo
w.append("# ").append(GENERATED_MSG).append("\n");
w.append("class=").append(pn).append(".").append(en).append("Configurer").append("\n");
String fileName = "META-INF/services/org/apache/camel/configurer/"
+ fqn;
- boolean updated = updateResource(buildContext,
resourcesOutputDir.toPath().resolve(fileName), w.toString());
+ boolean updated = updateResource(resourcesOutputDir.toPath(),
fileName, w.toString());
if (updated) {
getLog().info("Updated " + fileName);
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AllDslKotlinMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AllDslKotlinMojo.java
index ffe32a07567..8a023d157b4 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AllDslKotlinMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AllDslKotlinMojo.java
@@ -501,21 +501,8 @@ public class AllDslKotlinMojo extends
AbstractGeneratorMojo {
}
String code = codeBuilder.toString();
String filePath = packageName.replace('.', '/') + "/" + fileName +
".kt";
- Path fullPath = sourcesOutputDir.toPath().resolve(filePath);
- boolean update = true;
- try {
- if (Files.exists(fullPath)) {
- String existingCode = Files.readString(fullPath);
- if (existingCode.equals(code)) {
- update = false;
- }
- }
- } catch (IOException e) {
- throw new MojoFailureException(e);
- }
- if (update) {
- getLog().info("Updating " + what);
- updateResource(sourcesOutputDir.toPath(), filePath,
postProcessing.apply(code));
+ if (updateResource(sourcesOutputDir.toPath(), filePath,
postProcessing.apply(code))) {
+ getLog().info("Updated " + what);
}
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
index 6167d936bbd..6a2673aeb46 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
@@ -19,6 +19,7 @@ package org.apache.camel.maven.packaging;
import java.io.File;
import java.io.InputStream;
import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
@@ -200,8 +201,8 @@ public class ComponentDslMojo extends AbstractGeneratorMojo
{
final ComponentDslBuilderFactoryGenerator
componentDslBuilderFactoryGenerator = ComponentDslBuilderFactoryGenerator
.generateClass(componentModel, getProjectClassLoader(),
componentsDslPackageName);
boolean updated =
writeSourceIfChanged(componentDslBuilderFactoryGenerator.printClassAsString(),
- componentsDslFactoriesPackageName.replace('.', '/'),
- componentDslBuilderFactoryGenerator.getGeneratedClassName() +
".java", sourcesOutputDir);
+ componentsDslFactoriesPackageName.replace('.', '/') + "/"
+ + componentDslBuilderFactoryGenerator.getGeneratedClassName()
+ ".java", sourcesOutputDir);
if (updated) {
getLog().info("Updated ComponentDsl: " +
componentModel.getScheme());
@@ -229,7 +230,7 @@ public class ComponentDslMojo extends AbstractGeneratorMojo
{
final ComponentsBuilderFactoryGenerator
componentsBuilderFactoryGenerator = ComponentsBuilderFactoryGenerator
.generateClass(componentCachedModels, getProjectClassLoader(),
componentsDslPackageName);
boolean updated =
writeSourceIfChanged(componentsBuilderFactoryGenerator.printClassAsString(),
- componentsDslPackageName.replace('.', '/'),
componentsBuilderFactoryGenerator.getGeneratedClassName() + ".java",
+ componentsDslPackageName.replace('.', '/') + "/" +
componentsBuilderFactoryGenerator.getGeneratedClassName() + ".java",
sourcesOutputDir);
if (updated) {
@@ -237,10 +238,8 @@ public class ComponentDslMojo extends
AbstractGeneratorMojo {
}
}
- protected boolean writeSourceIfChanged(String source, String filePath,
String fileName, File outputDir)
+ protected boolean writeSourceIfChanged(String source, String filePath,
File outputDir)
throws MojoFailureException {
- Path target = outputDir.toPath().resolve(filePath).resolve(fileName);
-
try {
final String code = joinHeaderAndSource(licenseHeader, source);
@@ -248,9 +247,9 @@ public class ComponentDslMojo extends AbstractGeneratorMojo
{
getLog().debug("Source code generated:\n" + code);
}
- return updateResource(buildContext, target, code);
+ return updateResource(outputDir.toPath(), filePath, code);
} catch (Exception e) {
- throw new MojoFailureException("IOError with file " + target, e);
+ throw new MojoFailureException("IOError with file " + filePath, e);
}
}
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareComponentMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareComponentMojo.java
index 6767626e872..1e9fda50000 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareComponentMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareComponentMojo.java
@@ -246,7 +246,7 @@ public class PrepareComponentMojo extends
AbstractGeneratorMojo {
+ "\n" + s + "\n"
+ " " + endDependenciesMarker +
after;
- updateResource(buildContext, pomFile, updatedPom);
+ updateResource(root, "pom.xml", updatedPom);
} catch (IOException e) {
throw new MojoExecutionException("Error reading file " + pomFile +
" Reason: " + e, e);
}
@@ -293,7 +293,7 @@ public class PrepareComponentMojo extends
AbstractGeneratorMojo {
+ "\n" + s + "\n"
+ " " + endDependenciesMarker + after;
- updateResource(buildContext, pomFile, updatedPom);
+ updateResource(root, "pom.xml", updatedPom);
} catch (IOException e) {
throw new MojoExecutionException("Error reading file " + pomFile +
" Reason: " + e, e);
}
