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 2020/08/21 17:21:11 UTC
[camel] branch master updated (2fd0653 -> aa700ae)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 2fd0653 CAMEL-15444: fix incorrect assertion order (#4116)
new 3bcb33b Upgrade AWS SDK v2 to version 2.14.3
new aa700ae Regen and sync properties
The 2 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 +-
.../apache/camel/catalog/components/arangodb.json | 34 +++++++++++--------
.../camel/catalog/docs/arangodb-component.adoc | 38 +++++++++++++---------
.../apache/camel/component/cmis/CMISProducer.java | 5 +--
.../camel/component/cmis/CMISProducerTest.java | 2 +-
.../camel/component/file/remote/FtpOperations.java | 2 +-
.../apache/camel/component/irc/IrcComponent.java | 8 ++---
.../camel/component/quartz/QuartzEndpoint.java | 4 +--
.../QuartzScheduledPollConsumerScheduler.java | 4 +--
.../camel/support/jsse/SSLContextParameters.java | 4 +--
.../DefaultScheduledPollConsumerScheduler.java | 8 ++---
.../modules/ROOT/pages/arangodb-component.adoc | 38 +++++++++++++---------
parent/pom.xml | 2 +-
13 files changed, 85 insertions(+), 66 deletions(-)
[camel] 02/02: Regen and sync properties
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit aa700aedd5b9831bafbec8b6bb043a47c2140abb
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 21 19:19:57 2020 +0200
Regen and sync properties
---
camel-dependencies/pom.xml | 2 +-
.../apache/camel/catalog/components/arangodb.json | 34 +++++++++++--------
.../camel/catalog/docs/arangodb-component.adoc | 38 +++++++++++++---------
.../apache/camel/component/cmis/CMISProducer.java | 5 +--
.../camel/component/cmis/CMISProducerTest.java | 2 +-
.../camel/component/file/remote/FtpOperations.java | 2 +-
.../apache/camel/component/irc/IrcComponent.java | 8 ++---
.../camel/component/quartz/QuartzEndpoint.java | 4 +--
.../QuartzScheduledPollConsumerScheduler.java | 4 +--
.../camel/support/jsse/SSLContextParameters.java | 4 +--
.../DefaultScheduledPollConsumerScheduler.java | 8 ++---
.../modules/ROOT/pages/arangodb-component.adoc | 38 +++++++++++++---------
12 files changed, 84 insertions(+), 65 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 4f946b1..e1905bd 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -71,7 +71,7 @@
<awaitility-version>4.0.3</awaitility-version>
<aws-java-sdk-swf-libs>1.11.22</aws-java-sdk-swf-libs>
<aws-java-sdk-version>1.11.714</aws-java-sdk-version>
- <aws-java-sdk2-version>2.14.2</aws-java-sdk2-version>
+ <aws-java-sdk2-version>2.14.3</aws-java-sdk2-version>
<aws-xray-version>2.6.1</aws-xray-version>
<axiom-version>1.2.14</axiom-version>
<azure-eventhubs-checkpointstore-blob-version>1.1.2</azure-eventhubs-checkpointstore-blob-version>
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/arangodb.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/arangodb.json
index de469e3..d760499 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/arangodb.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/arangodb.json
@@ -3,9 +3,9 @@
"kind": "component",
"name": "arangodb",
"title": "ArangoDb",
- "description": "Perform operations on ArangoDb documents, collections and graphs.",
+ "description": "Perform operations on ArangoDb when used as a Document Database, or as a Graph Database",
"deprecated": false,
- "firstVersion": "3.5.0-SNAPSHOT",
+ "firstVersion": "3.5.0",
"label": "database,nosql",
"javaType": "org.apache.camel.component.arangodb.ArangoDbComponent",
"supportLevel": "Preview",
@@ -21,26 +21,32 @@
"lenientProperties": false
},
"componentProperties": {
- "collection": { "kind": "property", "displayName": "Collection", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "collection in the database" },
"configuration": { "kind": "property", "displayName": "Configuration", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "deprecated": false, "secret": false, "description": "Component configuration" },
- "host": { "kind": "property", "displayName": "Host", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "host if host and\/or port different from default" },
+ "documentCollection": { "kind": "property", "displayName": "Document Collection", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "Collection name, when using ArangoDb as a Document Database. Set the documentCollection name when using the CRUD operat [...]
+ "edgeCollection": { "kind": "property", "displayName": "Edge Collection", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "Collection name of vertices, when using ArangoDb as a Graph Database. Set the edgeCollection name to perform CRUD operation on [...]
+ "graph": { "kind": "property", "displayName": "Graph", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "Graph name, when using ArangoDb as a Graph Database. Combine this attribute with one of the two attributes vertexCollection and edgeCollection." },
+ "host": { "kind": "property", "displayName": "Host", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "ArangoDB host. If host and port are default, this field is Optional." },
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": 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 starting and cause the r [...]
- "operation": { "kind": "property", "displayName": "Operation", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.arangodb.ArangoDbOperation", "enum": [ "SAVE_DOCUMENT", "FIND_DOCUMENT_BY_KEY", "UPDATE_DOCUMENT", "DELETE_DOCUMENT", "AQL_QUERY" ], "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description" [...]
- "port": { "kind": "property", "displayName": "Port", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "port if host and\/or port different from default" },
+ "operation": { "kind": "property", "displayName": "Operation", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.arangodb.ArangoDbOperation", "enum": [ "SAVE_DOCUMENT", "FIND_DOCUMENT_BY_KEY", "UPDATE_DOCUMENT", "DELETE_DOCUMENT", "AQL_QUERY", "SAVE_VERTEX", "FIND_VERTEX_BY_KEY", "UPDATE_VERTEX", "DELETE_VERTEX", "SAVE_EDGE", "FIND_EDGE_BY_KEY", "UPDATE_EDGE", "DELETE_EDGE" ], "deprecated": false, "secret": false, " [...]
+ "port": { "kind": "property", "displayName": "Port", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "ArangoDB exposed port. If host and port are default, this field is Optional." },
+ "vertexCollection": { "kind": "property", "displayName": "Vertex Collection", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "Collection name of vertices, when using ArangoDb as a Graph Database. Set the vertexCollection name to perform CRUD operati [...]
"basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
- "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "password if user and\/or password different from default" },
- "user": { "kind": "property", "displayName": "User", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "user if user and\/or password different from default" }
+ "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "ArangoDB password. If user and password are default, this field is Optional." },
+ "user": { "kind": "property", "displayName": "User", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "ArangoDB user. If user and password are default, this field is Optional." }
},
"properties": {
"database": { "kind": "path", "displayName": "Database", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "description": "database name" },
- "collection": { "kind": "parameter", "displayName": "Collection", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "collection in the database" },
- "host": { "kind": "parameter", "displayName": "Host", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "host if host and\/or port different from default" },
+ "documentCollection": { "kind": "parameter", "displayName": "Document Collection", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "Collection name, when using ArangoDb as a Document Database. Set the documentCollection name when using the CRUD opera [...]
+ "edgeCollection": { "kind": "parameter", "displayName": "Edge Collection", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "Collection name of vertices, when using ArangoDb as a Graph Database. Set the edgeCollection name to perform CRUD operation on [...]
+ "graph": { "kind": "parameter", "displayName": "Graph", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "Graph name, when using ArangoDb as a Graph Database. Combine this attribute with one of the two attributes vertexCollection and edgeCollection." },
+ "host": { "kind": "parameter", "displayName": "Host", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "ArangoDB host. If host and port are default, this field is Optional." },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": 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 starting and cause the [...]
- "operation": { "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.arangodb.ArangoDbOperation", "enum": [ "SAVE_DOCUMENT", "FIND_DOCUMENT_BY_KEY", "UPDATE_DOCUMENT", "DELETE_DOCUMENT", "AQL_QUERY" ], "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description [...]
- "port": { "kind": "parameter", "displayName": "Port", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "port if host and\/or port different from default" },
+ "operation": { "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.arangodb.ArangoDbOperation", "enum": [ "SAVE_DOCUMENT", "FIND_DOCUMENT_BY_KEY", "UPDATE_DOCUMENT", "DELETE_DOCUMENT", "AQL_QUERY", "SAVE_VERTEX", "FIND_VERTEX_BY_KEY", "UPDATE_VERTEX", "DELETE_VERTEX", "SAVE_EDGE", "FIND_EDGE_BY_KEY", "UPDATE_EDGE", "DELETE_EDGE" ], "deprecated": false, "secret": false, [...]
+ "port": { "kind": "parameter", "displayName": "Port", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "ArangoDB exposed port. If host and port are default, this field is Optional." },
+ "vertexCollection": { "kind": "parameter", "displayName": "Vertex Collection", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "Collection name of vertices, when using ArangoDb as a Graph Database. Set the vertexCollection name to perform CRUD operat [...]
"basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
"synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
- "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "password if user and\/or password different from default" },
- "user": { "kind": "parameter", "displayName": "User", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "user if user and\/or password different from default" }
+ "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "ArangoDB password. If user and password are default, this field is Optional." },
+ "user": { "kind": "parameter", "displayName": "User", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.arangodb.ArangoDbConfiguration", "configurationField": "configuration", "description": "ArangoDB user. If user and password are default, this field is Optional." }
}
}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/arangodb-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/arangodb-component.adoc
index d883a0d..ff74b12 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/arangodb-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/arangodb-component.adoc
@@ -2,8 +2,8 @@
= ArangoDb Component
:docTitle: ArangoDb
:artifactId: camel-arangodb
-:description: Perform operations on ArangoDb documents, collections and graphs.
-:since: 3.5.0-SNAPSHOT
+:description: Perform operations on ArangoDb when used as a Document Database, or as a Graph Database
+:since: 3.5
:supportLevel: Preview
:component-header: Only producer is supported
@@ -38,22 +38,25 @@ arangodb:database[?options]
// component options: START
-The ArangoDb component supports 9 options, which are listed below.
+The ArangoDb component supports 12 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *collection* (producer) | collection in the database | | String
| *configuration* (producer) | Component configuration | | ArangoDbConfiguration
-| *host* (producer) | host if host and/or port different from default | | String
+| *documentCollection* (producer) | Collection name, when using ArangoDb as a Document Database. Set the documentCollection name when using the CRUD operation on the document database collections (SAVE_DOCUMENT , FIND_DOCUMENT_BY_KEY, UPDATE_DOCUMENT, DELETE_DOCUMENT). | | String
+| *edgeCollection* (producer) | Collection name of vertices, when using ArangoDb as a Graph Database. Set the edgeCollection name to perform CRUD operation on edges using these operations : SAVE_VERTEX, FIND_VERTEX_BY_KEY, UPDATE_VERTEX, DELETE_VERTEX. The graph attribute is mandatory. | | String
+| *graph* (producer) | Graph name, when using ArangoDb as a Graph Database. Combine this attribute with one of the two attributes vertexCollection and edgeCollection. | | String
+| *host* (producer) | ArangoDB host. If host and port are default, this field is Optional. | | String
| *lazyStartProducer* (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 then creating and [...]
-| *operation* (producer) | operation to perform. The value can be one of: SAVE_DOCUMENT, FIND_DOCUMENT_BY_KEY, UPDATE_DOCUMENT, DELETE_DOCUMENT, AQL_QUERY | | ArangoDbOperation
-| *port* (producer) | port if host and/or port different from default | | int
+| *operation* (producer) | Operations to perform on ArangoDb. For the operation AQL_QUERY, no need to specify a collection or graph. The value can be one of: SAVE_DOCUMENT, FIND_DOCUMENT_BY_KEY, UPDATE_DOCUMENT, DELETE_DOCUMENT, AQL_QUERY, SAVE_VERTEX, FIND_VERTEX_BY_KEY, UPDATE_VERTEX, DELETE_VERTEX, SAVE_EDGE, FIND_EDGE_BY_KEY, UPDATE_EDGE, DELETE_EDGE | | ArangoDbOperation
+| *port* (producer) | ArangoDB exposed port. If host and port are default, this field is Optional. | | int
+| *vertexCollection* (producer) | Collection name of vertices, when using ArangoDb as a Graph Database. Set the vertexCollection name to perform CRUD operation on vertices using these operations : SAVE_EDGE, FIND_EDGE_BY_KEY, UPDATE_EDGE, DELETE_EDGE. The graph attribute is mandatory. | | String
| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
-| *password* (security) | password if user and/or password different from default | | String
-| *user* (security) | user if user and/or password different from default | | String
+| *password* (security) | ArangoDB password. If user and password are default, this field is Optional. | | String
+| *user* (security) | ArangoDB user. If user and password are default, this field is Optional. | | String
|===
// component options: END
@@ -76,21 +79,24 @@ with the following path and query parameters:
|===
-=== Query Parameters (9 parameters):
+=== Query Parameters (12 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *collection* (producer) | collection in the database | | String
-| *host* (producer) | host if host and/or port different from default | | String
+| *documentCollection* (producer) | Collection name, when using ArangoDb as a Document Database. Set the documentCollection name when using the CRUD operation on the document database collections (SAVE_DOCUMENT , FIND_DOCUMENT_BY_KEY, UPDATE_DOCUMENT, DELETE_DOCUMENT). | | String
+| *edgeCollection* (producer) | Collection name of vertices, when using ArangoDb as a Graph Database. Set the edgeCollection name to perform CRUD operation on edges using these operations : SAVE_VERTEX, FIND_VERTEX_BY_KEY, UPDATE_VERTEX, DELETE_VERTEX. The graph attribute is mandatory. | | String
+| *graph* (producer) | Graph name, when using ArangoDb as a Graph Database. Combine this attribute with one of the two attributes vertexCollection and edgeCollection. | | String
+| *host* (producer) | ArangoDB host. If host and port are default, this field is Optional. | | String
| *lazyStartProducer* (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 then creating and [...]
-| *operation* (producer) | operation to perform. The value can be one of: SAVE_DOCUMENT, FIND_DOCUMENT_BY_KEY, UPDATE_DOCUMENT, DELETE_DOCUMENT, AQL_QUERY | | ArangoDbOperation
-| *port* (producer) | port if host and/or port different from default | | int
+| *operation* (producer) | Operations to perform on ArangoDb. For the operation AQL_QUERY, no need to specify a collection or graph. The value can be one of: SAVE_DOCUMENT, FIND_DOCUMENT_BY_KEY, UPDATE_DOCUMENT, DELETE_DOCUMENT, AQL_QUERY, SAVE_VERTEX, FIND_VERTEX_BY_KEY, UPDATE_VERTEX, DELETE_VERTEX, SAVE_EDGE, FIND_EDGE_BY_KEY, UPDATE_EDGE, DELETE_EDGE | | ArangoDbOperation
+| *port* (producer) | ArangoDB exposed port. If host and port are default, this field is Optional. | | int
+| *vertexCollection* (producer) | Collection name of vertices, when using ArangoDb as a Graph Database. Set the vertexCollection name to perform CRUD operation on vertices using these operations : SAVE_EDGE, FIND_EDGE_BY_KEY, UPDATE_EDGE, DELETE_EDGE. The graph attribute is mandatory. | | String
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
-| *password* (security) | password if user and/or password different from default | | String
-| *user* (security) | user if user and/or password different from default | | String
+| *password* (security) | ArangoDB password. If user and password are default, this field is Optional. | | String
+| *user* (security) | ArangoDB user. If user and password are default, this field is Optional. | | String
|===
// endpoint options: END
diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java
index 9187dcc..e431f15 100644
--- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java
+++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java
@@ -338,8 +338,9 @@ public class CMISProducer extends DefaultProducer {
Document document = (Document) getSessionFacade().getObjectById(objectId);
String newDocumentName = message.getHeader(PropertyIds.NAME, String.class);
- if(org.apache.camel.util.ObjectHelper.isNotEmpty(newDocumentName)) {
- return document.copy(destinationFolder, Collections.singletonMap(PropertyIds.NAME, newDocumentName), VersioningState.NONE, null, null, null, getSessionFacade().createOperationContext());
+ if (org.apache.camel.util.ObjectHelper.isNotEmpty(newDocumentName)) {
+ return document.copy(destinationFolder, Collections.singletonMap(PropertyIds.NAME, newDocumentName),
+ VersioningState.NONE, null, null, null, getSessionFacade().createOperationContext());
}
return document.copy(destinationFolder);
diff --git a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java
index c2bc4a0..f0c1502 100644
--- a/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java
+++ b/components/camel-cmis/src/test/java/org/apache/camel/component/cmis/CMISProducerTest.java
@@ -344,7 +344,7 @@ public class CMISProducerTest extends CMISTestSupport {
@Test
void copyDocumentWithNewName() throws UnsupportedEncodingException {
Folder destination = createFolderWithName("Destination");
- Document document = createTextDocument(createSession().getRootFolder(), "This is new test document", "document.txt");
+ Document document = createTextDocument(createSession().getRootFolder(), "This is new test document", "document.txt");
Exchange exchange = createExchangeWithInBody(null);
exchange.getIn().getHeaders().put(PropertyIds.OBJECT_TYPE_ID, CamelCMISConstants.CMIS_DOCUMENT);
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
index 6db8633..40e2e28 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
@@ -755,7 +755,7 @@ public class FtpOperations implements RemoteFileOperations<FTPFile> {
if (log.isDebugEnabled()) {
long time = watch.taken();
log.debug("Took {} ({} millis) to store file: {} and FTP client returned: {}",
- TimeUtils.printDuration(time), time, targetName, answer) ;
+ TimeUtils.printDuration(time), time, targetName, answer);
}
// store client reply information after the operation
diff --git a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
index 11c94f8..69aaa61 100644
--- a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
+++ b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
@@ -88,8 +88,8 @@ public class IrcComponent extends DefaultComponent implements SSLContextParamete
if (LOG.isDebugEnabled()) {
LOG.debug("Creating SSL Connection to {} destination(s): {} nick: {} user: {}",
- configuration.getHostname(), configuration.getSpaceSeparatedChannelNames(),
- configuration.getNickname(), configuration.getUsername());
+ configuration.getHostname(), configuration.getSpaceSeparatedChannelNames(),
+ configuration.getNickname(), configuration.getUsername());
}
SSLContextParameters sslParams = configuration.getSslContextParameters();
@@ -113,8 +113,8 @@ public class IrcComponent extends DefaultComponent implements SSLContextParamete
} else {
if (LOG.isDebugEnabled()) {
LOG.debug("Creating Connection to {} destination(s): {} nick: {} user: {}",
- configuration.getHostname(), configuration.getSpaceSeparatedChannelNames(),
- configuration.getNickname(), configuration.getUsername());
+ configuration.getHostname(), configuration.getSpaceSeparatedChannelNames(),
+ configuration.getNickname(), configuration.getUsername());
}
conn = new IRCConnection(
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
index 3026cce..be75e2a 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
@@ -399,8 +399,8 @@ public class QuartzEndpoint extends DefaultEndpoint {
if (LOG.isInfoEnabled()) {
LOG.info("Job {} (triggerType={}, jobClass={}) is scheduled. Next fire date is {}",
- trigger.getKey(), trigger.getClass().getSimpleName(),
- jobDetail.getJobClass().getSimpleName(), trigger.getNextFireTime());
+ trigger.getKey(), trigger.getClass().getSimpleName(),
+ jobDetail.getJobClass().getSimpleName(), trigger.getNextFireTime());
}
// Increase camel job count for this endpoint
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz/QuartzScheduledPollConsumerScheduler.java b/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz/QuartzScheduledPollConsumerScheduler.java
index 299566f..5ad07bc 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz/QuartzScheduledPollConsumerScheduler.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz/QuartzScheduledPollConsumerScheduler.java
@@ -255,8 +255,8 @@ public class QuartzScheduledPollConsumerScheduler extends ServiceSupport
if (LOG.isInfoEnabled()) {
LOG.info("Job {} (triggerType={}, jobClass={}) is scheduled. Next fire date is {}",
- trigger.getKey(), trigger.getClass().getSimpleName(),
- job.getJobClass().getSimpleName(), trigger.getNextFireTime());
+ trigger.getKey(), trigger.getClass().getSimpleName(),
+ job.getJobClass().getSimpleName(), trigger.getNextFireTime());
}
}
diff --git a/core/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextParameters.java b/core/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextParameters.java
index 931ae96..eb92f67 100644
--- a/core/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextParameters.java
+++ b/core/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextParameters.java
@@ -287,8 +287,8 @@ public class SSLContextParameters extends BaseSSLContextParameters {
LOG.debug(
"SSLContext [{}], initialized from [{}], is using provider [{}], protocol [{}], key managers {}, trust managers {}, and secure random [{}].",
- context, this, context.getProvider(), context.getProtocol(), keyManagers, trustManagers,
- secureRandom);
+ context, this, context.getProvider(), context.getProtocol(), keyManagers, trustManagers,
+ secureRandom);
context.init(keyManagers, trustManagers, secureRandom);
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumerScheduler.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumerScheduler.java
index 5137b0a..c210908 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumerScheduler.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumerScheduler.java
@@ -167,8 +167,8 @@ public class DefaultScheduledPollConsumerScheduler extends ServiceSupport implem
if (isUseFixedDelay()) {
if (LOG.isDebugEnabled()) {
LOG.debug("Scheduling poll (fixed delay) with initialDelay: {}, delay: {} ({}) for: {}",
- currentInitialDelay, currentDelay, getTimeUnit().name().toLowerCase(Locale.ENGLISH),
- consumer.getEndpoint());
+ currentInitialDelay, currentDelay, getTimeUnit().name().toLowerCase(Locale.ENGLISH),
+ consumer.getEndpoint());
}
for (int i = 0; i < concurrentTasks; i++) {
futures.add(scheduledExecutorService.scheduleWithFixedDelay(task, currentInitialDelay, currentDelay,
@@ -177,8 +177,8 @@ public class DefaultScheduledPollConsumerScheduler extends ServiceSupport implem
} else {
if (LOG.isDebugEnabled()) {
LOG.debug("Scheduling poll (fixed rate) with initialDelay: {}, delay: {} ({}) for: {}",
- currentInitialDelay, currentDelay, getTimeUnit().name().toLowerCase(Locale.ENGLISH),
- consumer.getEndpoint());
+ currentInitialDelay, currentDelay, getTimeUnit().name().toLowerCase(Locale.ENGLISH),
+ consumer.getEndpoint());
}
for (int i = 0; i < concurrentTasks; i++) {
futures.add(scheduledExecutorService.scheduleAtFixedRate(task, currentInitialDelay, currentDelay,
diff --git a/docs/components/modules/ROOT/pages/arangodb-component.adoc b/docs/components/modules/ROOT/pages/arangodb-component.adoc
index 510a5ee..b4b570d 100644
--- a/docs/components/modules/ROOT/pages/arangodb-component.adoc
+++ b/docs/components/modules/ROOT/pages/arangodb-component.adoc
@@ -4,8 +4,8 @@
:page-source: components/camel-arangodb/src/main/docs/arangodb-component.adoc
:docTitle: ArangoDb
:artifactId: camel-arangodb
-:description: Perform operations on ArangoDb documents, collections and graphs.
-:since: 3.5.0-SNAPSHOT
+:description: Perform operations on ArangoDb when used as a Document Database, or as a Graph Database
+:since: 3.5
:supportLevel: Preview
:component-header: Only producer is supported
@@ -40,22 +40,25 @@ arangodb:database[?options]
// component options: START
-The ArangoDb component supports 9 options, which are listed below.
+The ArangoDb component supports 12 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *collection* (producer) | collection in the database | | String
| *configuration* (producer) | Component configuration | | ArangoDbConfiguration
-| *host* (producer) | host if host and/or port different from default | | String
+| *documentCollection* (producer) | Collection name, when using ArangoDb as a Document Database. Set the documentCollection name when using the CRUD operation on the document database collections (SAVE_DOCUMENT , FIND_DOCUMENT_BY_KEY, UPDATE_DOCUMENT, DELETE_DOCUMENT). | | String
+| *edgeCollection* (producer) | Collection name of vertices, when using ArangoDb as a Graph Database. Set the edgeCollection name to perform CRUD operation on edges using these operations : SAVE_VERTEX, FIND_VERTEX_BY_KEY, UPDATE_VERTEX, DELETE_VERTEX. The graph attribute is mandatory. | | String
+| *graph* (producer) | Graph name, when using ArangoDb as a Graph Database. Combine this attribute with one of the two attributes vertexCollection and edgeCollection. | | String
+| *host* (producer) | ArangoDB host. If host and port are default, this field is Optional. | | String
| *lazyStartProducer* (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 then creating and [...]
-| *operation* (producer) | operation to perform. The value can be one of: SAVE_DOCUMENT, FIND_DOCUMENT_BY_KEY, UPDATE_DOCUMENT, DELETE_DOCUMENT, AQL_QUERY | | ArangoDbOperation
-| *port* (producer) | port if host and/or port different from default | | int
+| *operation* (producer) | Operations to perform on ArangoDb. For the operation AQL_QUERY, no need to specify a collection or graph. The value can be one of: SAVE_DOCUMENT, FIND_DOCUMENT_BY_KEY, UPDATE_DOCUMENT, DELETE_DOCUMENT, AQL_QUERY, SAVE_VERTEX, FIND_VERTEX_BY_KEY, UPDATE_VERTEX, DELETE_VERTEX, SAVE_EDGE, FIND_EDGE_BY_KEY, UPDATE_EDGE, DELETE_EDGE | | ArangoDbOperation
+| *port* (producer) | ArangoDB exposed port. If host and port are default, this field is Optional. | | int
+| *vertexCollection* (producer) | Collection name of vertices, when using ArangoDb as a Graph Database. Set the vertexCollection name to perform CRUD operation on vertices using these operations : SAVE_EDGE, FIND_EDGE_BY_KEY, UPDATE_EDGE, DELETE_EDGE. The graph attribute is mandatory. | | String
| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
-| *password* (security) | password if user and/or password different from default | | String
-| *user* (security) | user if user and/or password different from default | | String
+| *password* (security) | ArangoDB password. If user and password are default, this field is Optional. | | String
+| *user* (security) | ArangoDB user. If user and password are default, this field is Optional. | | String
|===
// component options: END
@@ -78,21 +81,24 @@ with the following path and query parameters:
|===
-=== Query Parameters (9 parameters):
+=== Query Parameters (12 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *collection* (producer) | collection in the database | | String
-| *host* (producer) | host if host and/or port different from default | | String
+| *documentCollection* (producer) | Collection name, when using ArangoDb as a Document Database. Set the documentCollection name when using the CRUD operation on the document database collections (SAVE_DOCUMENT , FIND_DOCUMENT_BY_KEY, UPDATE_DOCUMENT, DELETE_DOCUMENT). | | String
+| *edgeCollection* (producer) | Collection name of vertices, when using ArangoDb as a Graph Database. Set the edgeCollection name to perform CRUD operation on edges using these operations : SAVE_VERTEX, FIND_VERTEX_BY_KEY, UPDATE_VERTEX, DELETE_VERTEX. The graph attribute is mandatory. | | String
+| *graph* (producer) | Graph name, when using ArangoDb as a Graph Database. Combine this attribute with one of the two attributes vertexCollection and edgeCollection. | | String
+| *host* (producer) | ArangoDB host. If host and port are default, this field is Optional. | | String
| *lazyStartProducer* (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 then creating and [...]
-| *operation* (producer) | operation to perform. The value can be one of: SAVE_DOCUMENT, FIND_DOCUMENT_BY_KEY, UPDATE_DOCUMENT, DELETE_DOCUMENT, AQL_QUERY | | ArangoDbOperation
-| *port* (producer) | port if host and/or port different from default | | int
+| *operation* (producer) | Operations to perform on ArangoDb. For the operation AQL_QUERY, no need to specify a collection or graph. The value can be one of: SAVE_DOCUMENT, FIND_DOCUMENT_BY_KEY, UPDATE_DOCUMENT, DELETE_DOCUMENT, AQL_QUERY, SAVE_VERTEX, FIND_VERTEX_BY_KEY, UPDATE_VERTEX, DELETE_VERTEX, SAVE_EDGE, FIND_EDGE_BY_KEY, UPDATE_EDGE, DELETE_EDGE | | ArangoDbOperation
+| *port* (producer) | ArangoDB exposed port. If host and port are default, this field is Optional. | | int
+| *vertexCollection* (producer) | Collection name of vertices, when using ArangoDb as a Graph Database. Set the vertexCollection name to perform CRUD operation on vertices using these operations : SAVE_EDGE, FIND_EDGE_BY_KEY, UPDATE_EDGE, DELETE_EDGE. The graph attribute is mandatory. | | String
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
-| *password* (security) | password if user and/or password different from default | | String
-| *user* (security) | user if user and/or password different from default | | String
+| *password* (security) | ArangoDB password. If user and password are default, this field is Optional. | | String
+| *user* (security) | ArangoDB user. If user and password are default, this field is Optional. | | String
|===
// endpoint options: END
[camel] 01/02: Upgrade AWS SDK v2 to version 2.14.3
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3bcb33b5fb11bc1c27954c3aa192e22155c2ecd1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 21 18:40:01 2020 +0200
Upgrade AWS SDK v2 to version 2.14.3
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 9f2cd09..a08fd33 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -78,7 +78,7 @@
<avro-ipc-netty-version>1.9.1</avro-ipc-netty-version>
<awaitility-version>4.0.3</awaitility-version>
<aws-java-sdk-version>1.11.714</aws-java-sdk-version>
- <aws-java-sdk2-version>2.14.2</aws-java-sdk2-version>
+ <aws-java-sdk2-version>2.14.3</aws-java-sdk2-version>
<aws-java-sdk-swf-libs>1.11.22</aws-java-sdk-swf-libs>
<aws-xray-version>2.6.1</aws-xray-version>
<axiom-version>1.2.14</axiom-version>