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 2016/07/28 07:18:16 UTC
[1/2] camel git commit: CAMEL-10192: Fix option jobFromHeader data
type that was causing exception to be thrown if used
Repository: camel
Updated Branches:
refs/heads/master 1aad6ecad -> 4413f6caf
CAMEL-10192: Fix option jobFromHeader data type that was causing exception to be thrown if used
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bdd5f941
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bdd5f941
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bdd5f941
Branch: refs/heads/master
Commit: bdd5f941f24baee7a35d2140c1d7c97bd5b2019f
Parents: 1aad6ec
Author: asegarra <an...@outlook.com>
Authored: Wed Jul 27 17:07:31 2016 -0400
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 28 09:13:21 2016 +0200
----------------------------------------------------------------------
.../camel/component/spring/batch/SpringBatchEndpoint.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bdd5f941/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
index 0bd7dbb..6b9821b 100644
--- a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
+++ b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
@@ -43,7 +43,7 @@ public class SpringBatchEndpoint extends DefaultEndpoint {
private String jobName;
@UriParam
- private Boolean jobFromHeader;
+ private boolean jobFromHeader;
/**
* @deprecated will be removed in Camel 3.0
@@ -89,7 +89,7 @@ public class SpringBatchEndpoint extends DefaultEndpoint {
if (jobLauncher == null) {
jobLauncher = resolveJobLauncher();
}
- if (job == null && jobName != null && jobFromHeader == null) {
+ if (job == null && jobName != null && jobFromHeader == false) {
job = CamelContextHelper.mandatoryLookup(getCamelContext(), jobName, Job.class);
}
}
@@ -154,11 +154,11 @@ public class SpringBatchEndpoint extends DefaultEndpoint {
/**
* Explicitly defines if the jobName shouls be taken from the headers instead of the URI.
*/
- public void setJobFromHeader(Boolean jobFromHeader) {
+ public void setJobFromHeader(boolean jobFromHeader) {
this.jobFromHeader = jobFromHeader;
}
- public Boolean getJobFromHeader() {
+ public boolean getJobFromHeader() {
return jobFromHeader;
}
[2/2] camel git commit: Fixed CS. This closes #1089
Posted by da...@apache.org.
Fixed CS. This closes #1089
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4413f6ca
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4413f6ca
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4413f6ca
Branch: refs/heads/master
Commit: 4413f6cafe0ebb6c701442386d2606e868e11a10
Parents: bdd5f94
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jul 28 09:16:03 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 28 09:16:03 2016 +0200
----------------------------------------------------------------------
components/camel-spring-batch/src/main/docs/spring-batch.adoc | 4 +++-
.../apache/camel/component/spring/batch/SpringBatchEndpoint.java | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4413f6ca/components/camel-spring-batch/src/main/docs/spring-batch.adoc
----------------------------------------------------------------------
diff --git a/components/camel-spring-batch/src/main/docs/spring-batch.adoc b/components/camel-spring-batch/src/main/docs/spring-batch.adoc
index 5c9182a..bf82d27 100644
--- a/components/camel-spring-batch/src/main/docs/spring-batch.adoc
+++ b/components/camel-spring-batch/src/main/docs/spring-batch.adoc
@@ -56,6 +56,7 @@ The Spring Batch component supports 1 options which are listed below.
+
// endpoint options: START
The Spring Batch component supports 5 endpoint options which are listed below:
@@ -64,7 +65,7 @@ The Spring Batch component supports 5 endpoint options which are listed below:
|=======================================================================
| Name | Group | Default | Java Type | Description
| jobName | producer | | String | *Required* The name of the Spring Batch job located in the registry.
-| jobFromHeader | producer | | Boolean | Explicitly defines if the jobName shouls be taken from the headers instead of the URI.
+| jobFromHeader | producer | false | boolean | Explicitly defines if the jobName shouls be taken from the headers instead of the URI.
| jobLauncher | producer | | JobLauncher | Explicitly specifies a JobLauncher to be used.
| exchangePattern | advanced | InOnly | ExchangePattern | Sets the default exchange pattern when creating an exchange
| synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported).
@@ -73,6 +74,7 @@ The Spring Batch component supports 5 endpoint options which are listed below:
// endpoint options: END
+
[[SpringBatch-Usage]]
Usage
^^^^^
http://git-wip-us.apache.org/repos/asf/camel/blob/4413f6ca/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
index 6b9821b..9581ff9 100644
--- a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
+++ b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchEndpoint.java
@@ -89,7 +89,7 @@ public class SpringBatchEndpoint extends DefaultEndpoint {
if (jobLauncher == null) {
jobLauncher = resolveJobLauncher();
}
- if (job == null && jobName != null && jobFromHeader == false) {
+ if (job == null && jobName != null && !jobFromHeader) {
job = CamelContextHelper.mandatoryLookup(getCamelContext(), jobName, Job.class);
}
}