You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/04/21 08:47:30 UTC
[camel] 03/06: CAMEL-17894: simplify staled files check to avoid creating an unused String
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d1edd8afde41121e2b1dde0d27ac0d2dd4e0ce7b
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Wed Apr 20 16:45:54 2022 +0200
CAMEL-17894: simplify staled files check to avoid creating an unused String
---
.../camel/maven/packaging/PackageJandexMojo.java | 40 +++++++++++++++-------
1 file changed, 27 insertions(+), 13 deletions(-)
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageJandexMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageJandexMojo.java
index 20a6d12c23a..d661337588b 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageJandexMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageJandexMojo.java
@@ -77,19 +77,7 @@ public class PackageJandexMojo extends AbstractGeneratorMojo {
List<Path> inputs = pathStream.filter(f -> f.getFileName().toString().endsWith(".class"))
.collect(Collectors.toList());
if (index.exists()) {
- long lastmod = lastmod(index.toPath());
- String stale = inputs.stream().filter(p -> lastmod(p) > lastmod).map(Path::toString)
- .collect(Collectors.joining(", "));
- if (!stale.isEmpty()) {
- getLog().info("Stale files detected, re-generating index.");
- if (showStaleFiles) {
- getLog().info("Stale files: " + stale);
- } else if (getLog().isDebugEnabled()) {
- getLog().debug("Stale files: " + stale);
- }
- } else {
- // everything is in order, skip
- getLog().info("Skipping index generation, everything is up to date.");
+ if (isUpToDate(inputs)) {
return;
}
}
@@ -111,6 +99,32 @@ public class PackageJandexMojo extends AbstractGeneratorMojo {
}
}
+ private boolean isUpToDate(List<Path> inputs) {
+ long lastMod = lastmod(index.toPath());
+
+ long staledFiles = inputs.stream().filter(p -> lastmod(p) > lastMod).count();
+
+ if (staledFiles > 0) {
+ getLog().info("Stale files detected, re-generating index.");
+
+ String stale = inputs.stream().filter(p -> lastmod(p) > lastMod).map(Path::toString)
+ .collect(Collectors.joining(","));
+
+ if (showStaleFiles) {
+ getLog().info("Stale files: " + stale);
+ } else if (getLog().isDebugEnabled()) {
+ getLog().debug("Stale files: " + stale);
+ }
+
+ return false;
+ }
+
+ // everything is in order, skip
+ getLog().info("Skipping index generation, everything is up to date.");
+
+ return true;
+ }
+
private long lastmod(Path p) {
try {
return Files.getLastModifiedTime(p).toMillis();