You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/12/21 18:28:55 UTC
[camel] branch camel-3.20.x updated (04c2c86133c -> cd98e42e45f)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
from 04c2c86133c Merge branch 'release/3.20.0' into camel-3.20.x
new 51fd6aae5ec CAMEL-18661: clean-ups
new b2f26d8f91e camel-jbang - Polsished
new b0ca67f6237 Polished
new 6f3158e2fd0 Add missing descriptions to some options in route for XML DSL
new 56cae1960d6 camel-salesforce: Doc fix.
new e18de0b75fb Upgrade to Artemis 2.17.1
new 0554af0a33f camel-jbang - Fix potential NPE
new 2e4c6f2887c camel-jbang - Show version for catalog other
new 126d00d1814 Polished
new aadbceac32a Update to latest swagger-codegen-maven-plugin
new cd98e42e45f camel-jbang - Upgrade to latest quarkus for export
The 11 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:
camel-dependencies/pom.xml | 2 +-
.../org/apache/camel/catalog/components/plc4x.json | 2 +-
.../org/apache/camel/catalog/models/route.json | 5 ++-
.../apache/camel/catalog/schemas/camel-spring.xsd | 34 +++++++++++++++---
.../camel/cdi/test/CamelEventNotifierTest.java | 30 +++++++++-------
.../camel/opentelemetry/CurrentSpanTest.java | 42 ++++++++++++----------
.../org/apache/camel/component/plc4x/plc4x.json | 2 +-
.../camel-plc4x/src/main/docs/plc4x-component.adoc | 2 +-
.../camel/component/plc4x/Plc4XEndpoint.java | 3 ++
.../src/main/docs/salesforce-component.adoc | 5 +--
.../main/java/org/apache/camel/tracing/Tracer.java | 6 ++--
.../apache/camel/impl/engine/DefaultTracer.java | 7 ----
.../resources/org/apache/camel/model/route.json | 5 ++-
.../org/apache/camel/model/RouteDefinition.java | 2 +-
.../component/ComponentsBuilderFactory.java | 2 +-
.../dsl/Plc4xComponentBuilderFactory.java | 4 +--
.../src/generated/resources/metadata.json | 2 +-
.../builder/endpoint/StaticEndpointBuilders.java | 4 +--
.../endpoint/dsl/Plc4XEndpointBuilderFactory.java | 6 ++--
.../dsl/jbang/core/commands/ExportBaseCommand.java | 2 +-
.../jbang/core/commands/catalog/CatalogOther.java | 1 +
.../jbang/core/commands/catalog/VersionHelper.java | 3 ++
.../main/download/DependencyDownloaderKamelet.java | 10 +-----
parent/pom.xml | 2 +-
.../camel/maven/packaging/SchemaGeneratorMojo.java | 22 ++++++++++--
.../main/docs/camel-restdsl-openapi-plugin.adoc | 6 ++--
.../generator/openapi/AbstractGenerateMojo.java | 2 +-
27 files changed, 132 insertions(+), 81 deletions(-)
[camel] 06/11: Upgrade to Artemis 2.17.1
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e18de0b75fbf1fe2782362b0b3b15214694caf5f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 20 11:15:59 2022 +0100
Upgrade to Artemis 2.17.1
---
camel-dependencies/pom.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index b06eb8ece53..5729e53362f 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -33,7 +33,7 @@
<description>Camel Dependencies POM</description>
<properties>
<abdera-version>1.1.3</abdera-version>
- <activemq-artemis-version>2.27.0</activemq-artemis-version>
+ <activemq-artemis-version>2.27.1</activemq-artemis-version>
<activemq-version>5.17.3</activemq-version>
<apache-any23-version>2.7</apache-any23-version>
<apache-drill-version>1.19.0</apache-drill-version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 52b1a590350..b9501b5c186 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -51,7 +51,7 @@
<abdera-version>1.1.3</abdera-version>
<!-- Note that activemq dependency is only used for testing! -->
<activemq-version>5.17.3</activemq-version>
- <activemq-artemis-version>2.27.0</activemq-artemis-version>
+ <activemq-artemis-version>2.27.1</activemq-artemis-version>
<apacheds-version>2.0.0.AM26</apacheds-version>
<apache-any23-version>2.7</apache-any23-version>
<apache-drill-version>1.19.0</apache-drill-version>
[camel] 08/11: camel-jbang - Show version for catalog other
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2e4c6f2887cc8e9187c81a3d7a585a05a4546db3
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 20 11:40:22 2022 +0100
camel-jbang - Show version for catalog other
---
.../org/apache/camel/dsl/jbang/core/commands/catalog/CatalogOther.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogOther.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogOther.java
index 403b5f3d763..8b3b4e8a448 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogOther.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogOther.java
@@ -40,6 +40,7 @@ public class CatalogOther extends CatalogBaseCommand {
row.name = model.getName();
row.title = model.getTitle();
row.level = model.getSupportLevel().name();
+ row.since = model.getFirstVersionShort();
row.description = model.getDescription();
row.label = model.getLabel() != null ? model.getLabel() : "";
row.deprecated = model.isDeprecated();
[camel] 05/11: camel-salesforce: Doc fix.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 56cae1960d669a5f4a1b3b51a38ae155ce9f46e1
Author: Jeremy Ross <je...@gmail.com>
AuthorDate: Mon Dec 19 16:21:29 2022 -0600
camel-salesforce: Doc fix.
---
.../src/main/docs/salesforce-component.adoc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
index 6e57d7878e5..b6576d87d3a 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc
@@ -1262,8 +1262,9 @@ Get bulk query job results. `jobId` parameter is required. Accepts
| Parameter | Type | Description| Default| Required
| `jobId` | `String` | Id of Job to get results for | | x
-| `maxRecords` | `Integer` | Id of Job to get results for | |
-| `locator` | `locator` | Value to use for subsequent calls | |
+| `maxRecords` | `Integer` | The maximum number of records to retrieve per set of results for the query. The request is still subject to the size limits. If you are working with a very large number of query results, you may experience a timeout before receiving all the data from Salesforce. To prevent a timeout, specify the maximum number of records your client is expecting to receive in the maxRecords parameter. This splits the results into smaller sets with this value as the maximum size. | |
+| `locator` | `locator` | A string that identifies a specific set of query results. Providing a value for this parameter returns only that set of results.
+Omitting this parameter returns the first set of results. | |
|===
*Output*
[camel] 10/11: Update to latest swagger-codegen-maven-plugin
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit aadbceac32adbe30877e064d9cbef4c1de8f868f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Dec 21 09:50:49 2022 +0100
Update to latest swagger-codegen-maven-plugin
---
.../src/main/docs/camel-restdsl-openapi-plugin.adoc | 6 +++---
.../apache/camel/maven/generator/openapi/AbstractGenerateMojo.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/main/docs/camel-restdsl-openapi-plugin.adoc b/tooling/maven/camel-restdsl-openapi-plugin/src/main/docs/camel-restdsl-openapi-plugin.adoc
index fcf28685b10..bd97047b7b3 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/main/docs/camel-restdsl-openapi-plugin.adoc
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/main/docs/camel-restdsl-openapi-plugin.adoc
@@ -129,7 +129,7 @@ The plugin supports the following *additional* options
|========================================
| Parameter | Default Value | Description
-| `swaggerCodegenMavenPluginVersion` | 3.0.19 | The version of the `io.swagger.codegen.v3:swagger-codegen-maven-plugin` maven plugin to be used.
+| `swaggerCodegenMavenPluginVersion` | 3.0.36 | The version of the `io.swagger.codegen.v3:swagger-codegen-maven-plugin` maven plugin to be used.
| `modelOutput` | | Target output path (default is ${project.build.directory}/generated-sources/openapi)
| `modelPackage` | `io.swagger.client.model` | The package to use for generated model objects/classes
| `modelNamePrefix` | | Sets the pre- or suffix for model classes and enums
@@ -208,7 +208,7 @@ The plugin supports the following *additional* options
|========================================
| Parameter | Default Value | Description
-| `swaggerCodegenMavenPluginVersion` | 3.0.25 | The version of the `io.swagger.codegen.v3:swagger-codegen-maven-plugin` maven plugin to be used.
+| `swaggerCodegenMavenPluginVersion` | 3.0.36 | The version of the `io.swagger.codegen.v3:swagger-codegen-maven-plugin` maven plugin to be used.
| `modelOutput` | | Target output path (default is ${project.build.directory}/generated-sources/openapi)
| `modelPackage` | `io.swagger.client.model` | The package to use for generated model objects/classes
| `modelNamePrefix` | | Sets the pre- or suffix for model classes and enums
@@ -286,7 +286,7 @@ The plugin supports the following *additional* options
|========================================
| Parameter | Default Value | Description
-| `swaggerCodegenMavenPluginVersion` | 3.0.25 | The version of the `io.swagger.codegen.v3:swagger-codegen-maven-plugin` maven plugin to be used.
+| `swaggerCodegenMavenPluginVersion` | 3.0.36 | The version of the `io.swagger.codegen.v3:swagger-codegen-maven-plugin` maven plugin to be used.
| `modelOutput` | | Target output path (default is ${project.build.directory}/generated-sources/openapi)
| `modelPackage` | `io.swagger.client.model` | The package to use for generated model objects/classes
| `modelNamePrefix` | | Sets the pre- or suffix for model classes and enums
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/AbstractGenerateMojo.java b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/AbstractGenerateMojo.java
index c4bc65f49de..545b44847e2 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/AbstractGenerateMojo.java
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/AbstractGenerateMojo.java
@@ -124,7 +124,7 @@ abstract class AbstractGenerateMojo extends AbstractMojo {
@Parameter
String basePath;
- @Parameter(defaultValue = "3.0.25")
+ @Parameter(defaultValue = "3.0.36")
String swaggerCodegenMavenPluginVersion;
@Parameter(defaultValue = "${project}", readonly = true)
[camel] 02/11: camel-jbang - Polsished
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b2f26d8f91e786086fe7c3e6ad29a730462e24dc
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Dec 18 10:56:18 2022 +0100
camel-jbang - Polsished
---
.../camel/main/download/DependencyDownloaderKamelet.java | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderKamelet.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderKamelet.java
index 6dadc4e80b7..ff02f1ad03f 100644
--- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderKamelet.java
+++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderKamelet.java
@@ -51,22 +51,14 @@ import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.nodeAt;
public final class DependencyDownloaderKamelet extends ServiceSupport
implements CamelContextAware, RouteTemplateLoaderListener {
- private static final String KAMELETS_VERSION = "0.9.2";
+ private static final String KAMELETS_VERSION = "0.10.0";
private KameletDependencyDownloader downloader;
private CamelContext camelContext;
- private volatile boolean kameletsInUse;
public DependencyDownloaderKamelet(CamelContext camelContext) {
this.camelContext = camelContext;
}
- /**
- * Whether any kamelets are in use.
- */
- public boolean isKameletsInUse() {
- return kameletsInUse;
- }
-
@Override
public CamelContext getCamelContext() {
return camelContext;
[camel] 03/11: Polished
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b0ca67f62372f09f28595e660a19ca393d7d807d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Dec 18 14:11:41 2022 +0100
Polished
---
.../src/main/java/org/apache/camel/impl/engine/DefaultTracer.java | 7 -------
1 file changed, 7 deletions(-)
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java
index 3401ddb1cab..6d25689fd5c 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java
@@ -124,13 +124,6 @@ public class DefaultTracer extends ServiceSupport implements CamelContextAware,
boolean original = route.getRouteId().equals(exchange.getFromRouteId());
String arrow = original ? "*-->" : "--->";
- // we need to capture original source:line-number
- if (original && camelContext.isDebugging()) {
- // TODO: use in dumpTrace
- int line = route.getInput().getLineNumber();
- String loc = route.getInput().getLocation();
- }
-
StringBuilder sb = new StringBuilder();
sb.append(String.format(tracingFormat, arrow, route.getRouteId(), label));
sb.append(" ");
[camel] 11/11: camel-jbang - Upgrade to latest quarkus for export
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cd98e42e45f02be7b267914cf15ba0c4a895a922
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Dec 21 19:17:27 2022 +0100
camel-jbang - Upgrade to latest quarkus for export
---
.../org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index a06296c683c..4c062027a98 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -102,7 +102,7 @@ abstract class ExportBaseCommand extends CamelCommand {
protected String quarkusArtifactId;
@CommandLine.Option(names = { "--quarkus-version" }, description = "Quarkus Platform version",
- defaultValue = "2.14.2.Final")
+ defaultValue = "2.15.1.Final")
protected String quarkusVersion;
@CommandLine.Option(names = { "--maven-wrapper" }, defaultValue = "true",
[camel] 04/11: Add missing descriptions to some options in route for XML DSL
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6f3158e2fd01dfe632f14a5f1bc3ae3d786c0adf
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Dec 18 14:57:43 2022 +0100
Add missing descriptions to some options in route for XML DSL
---
.../org/apache/camel/catalog/models/route.json | 5 +++-
.../apache/camel/catalog/schemas/camel-spring.xsd | 34 +++++++++++++++++++---
.../resources/org/apache/camel/model/route.json | 5 +++-
.../org/apache/camel/model/RouteDefinition.java | 2 +-
.../camel/maven/packaging/SchemaGeneratorMojo.java | 22 ++++++++++++--
5 files changed, 59 insertions(+), 9 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/route.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/route.json
index ad97683f253..ef4583cf14a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/route.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/route.json
@@ -13,9 +13,12 @@
},
"properties": {
"group": { "kind": "attribute", "displayName": "Group", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The group that this route belongs to; could be the name of the RouteBuilder class or be explicitly configured in the XML. May be null." },
+ "nodePrefixId": { "kind": "attribute", "displayName": "Node Prefix Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets a prefix to use for all node ids (not route id)." },
+ "routeConfigurationId": { "kind": "attribute", "displayName": "Route Configuration Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The route configuration id or pattern this route should use for configuration. Multiple id\/pattern can be separated by comma." },
+ "precondition": { "kind": "attribute", "displayName": "Precondition", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The predicate of the precondition in simple language to evaluate in order to determine if this route should be included or not." },
"streamCache": { "kind": "attribute", "displayName": "Stream Cache", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Whether stream caching is enabled on this route." },
"trace": { "kind": "attribute", "displayName": "Trace", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Whether tracing is enabled on this route." },
- "messageHistory": { "kind": "attribute", "displayName": "Message History", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "true", "description": "Whether message history is enabled on this route." },
+ "messageHistory": { "kind": "attribute", "displayName": "Message History", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Whether message history is enabled on this route." },
"logMask": { "kind": "attribute", "displayName": "Log Mask", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "false", "description": "Whether security mask for Logging is enabled on this route." },
"delayer": { "kind": "attribute", "displayName": "Delayer", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Whether to slow down processing messages by a given delay in msec." },
"autoStartup": { "kind": "attribute", "displayName": "Auto Startup", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "true", "description": "Whether to auto start this route" },
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 0f56ca75b83..9f7700b0877 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
@@ -16179,19 +16179,45 @@ Whether security mask for Logging is enabled on this route. Default value: false
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-Whether message history is enabled on this route. Default value: true
+Whether message history is enabled on this route.
]]>
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="nodePrefixId" type="xs:string"/>
+ <xs:attribute name="nodePrefixId" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ <![CDATA[
+Sets a prefix to use for all node ids (not route id).
+ ]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
- <xs:attribute name="precondition" type="xs:string"/>
+ <xs:attribute name="precondition" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ <![CDATA[
+The predicate of the precondition in simple language to evaluate in order to
+determine if this route should be included or not.
+ ]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
<xs:attribute name="rest" type="xs:boolean"/>
- <xs:attribute name="routeConfigurationId" type="xs:string"/>
+ <xs:attribute name="routeConfigurationId" type="xs:string">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ <![CDATA[
+The route configuration id or pattern this route should use for configuration.
+Multiple id/pattern can be separated by comma.
+ ]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
<xs:attribute name="routePolicyRef" type="xs:string">
<xs:annotation>
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/route.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/route.json
index ad97683f253..ef4583cf14a 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/route.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/route.json
@@ -13,9 +13,12 @@
},
"properties": {
"group": { "kind": "attribute", "displayName": "Group", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The group that this route belongs to; could be the name of the RouteBuilder class or be explicitly configured in the XML. May be null." },
+ "nodePrefixId": { "kind": "attribute", "displayName": "Node Prefix Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets a prefix to use for all node ids (not route id)." },
+ "routeConfigurationId": { "kind": "attribute", "displayName": "Route Configuration Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The route configuration id or pattern this route should use for configuration. Multiple id\/pattern can be separated by comma." },
+ "precondition": { "kind": "attribute", "displayName": "Precondition", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The predicate of the precondition in simple language to evaluate in order to determine if this route should be included or not." },
"streamCache": { "kind": "attribute", "displayName": "Stream Cache", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Whether stream caching is enabled on this route." },
"trace": { "kind": "attribute", "displayName": "Trace", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Whether tracing is enabled on this route." },
- "messageHistory": { "kind": "attribute", "displayName": "Message History", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "true", "description": "Whether message history is enabled on this route." },
+ "messageHistory": { "kind": "attribute", "displayName": "Message History", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Whether message history is enabled on this route." },
"logMask": { "kind": "attribute", "displayName": "Log Mask", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "false", "description": "Whether security mask for Logging is enabled on this route." },
"delayer": { "kind": "attribute", "displayName": "Delayer", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Whether to slow down processing messages by a given delay in msec." },
"autoStartup": { "kind": "attribute", "displayName": "Auto Startup", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "true", "description": "Whether to auto start this route" },
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java
index 534ae072df8..ea92bc4611b 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java
@@ -927,7 +927,7 @@ public class RouteDefinition extends OutputDefinition<RouteDefinition>
* Whether message history is enabled on this route.
*/
@XmlAttribute
- @Metadata(label = "advanced", javaType = "java.lang.Boolean", defaultValue = "true")
+ @Metadata(label = "advanced", javaType = "java.lang.Boolean")
public void setMessageHistory(String messageHistory) {
this.messageHistory = messageHistory;
}
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
index 8707c55bf34..c8300353a7d 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
@@ -644,7 +644,25 @@ public class SchemaGeneratorMojo extends AbstractGeneratorMojo {
false, null, null, false, false);
eipOptions.add(ep);
- // group
+ // nodePrefixId
+ docComment = findJavaDoc(null, "nodePrefixId", null, classElement, true);
+ ep = createOption("nodePrefixId", "Node Prefix Id", "attribute", "java.lang.String", false, "", "", docComment, false, null,
+ false, null, null, false, false);
+ eipOptions.add(ep);
+
+ // routeConfigurationId
+ docComment = findJavaDoc(null, "routeConfigurationId", null, classElement, true);
+ ep = createOption("routeConfigurationId", "Route Configuration Id", "attribute", "java.lang.String", false, "", "", docComment, false, null,
+ false, null, null, false, false);
+ eipOptions.add(ep);
+
+ // precondition
+ docComment = findJavaDoc(null, "precondition", null, classElement, true);
+ ep = createOption("precondition", "Precondition", "attribute", "java.lang.String", false, "", "", docComment, false,
+ null, false, null, null, false, false);
+ eipOptions.add(ep);
+
+ // stream cache
docComment = findJavaDoc(null, "streamCache", null, classElement, true);
ep = createOption("streamCache", "Stream Cache", "attribute", "java.lang.String", false, "", "", docComment, false,
null,
@@ -660,7 +678,7 @@ public class SchemaGeneratorMojo extends AbstractGeneratorMojo {
// message history
docComment = findJavaDoc(null, "messageHistory", null, classElement, true);
- ep = createOption("messageHistory", "Message History", "attribute", "java.lang.String", false, "true", "", docComment,
+ ep = createOption("messageHistory", "Message History", "attribute", "java.lang.String", false, "", "", docComment,
false, null, false, null, null, false, false);
eipOptions.add(ep);
[camel] 01/11: CAMEL-18661: clean-ups
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 51fd6aae5ec471ba4eef293dc8ed1a15381be49d
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Fri Dec 16 13:20:21 2022 +0100
CAMEL-18661: clean-ups
---
.../camel/cdi/test/CamelEventNotifierTest.java | 30 +++++++++-------
.../camel/opentelemetry/CurrentSpanTest.java | 42 ++++++++++++----------
.../main/java/org/apache/camel/tracing/Tracer.java | 6 ++--
3 files changed, 43 insertions(+), 35 deletions(-)
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
index ca889a10242..cca199e7fe6 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
@@ -31,7 +31,8 @@ import org.apache.camel.cdi.CdiCamelExtension;
import org.apache.camel.cdi.Uri;
import org.apache.camel.cdi.bean.SimpleCamelRoute;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.spi.CamelEvent;
+import org.apache.camel.spi.CamelEvent.CamelContextInitializedEvent;
+import org.apache.camel.spi.CamelEvent.CamelContextInitializingEvent;
import org.apache.camel.spi.CamelEvent.CamelContextStartedEvent;
import org.apache.camel.spi.CamelEvent.CamelContextStartingEvent;
import org.apache.camel.spi.CamelEvent.CamelContextStoppedEvent;
@@ -55,6 +56,7 @@ import org.junit.runner.RunWith;
import static org.apache.camel.component.mock.MockEndpoint.assertIsSatisfied;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.equalTo;
@RunWith(Arquillian.class)
public class CamelEventNotifierTest {
@@ -71,12 +73,12 @@ public class CamelEventNotifierTest {
@ApplicationScoped
private List<Class> firedEvents = new ArrayList<>();
- private void onCamelContextStartingEvent(@Observes CamelEvent.CamelContextInitializingEvent event, List<Class> events) {
- events.add(CamelEvent.CamelContextInitializingEvent.class);
+ private void onCamelContextStartingEvent(@Observes CamelContextInitializingEvent event, List<Class> events) {
+ events.add(CamelContextInitializingEvent.class);
}
- private void onCamelContextStartingEvent(@Observes CamelEvent.CamelContextInitializedEvent event, List<Class> events) {
- events.add(CamelEvent.CamelContextInitializedEvent.class);
+ private void onCamelContextStartingEvent(@Observes CamelContextInitializedEvent event, List<Class> events) {
+ events.add(CamelContextInitializedEvent.class);
}
private void onCamelContextStartingEvent(@Observes CamelContextStartingEvent event, List<Class> events) {
@@ -115,8 +117,8 @@ public class CamelEventNotifierTest {
public void startedCamelContext(List<Class> events) {
assertThat("Events fired are incorrect!", events,
contains(
- CamelEvent.CamelContextInitializingEvent.class,
- CamelEvent.CamelContextInitializedEvent.class,
+ CamelContextInitializingEvent.class,
+ CamelContextInitializedEvent.class,
CamelContextStartingEvent.class,
CamelContextStartedEvent.class));
}
@@ -131,10 +133,11 @@ public class CamelEventNotifierTest {
assertIsSatisfied(2L, TimeUnit.SECONDS, outbound);
- assertThat("Events fired are incorrect!", events,
+ assertThat("Events count is incorrect!", events.size(), equalTo(12));
+ assertThat("Events types are incorrect!", events,
contains(
- CamelEvent.CamelContextInitializingEvent.class,
- CamelEvent.CamelContextInitializedEvent.class,
+ CamelContextInitializingEvent.class,
+ CamelContextInitializedEvent.class,
CamelContextStartingEvent.class,
CamelContextStartedEvent.class,
ExchangeSendingEvent.class,
@@ -152,10 +155,11 @@ public class CamelEventNotifierTest {
public void stopCamelContext(CamelContext context, List<Class> events) {
context.stop();
- assertThat("Events fired are incorrect!", events,
+ assertThat("Events count is incorrect!", events.size(), equalTo(14));
+ assertThat("Events types are incorrect!", events,
contains(
- CamelEvent.CamelContextInitializingEvent.class,
- CamelEvent.CamelContextInitializedEvent.class,
+ CamelContextInitializingEvent.class,
+ CamelContextInitializedEvent.class,
CamelContextStartingEvent.class,
CamelContextStartedEvent.class,
ExchangeSendingEvent.class,
diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CurrentSpanTest.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CurrentSpanTest.java
index 9caf8792b16..c5157e14506 100644
--- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CurrentSpanTest.java
+++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CurrentSpanTest.java
@@ -20,7 +20,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.TimeUnit;
@@ -29,6 +28,7 @@ import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.sdk.trace.ReadableSpan;
import io.opentelemetry.sdk.trace.data.SpanData;
import org.apache.camel.AsyncCallback;
+import org.apache.camel.CamelContext;
import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
@@ -49,18 +49,28 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
class CurrentSpanTest extends CamelOpenTelemetryTestSupport {
- private static final Executor DELAYED = CompletableFuture.delayedExecutor(10L, TimeUnit.MILLISECONDS, new ForkJoinPool(3));
CurrentSpanTest() {
super(new SpanTestData[0]);
}
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext context = super.createCamelContext();
+ context.addComponent("asyncmock1", new AsyncMockComponent());
+ context.addComponent("asyncmock2", new AsyncMockComponent());
+ context.addComponent("asyncmock3", new AsyncMockComponent());
+ context.addComponent("syncmock", new SyncMockComponent());
+
+ return context;
+ }
+
@Test
void testSync() {
SpanTestData[] expectedSpans = {
new SpanTestData().setLabel("syncmock:result").setUri("syncmock://result").setOperation("syncmock")
.setKind(SpanKind.CLIENT),
- new SpanTestData().setLabel("direct:bar").setUri("direct://bar").setOperation("bar").setKind(SpanKind.INTERNAL),
+ new SpanTestData().setLabel("direct:bar").setUri("direct://bar").setOperation("bar")
};
// sync pipeline
@@ -78,7 +88,7 @@ class CurrentSpanTest extends CamelOpenTelemetryTestSupport {
SpanTestData[] expectedSpans = {
new SpanTestData().setLabel("asyncmock1:result").setUri("asyncmock1://result").setOperation("asyncmock1")
.setKind(SpanKind.CLIENT),
- new SpanTestData().setLabel("direct:foo").setUri("direct://foo").setOperation("foo").setKind(SpanKind.INTERNAL),
+ new SpanTestData().setLabel("direct:foo").setUri("direct://foo").setOperation("foo")
};
// sync to async pipeline
@@ -97,8 +107,7 @@ class CurrentSpanTest extends CamelOpenTelemetryTestSupport {
SpanTestData[] expectedSpans = {
new SpanTestData().setLabel("syncmock:result").setUri("syncmock://result").setOperation("syncmock")
.setKind(SpanKind.CLIENT),
- new SpanTestData().setLabel("asyncmock1:start").setUri("asyncmock1://start").setOperation("asyncmock1")
- .setKind(SpanKind.INTERNAL),
+ new SpanTestData().setLabel("asyncmock1:start").setUri("asyncmock1://start").setOperation("asyncmock1"),
new SpanTestData().setLabel("asyncmock1:start").setUri("asyncmock1://start").setOperation("asyncmock1")
.setKind(SpanKind.CLIENT),
};
@@ -116,8 +125,7 @@ class CurrentSpanTest extends CamelOpenTelemetryTestSupport {
SpanTestData[] expectedSpans = {
new SpanTestData().setLabel("asyncmock2:result").setUri("asyncmock2://result").setOperation("asyncmock2")
.setKind(SpanKind.CLIENT),
- new SpanTestData().setLabel("asyncmock2:start").setUri("asyncmock2://start").setOperation("asyncmock2")
- .setKind(SpanKind.INTERNAL),
+ new SpanTestData().setLabel("asyncmock2:start").setUri("asyncmock2://start").setOperation("asyncmock2"),
new SpanTestData().setLabel("asyncmock2:start").setUri("asyncmock2://start").setOperation("asyncmock2")
.setKind(SpanKind.CLIENT),
};
@@ -140,7 +148,6 @@ class CurrentSpanTest extends CamelOpenTelemetryTestSupport {
new SpanTestData().setLabel("syncmock:result").setUri("syncmock://result").setOperation("syncmock")
.setKind(SpanKind.CLIENT),
new SpanTestData().setLabel("direct:start").setUri("direct://start").setOperation("start")
- .setKind(SpanKind.INTERNAL)
};
// sync pipeline
@@ -168,11 +175,6 @@ class CurrentSpanTest extends CamelOpenTelemetryTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- context.addComponent("asyncmock1", new AsyncMockComponent());
- context.addComponent("asyncmock2", new AsyncMockComponent());
- context.addComponent("asyncmock3", new AsyncMockComponent());
- context.addComponent("syncmock", new SyncMockComponent());
-
// sync pipeline
from("direct:bar").to("syncmock:result");
@@ -221,8 +223,7 @@ class CurrentSpanTest extends CamelOpenTelemetryTestSupport {
}
return newExchange;
})
- .executorService(Executors.newFixedThreadPool(10))
- .parallelProcessing()
+ .executorService(context.getExecutorServiceManager().newFixedThreadPool(this, "CurrentSpanTest", 10))
.streaming()
.delay(10)
.to("log:line", "asyncmock1:start")
@@ -233,7 +234,7 @@ class CurrentSpanTest extends CamelOpenTelemetryTestSupport {
};
}
- private class AsyncMockComponent extends MockComponent {
+ private static class AsyncMockComponent extends MockComponent {
@Override
protected Endpoint createEndpoint(String uri, String key, Map<String, Object> parameters) {
@@ -242,6 +243,9 @@ class CurrentSpanTest extends CamelOpenTelemetryTestSupport {
}
private static class AsyncMockEndpoint extends MockEndpoint {
+ private static final Executor DELAYED
+ = CompletableFuture.delayedExecutor(10L, TimeUnit.MILLISECONDS, new ForkJoinPool(3));
+
private Consumer consumer;
private final String key;
@@ -299,7 +303,7 @@ class CurrentSpanTest extends CamelOpenTelemetryTestSupport {
}
}
- private class SyncMockComponent extends MockComponent {
+ private static class SyncMockComponent extends MockComponent {
@Override
protected Endpoint createEndpoint(String uri, String key, Map<String, Object> parameters) {
@@ -307,7 +311,7 @@ class CurrentSpanTest extends CamelOpenTelemetryTestSupport {
}
}
- private class SyncMockEndpoint extends MockEndpoint {
+ private static class SyncMockEndpoint extends MockEndpoint {
public SyncMockEndpoint(SyncMockComponent component, String uri, String key) {
super(uri, component);
}
diff --git a/components/camel-tracing/src/main/java/org/apache/camel/tracing/Tracer.java b/components/camel-tracing/src/main/java/org/apache/camel/tracing/Tracer.java
index bf1662c06f7..c7ef133c491 100644
--- a/components/camel-tracing/src/main/java/org/apache/camel/tracing/Tracer.java
+++ b/components/camel-tracing/src/main/java/org/apache/camel/tracing/Tracer.java
@@ -238,7 +238,7 @@ public abstract class Tracer extends ServiceSupport implements RoutePolicyFactor
if (event instanceof CamelEvent.ExchangeSendingEvent) {
CamelEvent.ExchangeSendingEvent ese = (CamelEvent.ExchangeSendingEvent) event;
SpanDecorator sd = getSpanDecorator(ese.getEndpoint());
- if (exclude(sd, ese.getExchange(), ese.getEndpoint())) {
+ if (shouldExclude(sd, ese.getExchange(), ese.getEndpoint())) {
return;
}
@@ -254,7 +254,7 @@ public abstract class Tracer extends ServiceSupport implements RoutePolicyFactor
} else if (event instanceof CamelEvent.ExchangeSentEvent) {
CamelEvent.ExchangeSentEvent ese = (CamelEvent.ExchangeSentEvent) event;
SpanDecorator sd = getSpanDecorator(ese.getEndpoint());
- if (exclude(sd, ese.getExchange(), ese.getEndpoint())) {
+ if (shouldExclude(sd, ese.getExchange(), ese.getEndpoint())) {
return;
}
@@ -283,7 +283,7 @@ public abstract class Tracer extends ServiceSupport implements RoutePolicyFactor
}
}
- private boolean exclude(SpanDecorator sd, Exchange exchange, Endpoint endpoint) {
+ private boolean shouldExclude(SpanDecorator sd, Exchange exchange, Endpoint endpoint) {
return sd instanceof AbstractInternalSpanDecorator || !sd.newSpan()
|| isExcluded(exchange, endpoint);
}
[camel] 09/11: Polished
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 126d00d181428f3f0fe39bcb5bc7dff39548fd1d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 20 11:44:22 2022 +0100
Polished
---
.../resources/org/apache/camel/catalog/components/plc4x.json | 2 +-
.../generated/resources/org/apache/camel/component/plc4x/plc4x.json | 2 +-
components/camel-plc4x/src/main/docs/plc4x-component.adoc | 2 +-
.../main/java/org/apache/camel/component/plc4x/Plc4XEndpoint.java | 3 +++
.../apache/camel/builder/component/ComponentsBuilderFactory.java | 2 +-
.../camel/builder/component/dsl/Plc4xComponentBuilderFactory.java | 4 ++--
dsl/camel-componentdsl/src/generated/resources/metadata.json | 2 +-
.../org/apache/camel/builder/endpoint/StaticEndpointBuilders.java | 4 ++--
.../camel/builder/endpoint/dsl/Plc4XEndpointBuilderFactory.java | 6 +++---
9 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/plc4x.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/plc4x.json
index 67c4e12624b..64942f811b3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/plc4x.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/plc4x.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "plc4x",
"title": "PLC4X",
- "description": "Camel PLC4X support",
+ "description": "Read and write to PLC devices",
"deprecated": false,
"firstVersion": "3.20.0",
"label": "iot",
diff --git a/components/camel-plc4x/src/generated/resources/org/apache/camel/component/plc4x/plc4x.json b/components/camel-plc4x/src/generated/resources/org/apache/camel/component/plc4x/plc4x.json
index 67c4e12624b..64942f811b3 100644
--- a/components/camel-plc4x/src/generated/resources/org/apache/camel/component/plc4x/plc4x.json
+++ b/components/camel-plc4x/src/generated/resources/org/apache/camel/component/plc4x/plc4x.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "plc4x",
"title": "PLC4X",
- "description": "Camel PLC4X support",
+ "description": "Read and write to PLC devices",
"deprecated": false,
"firstVersion": "3.20.0",
"label": "iot",
diff --git a/components/camel-plc4x/src/main/docs/plc4x-component.adoc b/components/camel-plc4x/src/main/docs/plc4x-component.adoc
index e17bd6e892d..87cedd0bec9 100644
--- a/components/camel-plc4x/src/main/docs/plc4x-component.adoc
+++ b/components/camel-plc4x/src/main/docs/plc4x-component.adoc
@@ -2,7 +2,7 @@
:doctitle: PLC4X
:shortname: plc4x
:artifactid: camel-plc4x
-:description: Camel PLC4X support
+:description: Read and write to PLC devices
:since: 3.20
:supportlevel: Preview
:component-header: Both producer and consumer are supported
diff --git a/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XEndpoint.java b/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XEndpoint.java
index 9883ccd4831..4ad9fa58694 100644
--- a/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XEndpoint.java
+++ b/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XEndpoint.java
@@ -35,6 +35,9 @@ import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
+/**
+ * Read and write to PLC devices
+ */
@UriEndpoint(scheme = "plc4x", firstVersion = "3.20.0", title = "PLC4X",
syntax = "plc4x:driver", category = Category.IOT)
public class Plc4XEndpoint extends DefaultEndpoint {
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
index 014bba87ea0..db5aaa3a824 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
@@ -3452,7 +3452,7 @@ public interface ComponentsBuilderFactory {
}
/**
* PLC4X (camel-plc4x)
- * Camel PLC4X support
+ * Read and write to PLC devices
*
* Category: iot
* Since: 3.20
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Plc4xComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Plc4xComponentBuilderFactory.java
index 303bc2e38f3..ee2beaad5ec 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Plc4xComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Plc4xComponentBuilderFactory.java
@@ -23,7 +23,7 @@ import org.apache.camel.builder.component.ComponentBuilder;
import org.apache.camel.component.plc4x.Plc4XComponent;
/**
- * Camel PLC4X support
+ * Read and write to PLC devices
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@@ -32,7 +32,7 @@ public interface Plc4xComponentBuilderFactory {
/**
* PLC4X (camel-plc4x)
- * Camel PLC4X support
+ * Read and write to PLC devices
*
* Category: iot
* Since: 3.20
diff --git a/dsl/camel-componentdsl/src/generated/resources/metadata.json b/dsl/camel-componentdsl/src/generated/resources/metadata.json
index a5c1b183cfc..93942f78719 100644
--- a/dsl/camel-componentdsl/src/generated/resources/metadata.json
+++ b/dsl/camel-componentdsl/src/generated/resources/metadata.json
@@ -5674,7 +5674,7 @@
"kind": "component",
"name": "plc4x",
"title": "PLC4X",
- "description": "Camel PLC4X support",
+ "description": "Read and write to PLC devices",
"deprecated": false,
"firstVersion": "3.20.0",
"label": "iot",
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index 79074855a63..12fa27e5e70 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -11977,7 +11977,7 @@ public class StaticEndpointBuilders {
}
/**
* PLC4X (camel-plc4x)
- * Camel PLC4X support
+ * Read and write to PLC devices
*
* Category: iot
* Since: 3.20
@@ -11997,7 +11997,7 @@ public class StaticEndpointBuilders {
}
/**
* PLC4X (camel-plc4x)
- * Camel PLC4X support
+ * Read and write to PLC devices
*
* Category: iot
* Since: 3.20
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Plc4XEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Plc4XEndpointBuilderFactory.java
index b0170ae6964..df0a95cf472 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Plc4XEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Plc4XEndpointBuilderFactory.java
@@ -26,7 +26,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
- * Camel PLC4X support
+ * Read and write to PLC devices
*
* Generated by camel build tools - do NOT edit this file!
*/
@@ -414,7 +414,7 @@ public interface Plc4XEndpointBuilderFactory {
public interface Plc4XBuilders {
/**
* PLC4X (camel-plc4x)
- * Camel PLC4X support
+ * Read and write to PLC devices
*
* Category: iot
* Since: 3.20
@@ -433,7 +433,7 @@ public interface Plc4XEndpointBuilderFactory {
}
/**
* PLC4X (camel-plc4x)
- * Camel PLC4X support
+ * Read and write to PLC devices
*
* Category: iot
* Since: 3.20
[camel] 07/11: camel-jbang - Fix potential NPE
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0554af0a33f97d9ce8ac3a101b1a1239e4f5da25
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 20 11:38:16 2022 +0100
camel-jbang - Fix potential NPE
---
.../apache/camel/dsl/jbang/core/commands/catalog/VersionHelper.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/VersionHelper.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/VersionHelper.java
index 20985ddf161..587a56b70d8 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/VersionHelper.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/VersionHelper.java
@@ -24,6 +24,9 @@ final class VersionHelper {
}
public static boolean isGE(String source, String target) {
+ if (source == null || target == null) {
+ return false;
+ }
String s1 = StringHelper.before(source, ".");
String s2 = StringHelper.after(source, ".");
if (s1 == null) {