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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 43f92ab [create-pull-request] automated change
43f92ab is described below
commit 43f92ab7561b0633421dca7834a8e3d8500cc725
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Apr 28 01:01:10 2021 +0000
[create-pull-request] automated change
---
.../camel/springboot/catalog/components/atlasmap.json | 6 +++---
.../camel/springboot/catalog/components/aws2-ddb.json | 2 ++
.../src/main/docs/atlasmap-starter.adoc | 3 ++-
.../springboot/AtlasMapComponentConfiguration.java | 13 +++++++++++++
.../src/main/docs/aws2-ddb-starter.adoc | 3 ++-
.../aws2/ddb/springboot/Ddb2ComponentConfiguration.java | 15 +++++++++++++++
docs/modules/ROOT/pages/atlasmap-starter.adoc | 3 ++-
docs/modules/ROOT/pages/aws2-ddb-starter.adoc | 3 ++-
tooling/camel-spring-boot-dependencies/pom.xml | 2 +-
9 files changed, 42 insertions(+), 8 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atlasmap.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atlasmap.json
index 70d8481..10da0d8 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atlasmap.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atlasmap.json
@@ -24,7 +24,8 @@
"componentProperties": {
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether the producer
should be started lazy (on the first message). By starting lazy you can use
this to allow CamelContext and routes to startup in situations where a producer
may otherwise fail during star [...]
"atlasContextFactory": { "kind": "property", "displayName": "Atlas Context
Factory", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "io.atlasmap.api.AtlasContextFactory", "deprecated":
false, "autowired": false, "secret": false, "description": "To use the
AtlasContextFactory otherwise a new engine is created." },
- "autowiredEnabled": { "kind": "property", "displayName": "Autowired
Enabled", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which t [...]
+ "autowiredEnabled": { "kind": "property", "displayName": "Autowired
Enabled", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which t [...]
+ "propertiesFile": { "kind": "property", "displayName": "Properties File",
"group": "advanced", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The URI of the properties file which is used
for AtlasContextFactory initialization." }
},
"properties": {
"resourceUri": { "kind": "path", "displayName": "Resource Uri", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Path to the resource. You can prefix
with: classpath, file, http, ref, or bean. classpath, file and http loads the
resource using these protocols (classpath is default). ref will lookup the
resource in the registry. bean will [...]
@@ -33,7 +34,6 @@
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether the producer
should be started lazy (on the first message). By starting lazy you can use
this to allow CamelContext and routes to startup in situations where a producer
may otherwise fail during sta [...]
"sourceMapName": { "kind": "parameter", "displayName": "Source Map Name",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The Exchange property name for a source
message map which hold java.util.Map<String, Message> where the key is
AtlasMap Document ID. AtlasMap consumes Message bodies as source documents, as
well as message headers as source propert [...]
"targetMapMode": { "kind": "parameter", "displayName": "Target Map Mode",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.atlasmap.AtlasMapEndpoint.TargetMapMode", "enum": [
"MAP", "MESSAGE_HEADER", "EXCHANGE_PROPERTY" ], "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "MAP", "description":
"TargetMapMode enum value to specify how multiple target documents are
delivered if exist. 'MAP': Stores th [...]
- "targetMapName": { "kind": "parameter", "displayName": "Target Map Name",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The Exchange property name for a target
document map which hold java.util.Map<String, Object> where the key is
AtlasMap Document ID. AtlasMap populates multiple target documents into this
map." },
- "propertiesFile": { "kind": "parameter", "displayName": "Properties File",
"group": "advanced", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The URI of the properties file which is used
for AtlasContextFactory initialization." }
+ "targetMapName": { "kind": "parameter", "displayName": "Target Map Name",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The Exchange property name for a target
document map which hold java.util.Map<String, Object> where the key is
AtlasMap Document ID. AtlasMap populates multiple target documents into this
map." }
}
}
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddb.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddb.json
index e94cb53..a81a4e0 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddb.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ddb.json
@@ -38,6 +38,7 @@
"region": { "kind": "property", "displayName": "Region", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.ddb.Ddb2Configuration",
"configurationField": "configuration", "description": "The region in which DDB
client needs to work" },
"trustAllCertificates": { "kind": "property", "displayName": "Trust All
Certificates", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.ddb.Ddb2Configuration", "configurationField":
"configuration", "description": "If we want to trust all certificates in case
of overriding the endpoint" },
"uriEndpointOverride": { "kind": "property", "displayName": "Uri Endpoint
Override", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.ddb.Ddb2Configuration", "configurationField":
"configuration", "description": "Set the overriding uri endpoint. This option
needs to be used in combination with overrideEndpoint option" },
+ "useDefaultCredentialsProvider": { "kind": "property", "displayName": "Use
Default Credentials Provider", "group": "producer", "label": "", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.ddb.Ddb2Configuration",
"configurationField": "configuration", "description": "Set whether the S3
client should expect to load credentials through a de [...]
"writeCapacity": { "kind": "property", "displayName": "Write Capacity",
"group": "producer", "label": "", "required": false, "type": "integer",
"javaType": "java.lang.Long", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.ddb.Ddb2Configuration", "configurationField":
"configuration", "description": "The provisioned throughput to reserved for
writing resources to your table" },
"autowiredEnabled": { "kind": "property", "displayName": "Autowired
Enabled", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which t [...]
"accessKey": { "kind": "property", "displayName": "Access Key", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.aws2.ddb.Ddb2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Access Key" },
@@ -60,6 +61,7 @@
"region": { "kind": "parameter", "displayName": "Region", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.ddb.Ddb2Configuration",
"configurationField": "configuration", "description": "The region in which DDB
client needs to work" },
"trustAllCertificates": { "kind": "parameter", "displayName": "Trust All
Certificates", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.ddb.Ddb2Configuration", "configurationField":
"configuration", "description": "If we want to trust all certificates in case
of overriding the endpoint" },
"uriEndpointOverride": { "kind": "parameter", "displayName": "Uri Endpoint
Override", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.ddb.Ddb2Configuration", "configurationField":
"configuration", "description": "Set the overriding uri endpoint. This option
needs to be used in combination with overrideEndpoint option" },
+ "useDefaultCredentialsProvider": { "kind": "parameter", "displayName":
"Use Default Credentials Provider", "group": "producer", "label": "",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.ddb.Ddb2Configuration",
"configurationField": "configuration", "description": "Set whether the S3
client should expect to load credentials through a d [...]
"writeCapacity": { "kind": "parameter", "displayName": "Write Capacity",
"group": "producer", "label": "", "required": false, "type": "integer",
"javaType": "java.lang.Long", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.ddb.Ddb2Configuration", "configurationField":
"configuration", "description": "The provisioned throughput to reserved for
writing resources to your table" },
"accessKey": { "kind": "parameter", "displayName": "Access Key", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.aws2.ddb.Ddb2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Access Key" },
"secretKey": { "kind": "parameter", "displayName": "Secret Key", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.aws2.ddb.Ddb2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Secret Key" }
diff --git
a/components-starter/camel-atlasmap-starter/src/main/docs/atlasmap-starter.adoc
b/components-starter/camel-atlasmap-starter/src/main/docs/atlasmap-starter.adoc
index f565d35..8f98ba3 100644
---
a/components-starter/camel-atlasmap-starter/src/main/docs/atlasmap-starter.adoc
+++
b/components-starter/camel-atlasmap-starter/src/main/docs/atlasmap-starter.adoc
@@ -17,7 +17,7 @@ When using atlasmap with Spring Boot make sure to use the
following Maven depend
----
-The component supports 4 options, which are listed below.
+The component supports 5 options, which are listed below.
@@ -28,5 +28,6 @@ The component supports 4 options, which are listed below.
| *camel.component.atlasmap.autowired-enabled* | Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which then gets configured on the component. This
can be used for automatic configuring JDBC data sources, JMS connection
factories, AWS Clients, etc. | true | Boolean
| *camel.component.atlasmap.enabled* | Whether to enable auto configuration of
the atlasmap component. This is enabled by default. | | Boolean
| *camel.component.atlasmap.lazy-start-producer* | Whether the producer should
be started lazy (on the first message). By starting lazy you can use this to
allow CamelContext and routes to startup in situations where a producer may
otherwise fail during starting and cause the route to fail being started. By
deferring this startup to be lazy then the startup failure can be handled
during routing messages via Camel's routing error handlers. Beware that when
the first message is processed t [...]
+| *camel.component.atlasmap.properties-file* | The URI of the properties file
which is used for AtlasContextFactory initialization. | | String
|===
// spring-boot-auto-configure options: END
diff --git
a/components-starter/camel-atlasmap-starter/src/main/java/org/apache/camel/component/atlasmap/springboot/AtlasMapComponentConfiguration.java
b/components-starter/camel-atlasmap-starter/src/main/java/org/apache/camel/component/atlasmap/springboot/AtlasMapComponentConfiguration.java
index bbafe55..7007bad 100644
---
a/components-starter/camel-atlasmap-starter/src/main/java/org/apache/camel/component/atlasmap/springboot/AtlasMapComponentConfiguration.java
+++
b/components-starter/camel-atlasmap-starter/src/main/java/org/apache/camel/component/atlasmap/springboot/AtlasMapComponentConfiguration.java
@@ -62,6 +62,11 @@ public class AtlasMapComponentConfiguration
* etc.
*/
private Boolean autowiredEnabled = true;
+ /**
+ * The URI of the properties file which is used for AtlasContextFactory
+ * initialization.
+ */
+ private String propertiesFile;
public Boolean getLazyStartProducer() {
return lazyStartProducer;
@@ -86,4 +91,12 @@ public class AtlasMapComponentConfiguration
public void setAutowiredEnabled(Boolean autowiredEnabled) {
this.autowiredEnabled = autowiredEnabled;
}
+
+ public String getPropertiesFile() {
+ return propertiesFile;
+ }
+
+ public void setPropertiesFile(String propertiesFile) {
+ this.propertiesFile = propertiesFile;
+ }
}
\ No newline at end of file
diff --git
a/components-starter/camel-aws2-ddb-starter/src/main/docs/aws2-ddb-starter.adoc
b/components-starter/camel-aws2-ddb-starter/src/main/docs/aws2-ddb-starter.adoc
index 42a43b5..1240237 100644
---
a/components-starter/camel-aws2-ddb-starter/src/main/docs/aws2-ddb-starter.adoc
+++
b/components-starter/camel-aws2-ddb-starter/src/main/docs/aws2-ddb-starter.adoc
@@ -17,7 +17,7 @@ When using aws2-ddb with Spring Boot make sure to use the
following Maven depend
----
-The component supports 38 options, which are listed below.
+The component supports 39 options, which are listed below.
@@ -44,6 +44,7 @@ The component supports 38 options, which are listed below.
| *camel.component.aws2-ddb.secret-key* | Amazon AWS Secret Key | | String
| *camel.component.aws2-ddb.trust-all-certificates* | If we want to trust all
certificates in case of overriding the endpoint | false | Boolean
| *camel.component.aws2-ddb.uri-endpoint-override* | Set the overriding uri
endpoint. This option needs to be used in combination with overrideEndpoint
option | | String
+| *camel.component.aws2-ddb.use-default-credentials-provider* | Set whether
the S3 client should expect to load credentials through a default credentials
provider or to expect static credentials to be passed in. | false | Boolean
| *camel.component.aws2-ddb.write-capacity* | The provisioned throughput to
reserved for writing resources to your table | | Long
| *camel.component.aws2-ddbstream.access-key* | Amazon AWS Access Key | |
String
| *camel.component.aws2-ddbstream.amazon-dynamo-db-streams-client* | Amazon
DynamoDB client to use for all requests for this endpoint. The option is a
software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClient type. |
| DynamoDbStreamsClient
diff --git
a/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddb/springboot/Ddb2ComponentConfiguration.java
b/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddb/springboot/Ddb2ComponentConfiguration.java
index b14cd59..f4bfc4f 100644
---
a/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddb/springboot/Ddb2ComponentConfiguration.java
+++
b/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddb/springboot/Ddb2ComponentConfiguration.java
@@ -121,6 +121,12 @@ public class Ddb2ComponentConfiguration
*/
private String uriEndpointOverride;
/**
+ * Set whether the S3 client should expect to load credentials through a
+ * default credentials provider or to expect static credentials to be
passed
+ * in.
+ */
+ private Boolean useDefaultCredentialsProvider = false;
+ /**
* The provisioned throughput to reserved for writing resources to your
* table
*/
@@ -271,6 +277,15 @@ public class Ddb2ComponentConfiguration
this.uriEndpointOverride = uriEndpointOverride;
}
+ public Boolean getUseDefaultCredentialsProvider() {
+ return useDefaultCredentialsProvider;
+ }
+
+ public void setUseDefaultCredentialsProvider(
+ Boolean useDefaultCredentialsProvider) {
+ this.useDefaultCredentialsProvider = useDefaultCredentialsProvider;
+ }
+
public Long getWriteCapacity() {
return writeCapacity;
}
diff --git a/docs/modules/ROOT/pages/atlasmap-starter.adoc
b/docs/modules/ROOT/pages/atlasmap-starter.adoc
index f565d35..8f98ba3 100644
--- a/docs/modules/ROOT/pages/atlasmap-starter.adoc
+++ b/docs/modules/ROOT/pages/atlasmap-starter.adoc
@@ -17,7 +17,7 @@ When using atlasmap with Spring Boot make sure to use the
following Maven depend
----
-The component supports 4 options, which are listed below.
+The component supports 5 options, which are listed below.
@@ -28,5 +28,6 @@ The component supports 4 options, which are listed below.
| *camel.component.atlasmap.autowired-enabled* | Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which then gets configured on the component. This
can be used for automatic configuring JDBC data sources, JMS connection
factories, AWS Clients, etc. | true | Boolean
| *camel.component.atlasmap.enabled* | Whether to enable auto configuration of
the atlasmap component. This is enabled by default. | | Boolean
| *camel.component.atlasmap.lazy-start-producer* | Whether the producer should
be started lazy (on the first message). By starting lazy you can use this to
allow CamelContext and routes to startup in situations where a producer may
otherwise fail during starting and cause the route to fail being started. By
deferring this startup to be lazy then the startup failure can be handled
during routing messages via Camel's routing error handlers. Beware that when
the first message is processed t [...]
+| *camel.component.atlasmap.properties-file* | The URI of the properties file
which is used for AtlasContextFactory initialization. | | String
|===
// spring-boot-auto-configure options: END
diff --git a/docs/modules/ROOT/pages/aws2-ddb-starter.adoc
b/docs/modules/ROOT/pages/aws2-ddb-starter.adoc
index 42a43b5..1240237 100644
--- a/docs/modules/ROOT/pages/aws2-ddb-starter.adoc
+++ b/docs/modules/ROOT/pages/aws2-ddb-starter.adoc
@@ -17,7 +17,7 @@ When using aws2-ddb with Spring Boot make sure to use the
following Maven depend
----
-The component supports 38 options, which are listed below.
+The component supports 39 options, which are listed below.
@@ -44,6 +44,7 @@ The component supports 38 options, which are listed below.
| *camel.component.aws2-ddb.secret-key* | Amazon AWS Secret Key | | String
| *camel.component.aws2-ddb.trust-all-certificates* | If we want to trust all
certificates in case of overriding the endpoint | false | Boolean
| *camel.component.aws2-ddb.uri-endpoint-override* | Set the overriding uri
endpoint. This option needs to be used in combination with overrideEndpoint
option | | String
+| *camel.component.aws2-ddb.use-default-credentials-provider* | Set whether
the S3 client should expect to load credentials through a default credentials
provider or to expect static credentials to be passed in. | false | Boolean
| *camel.component.aws2-ddb.write-capacity* | The provisioned throughput to
reserved for writing resources to your table | | Long
| *camel.component.aws2-ddbstream.access-key* | Amazon AWS Access Key | |
String
| *camel.component.aws2-ddbstream.amazon-dynamo-db-streams-client* | Amazon
DynamoDB client to use for all requests for this endpoint. The option is a
software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClient type. |
| DynamoDbStreamsClient
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index bdcd030..c7fc1a9 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -339,7 +339,7 @@
<dependency>
<groupId>net.corda</groupId>
<artifactId>corda-rpc</artifactId>
- <version>4.7</version>
+ <version>4.8</version>
<exclusions>
<exclusion>
<groupId>co.paralleluniverse</groupId>
