essobedo commented on a change in pull request #7245:
URL: https://github.com/apache/camel/pull/7245#discussion_r831983235
##########
File path:
catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
##########
@@ -650,6 +486,166 @@ protected void doExecuteRoutes(CamelCatalog catalog)
throws MojoExecutionExcepti
}
}
+ 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 = buildValidationSuccessMessage("Endpoint validation
passed at: ", detail.getClassName(), detail.getLineNumber(),
detail.getMethodName(), detail.getFileName(), result.getUri());
+
+ return sb.toString();
+ }
+
+ 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();
Review comment:
```suggestion
try (InputStream is = new FileInputStream(file)) {
XmlRouteParser.parseXmlRouteEndpoints(is, baseDir, fqn,
fileEndpoints);
}
```
##########
File path:
catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
##########
@@ -650,6 +486,166 @@ protected void doExecuteRoutes(CamelCatalog catalog)
throws MojoExecutionExcepti
}
}
+ 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 = buildValidationSuccessMessage("Endpoint validation
passed at: ", detail.getClassName(), detail.getLineNumber(),
detail.getMethodName(), detail.getFileName(), result.getUri());
+
+ return sb.toString();
+ }
+
+ 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();
Review comment:
```suggestion
try (InputStream is = new FileInputStream(file)) {
XmlRouteParser.parseXmlRouteSimpleExpressions(is, baseDir,
fqn, fileSimpleExpressions);
}
```
##########
File path:
catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
##########
@@ -650,6 +486,166 @@ protected void doExecuteRoutes(CamelCatalog catalog)
throws MojoExecutionExcepti
}
}
+ 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 = buildValidationSuccessMessage("Endpoint validation
passed at: ", detail.getClassName(), detail.getLineNumber(),
detail.getMethodName(), detail.getFileName(), result.getUri());
+
+ return sb.toString();
+ }
+
+ 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();
Review comment:
```suggestion
try (InputStream is = new FileInputStream(file)) {
XmlRouteParser.parseXmlRouteRouteIds(is, baseDir, fqn,
fileRouteIds);
}
```
##########
File path:
catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
##########
@@ -746,6 +691,68 @@ private int
validateEndpointPairs(List<CamelEndpointDetails> endpoints, String s
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);
Review comment:
Ideally if you could replace the regular expression `append\("(.)"\)`
with `append('$1')` globally it could nice
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]