You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/10/14 11:29:37 UTC
[camel] branch main updated (268c1d0 -> 5f48eaf)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 268c1d0 (chores) camel-file: prevent leaking the array with the input files
new d2955af CAMEL-17077 - Fix syntax in endpoint to be without slashes
new 010f364 CAMEL-17077 - Regen Component
new 5f48eaf Regen
The 3 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/catalog/components/aws-secrets-manager.json | 2 +-
.../org/apache/camel/catalog/schemas/camel-spring.xsd | 18 +++++++++---------
.../SecretsManagerEndpointUriFactory.java | 2 +-
.../aws/secretsmanager/aws-secrets-manager.json | 2 +-
.../aws/secretsmanager/SecretsManagerEndpoint.java | 2 +-
.../src/generated/resources/metadata.json | 2 +-
.../camel/builder/endpoint/StaticEndpointBuilders.java | 8 ++++----
.../dsl/SecretsManagerEndpointBuilderFactory.java | 8 ++++----
8 files changed, 22 insertions(+), 22 deletions(-)
[camel] 02/03: CAMEL-17077 - Regen Component
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 010f364e544d06610cd1f75733b3cfacf00c03f1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Oct 14 13:23:09 2021 +0200
CAMEL-17077 - Regen Component
---
.../secretsmanager/SecretsManagerEndpointUriFactory.java | 2 +-
.../component/aws/secretsmanager/aws-secrets-manager.json | 2 +-
.../src/generated/resources/metadata.json | 2 +-
.../camel/builder/endpoint/EndpointBuilderFactory.java | 13 +++----------
.../camel/builder/endpoint/StaticEndpointBuilders.java | 8 ++++----
.../endpoint/dsl/SecretsManagerEndpointBuilderFactory.java | 8 ++++----
6 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/generated/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerEndpointUriFactory.java b/components/camel-aws/camel-aws-secrets-manager/src/generated/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerEndpointUriFactory.java
index 9b1b066..1852ff8 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/generated/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerEndpointUriFactory.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/generated/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerEndpointUriFactory.java
@@ -15,7 +15,7 @@ import org.apache.camel.spi.EndpointUriFactory;
*/
public class SecretsManagerEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
- private static final String BASE = "://label";
+ private static final String BASE = ":label";
private static final Set<String> PROPERTY_NAMES;
private static final Set<String> SECRET_PROPERTY_NAMES;
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/generated/resources/org/apache/camel/component/aws/secretsmanager/aws-secrets-manager.json b/components/camel-aws/camel-aws-secrets-manager/src/generated/resources/org/apache/camel/component/aws/secretsmanager/aws-secrets-manager.json
index 7b2b060..bbc3980 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/generated/resources/org/apache/camel/component/aws/secretsmanager/aws-secrets-manager.json
+++ b/components/camel-aws/camel-aws-secrets-manager/src/generated/resources/org/apache/camel/component/aws/secretsmanager/aws-secrets-manager.json
@@ -14,7 +14,7 @@
"version": "3.13.0-SNAPSHOT",
"scheme": "aws-secrets-manager",
"extendsScheme": "",
- "syntax": "aws-secrets-manager:\/\/label",
+ "syntax": "aws-secrets-manager:label",
"async": false,
"api": false,
"consumerOnly": false,
diff --git a/core/camel-componentdsl/src/generated/resources/metadata.json b/core/camel-componentdsl/src/generated/resources/metadata.json
index dc92dba..8293150 100644
--- a/core/camel-componentdsl/src/generated/resources/metadata.json
+++ b/core/camel-componentdsl/src/generated/resources/metadata.json
@@ -899,7 +899,7 @@
"version": "3.13.0-SNAPSHOT",
"scheme": "aws-secrets-manager",
"extendsScheme": "",
- "syntax": "aws-secrets-manager:\/\/label",
+ "syntax": "aws-secrets-manager:label",
"async": false,
"api": false,
"consumerOnly": false,
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
index dd07f1a..c447925 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
@@ -373,21 +373,14 @@ public interface EndpointBuilderFactory
default org.apache.camel.Expression endpoints(
org.apache.camel.builder.EndpointProducerBuilder... endpoints) {
return new org.apache.camel.support.ExpressionAdapter() {
-
- private List<org.apache.camel.Expression> expressions = null;
+ List<org.apache.camel.Expression> expressions = Stream.of(endpoints)
+ .map(org.apache.camel.builder.EndpointProducerBuilder::expr)
+ .collect(Collectors.toList());
@Override
public Object evaluate(org.apache.camel.Exchange exchange) {
return expressions.stream().map(e -> e.evaluate(exchange, Object.class)).collect(Collectors.toList());
}
-
- @Override
- public void init(org.apache.camel.CamelContext context) {
- super.init(context);
- expressions = Stream.of(endpoints)
- .map(epb -> epb.expr(context))
- .collect(Collectors.toList());
- }
};
}
}
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index 16cd402..5620a57 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -1796,12 +1796,12 @@ public class StaticEndpointBuilders {
* Since: 3.9
* Maven coordinates: org.apache.camel:camel-aws-secrets-manager
*
- * Syntax: <code>aws-secrets-manager://label</code>
+ * Syntax: <code>aws-secrets-manager:label</code>
*
* Path parameter: label (required)
* Logical name
*
- * @param path //label
+ * @param path label
* @return the dsl builder
*/
public static org.apache.camel.builder.endpoint.dsl.SecretsManagerEndpointBuilderFactory.SecretsManagerEndpointBuilder awsSecretsManager(
@@ -1816,14 +1816,14 @@ public class StaticEndpointBuilders {
* Since: 3.9
* Maven coordinates: org.apache.camel:camel-aws-secrets-manager
*
- * Syntax: <code>aws-secrets-manager://label</code>
+ * Syntax: <code>aws-secrets-manager:label</code>
*
* Path parameter: label (required)
* Logical name
*
* @param componentName to use a custom component name for the endpoint
* instead of the default name
- * @param path //label
+ * @param path label
* @return the dsl builder
*/
public static org.apache.camel.builder.endpoint.dsl.SecretsManagerEndpointBuilderFactory.SecretsManagerEndpointBuilder awsSecretsManager(
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SecretsManagerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SecretsManagerEndpointBuilderFactory.java
index cd40938..7dbc57f 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SecretsManagerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SecretsManagerEndpointBuilderFactory.java
@@ -494,12 +494,12 @@ public interface SecretsManagerEndpointBuilderFactory {
* Since: 3.9
* Maven coordinates: org.apache.camel:camel-aws-secrets-manager
*
- * Syntax: <code>aws-secrets-manager://label</code>
+ * Syntax: <code>aws-secrets-manager:label</code>
*
* Path parameter: label (required)
* Logical name
*
- * @param path //label
+ * @param path label
* @return the dsl builder
*/
default SecretsManagerEndpointBuilder awsSecretsManager(String path) {
@@ -513,14 +513,14 @@ public interface SecretsManagerEndpointBuilderFactory {
* Since: 3.9
* Maven coordinates: org.apache.camel:camel-aws-secrets-manager
*
- * Syntax: <code>aws-secrets-manager://label</code>
+ * Syntax: <code>aws-secrets-manager:label</code>
*
* Path parameter: label (required)
* Logical name
*
* @param componentName to use a custom component name for the endpoint
* instead of the default name
- * @param path //label
+ * @param path label
* @return the dsl builder
*/
default SecretsManagerEndpointBuilder awsSecretsManager(
[camel] 01/03: CAMEL-17077 - Fix syntax in endpoint to be without
slashes
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d2955af34b5741b4f1a974f7f99736ef89ba3987
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Oct 14 13:18:46 2021 +0200
CAMEL-17077 - Fix syntax in endpoint to be without slashes
---
.../camel/component/aws/secretsmanager/SecretsManagerEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerEndpoint.java b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerEndpoint.java
index 9f93554..327046b 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerEndpoint.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerEndpoint.java
@@ -32,7 +32,7 @@ import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
* Manage AWS Secrets Manager services using AWS SDK version 2.x.
*/
@UriEndpoint(firstVersion = "3.9.0", scheme = "aws-secrets-manager", title = "AWS Secrets Manager",
- syntax = "aws-secrets-manager://label", producerOnly = true, category = { Category.CLOUD, Category.MANAGEMENT })
+ syntax = "aws-secrets-manager:label", producerOnly = true, category = { Category.CLOUD, Category.MANAGEMENT })
public class SecretsManagerEndpoint extends ScheduledPollEndpoint {
private SecretsManagerClient secretsManagerClient;
[camel] 03/03: Regen
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5f48eaf22d30ecc3f0068e5604d45f0b167a5ecc
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Oct 14 13:28:59 2021 +0200
Regen
---
.../camel/catalog/components/aws-secrets-manager.json | 2 +-
.../org/apache/camel/catalog/schemas/camel-spring.xsd | 18 +++++++++---------
.../camel/builder/endpoint/EndpointBuilderFactory.java | 13 ++++++++++---
3 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-secrets-manager.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-secrets-manager.json
index 7b2b060..bbc3980 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-secrets-manager.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-secrets-manager.json
@@ -14,7 +14,7 @@
"version": "3.13.0-SNAPSHOT",
"scheme": "aws-secrets-manager",
"extendsScheme": "",
- "syntax": "aws-secrets-manager:\/\/label",
+ "syntax": "aws-secrets-manager:label",
"async": false,
"api": false,
"consumerOnly": false,
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 75973ff..3ef0c30 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
@@ -3213,7 +3213,7 @@ Interval in millis that is used by the background task that checks for timeouts
( org.apache.camel.TimeoutMap ). By default the timeout checker runs every
second. The timeout is an approximation and there is no guarantee that the a
timeout is triggered exactly after the timeout value. It is not recommended to
-use very low timeout values or checker intervals. Default value: 1000
+use very low timeout values or checker intervals. Default value: 1s
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -3378,7 +3378,7 @@ Sets the maximum number of retries.
<xs:attribute name="retryDelay" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
-Sets the delay in millis between retries. Default value: 50
+Sets the delay in millis between retries. Default value: 50ms
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -3386,7 +3386,7 @@ Sets the delay in millis between retries. Default value: 50
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
Sets the upper value of retry in millis between retries, when using exponential
-or random backoff. Default value: 1000
+or random backoff. Default value: 1s
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -4309,7 +4309,7 @@ breaker options are not in use.
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
Control how long the circuit breaker stays open. The default is 5 seconds.
-Default value: 5000
+Default value: 5s
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -4351,7 +4351,7 @@ Default value: false
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
Configures the thread execution timeout. Default value is 1 second. Default
-value: 1000
+value: 1s
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -10406,7 +10406,7 @@ value: 100
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
Sets the timeout for collecting elements to be re-ordered. The default timeout
-is 1000 msec. Default value: 1000
+is 1000 msec. Default value: 1s
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -10454,7 +10454,7 @@ Sets the capacity of the resequencer inbound queue. Default value: 1000
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
Sets minimum time (milliseconds) to wait for missing elements (messages).
-Default value: 1000
+Default value: 1s
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -10462,7 +10462,7 @@ Default value: 1000
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
Sets the interval in milliseconds the stream resequencer will at most wait while
-waiting for condition of being able to deliver. Default value: 1000
+waiting for condition of being able to deliver. Default value: 1s
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -11135,7 +11135,7 @@ use.
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
Sets the sample period during which only a single Exchange will pass through.
-Default value: 1000
+Default value: 1s
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
index c447925..dd07f1a 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
@@ -373,14 +373,21 @@ public interface EndpointBuilderFactory
default org.apache.camel.Expression endpoints(
org.apache.camel.builder.EndpointProducerBuilder... endpoints) {
return new org.apache.camel.support.ExpressionAdapter() {
- List<org.apache.camel.Expression> expressions = Stream.of(endpoints)
- .map(org.apache.camel.builder.EndpointProducerBuilder::expr)
- .collect(Collectors.toList());
+
+ private List<org.apache.camel.Expression> expressions = null;
@Override
public Object evaluate(org.apache.camel.Exchange exchange) {
return expressions.stream().map(e -> e.evaluate(exchange, Object.class)).collect(Collectors.toList());
}
+
+ @Override
+ public void init(org.apache.camel.CamelContext context) {
+ super.init(context);
+ expressions = Stream.of(endpoints)
+ .map(epb -> epb.expr(context))
+ .collect(Collectors.toList());
+ }
};
}
}