You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/01/13 17:12:13 UTC

[2/2] camel git commit: CAMEL-10459: Add batch to docs. This closes #1399

CAMEL-10459: Add batch to docs. This closes #1399


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bc234678
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bc234678
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bc234678

Branch: refs/heads/master
Commit: bc234678dda300ba1336e5c946e3a279e37fc101
Parents: d96e0d3
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Jan 13 18:11:46 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jan 13 18:11:46 2017 +0100

----------------------------------------------------------------------
 components/camel-elsql/src/main/docs/elsql-component.adoc       | 5 +++--
 .../java/org/apache/camel/component/elsql/ElsqlEndpoint.java    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/bc234678/components/camel-elsql/src/main/docs/elsql-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-elsql/src/main/docs/elsql-component.adoc b/components/camel-elsql/src/main/docs/elsql-component.adoc
index 8759208..a4815a4 100644
--- a/components/camel-elsql/src/main/docs/elsql-component.adoc
+++ b/components/camel-elsql/src/main/docs/elsql-component.adoc
@@ -66,7 +66,7 @@ The ElSQL component supports 4 options which are listed below.
 // component options: END
 
 // endpoint options: START
-The ElSQL component supports 48 endpoint options which are listed below:
+The ElSQL component supports 49 endpoint options which are listed below:
 
 {% raw %}
 [width="100%",cols="2,1,1m,1m,5",options="header"]
@@ -97,6 +97,7 @@ The ElSQL component supports 48 endpoint options which are listed below:
 | exchangePattern | consumer (advanced) |  | ExchangePattern | Sets the exchange pattern when the consumer creates an exchange.
 | pollStrategy | consumer (advanced) |  | PollingConsumerPollStrategy | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel.
 | processingStrategy | consumer (advanced) |  | SqlProcessingStrategy | Allows to plugin to use a custom org.apache.camel.component.sql.SqlProcessingStrategy to execute queries when the consumer has processed the rows/batch.
+| batch | producer | false | boolean | Enables or disables batch mode
 | noop | producer | false | boolean | If set will ignore the results of the SQL query and use the existing IN message as the OUT message for the continuation of processing
 | useMessageBodyForSql | producer | false | boolean | Whether to use the message body as the SQL and then headers for parameters. If this option is enabled then the SQL in the uri is not used.
 | alwaysPopulateStatement | producer (advanced) | false | boolean | If enabled then the populateStatement method from org.apache.camel.component.sql.SqlPrepareStatementStrategy is always invoked also if there is no expected parameters to be prepared. When this is false then the populateStatement is only invoked if there is 1 or more expected parameters to be set; for example this avoids reading the message body/headers for SQL queries with no parameters.
@@ -215,4 +216,4 @@ assumes to have�`getLicense` and�`getMinimum` methods:
 
 * link:sql-component.html[SQL Component]
 * link:mybatis.html[MyBatis]
-* link:jdbc.html[JDBC]
\ No newline at end of file
+* link:jdbc.html[JDBC]

http://git-wip-us.apache.org/repos/asf/camel/blob/bc234678/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java
index f395f40..fede90c 100644
--- a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java
+++ b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/ElsqlEndpoint.java
@@ -48,7 +48,7 @@ import org.springframework.jdbc.core.namedparam.SqlParameterSource;
  * The elsql component is an extension to the existing SQL Component that uses ElSql to define the SQL queries.
  */
 @UriEndpoint(scheme = "elsql", title = "ElSQL", syntax = "elsql:elsqlName:resourceUri", consumerClass = ElsqlConsumer.class,
-        label = "database,sql", excludeProperties = "batch") // batch is not supported
+        label = "database,sql")
 public class ElsqlEndpoint extends DefaultSqlEndpoint {
 
     private static final Logger LOG = LoggerFactory.getLogger(ElsqlEndpoint.class);