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/03/22 11:41:59 UTC
[camel] branch main updated (edbf501 -> 2abb196)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.
from edbf501 CAMEL-16628: Enable IT with profile plugin-itest
new 56cb22d (chores) camel-report-maven-plugin: remove duplications and code cleanup
new 6d241e1 (chores) camel-report-maven-plugin: use generics to avoid duplications
new 06ff64b (chores) camel-report-maven-plugin: use try-with-resources for simplicity
new 5ae9177 (chores) camel-report-maven-plugin: consolidate building validation messages
new b9b9ce2 (chores) camel-report-maven-plugin: simplify list iteration
new aabab43 (chores) camel-report-maven-plugin: use try-with-resources where possible
new 0f9a0d9 (chores) camel-report-maven-plugin: simplify boolean evaluation in pattern matching
new 2abb196 (chores) camel-report-maven-plugin: simplify check for pattern matching
The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/camel/maven/ValidateMojo.java | 619 +++++++++------------
1 file changed, 269 insertions(+), 350 deletions(-)
[camel] 01/08: (chores) camel-report-maven-plugin: remove duplications and code cleanup
Posted by or...@apache.org.
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 56cb22d1c42cdb6c0df48f459297749e53dfd4af
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 21 15:13:39 2022 +0100
(chores) camel-report-maven-plugin: remove duplications and code cleanup
---
.../java/org/apache/camel/maven/ValidateMojo.java | 495 +++++++++++----------
1 file changed, 256 insertions(+), 239 deletions(-)
diff --git a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
index a422cdf..b84ddfb 100644
--- a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
+++ b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
@@ -380,107 +380,18 @@ public class ValidateMojo extends AbstractExecMojo {
Set<File> xmlFiles = new LinkedHashSet<>();
// find all java route builder classes
- if (includeJava) {
- List list = project.getCompileSourceRoots();
- for (Object obj : list) {
- String dir = (String) obj;
- findJavaFiles(new File(dir), javaFiles);
- }
- if (includeTest) {
- list = project.getTestCompileSourceRoots();
- for (Object obj : list) {
- String dir = (String) obj;
- findJavaFiles(new File(dir), javaFiles);
- }
- }
- }
+ findJavaRouteBuilderClasses(javaFiles);
// find all xml routes
- if (includeXml) {
- List list = project.getResources();
- for (Object obj : list) {
- Resource dir = (Resource) obj;
- findXmlFiles(new File(dir.getDirectory()), xmlFiles);
- }
- if (includeTest) {
- list = project.getTestResources();
- for (Object obj : list) {
- Resource dir = (Resource) obj;
- findXmlFiles(new File(dir.getDirectory()), xmlFiles);
- }
- }
- }
+ findXmlRouters(xmlFiles);
for (File file : javaFiles) {
if (matchRouteFile(file)) {
- try {
- List<CamelEndpointDetails> fileEndpoints = new ArrayList<>();
- List<CamelRouteDetails> fileRouteIds = new ArrayList<>();
- List<CamelSimpleExpressionDetails> fileSimpleExpressions = new ArrayList<>();
- List<String> unparsable = new ArrayList<>();
-
- // parse the java source code and find Camel RouteBuilder classes
- String fqn = file.getPath();
- String baseDir = ".";
- JavaType out = Roaster.parse(file);
- // we should only parse java classes (not interfaces and enums etc)
- if (out instanceof JavaClassSource) {
- JavaClassSource clazz = (JavaClassSource) out;
- RouteBuilderParser.parseRouteBuilderEndpoints(clazz, baseDir, fqn, fileEndpoints, unparsable, includeTest);
- RouteBuilderParser.parseRouteBuilderSimpleExpressions(clazz, baseDir, fqn, fileSimpleExpressions);
- if (duplicateRouteId) {
- RouteBuilderParser.parseRouteBuilderRouteIds(clazz, baseDir, fqn, fileRouteIds);
- }
-
- // add what we found in this file to the total list
- endpoints.addAll(fileEndpoints);
- simpleExpressions.addAll(fileSimpleExpressions);
- routeIds.addAll(fileRouteIds);
-
- // was there any unparsable?
- if (logUnparseable && !unparsable.isEmpty()) {
- for (String uri : unparsable) {
- getLog().warn("Cannot parse endpoint uri " + uri + " in java file " + file);
- }
- }
- }
- } catch (Exception e) {
- getLog().warn("Error parsing java file " + file + " code due " + e.getMessage(), e);
- }
+ parseJavaRouteFile(endpoints, simpleExpressions, routeIds, file);
}
}
for (File file : xmlFiles) {
if (matchRouteFile(file)) {
- try {
- List<CamelEndpointDetails> fileEndpoints = new ArrayList<>();
- List<CamelSimpleExpressionDetails> fileSimpleExpressions = new ArrayList<>();
- List<CamelRouteDetails> fileRouteIds = new ArrayList<>();
-
- // parse the xml source code and find Camel routes
- String fqn = file.getPath();
- String baseDir = ".";
-
- InputStream is = new FileInputStream(file);
- XmlRouteParser.parseXmlRouteEndpoints(is, baseDir, fqn, fileEndpoints);
- is.close();
- // need a new stream
- is = new FileInputStream(file);
- XmlRouteParser.parseXmlRouteSimpleExpressions(is, baseDir, fqn, fileSimpleExpressions);
- is.close();
-
- if (duplicateRouteId) {
- // need a new stream
- is = new FileInputStream(file);
- XmlRouteParser.parseXmlRouteRouteIds(is, baseDir, fqn, fileRouteIds);
- is.close();
- }
-
- // add what we found in this file to the total list
- endpoints.addAll(fileEndpoints);
- simpleExpressions.addAll(fileSimpleExpressions);
- routeIds.addAll(fileRouteIds);
- } catch (Exception e) {
- getLog().warn("Error parsing xml file " + file + " code due " + e.getMessage(), e);
- }
+ parseXmlRouteFile(endpoints, simpleExpressions, routeIds, file);
}
}
@@ -519,76 +430,16 @@ public class ValidateMojo extends AbstractExecMojo {
endpointErrors++;
}
- StringBuilder sb = new StringBuilder();
- sb.append("Endpoint validation error at: ");
- if (detail.getClassName() != null && detail.getLineNumber() != null) {
- // this is from java code
- sb.append(detail.getClassName());
- if (detail.getMethodName() != null) {
- sb.append(".").append(detail.getMethodName());
- }
- sb.append("(").append(asSimpleClassName(detail.getClassName())).append(".java:");
- sb.append(detail.getLineNumber()).append(")");
- } else if (detail.getLineNumber() != null) {
- // this is from xml
- String fqn = stripRootPath(asRelativeFile(detail.getFileName()));
- if (fqn.endsWith(".xml")) {
- fqn = fqn.substring(0, fqn.length() - 4);
- fqn = asPackageName(fqn);
- }
- sb.append(fqn);
- sb.append("(").append(asSimpleClassName(fqn)).append(".xml:");
- sb.append(detail.getLineNumber()).append(")");
- } else {
- sb.append(detail.getFileName());
- }
- sb.append("\n\n");
- String out = result.summaryErrorMessage(false, ignoreDeprecated, true);
- sb.append(out);
- sb.append("\n\n");
+ String msg = buildValidationErrorMessage(detail, result);
- getLog().warn(sb.toString());
+ getLog().warn(msg);
} else if (showAll) {
- StringBuilder sb = new StringBuilder();
- sb.append("Endpoint validation passed at: ");
- if (detail.getClassName() != null && detail.getLineNumber() != null) {
- // this is from java code
- sb.append(detail.getClassName());
- if (detail.getMethodName() != null) {
- sb.append(".").append(detail.getMethodName());
- }
- sb.append("(").append(asSimpleClassName(detail.getClassName())).append(".java:");
- sb.append(detail.getLineNumber()).append(")");
- } else if (detail.getLineNumber() != null) {
- // this is from xml
- String fqn = stripRootPath(asRelativeFile(detail.getFileName()));
- if (fqn.endsWith(".xml")) {
- fqn = fqn.substring(0, fqn.length() - 4);
- fqn = asPackageName(fqn);
- }
- sb.append(fqn);
- sb.append("(").append(asSimpleClassName(fqn)).append(".xml:");
- sb.append(detail.getLineNumber()).append(")");
- } else {
- sb.append(detail.getFileName());
- }
- sb.append("\n");
- sb.append("\n\t").append(result.getUri());
- sb.append("\n\n");
+ String msg = buildValidationPassedMessage(detail, result);
- getLog().info(sb.toString());
+ getLog().info(msg);
}
}
- String endpointSummary;
- if (endpointErrors == 0) {
- int ok = endpoints.size() - endpointErrors - incapableErrors - unknownComponents;
- endpointSummary = String.format("Endpoint validation success: (%s = passed, %s = invalid, %s = incapable, %s = unknown components, %s = deprecated options)",
- ok, endpointErrors, incapableErrors, unknownComponents, deprecatedOptions);
- } else {
- int ok = endpoints.size() - endpointErrors - incapableErrors - unknownComponents;
- endpointSummary = String.format("Endpoint validation error: (%s = passed, %s = invalid, %s = incapable, %s = unknown components, %s = deprecated options)",
- ok, endpointErrors, incapableErrors, unknownComponents, deprecatedOptions);
- }
+ String endpointSummary = buildEndpointSummaryMessage(endpoints, endpointErrors, unknownComponents, incapableErrors, deprecatedOptions);
if (endpointErrors > 0) {
getLog().warn(endpointSummary);
} else {
@@ -597,14 +448,7 @@ public class ValidateMojo extends AbstractExecMojo {
// simple
int simpleErrors = validateSimple(catalog, simpleExpressions);
- String simpleSummary;
- if (simpleErrors == 0) {
- int ok = simpleExpressions.size() - simpleErrors;
- simpleSummary = String.format("Simple validation success: (%s = passed, %s = invalid)", ok, simpleErrors);
- } else {
- int ok = simpleExpressions.size() - simpleErrors;
- simpleSummary = String.format("Simple validation error: (%s = passed, %s = invalid)", ok, simpleErrors);
- }
+ String simpleSummary = buildSimpleSummaryMessage(simpleExpressions, simpleErrors);
if (simpleErrors > 0) {
getLog().warn(simpleSummary);
} else {
@@ -650,6 +494,200 @@ public class ValidateMojo extends AbstractExecMojo {
}
}
+ private String buildSimpleSummaryMessage(List<CamelSimpleExpressionDetails> simpleExpressions, int simpleErrors) {
+ String simpleSummary;
+ if (simpleErrors == 0) {
+ int ok = simpleExpressions.size() - simpleErrors;
+ simpleSummary = String.format("Simple validation success: (%s = passed, %s = invalid)", ok, simpleErrors);
+ } else {
+ int ok = simpleExpressions.size() - simpleErrors;
+ simpleSummary = String.format("Simple validation error: (%s = passed, %s = invalid)", ok, simpleErrors);
+ }
+ return simpleSummary;
+ }
+
+ private String buildEndpointSummaryMessage(List<CamelEndpointDetails> endpoints, int endpointErrors, int unknownComponents, int incapableErrors, int deprecatedOptions) {
+ String endpointSummary;
+ if (endpointErrors == 0) {
+ int ok = endpoints.size() - endpointErrors - incapableErrors - unknownComponents;
+ endpointSummary = String.format("Endpoint validation success: (%s = passed, %s = invalid, %s = incapable, %s = unknown components, %s = deprecated options)",
+ ok, endpointErrors, incapableErrors, unknownComponents, deprecatedOptions);
+ } else {
+ int ok = endpoints.size() - endpointErrors - incapableErrors - unknownComponents;
+ endpointSummary = String.format("Endpoint validation error: (%s = passed, %s = invalid, %s = incapable, %s = unknown components, %s = deprecated options)",
+ ok, endpointErrors, incapableErrors, unknownComponents, deprecatedOptions);
+ }
+ return endpointSummary;
+ }
+
+ private String buildValidationPassedMessage(CamelEndpointDetails detail, EndpointValidationResult result) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("Endpoint validation passed at: ");
+ if (detail.getClassName() != null && detail.getLineNumber() != null) {
+ // this is from java code
+ sb.append(detail.getClassName());
+ if (detail.getMethodName() != null) {
+ sb.append(".").append(detail.getMethodName());
+ }
+ sb.append("(").append(asSimpleClassName(detail.getClassName())).append(".java:");
+ sb.append(detail.getLineNumber()).append(")");
+ } else if (detail.getLineNumber() != null) {
+ // this is from xml
+ String fqn = stripRootPath(asRelativeFile(detail.getFileName()));
+ if (fqn.endsWith(".xml")) {
+ fqn = fqn.substring(0, fqn.length() - 4);
+ fqn = asPackageName(fqn);
+ }
+ sb.append(fqn);
+ sb.append("(").append(asSimpleClassName(fqn)).append(".xml:");
+ sb.append(detail.getLineNumber()).append(")");
+ } else {
+ sb.append(detail.getFileName());
+ }
+ sb.append("\n");
+ sb.append("\n\t").append(result.getUri());
+ sb.append("\n\n");
+
+ String msg = sb.toString();
+ return msg;
+ }
+
+ private String buildValidationErrorMessage(CamelEndpointDetails detail, EndpointValidationResult result) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("Endpoint validation error at: ");
+ if (detail.getClassName() != null && detail.getLineNumber() != null) {
+ // this is from java code
+ sb.append(detail.getClassName());
+ if (detail.getMethodName() != null) {
+ sb.append(".").append(detail.getMethodName());
+ }
+ sb.append("(").append(asSimpleClassName(detail.getClassName())).append(".java:");
+ sb.append(detail.getLineNumber()).append(")");
+ } else if (detail.getLineNumber() != null) {
+ // this is from xml
+ String fqn = stripRootPath(asRelativeFile(detail.getFileName()));
+ if (fqn.endsWith(".xml")) {
+ fqn = fqn.substring(0, fqn.length() - 4);
+ fqn = asPackageName(fqn);
+ }
+ sb.append(fqn);
+ sb.append("(").append(asSimpleClassName(fqn)).append(".xml:");
+ sb.append(detail.getLineNumber()).append(")");
+ } else {
+ sb.append(detail.getFileName());
+ }
+ sb.append("\n\n");
+ String out = result.summaryErrorMessage(false, ignoreDeprecated, true);
+ sb.append(out);
+ sb.append("\n\n");
+ return sb.toString();
+ }
+
+ private void parseXmlRouteFile(List<CamelEndpointDetails> endpoints, List<CamelSimpleExpressionDetails> simpleExpressions, List<CamelRouteDetails> routeIds, File file) {
+ try {
+ List<CamelEndpointDetails> fileEndpoints = new ArrayList<>();
+ List<CamelSimpleExpressionDetails> fileSimpleExpressions = new ArrayList<>();
+ List<CamelRouteDetails> fileRouteIds = new ArrayList<>();
+
+ // parse the xml source code and find Camel routes
+ String fqn = file.getPath();
+ String baseDir = ".";
+
+ InputStream is = new FileInputStream(file);
+ XmlRouteParser.parseXmlRouteEndpoints(is, baseDir, fqn, fileEndpoints);
+ is.close();
+ // need a new stream
+ is = new FileInputStream(file);
+ XmlRouteParser.parseXmlRouteSimpleExpressions(is, baseDir, fqn, fileSimpleExpressions);
+ is.close();
+
+ if (duplicateRouteId) {
+ // need a new stream
+ is = new FileInputStream(file);
+ XmlRouteParser.parseXmlRouteRouteIds(is, baseDir, fqn, fileRouteIds);
+ is.close();
+ }
+
+ // add what we found in this file to the total list
+ endpoints.addAll(fileEndpoints);
+ simpleExpressions.addAll(fileSimpleExpressions);
+ routeIds.addAll(fileRouteIds);
+ } catch (Exception e) {
+ getLog().warn("Error parsing xml file " + file + " code due " + e.getMessage(), e);
+ }
+ }
+
+ private void parseJavaRouteFile(List<CamelEndpointDetails> endpoints, List<CamelSimpleExpressionDetails> simpleExpressions, List<CamelRouteDetails> routeIds, File file) {
+ try {
+ List<CamelEndpointDetails> fileEndpoints = new ArrayList<>();
+ List<CamelRouteDetails> fileRouteIds = new ArrayList<>();
+ List<CamelSimpleExpressionDetails> fileSimpleExpressions = new ArrayList<>();
+ List<String> unparsable = new ArrayList<>();
+
+ // parse the java source code and find Camel RouteBuilder classes
+ String fqn = file.getPath();
+ String baseDir = ".";
+ JavaType out = Roaster.parse(file);
+ // we should only parse java classes (not interfaces and enums etc)
+ if (out instanceof JavaClassSource) {
+ JavaClassSource clazz = (JavaClassSource) out;
+ RouteBuilderParser.parseRouteBuilderEndpoints(clazz, baseDir, fqn, fileEndpoints, unparsable, includeTest);
+ RouteBuilderParser.parseRouteBuilderSimpleExpressions(clazz, baseDir, fqn, fileSimpleExpressions);
+ if (duplicateRouteId) {
+ RouteBuilderParser.parseRouteBuilderRouteIds(clazz, baseDir, fqn, fileRouteIds);
+ }
+
+ // add what we found in this file to the total list
+ endpoints.addAll(fileEndpoints);
+ simpleExpressions.addAll(fileSimpleExpressions);
+ routeIds.addAll(fileRouteIds);
+
+ // was there any unparsable?
+ if (logUnparseable && !unparsable.isEmpty()) {
+ for (String uri : unparsable) {
+ getLog().warn("Cannot parse endpoint uri " + uri + " in java file " + file);
+ }
+ }
+ }
+ } catch (Exception e) {
+ getLog().warn("Error parsing java file " + file + " code due " + e.getMessage(), e);
+ }
+ }
+
+ private void findXmlRouters(Set<File> xmlFiles) {
+ if (includeXml) {
+ List list = project.getResources();
+ for (Object obj : list) {
+ Resource dir = (Resource) obj;
+ findXmlFiles(new File(dir.getDirectory()), xmlFiles);
+ }
+ if (includeTest) {
+ list = project.getTestResources();
+ for (Object obj : list) {
+ Resource dir = (Resource) obj;
+ findXmlFiles(new File(dir.getDirectory()), xmlFiles);
+ }
+ }
+ }
+ }
+
+ private void findJavaRouteBuilderClasses(Set<File> javaFiles) {
+ if (includeJava) {
+ List list = project.getCompileSourceRoots();
+ for (Object obj : list) {
+ String dir = (String) obj;
+ findJavaFiles(new File(dir), javaFiles);
+ }
+ if (includeTest) {
+ list = project.getTestCompileSourceRoots();
+ for (Object obj : list) {
+ String dir = (String) obj;
+ findJavaFiles(new File(dir), javaFiles);
+ }
+ }
+ }
+ }
+
private int countEndpointPairs(List<CamelEndpointDetails> endpoints, String scheme) {
int pairs = 0;
@@ -854,68 +892,48 @@ public class ValidateMojo extends AbstractExecMojo {
if (count > 1) {
duplicateRouteIdErrors++;
- StringBuilder sb = new StringBuilder();
- sb.append("Duplicate route id validation error at: ");
- if (detail.getClassName() != null && detail.getLineNumber() != null) {
- // this is from java code
- sb.append(detail.getClassName());
- if (detail.getMethodName() != null) {
- sb.append(".").append(detail.getMethodName());
- }
- sb.append("(").append(asSimpleClassName(detail.getClassName())).append(".java:");
- sb.append(detail.getLineNumber()).append(")");
- } else if (detail.getLineNumber() != null) {
- // this is from xml
- String fqn = stripRootPath(asRelativeFile(detail.getFileName()));
- if (fqn.endsWith(".xml")) {
- fqn = fqn.substring(0, fqn.length() - 4);
- fqn = asPackageName(fqn);
- }
- sb.append(fqn);
- sb.append("(").append(asSimpleClassName(fqn)).append(".xml:");
- sb.append(detail.getLineNumber()).append(")");
- } else {
- sb.append(detail.getFileName());
- }
- sb.append("\n");
- sb.append("\n\t").append(detail.getRouteId());
- sb.append("\n\n");
-
- getLog().warn(sb.toString());
+ final String msg = buildRouteIdValidationMessage("Duplicate route id validation error at: ", detail);
+ getLog().warn(msg);
} else if (showAll) {
- StringBuilder sb = new StringBuilder();
- sb.append("Duplicate route id validation passed at: ");
- if (detail.getClassName() != null && detail.getLineNumber() != null) {
- // this is from java code
- sb.append(detail.getClassName());
- if (detail.getMethodName() != null) {
- sb.append(".").append(detail.getMethodName());
- }
- sb.append("(").append(asSimpleClassName(detail.getClassName())).append(".java:");
- sb.append(detail.getLineNumber()).append(")");
- } else if (detail.getLineNumber() != null) {
- // this is from xml
- String fqn = stripRootPath(asRelativeFile(detail.getFileName()));
- if (fqn.endsWith(".xml")) {
- fqn = fqn.substring(0, fqn.length() - 4);
- fqn = asPackageName(fqn);
- }
- sb.append(fqn);
- sb.append("(").append(asSimpleClassName(fqn)).append(".xml:");
- sb.append(detail.getLineNumber()).append(")");
- } else {
- sb.append(detail.getFileName());
- }
- sb.append("\n");
- sb.append("\n\t").append(detail.getRouteId());
- sb.append("\n\n");
-
- getLog().info(sb.toString());
+ final String msg = buildRouteIdValidationMessage("Duplicate route id validation passed at: ", detail);
+ getLog().info(msg);
}
}
}
return duplicateRouteIdErrors;
}
+
+ private String buildRouteIdValidationMessage(String str, CamelRouteDetails detail) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(str);
+ if (detail.getClassName() != null && detail.getLineNumber() != null) {
+ // this is from java code
+ sb.append(detail.getClassName());
+ if (detail.getMethodName() != null) {
+ sb.append(".").append(detail.getMethodName());
+ }
+ sb.append("(").append(asSimpleClassName(detail.getClassName())).append(".java:");
+ sb.append(detail.getLineNumber()).append(")");
+ } else if (detail.getLineNumber() != null) {
+ // this is from xml
+ String fqn = stripRootPath(asRelativeFile(detail.getFileName()));
+ if (fqn.endsWith(".xml")) {
+ fqn = fqn.substring(0, fqn.length() - 4);
+ fqn = asPackageName(fqn);
+ }
+ sb.append(fqn);
+ sb.append("(").append(asSimpleClassName(fqn)).append(".xml:");
+ sb.append(detail.getLineNumber()).append(")");
+ } else {
+ sb.append(detail.getFileName());
+ }
+ sb.append("\n");
+ sb.append("\n\t").append(detail.getRouteId());
+ sb.append("\n\n");
+
+ final String msg = sb.toString();
+ return msg;
+ }
// CHECKSTYLE:ON
private static int countRouteId(List<CamelRouteDetails> details, String routeId) {
@@ -1009,28 +1027,14 @@ public class ValidateMojo extends AbstractExecMojo {
// exclude take precedence
if (excludes != null) {
- for (String exclude : excludes.split(",")) {
- exclude = exclude.trim();
- // try both with and without directory in the name
- String fqn = stripRootPath(asRelativeFile(file.getAbsolutePath()));
- boolean match = PatternHelper.matchPattern(fqn, exclude) || PatternHelper.matchPattern(file.getName(), exclude);
- if (match) {
- return false;
- }
+ if (fileListMatchesPattern(excludes, file)) {
+ return false;
}
}
// include
if (includes != null) {
- for (String include : includes.split(",")) {
- include = include.trim();
- // try both with and without directory in the name
- String fqn = stripRootPath(asRelativeFile(file.getAbsolutePath()));
- boolean match = PatternHelper.matchPattern(fqn, include) || PatternHelper.matchPattern(file.getName(), include);
- if (match) {
- return true;
- }
- }
+ if (fileListMatchesPattern(includes, file)) return true;
// did not match any includes
return false;
}
@@ -1039,6 +1043,19 @@ public class ValidateMojo extends AbstractExecMojo {
return true;
}
+ private boolean fileListMatchesPattern(String fileList, File file) {
+ for (String exclude : fileList.split(",")) {
+ exclude = exclude.trim();
+ // try both with and without directory in the name
+ String fqn = stripRootPath(asRelativeFile(file.getAbsolutePath()));
+ boolean match = PatternHelper.matchPattern(fqn, exclude) || PatternHelper.matchPattern(file.getName(), exclude);
+ if (match) {
+ return true;
+ }
+ }
+ return false;
+ }
+
private String asRelativeFile(String name) {
String answer = name;
[camel] 06/08: (chores) camel-report-maven-plugin: use try-with-resources where possible
Posted by or...@apache.org.
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 aabab430e490be7dd8758f78853400eb62847aff
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Tue Mar 22 11:04:39 2022 +0100
(chores) camel-report-maven-plugin: use try-with-resources where possible
Co-authored-by: Nicolas Filotto <es...@users.noreply.github.com>
---
.../main/java/org/apache/camel/maven/ValidateMojo.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
index 963d40b..457ab41 100644
--- a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
+++ b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
@@ -558,19 +558,19 @@ public class ValidateMojo extends AbstractExecMojo {
String fqn = file.getPath();
String baseDir = ".";
- InputStream is = new FileInputStream(file);
- XmlRouteParser.parseXmlRouteEndpoints(is, baseDir, fqn, fileEndpoints);
- is.close();
+ try (InputStream is = new FileInputStream(file)) {
+ XmlRouteParser.parseXmlRouteEndpoints(is, baseDir, fqn, fileEndpoints);
+ }
// need a new stream
- is = new FileInputStream(file);
- XmlRouteParser.parseXmlRouteSimpleExpressions(is, baseDir, fqn, fileSimpleExpressions);
- is.close();
+ try (InputStream is = new FileInputStream(file)) {
+ XmlRouteParser.parseXmlRouteSimpleExpressions(is, baseDir, fqn, fileSimpleExpressions);
+ }
if (duplicateRouteId) {
// need a new stream
- is = new FileInputStream(file);
- XmlRouteParser.parseXmlRouteRouteIds(is, baseDir, fqn, fileRouteIds);
- is.close();
+ try (InputStream is = new FileInputStream(file)) {
+ XmlRouteParser.parseXmlRouteRouteIds(is, baseDir, fqn, fileRouteIds);
+ }
}
// add what we found in this file to the total list
[camel] 03/08: (chores) camel-report-maven-plugin: use try-with-resources for simplicity
Posted by or...@apache.org.
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 06ff64ba91adfd9e12234aa5ef14b0509d66492c
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 21 15:22:00 2022 +0100
(chores) camel-report-maven-plugin: use try-with-resources for simplicity
---
.../src/main/java/org/apache/camel/maven/ValidateMojo.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
index 409d923..7c3be7c 100644
--- a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
+++ b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
@@ -41,7 +41,6 @@ import org.apache.camel.parser.model.CamelEndpointDetails;
import org.apache.camel.parser.model.CamelRouteDetails;
import org.apache.camel.parser.model.CamelSimpleExpressionDetails;
import org.apache.camel.support.PatternHelper;
-import org.apache.camel.util.IOHelper;
import org.apache.camel.util.OrderedProperties;
import org.apache.camel.util.StringHelper;
import org.apache.maven.model.Dependency;
@@ -234,9 +233,7 @@ public class ValidateMojo extends AbstractExecMojo {
for (File file : propertiesFiles) {
if (matchPropertiesFile(file)) {
- InputStream is = null;
- try {
- is = new FileInputStream(file);
+ try (InputStream is = new FileInputStream(file)) {
Properties prop = new OrderedProperties();
prop.load(is);
@@ -261,8 +258,6 @@ public class ValidateMojo extends AbstractExecMojo {
}
} catch (Exception e) {
getLog().warn("Error parsing file " + file + " code due " + e.getMessage(), e);
- } finally {
- IOHelper.close(is);
}
}
}
[camel] 04/08: (chores) camel-report-maven-plugin: consolidate building validation messages
Posted by or...@apache.org.
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 5ae91770311baa02bec2b0b40416bbf934923e66
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue Mar 22 09:41:45 2022 +0100
(chores) camel-report-maven-plugin: consolidate building validation messages
---
.../java/org/apache/camel/maven/ValidateMojo.java | 213 +++++++--------------
1 file changed, 74 insertions(+), 139 deletions(-)
diff --git a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
index 7c3be7c..6ecdeb9 100644
--- a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
+++ b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
@@ -514,35 +514,9 @@ public class ValidateMojo extends AbstractExecMojo {
}
private String buildValidationPassedMessage(CamelEndpointDetails detail, EndpointValidationResult result) {
- StringBuilder sb = new StringBuilder();
- sb.append("Endpoint validation passed at: ");
- if (detail.getClassName() != null && detail.getLineNumber() != null) {
- // this is from java code
- sb.append(detail.getClassName());
- if (detail.getMethodName() != null) {
- sb.append(".").append(detail.getMethodName());
- }
- sb.append("(").append(asSimpleClassName(detail.getClassName())).append(".java:");
- sb.append(detail.getLineNumber()).append(")");
- } else if (detail.getLineNumber() != null) {
- // this is from xml
- String fqn = stripRootPath(asRelativeFile(detail.getFileName()));
- if (fqn.endsWith(".xml")) {
- fqn = fqn.substring(0, fqn.length() - 4);
- fqn = asPackageName(fqn);
- }
- sb.append(fqn);
- sb.append("(").append(asSimpleClassName(fqn)).append(".xml:");
- sb.append(detail.getLineNumber()).append(")");
- } else {
- sb.append(detail.getFileName());
- }
- sb.append("\n");
- sb.append("\n\t").append(result.getUri());
- sb.append("\n\n");
+ StringBuilder sb = buildValidationSuccessMessage("Endpoint validation passed at: ", detail.getClassName(), detail.getLineNumber(), detail.getMethodName(), detail.getFileName(), result.getUri());
- String msg = sb.toString();
- return msg;
+ return sb.toString();
}
private String buildValidationErrorMessage(CamelEndpointDetails detail, EndpointValidationResult result) {
@@ -706,64 +680,13 @@ public class ValidateMojo extends AbstractExecMojo {
if (none) {
errors++;
- StringBuilder sb = new StringBuilder();
- sb.append("Endpoint pair (seda/direct) validation error at: ");
- if (detail.getClassName() != null && detail.getLineNumber() != null) {
- // this is from java code
- sb.append(detail.getClassName());
- if (detail.getMethodName() != null) {
- sb.append(".").append(detail.getMethodName());
- }
- sb.append("(").append(asSimpleClassName(detail.getClassName())).append(".java:");
- sb.append(detail.getLineNumber()).append(")");
- } else if (detail.getLineNumber() != null) {
- // this is from xml
- String fqn = stripRootPath(asRelativeFile(detail.getFileName()));
- if (fqn.endsWith(".xml")) {
- fqn = fqn.substring(0, fqn.length() - 4);
- fqn = asPackageName(fqn);
- }
- sb.append(fqn);
- sb.append("(").append(asSimpleClassName(fqn)).append(".xml:");
- sb.append(detail.getLineNumber()).append(")");
- } else {
- sb.append(detail.getFileName());
- }
- sb.append("\n");
- sb.append("\n\t").append(detail.getEndpointUri());
- sb.append("\n\n\t\t\t\t").append(endpointPathSummaryError(detail));
- sb.append("\n\n");
-
- getLog().warn(sb.toString());
+ final String msg = buildEndpointValidationErrorMessage(detail);
+ getLog().warn(msg);
} else if (showAll) {
- StringBuilder sb = new StringBuilder();
- sb.append("Endpoint pair (seda/direct) validation passed at: ");
- if (detail.getClassName() != null && detail.getLineNumber() != null) {
- // this is from java code
- sb.append(detail.getClassName());
- if (detail.getMethodName() != null) {
- sb.append(".").append(detail.getMethodName());
- }
- sb.append("(").append(asSimpleClassName(detail.getClassName())).append(".java:");
- sb.append(detail.getLineNumber()).append(")");
- } else if (detail.getLineNumber() != null) {
- // this is from xml
- String fqn = stripRootPath(asRelativeFile(detail.getFileName()));
- if (fqn.endsWith(".xml")) {
- fqn = fqn.substring(0, fqn.length() - 4);
- fqn = asPackageName(fqn);
- }
- sb.append(fqn);
- sb.append("(").append(asSimpleClassName(fqn)).append(".xml:");
- sb.append(detail.getLineNumber()).append(")");
- } else {
- sb.append(detail.getFileName());
- }
- sb.append("\n");
- sb.append("\n\t").append(detail.getEndpointUri());
- sb.append("\n\n");
+ StringBuilder sb = buildValidationSuccessMessage("Endpoint pair (seda/direct) validation passed at: ", detail.getClassName(), detail.getLineNumber(), detail.getMethodName(), detail.getFileName(), detail.getEndpointUri());
- getLog().info(sb.toString());
+ final String msg = sb.toString();
+ getLog().info(msg);
}
}
@@ -773,6 +696,68 @@ public class ValidateMojo extends AbstractExecMojo {
return errors;
}
+ private StringBuilder buildValidationSuccessMessage(String str, String className, String lineNumber, String methodName, String fileName, String uri) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(str);
+ if (className != null && lineNumber != null) {
+ // this is from java code
+ sb.append(className);
+ if (methodName != null) {
+ sb.append(".").append(methodName);
+ }
+ sb.append("(").append(asSimpleClassName(className)).append(".java:");
+ sb.append(lineNumber).append(")");
+ } else if (lineNumber != null) {
+ // this is from xml
+ String fqn = stripRootPath(asRelativeFile(fileName));
+ if (fqn.endsWith(".xml")) {
+ fqn = fqn.substring(0, fqn.length() - 4);
+ fqn = asPackageName(fqn);
+ }
+ sb.append(fqn);
+ sb.append("(").append(asSimpleClassName(fqn)).append(".xml:");
+ sb.append(lineNumber).append(")");
+ } else {
+ sb.append(fileName);
+ }
+ sb.append("\n");
+ sb.append("\n\t").append(uri);
+ sb.append("\n\n");
+ return sb;
+ }
+
+ private String buildEndpointValidationErrorMessage(CamelEndpointDetails detail) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("Endpoint pair (seda/direct) validation error at: ");
+ if (detail.getClassName() != null && detail.getLineNumber() != null) {
+ // this is from java code
+ sb.append(detail.getClassName());
+ if (detail.getMethodName() != null) {
+ sb.append(".").append(detail.getMethodName());
+ }
+ sb.append("(").append(asSimpleClassName(detail.getClassName())).append(".java:");
+ sb.append(detail.getLineNumber()).append(")");
+ } else if (detail.getLineNumber() != null) {
+ // this is from xml
+ String fqn = stripRootPath(asRelativeFile(detail.getFileName()));
+ if (fqn.endsWith(".xml")) {
+ fqn = fqn.substring(0, fqn.length() - 4);
+ fqn = asPackageName(fqn);
+ }
+ sb.append(fqn);
+ sb.append("(").append(asSimpleClassName(fqn)).append(".xml:");
+ sb.append(detail.getLineNumber()).append(")");
+ } else {
+ sb.append(detail.getFileName());
+ }
+ sb.append("\n");
+ sb.append("\n\t").append(detail.getEndpointUri());
+ sb.append("\n\n\t\t\t\t").append(endpointPathSummaryError(detail));
+ sb.append("\n\n");
+
+ return sb.toString();
+ }
+
private static String endpointPathSummaryError(CamelEndpointDetails detail) {
String uri = detail.getEndpointUri();
String p = uri.contains("?") ? StringHelper.before(uri, "?") : uri;
@@ -835,32 +820,7 @@ public class ValidateMojo extends AbstractExecMojo {
getLog().warn(sb.toString());
} else if (showAll) {
- StringBuilder sb = new StringBuilder();
- sb.append("Simple validation passed at: ");
- if (detail.getClassName() != null && detail.getLineNumber() != null) {
- // this is from java code
- sb.append(detail.getClassName());
- if (detail.getMethodName() != null) {
- sb.append(".").append(detail.getMethodName());
- }
- sb.append("(").append(asSimpleClassName(detail.getClassName())).append(".java:");
- sb.append(detail.getLineNumber()).append(")");
- } else if (detail.getLineNumber() != null) {
- // this is from xml
- String fqn = stripRootPath(asRelativeFile(detail.getFileName()));
- if (fqn.endsWith(".xml")) {
- fqn = fqn.substring(0, fqn.length() - 4);
- fqn = asPackageName(fqn);
- }
- sb.append(fqn);
- sb.append("(").append(asSimpleClassName(fqn)).append(".xml:");
- sb.append(detail.getLineNumber()).append(")");
- } else {
- sb.append(detail.getFileName());
- }
- sb.append("\n");
- sb.append("\n\t").append(result.getText());
- sb.append("\n\n");
+ StringBuilder sb = buildValidationSuccessMessage("Simple validation passed at: ", detail.getClassName(), detail.getLineNumber(), detail.getMethodName(), detail.getFileName(), result.getText());
getLog().info(sb.toString());
}
@@ -893,35 +853,9 @@ public class ValidateMojo extends AbstractExecMojo {
}
private String buildRouteIdValidationMessage(String str, CamelRouteDetails detail) {
- StringBuilder sb = new StringBuilder();
- sb.append(str);
- if (detail.getClassName() != null && detail.getLineNumber() != null) {
- // this is from java code
- sb.append(detail.getClassName());
- if (detail.getMethodName() != null) {
- sb.append(".").append(detail.getMethodName());
- }
- sb.append("(").append(asSimpleClassName(detail.getClassName())).append(".java:");
- sb.append(detail.getLineNumber()).append(")");
- } else if (detail.getLineNumber() != null) {
- // this is from xml
- String fqn = stripRootPath(asRelativeFile(detail.getFileName()));
- if (fqn.endsWith(".xml")) {
- fqn = fqn.substring(0, fqn.length() - 4);
- fqn = asPackageName(fqn);
- }
- sb.append(fqn);
- sb.append("(").append(asSimpleClassName(fqn)).append(".xml:");
- sb.append(detail.getLineNumber()).append(")");
- } else {
- sb.append(detail.getFileName());
- }
- sb.append("\n");
- sb.append("\n\t").append(detail.getRouteId());
- sb.append("\n\n");
+ StringBuilder sb = buildValidationSuccessMessage(str, detail.getClassName(), detail.getLineNumber(), detail.getMethodName(), detail.getFileName(), detail.getRouteId());
- final String msg = sb.toString();
- return msg;
+ return sb.toString();
}
// CHECKSTYLE:ON
@@ -1022,7 +956,8 @@ public class ValidateMojo extends AbstractExecMojo {
// include
if (includes != null) {
- if (fileListMatchesPattern(includes, file)) return true;
+ if (fileListMatchesPattern(includes, file))
+ return true;
// did not match any includes
return false;
}
[camel] 02/08: (chores) camel-report-maven-plugin: use generics to avoid duplications
Posted by or...@apache.org.
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 6d241e154a05a8a4d5fd1050729ac9e5fc5dea1f
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Mar 21 15:20:01 2022 +0100
(chores) camel-report-maven-plugin: use generics to avoid duplications
---
.../java/org/apache/camel/maven/ValidateMojo.java | 45 ++++++++--------------
1 file changed, 17 insertions(+), 28 deletions(-)
diff --git a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
index b84ddfb..409d923 100644
--- a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
+++ b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
@@ -219,15 +219,13 @@ public class ValidateMojo extends AbstractExecMojo {
// TODO: implement me
Set<File> propertiesFiles = new LinkedHashSet<>();
- List list = project.getResources();
- for (Object obj : list) {
- Resource dir = (Resource) obj;
+ List<Resource> list = project.getResources();
+ for (Resource dir : list) {
findPropertiesFiles(new File(dir.getDirectory()), propertiesFiles);
}
if (includeTest) {
list = project.getTestResources();
- for (Object obj : list) {
- Resource dir = (Resource) obj;
+ for (Resource dir : list) {
findPropertiesFiles(new File(dir.getDirectory()), propertiesFiles);
}
}
@@ -656,15 +654,13 @@ public class ValidateMojo extends AbstractExecMojo {
private void findXmlRouters(Set<File> xmlFiles) {
if (includeXml) {
- List list = project.getResources();
- for (Object obj : list) {
- Resource dir = (Resource) obj;
+ List<Resource> list = project.getResources();
+ for (Resource dir : list) {
findXmlFiles(new File(dir.getDirectory()), xmlFiles);
}
if (includeTest) {
list = project.getTestResources();
- for (Object obj : list) {
- Resource dir = (Resource) obj;
+ for (Resource dir : list) {
findXmlFiles(new File(dir.getDirectory()), xmlFiles);
}
}
@@ -673,15 +669,13 @@ public class ValidateMojo extends AbstractExecMojo {
private void findJavaRouteBuilderClasses(Set<File> javaFiles) {
if (includeJava) {
- List list = project.getCompileSourceRoots();
- for (Object obj : list) {
- String dir = (String) obj;
+ List<String> list = project.getCompileSourceRoots();
+ for (String dir : list) {
findJavaFiles(new File(dir), javaFiles);
}
if (includeTest) {
list = project.getTestCompileSourceRoots();
- for (Object obj : list) {
- String dir = (String) obj;
+ for (String dir : list) {
findJavaFiles(new File(dir), javaFiles);
}
}
@@ -949,9 +943,8 @@ public class ValidateMojo extends AbstractExecMojo {
private static String findCamelVersion(MavenProject project) {
Dependency candidate = null;
- List list = project.getDependencies();
- for (Object obj : list) {
- Dependency dep = (Dependency) obj;
+ List<Dependency> list = project.getDependencies();
+ for (Dependency dep : list) {
if ("org.apache.camel".equals(dep.getGroupId())) {
if ("camel-core".equals(dep.getArtifactId())) {
// favor camel-core
@@ -1073,33 +1066,29 @@ public class ValidateMojo extends AbstractExecMojo {
private String stripRootPath(String name) {
// strip out any leading source / resource directory
- List list = project.getCompileSourceRoots();
- for (Object obj : list) {
- String dir = (String) obj;
+ List<String> list = project.getCompileSourceRoots();
+ for (String dir : list) {
dir = asRelativeFile(dir);
if (name.startsWith(dir)) {
return name.substring(dir.length() + 1);
}
}
list = project.getTestCompileSourceRoots();
- for (Object obj : list) {
- String dir = (String) obj;
+ for (String dir : list) {
dir = asRelativeFile(dir);
if (name.startsWith(dir)) {
return name.substring(dir.length() + 1);
}
}
- List resources = project.getResources();
- for (Object obj : resources) {
- Resource resource = (Resource) obj;
+ List<Resource> resources = project.getResources();
+ for (Resource resource : resources) {
String dir = asRelativeFile(resource.getDirectory());
if (name.startsWith(dir)) {
return name.substring(dir.length() + 1);
}
}
resources = project.getTestResources();
- for (Object obj : resources) {
- Resource resource = (Resource) obj;
+ for (Resource resource : resources) {
String dir = asRelativeFile(resource.getDirectory());
if (name.startsWith(dir)) {
return name.substring(dir.length() + 1);
[camel] 05/08: (chores) camel-report-maven-plugin: simplify list iteration
Posted by or...@apache.org.
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 b9b9ce2983943671348270cde8f6b84056720e81
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Tue Mar 22 10:42:27 2022 +0100
(chores) camel-report-maven-plugin: simplify list iteration
Co-authored-by: Nicolas Filotto <es...@users.noreply.github.com>
---
.../java/org/apache/camel/maven/ValidateMojo.java | 33 ++++++++--------------
1 file changed, 11 insertions(+), 22 deletions(-)
diff --git a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
index 6ecdeb9..963d40b 100644
--- a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
+++ b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
@@ -218,13 +218,11 @@ public class ValidateMojo extends AbstractExecMojo {
// TODO: implement me
Set<File> propertiesFiles = new LinkedHashSet<>();
- List<Resource> list = project.getResources();
- for (Resource dir : list) {
+ for (Resource dir : project.getResources()) {
findPropertiesFiles(new File(dir.getDirectory()), propertiesFiles);
}
if (includeTest) {
- list = project.getTestResources();
- for (Resource dir : list) {
+ for (Resource dir : project.getTestResources()) {
findPropertiesFiles(new File(dir.getDirectory()), propertiesFiles);
}
}
@@ -623,13 +621,11 @@ public class ValidateMojo extends AbstractExecMojo {
private void findXmlRouters(Set<File> xmlFiles) {
if (includeXml) {
- List<Resource> list = project.getResources();
- for (Resource dir : list) {
+ for (Resource dir : project.getResources()) {
findXmlFiles(new File(dir.getDirectory()), xmlFiles);
}
if (includeTest) {
- list = project.getTestResources();
- for (Resource dir : list) {
+ for (Resource dir : project.getTestResources()) {
findXmlFiles(new File(dir.getDirectory()), xmlFiles);
}
}
@@ -638,13 +634,11 @@ public class ValidateMojo extends AbstractExecMojo {
private void findJavaRouteBuilderClasses(Set<File> javaFiles) {
if (includeJava) {
- List<String> list = project.getCompileSourceRoots();
- for (String dir : list) {
+ for (String dir : project.getCompileSourceRoots()) {
findJavaFiles(new File(dir), javaFiles);
}
if (includeTest) {
- list = project.getTestCompileSourceRoots();
- for (String dir : list) {
+ for (String dir : project.getTestCompileSourceRoots()) {
findJavaFiles(new File(dir), javaFiles);
}
}
@@ -872,8 +866,7 @@ public class ValidateMojo extends AbstractExecMojo {
private static String findCamelVersion(MavenProject project) {
Dependency candidate = null;
- List<Dependency> list = project.getDependencies();
- for (Dependency dep : list) {
+ for (Dependency dep : project.getDependencies()) {
if ("org.apache.camel".equals(dep.getGroupId())) {
if ("camel-core".equals(dep.getArtifactId())) {
// favor camel-core
@@ -996,29 +989,25 @@ public class ValidateMojo extends AbstractExecMojo {
private String stripRootPath(String name) {
// strip out any leading source / resource directory
- List<String> list = project.getCompileSourceRoots();
- for (String dir : list) {
+ for (String dir : project.getCompileSourceRoots()) {
dir = asRelativeFile(dir);
if (name.startsWith(dir)) {
return name.substring(dir.length() + 1);
}
}
- list = project.getTestCompileSourceRoots();
- for (String dir : list) {
+ for (String dir : project.getTestCompileSourceRoots()) {
dir = asRelativeFile(dir);
if (name.startsWith(dir)) {
return name.substring(dir.length() + 1);
}
}
- List<Resource> resources = project.getResources();
- for (Resource resource : resources) {
+ for (Resource resource : project.getResources()) {
String dir = asRelativeFile(resource.getDirectory());
if (name.startsWith(dir)) {
return name.substring(dir.length() + 1);
}
}
- resources = project.getTestResources();
- for (Resource resource : resources) {
+ for (Resource resource : project.getTestResources()) {
String dir = asRelativeFile(resource.getDirectory());
if (name.startsWith(dir)) {
return name.substring(dir.length() + 1);
[camel] 07/08: (chores) camel-report-maven-plugin: simplify boolean evaluation in pattern matching
Posted by or...@apache.org.
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 0f9a0d973747e2b953e49736b50d20232f0768f0
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Tue Mar 22 11:06:34 2022 +0100
(chores) camel-report-maven-plugin: simplify boolean evaluation in pattern matching
Co-authored-by: Nicolas Filotto <es...@users.noreply.github.com>
---
.../src/main/java/org/apache/camel/maven/ValidateMojo.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
index 457ab41..1f5c9ba 100644
--- a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
+++ b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
@@ -964,10 +964,7 @@ public class ValidateMojo extends AbstractExecMojo {
exclude = exclude.trim();
// try both with and without directory in the name
String fqn = stripRootPath(asRelativeFile(file.getAbsolutePath()));
- boolean match = PatternHelper.matchPattern(fqn, exclude) || PatternHelper.matchPattern(file.getName(), exclude);
- if (match) {
- return true;
- }
+ return PatternHelper.matchPattern(fqn, exclude) || PatternHelper.matchPattern(file.getName(), exclude);
}
return false;
}
[camel] 08/08: (chores) camel-report-maven-plugin: simplify check for pattern matching
Posted by or...@apache.org.
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 2abb196ee62fbe26ec4f2b9451eb67236b1d5ff4
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Tue Mar 22 11:31:12 2022 +0100
(chores) camel-report-maven-plugin: simplify check for pattern matching
---
.../src/main/java/org/apache/camel/maven/ValidateMojo.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
index 1f5c9ba..d203cc9 100644
--- a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
+++ b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
@@ -949,10 +949,7 @@ public class ValidateMojo extends AbstractExecMojo {
// include
if (includes != null) {
- if (fileListMatchesPattern(includes, file))
- return true;
- // did not match any includes
- return false;
+ return fileListMatchesPattern(includes, file);
}
// was not excluded nor failed include so its accepted