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-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new 05b805a [create-pull-request] automated change
05b805a is described below
commit 05b805a97833bed1cd19be453f0033ca2181527d
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Aug 20 01:09:13 2020 +0000
[create-pull-request] automated change
---
.../springboot/catalog/components/olingo2.json | 4 +++
.../src/main/docs/olingo2-starter.adoc | 4 ++-
.../springboot/Olingo2ComponentConfiguration.java | 35 ++++++++++++++++++++++
docs/modules/ROOT/pages/olingo2-starter.adoc | 4 ++-
tooling/camel-spring-boot-dependencies/pom.xml | 2 +-
5 files changed, 46 insertions(+), 3 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/olingo2.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/olingo2.json
index d6f595c..5938bf4 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/olingo2.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/olingo2.json
@@ -24,6 +24,8 @@
"configuration": { "kind": "property", "displayName": "Configuration",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.olingo2.Olingo2Configuration",
"deprecated": false, "secret": false, "description": "To use the shared
configuration" },
"connectTimeout": { "kind": "property", "displayName": "Connect Timeout",
"group": "common", "label": "", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "secret": false, "defaultValue":
"30000", "configurationClass":
"org.apache.camel.component.olingo2.Olingo2Configuration",
"configurationField": "configuration", "description": "HTTP connection creation
timeout in milliseconds, defaults to 30,000 (30 seconds)" },
"contentType": { "kind": "property", "displayName": "Content Type",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"defaultValue": "application\/json;charset=utf-8", "configurationClass":
"org.apache.camel.component.olingo2.Olingo2Configuration",
"configurationField": "configuration", "description": "Content-Type header
value can be used to specify JSON or XML message format, defaults to appli [...]
+ "entityProviderReadProperties": { "kind": "property", "displayName":
"Entity Provider Read Properties", "group": "common", "label": "", "required":
false, "type": "object", "javaType":
"org.apache.olingo.odata2.api.ep.EntityProviderReadProperties", "deprecated":
false, "secret": false, "configurationClass":
"org.apache.camel.component.olingo2.Olingo2Configuration",
"configurationField": "configuration", "description": "Custom entity provider
read properties applied to all read operat [...]
+ "entityProviderWriteProperties": { "kind": "property", "displayName":
"Entity Provider Write Properties", "group": "common", "label": "", "required":
false, "type": "object", "javaType":
"org.apache.olingo.odata2.api.ep.EntityProviderWriteProperties", "deprecated":
false, "secret": false, "configurationClass":
"org.apache.camel.component.olingo2.Olingo2Configuration",
"configurationField": "configuration", "description": "Custom entity provider
write properties applied to create, upd [...]
"filterAlreadySeen": { "kind": "property", "displayName": "Filter Already
Seen", "group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
false, "configurationClass":
"org.apache.camel.component.olingo2.Olingo2Configuration",
"configurationField": "configuration", "description": "Set this to true to
filter out results that have already been communicated by this component." },
"httpHeaders": { "kind": "property", "displayName": "Http Headers",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "java.util.Map<java.lang.String, java.lang.String>", "deprecated":
false, "secret": false, "configurationClass":
"org.apache.camel.component.olingo2.Olingo2Configuration",
"configurationField": "configuration", "description": "Custom HTTP headers to
inject into every request, this could include OAuth tokens, etc." },
"proxy": { "kind": "property", "displayName": "Proxy", "group": "common",
"label": "", "required": false, "type": "object", "javaType":
"org.apache.http.HttpHost", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.olingo2.Olingo2Configuration",
"configurationField": "configuration", "description": "HTTP proxy server
configuration" },
@@ -43,6 +45,8 @@
"methodName": { "kind": "path", "displayName": "Method Name", "group":
"common", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "configurationClass":
"org.apache.camel.component.olingo2.Olingo2Configuration",
"configurationField": "configuration", "description": "What sub operation to
use for the selected operation" },
"connectTimeout": { "kind": "parameter", "displayName": "Connect Timeout",
"group": "common", "label": "", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "secret": false, "defaultValue":
"30000", "configurationClass":
"org.apache.camel.component.olingo2.Olingo2Configuration",
"configurationField": "configuration", "description": "HTTP connection creation
timeout in milliseconds, defaults to 30,000 (30 seconds)" },
"contentType": { "kind": "parameter", "displayName": "Content Type",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"defaultValue": "application\/json;charset=utf-8", "configurationClass":
"org.apache.camel.component.olingo2.Olingo2Configuration",
"configurationField": "configuration", "description": "Content-Type header
value can be used to specify JSON or XML message format, defaults to appl [...]
+ "entityProviderReadProperties": { "kind": "parameter", "displayName":
"Entity Provider Read Properties", "group": "common", "label": "", "required":
false, "type": "object", "javaType":
"org.apache.olingo.odata2.api.ep.EntityProviderReadProperties", "deprecated":
false, "secret": false, "configurationClass":
"org.apache.camel.component.olingo2.Olingo2Configuration",
"configurationField": "configuration", "description": "Custom entity provider
read properties applied to all read opera [...]
+ "entityProviderWriteProperties": { "kind": "parameter", "displayName":
"Entity Provider Write Properties", "group": "common", "label": "", "required":
false, "type": "object", "javaType":
"org.apache.olingo.odata2.api.ep.EntityProviderWriteProperties", "deprecated":
false, "secret": false, "configurationClass":
"org.apache.camel.component.olingo2.Olingo2Configuration",
"configurationField": "configuration", "description": "Custom entity provider
write properties applied to create, up [...]
"filterAlreadySeen": { "kind": "parameter", "displayName": "Filter Already
Seen", "group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
false, "configurationClass":
"org.apache.camel.component.olingo2.Olingo2Configuration",
"configurationField": "configuration", "description": "Set this to true to
filter out results that have already been communicated by this component." },
"httpHeaders": { "kind": "parameter", "displayName": "Http Headers",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "java.util.Map<java.lang.String, java.lang.String>", "deprecated":
false, "secret": false, "configurationClass":
"org.apache.camel.component.olingo2.Olingo2Configuration",
"configurationField": "configuration", "description": "Custom HTTP headers to
inject into every request, this could include OAuth tokens, etc." },
"inBody": { "kind": "parameter", "displayName": "In Body", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "description": "Sets
the name of a parameter to be passed in the exchange In Body" },
diff --git
a/components-starter/camel-olingo2-starter/src/main/docs/olingo2-starter.adoc
b/components-starter/camel-olingo2-starter/src/main/docs/olingo2-starter.adoc
index d106117..595c74f 100644
---
a/components-starter/camel-olingo2-starter/src/main/docs/olingo2-starter.adoc
+++
b/components-starter/camel-olingo2-starter/src/main/docs/olingo2-starter.adoc
@@ -17,7 +17,7 @@ When using olingo2 with Spring Boot make sure to use the
following Maven depende
----
-The component supports 17 options, which are listed below.
+The component supports 19 options, which are listed below.
@@ -30,6 +30,8 @@ The component supports 17 options, which are listed below.
| *camel.component.olingo2.connect-timeout* | HTTP connection creation timeout
in milliseconds, defaults to 30,000 (30 seconds) | 30000 | Integer
| *camel.component.olingo2.content-type* | Content-Type header value can be
used to specify JSON or XML message format, defaults to
application/json;charset=utf-8 | application/json;charset=utf-8 | String
| *camel.component.olingo2.enabled* | Whether to enable auto configuration of
the olingo2 component. This is enabled by default. | | Boolean
+| *camel.component.olingo2.entity-provider-read-properties* | Custom entity
provider read properties applied to all read operations. The option is a
org.apache.olingo.odata2.api.ep.EntityProviderReadProperties type. | | String
+| *camel.component.olingo2.entity-provider-write-properties* | Custom entity
provider write properties applied to create, update, patch, batch and merge
operations. For instance users can skip the Json object wrapper or enable
content only mode when sending request data. A service URI set in the
properties will always be overwritten by the serviceUri configuration
parameter. Please consider to using the serviceUri configuration parameter
instead of setting the respective write property h [...]
| *camel.component.olingo2.filter-already-seen* | Set this to true to filter
out results that have already been communicated by this component. | false |
Boolean
| *camel.component.olingo2.http-async-client-builder* | Custom HTTP async
client builder for more complex HTTP client configuration, overrides
connectionTimeout, socketTimeout, proxy and sslContext. Note that a
socketTimeout MUST be specified in the builder, otherwise OData requests could
block indefinitely. The option is a
org.apache.http.impl.nio.client.HttpAsyncClientBuilder type. | | String
| *camel.component.olingo2.http-client-builder* | Custom HTTP client builder
for more complex HTTP client configuration, overrides connectionTimeout,
socketTimeout, proxy and sslContext. Note that a socketTimeout MUST be
specified in the builder, otherwise OData requests could block indefinitely.
The option is a org.apache.http.impl.client.HttpClientBuilder type. | | String
diff --git
a/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConfiguration.java
b/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConfiguration.java
index c6c8bca..4408be0 100644
---
a/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConfiguration.java
+++
b/components-starter/camel-olingo2-starter/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentConfiguration.java
@@ -53,6 +53,23 @@ public class Olingo2ComponentConfiguration
*/
private String contentType = "application/json;charset=utf-8";
/**
+ * Custom entity provider read properties applied to all read operations.
+ * The option is a
+ * org.apache.olingo.odata2.api.ep.EntityProviderReadProperties type.
+ */
+ private String entityProviderReadProperties;
+ /**
+ * Custom entity provider write properties applied to create, update,
patch,
+ * batch and merge operations. For instance users can skip the Json object
+ * wrapper or enable content only mode when sending request data. A service
+ * URI set in the properties will always be overwritten by the serviceUri
+ * configuration parameter. Please consider to using the serviceUri
+ * configuration parameter instead of setting the respective write property
+ * here. The option is a
+ * org.apache.olingo.odata2.api.ep.EntityProviderWriteProperties type.
+ */
+ private String entityProviderWriteProperties;
+ /**
* Set this to true to filter out results that have already been
* communicated by this component.
*/
@@ -157,6 +174,24 @@ public class Olingo2ComponentConfiguration
this.contentType = contentType;
}
+ public String getEntityProviderReadProperties() {
+ return entityProviderReadProperties;
+ }
+
+ public void setEntityProviderReadProperties(
+ String entityProviderReadProperties) {
+ this.entityProviderReadProperties = entityProviderReadProperties;
+ }
+
+ public String getEntityProviderWriteProperties() {
+ return entityProviderWriteProperties;
+ }
+
+ public void setEntityProviderWriteProperties(
+ String entityProviderWriteProperties) {
+ this.entityProviderWriteProperties = entityProviderWriteProperties;
+ }
+
public Boolean getFilterAlreadySeen() {
return filterAlreadySeen;
}
diff --git a/docs/modules/ROOT/pages/olingo2-starter.adoc
b/docs/modules/ROOT/pages/olingo2-starter.adoc
index d106117..595c74f 100644
--- a/docs/modules/ROOT/pages/olingo2-starter.adoc
+++ b/docs/modules/ROOT/pages/olingo2-starter.adoc
@@ -17,7 +17,7 @@ When using olingo2 with Spring Boot make sure to use the
following Maven depende
----
-The component supports 17 options, which are listed below.
+The component supports 19 options, which are listed below.
@@ -30,6 +30,8 @@ The component supports 17 options, which are listed below.
| *camel.component.olingo2.connect-timeout* | HTTP connection creation timeout
in milliseconds, defaults to 30,000 (30 seconds) | 30000 | Integer
| *camel.component.olingo2.content-type* | Content-Type header value can be
used to specify JSON or XML message format, defaults to
application/json;charset=utf-8 | application/json;charset=utf-8 | String
| *camel.component.olingo2.enabled* | Whether to enable auto configuration of
the olingo2 component. This is enabled by default. | | Boolean
+| *camel.component.olingo2.entity-provider-read-properties* | Custom entity
provider read properties applied to all read operations. The option is a
org.apache.olingo.odata2.api.ep.EntityProviderReadProperties type. | | String
+| *camel.component.olingo2.entity-provider-write-properties* | Custom entity
provider write properties applied to create, update, patch, batch and merge
operations. For instance users can skip the Json object wrapper or enable
content only mode when sending request data. A service URI set in the
properties will always be overwritten by the serviceUri configuration
parameter. Please consider to using the serviceUri configuration parameter
instead of setting the respective write property h [...]
| *camel.component.olingo2.filter-already-seen* | Set this to true to filter
out results that have already been communicated by this component. | false |
Boolean
| *camel.component.olingo2.http-async-client-builder* | Custom HTTP async
client builder for more complex HTTP client configuration, overrides
connectionTimeout, socketTimeout, proxy and sslContext. Note that a
socketTimeout MUST be specified in the builder, otherwise OData requests could
block indefinitely. The option is a
org.apache.http.impl.nio.client.HttpAsyncClientBuilder type. | | String
| *camel.component.olingo2.http-client-builder* | Custom HTTP client builder
for more complex HTTP client configuration, overrides connectionTimeout,
socketTimeout, proxy and sslContext. Note that a socketTimeout MUST be
specified in the builder, otherwise OData requests could block indefinitely.
The option is a org.apache.http.impl.client.HttpClientBuilder type. | | String
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index dc152d7..da20f43 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -83,7 +83,7 @@
<dependency>
<groupId>com.dropbox.core</groupId>
<artifactId>dropbox-core-sdk</artifactId>
- <version>3.1.4</version>
+ <version>3.1.5</version>
</dependency>
<dependency>
<groupId>com.github.dozermapper</groupId>
