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 2939418 Regen 2939418 is described below commit 293941845127b1108b8703d14541be9d7ce77341 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Tue Jan 18 06:55:30 2022 +0100 Regen --- .../apache/camel/catalog/schemas/camel-spring.xsd | 2 +- .../ROOT/pages/camel-report-maven-plugin.adoc | 47 +++++++++------------- 2 files changed, 20 insertions(+), 29 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd index a47425e..56067ee 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd @@ -13156,7 +13156,7 @@ Set a reference to a custom Expression to use. <xs:element ref="tns:fhirXml"/> <xs:element ref="tns:flatpack"/> <xs:element ref="tns:grok"/> - <xs:element ref="tns:gzipDeflater"/> + <xs:element name="gzipDeflator" type="tns:gzipDeflaterDataFormat"/> <xs:element ref="tns:hl7"/> <xs:element ref="tns:ical"/> <xs:element ref="tns:jacksonXml"/> diff --git a/docs/user-manual/modules/ROOT/pages/camel-report-maven-plugin.adoc b/docs/user-manual/modules/ROOT/pages/camel-report-maven-plugin.adoc index 7e05009..7b456b9 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-report-maven-plugin.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-report-maven-plugin.adoc @@ -15,9 +15,8 @@ For validating the source code for mis configured Camel: - seda/direct endpoint pairs - configuration in properties files -Then you can run validate goal from the command line or from within your Java editor such as IDEA or Eclipse. +Then you can run the validate goal from the command line or from within your Java editor such as IDEA or Eclipse. -[source,bash] ---- mvn camel-report:validate ---- @@ -67,41 +66,38 @@ changed accordingly to `process-test-classes` as shown below: === Running the goal on any Maven project -You can also run validate goal on any Maven project without having to add the plugin to the `pom.xml` file. +You can also run the validate goal on any Maven project without having to add the plugin to the `pom.xml` file. Doing so requires to specify the plugin using its fully qualified name. For example to run the goal on -the `cdi` from Apache Camel you can run +the `camel-example-cdi` from Apache Camel you can run -[source,bash] ---- -$cd examples/cdi -$mvn org.apache.camel:camel-report-maven-plugin:3.13.0:validate +$cd camel-example-cdi +$mvn org.apache.camel:camel-report-maven-plugin:2.20.0:validate ---- which then runs and outputs the following: ---- [INFO] ------------------------------------------------------------------------ -[INFO] Building Camel :: Example :: CDI 3.13.0 +[INFO] Building Camel :: Example :: CDI 3.0.0 [INFO] ------------------------------------------------------------------------ [INFO] -[INFO] --- camel-report-maven-plugin:3.13.0:validate (default-cli) @ camel-example-cdi --- -[INFO] Endpoint validation success: (5 = passed, 0 = invalid, 0 = incapable, 0 = unknown components, 0 = deprecated options) +[INFO] --- camel-report-maven-plugin:3.0.0:validate (default-cli) @ camel-example-cdi --- +[INFO] Endpoint validation success: (4 = passed, 0 = invalid, 0 = incapable, 0 = unknown components) [INFO] Simple validation success: (0 = passed, 0 = invalid) -[INFO] Endpoint pair (seda/direct) validation success: (0 = pairs) -[INFO] Duplicate route id validation success: (0 = ids) -[INFO] Configuration validation success: (0 = passed, 0 = invalid, 0 = incapable, 0 = unknown components, 0 = deprecated options) [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS [INFO] ------------------------------------------------------------------------ ---- -The validation passed, and 5 endpoints was validated. Now suppose we made a typo in one of the Camel endpoint uris in the source code, such as: +The validation passed, and 4 endpoints was validated. Now suppose we made a typo in one of the Camel endpoint uris in the source code, such as: [source,java] ---- @Uri("timer:foo?period=5000") ---- + is changed to include a typo error in the `period` option [source,java] @@ -109,15 +105,15 @@ is changed to include a typo error in the `period` option @Uri("timer:foo?perid=5000") ---- -And when running validate goal again reports the following: +And when running the validate goal again reports the following: ---- [INFO] ------------------------------------------------------------------------ -[INFO] Building Camel :: Example :: CDI 3.13.0 +[INFO] Building Camel :: Example :: CDI 3.0.0 [INFO] ------------------------------------------------------------------------ [INFO] -[INFO] --- camel-report-maven-plugin:3.13.0:validate (default-cli) @ camel-example-cdi --- -[WARNING] Endpoint validation error at: org.apache.camel.example.cdi.MyRoutes(MyRoutes.java:31) +[INFO] --- camel-report-maven-plugin:3.0.0:validate (default-cli) @ camel-example-cdi --- +[WARNING] Endpoint validation error at: org.apache.camel.example.cdi.MyRoutes(MyRoutes.java:32) timer:foo?perid=5000 @@ -159,7 +155,6 @@ The maven plugin *validate* goal supports the following options which can be con For example to turn off ignoring usage of deprecated options from the command line, you can run: -[source,bash] ---- $mvn camel-report:validate -Dcamel.ignoreDeprecated=true ---- @@ -171,10 +166,9 @@ Notice that you must prefix the `-D` command argument with `camel.`, eg `camel.i If you have a Maven project then you can run the plugin to validate the endpoints in the unit test source code as well. You can pass in the options using `-D` style as shown: -[source,bash] ---- $cd myproject -$mvn org.apache.camel:camel-report-maven-plugin:3.0.0:validate -DincludeTest=true +$mvn org.apache.camel:camel-report-maven-plugin:3.0.0:validate -Dcamel.includeTest=true ---- @@ -226,7 +220,6 @@ This can be done either in the configuration of the `maven-surefire-plugin`: Or from the command line when running tests: -[source,bash] ---- mvn clean test -DCamelTestRouteCoverage=true ---- @@ -246,7 +239,7 @@ public class FooApplicationTest { ==== Enabling via isDumpRouteCoverage method -However, if you are using `camel-test-junit5` and your unit tests are extending `CamelTestSupport` then you can +However if you are using `camel-test` and your unit tests are extending `CamelTestSupport` then you can turn on route coverage as shown: [source,java] @@ -257,7 +250,7 @@ public boolean isDumpRouteCoverage() { } ---- -Routes that can be route covered must have a unique id assigned, in other words you cannot use anonymous routes. +Routes that can be route coveraged must have an unique id assigned, in other words you cannot use anonymous routes. You do this using `routeId` in Java DSL: @@ -283,22 +276,20 @@ And in XML DSL you just assign the route id via the id attribute After unit testing with: -[source,bash] ---- mvn test ---- You can then run the goal to report the route coverage -[source,bash] ---- mvn camel-report:route-coverage ---- -Which then reports which routes have missing route coverage with precise source code line reporting: +Which then reports which routes has missing route coverage with precise source code line reporting: ---- -[INFO] --- camel-camel-report-plugin:3.13.0:route-coverage (default-cli) @ camel-example-spring-boot-xml --- +[INFO] --- camel-camel-report-plugin:3.0.0:route-coverage (default-cli) @ camel-example-spring-boot-xml --- [INFO] Discovered 1 routes [INFO] Route coverage summary: