(camel) branch main updated: Fix HTML route coverage report generation on Windows machines (#14078)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 49e89fa2d17 Fix HTML route coverage report generation on Windows 
machines (#14078)
49e89fa2d17 is described below

commit 49e89fa2d176d14bdf48ca99c6289ff5bb0613c2
Author: Adriano Machado <60320+ammach...@users.noreply.github.com>
AuthorDate: Tue May 7 23:59:49 2024 -0400

    Fix HTML route coverage report generation on Windows machines (#14078)
---
 .../src/main/java/org/apache/camel/maven/RouteCoverageMojo.java        | 2 +-
 .../apache/camel/maven/htmlxlsx/process/CoverageResultsProcessor.java  | 2 +-
 .../main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java    | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
 
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
index f6edcfaddb7..bcce20ecb24 100644
--- 
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
+++ 
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
@@ -374,7 +374,7 @@ public class RouteCoverageMojo extends AbstractMojo {
             String out = processor.generateReport(project, xmlPath, htmlPath);
             getLog().info(out);
         } catch (Exception e) {
-            getLog().warn("Error generating HTML route coverage reports " + 
e.getMessage());
+            getLog().warn("Error generating HTML route coverage reports due " 
+ e.getMessage());
         }
     }
 
diff --git 
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/CoverageResultsProcessor.java
 
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/CoverageResultsProcessor.java
index b82fcb7a507..4273ba7b674 100644
--- 
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/CoverageResultsProcessor.java
+++ 
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/CoverageResultsProcessor.java
@@ -72,7 +72,7 @@ public class CoverageResultsProcessor {
 
         parseAllTestResults(xmlPath);
 
-        if (testResults.size() > 0) {
+        if (!testResults.isEmpty()) {
 
             gatherBestRouteCoverages();
 
diff --git 
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java
 
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java
index ac960befd66..fd886bc1815 100644
--- 
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java
+++ 
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java
@@ -27,6 +27,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
 
 public class FileUtil {
@@ -100,6 +101,6 @@ public class FileUtil {
 
     public String readFileFromClassPath(String path) throws IOException {
 
-        return IOUtils.resourceToString(path, Charset.defaultCharset(), 
FileUtil.class.getClassLoader());
+        return IOUtils.resourceToString(FilenameUtils.separatorsToUnix(path), 
Charset.defaultCharset(), FileUtil.class.getClassLoader());
     }
 }