[1/4] camel git commit: camel-mybatis: add outputHeader parameter (CAMEL-8192)
Repository: camel
Updated Branches:
refs/heads/master 7e7c659f0 - 9bd940d83
camel-mybatis: add outputHeader parameter (CAMEL-8192)
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0edbf038
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0edbf038
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0edbf038
Branch: refs/heads/master
Commit: 0edbf038f37e1f7a5a0ae2a926b4ae153ef790a0
Parents: 2c4c06c
Author: Askannon askan...@flexarc.com
Authored: Wed Dec 31 14:19:01 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Jan 2 08:30:44 2015 +0100
--
.../java/org/apache/camel/component/mybatis/MyBatisEndpoint.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/0edbf038/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
--
diff --git
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
index 93a2c12..c857226 100644
---
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
+++
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
@@ -149,7 +149,9 @@ public class MyBatisEndpoint extends DefaultPollingEndpoint
{
* By default, outputHeader == null and the query result is stored in the
message body,
* any existing content in the message body is discarded.
* If outputHeader is set, the value is used as the name of the header to
store the
- * query result and the original message body is preserved.
+ * query result and the original message body is preserved. Setting
outputHeader will
+ * also omit populating the default CamelMyBatisResult header since it
would be the same
+ * as outputHeader all the time.
*/
public void setOutputHeader(String outputHeader) {
this.outputHeader = outputHeader;
[2/4] camel git commit: camel-mybatis: add outputHeader parameter (CAMEL-8192)
camel-mybatis: add outputHeader parameter (CAMEL-8192)
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2c4c06c1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2c4c06c1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2c4c06c1
Branch: refs/heads/master
Commit: 2c4c06c1e3712e2cd4a4b7e10c0b649db5a94886
Parents: c88effa
Author: Askannon askan...@flexarc.com
Authored: Wed Dec 31 13:55:38 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Jan 2 08:30:44 2015 +0100
--
.../component/mybatis/MyBatisProducer.java | 10 +++-
.../MyBatisInsertWithOutputHeaderTest.java | 63
2 files changed, 70 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/2c4c06c1/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
--
diff --git
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
index f37c6d3..602ae09 100644
---
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
+++
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
@@ -226,7 +226,8 @@ public class MyBatisProducer extends DefaultProducer {
}
private void doProcessResult(Exchange exchange, Object result, SqlSession
session) {
-if (endpoint.getStatementType() == StatementType.SelectList ||
endpoint.getStatementType() == StatementType.SelectOne) {
+final String outputHeader = getEndpoint().getOutputHeader();
+ if (endpoint.getStatementType() == StatementType.SelectList ||
endpoint.getStatementType() == StatementType.SelectOne) {
Message answer = exchange.getIn();
if (ExchangeHelper.isOutCapable(exchange)) {
answer = exchange.getOut();
@@ -236,7 +237,6 @@ public class MyBatisProducer extends DefaultProducer {
// we should not set the body if its a stored procedure as the
result is already in its OUT parameter
MappedStatement ms =
session.getConfiguration().getMappedStatement(statement);
-final String outputHeader = getEndpoint().getOutputHeader();
if (ms != null ms.getStatementType() ==
org.apache.ibatis.mapping.StatementType.CALLABLE) {
if (result == null) {
LOG.trace(Setting result as existing body as MyBatis
statement type is Callable, and there was no result.);
@@ -268,7 +268,11 @@ public class MyBatisProducer extends DefaultProducer {
answer.setHeader(MyBatisConstants.MYBATIS_STATEMENT_NAME,
statement);
} else {
Message msg = exchange.getIn();
-msg.setHeader(MyBatisConstants.MYBATIS_RESULT, result);
+if(outputHeader != null) {
+ msg.setHeader(outputHeader, result);
+} else {
+msg.setHeader(MyBatisConstants.MYBATIS_RESULT, result);
+}
msg.setHeader(MyBatisConstants.MYBATIS_STATEMENT_NAME, statement);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/2c4c06c1/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithOutputHeaderTest.java
--
diff --git
a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithOutputHeaderTest.java
b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithOutputHeaderTest.java
new file mode 100644
index 000..8feeded
--- /dev/null
+++
b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithOutputHeaderTest.java
@@ -0,0 +1,63 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mybatis;
camel git commit: fixed CS error
Repository: camel
Updated Branches:
refs/heads/master 85778bc43 - 1d5ba0570
fixed CS error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1d5ba057
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1d5ba057
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1d5ba057
Branch: refs/heads/master
Commit: 1d5ba05703f97eec7aa6894454b14ddce4278710
Parents: 85778bc
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Jan 2 08:00:34 2015 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Jan 2 08:01:16 2015 +0100
--
.../camel/component/jira/mocks/MockSearchRestClient.java | 8
.../apache/camel/component/jira/mocks/MockSearchResult.java | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/1d5ba057/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchRestClient.java
--
diff --git
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchRestClient.java
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchRestClient.java
index 8eb5463..44d38cb 100644
---
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchRestClient.java
+++
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchRestClient.java
@@ -33,11 +33,11 @@ import org.joda.time.DateTime;
public class MockSearchRestClient implements SearchRestClient {
+
private static final String KEY_BASE = CAMELJIRA-;
-private final ListBasicIssue issues = new ArrayList();
-private final MapLong, ListComment comments = new HashMap();
+private final ListBasicIssue issues = new ArrayListBasicIssue();
+private final MapLong, ListComment comments = new HashMapLong,
ListComment();
private AtomicLong basicIssueId = new AtomicLong(0);
-
@Override
public SearchResult searchJql(String s, ProgressMonitor progressMonitor) {
@@ -51,7 +51,7 @@ public class MockSearchRestClient implements SearchRestClient
{
@Override
public SearchResult searchJqlWithFullIssues(String jql, int maxPerQuery,
int start, ProgressMonitor progressMonitor) {
-ListBasicIssue result = new ArrayList();
+ListBasicIssue result = new ArrayListBasicIssue();
for (BasicIssue issue : issues) {
if (issue.getId() = start) {
result.add(issue);
http://git-wip-us.apache.org/repos/asf/camel/blob/1d5ba057/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchResult.java
--
diff --git
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchResult.java
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchResult.java
index f8ef7ee..1945465 100644
---
a/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchResult.java
+++
b/components/camel-jira/src/test/java/org/apache/camel/component/jira/mocks/MockSearchResult.java
@@ -43,7 +43,7 @@ public class MockSearchResult extends SearchResult {
@Override
public Iterable? extends BasicIssue getIssues() {
Collections.sort(issues, basicIssueComparator);
-ArrayList? extends BasicIssue copy = new ArrayList(issues);
+ArrayList? extends BasicIssue copy = new
ArrayListBasicIssue(issues);
if (!issues.isEmpty()) {
issues.remove(0);
}
camel git commit: CAMEL-8185: Changed parameter of scr reference event methods from service interface to service reference to handle multiple service versions
Repository: camel
Updated Branches:
refs/heads/master 1d5ba0570 - 7e7c659f0
CAMEL-8185: Changed parameter of scr reference event methods from service
interface to service reference to handle multiple service versions
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7e7c659f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7e7c659f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7e7c659f
Branch: refs/heads/master
Commit: 7e7c659f006b1e6c364ef46b437e24788da3af48
Parents: 1d5ba05
Author: Andrew Block andy.bl...@gmail.com
Authored: Thu Jan 1 20:29:59 2015 -0600
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Jan 2 08:28:54 2015 +0100
--
.../main/java/org/apache/camel/scr/AbstractCamelRunner.java| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/7e7c659f/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
--
diff --git
a/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
b/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
index 2e60d59..e341952 100644
---
a/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
+++
b/components/camel-scr/src/main/java/org/apache/camel/scr/AbstractCamelRunner.java
@@ -42,9 +42,9 @@ import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.ExplicitCamelContextNameStrategy;
import org.apache.camel.impl.SimpleRegistry;
import org.apache.camel.model.ModelCamelContext;
-import org.apache.camel.spi.ComponentResolver;
import org.apache.camel.util.ReflectionHelper;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -221,12 +221,12 @@ public abstract class AbstractCamelRunner implements
Runnable {
return context;
}
-protected void gotCamelComponent(final ComponentResolver
componentResolver) {
+protected void gotCamelComponent(final ServiceReference serviceReference) {
log.trace(Got a new Camel Component.);
runWithDelay(this);
}
-protected void lostCamelComponent(final ComponentResolver
componentResolver) {
+protected void lostCamelComponent(final ServiceReference serviceReference)
{
log.trace(Lost a Camel Component.);
}
[1/2] camel git commit: Upgrade netty 4
Repository: camel Updated Branches: refs/heads/camel-2.14.x fb4cb5c10 - 0a5a7dc4a refs/heads/master 5dd0a639f - b01ba794b Upgrade netty 4 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b01ba794 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b01ba794 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b01ba794 Branch: refs/heads/master Commit: b01ba794baaf4ea76710f062cf65874f52bef0bd Parents: 5dd0a63 Author: Claus Ibsen davscl...@apache.org Authored: Thu Jan 1 20:27:49 2015 +0100 Committer: Claus Ibsen davscl...@apache.org Committed: Thu Jan 1 20:27:49 2015 +0100 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/b01ba794/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 7785267..15d238c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -344,7 +344,7 @@ mybatis-version3.2.8/mybatis-version neethi-bundle-version3.0.1/neethi-bundle-version netty3-version3.9.6.Final/netty3-version -netty-version4.0.24.Final/netty-version +netty-version4.0.25.Final/netty-version noggit-bundle-version0.5_1/noggit-bundle-version !-- should be in-sync with deltaspike -- openwebbeans-version1.2.0/openwebbeans-version
camel git commit: upgrade Spring 4.1.3.RELEASE to 4.1.4.RELEASE
Repository: camel
Updated Branches:
refs/heads/master b1552656f - 1e2b8f2e0
upgrade Spring 4.1.3.RELEASE to 4.1.4.RELEASE
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1e2b8f2e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1e2b8f2e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1e2b8f2e
Branch: refs/heads/master
Commit: 1e2b8f2e0fb3bb70f892f1be10bcae71ca3aea83
Parents: b155265
Author: Christian Mueller cmuel...@apache.org
Authored: Thu Jan 1 13:22:16 2015 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Thu Jan 1 13:22:16 2015 +0100
--
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/1e2b8f2e/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 39e4faf..7785267 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -431,7 +431,7 @@
spring-version${spring4-version}/spring-version
spring32-version3.2.11.RELEASE/spring32-version
spring40-version4.0.7.RELEASE/spring40-version
-spring4-version4.1.3.RELEASE/spring4-version
+spring4-version4.1.4.RELEASE/spring4-version
spring-osgi-version1.2.1/spring-osgi-version
spring-security-version3.2.5.RELEASE/spring-security-version
spring-ws-version2.1.4.RELEASE/spring-ws-version
camel git commit: [Spring Boot] Refactoring.
Repository: camel
Updated Branches:
refs/heads/master 578625d72 - 85778bc43
[Spring Boot] Refactoring.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/85778bc4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/85778bc4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/85778bc4
Branch: refs/heads/master
Commit: 85778bc435247fd79add5116b6cab5067a6933d3
Parents: 578625d
Author: Henryk Konsek hekon...@gmail.com
Authored: Thu Jan 1 21:01:31 2015 +0100
Committer: Henryk Konsek hekon...@gmail.com
Committed: Thu Jan 1 21:01:31 2015 +0100
--
.../java/org/apache/camel/spring/boot/CamelAutoConfiguration.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/85778bc4/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
--
diff --git
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
index 4f24f7c..3eb5f72 100644
---
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
+++
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
@@ -125,7 +125,7 @@ public class CamelAutoConfiguration {
}
@Bean
-RoutesCollector camelRoutesInjector() {
+RoutesCollector routesCollector() {
return new RoutesCollector();
}
[2/2] camel git commit: Upgrade Netty 4
Upgrade Netty 4 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0a5a7dc4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0a5a7dc4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0a5a7dc4 Branch: refs/heads/camel-2.14.x Commit: 0a5a7dc4adb27951ee87f5b0d620b7159adcd848 Parents: fb4cb5c Author: Claus Ibsen davscl...@apache.org Authored: Thu Jan 1 20:29:24 2015 +0100 Committer: Claus Ibsen davscl...@apache.org Committed: Thu Jan 1 20:29:24 2015 +0100 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/0a5a7dc4/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 711fe6f..aa5892f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -327,7 +327,7 @@ mybatis-version3.2.7/mybatis-version neethi-bundle-version3.0.1/neethi-bundle-version netty3-version3.9.4.Final/netty3-version -netty-version4.0.24.Final/netty-version +netty-version4.0.25.Final/netty-version noggit-bundle-version0.5_1/noggit-bundle-version !-- should be in-sync with deltaspike -- openwebbeans-version1.2.0/openwebbeans-version
[3/4] camel git commit: camel-mybatis: add outputHeader parameter (CAMEL-8192)
camel-mybatis: add outputHeader parameter (CAMEL-8192)
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c88effa9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c88effa9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c88effa9
Branch: refs/heads/master
Commit: c88effa908591f824c989a43e625178744bf12eb
Parents: 7e7c659
Author: Askannon askan...@flexarc.com
Authored: Wed Dec 31 13:33:28 2014 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Jan 2 08:30:44 2015 +0100
--
.../component/mybatis/MyBatisConsumer.java | 7 +++-
.../component/mybatis/MyBatisEndpoint.java | 17
.../component/mybatis/MyBatisProducer.java | 32 +++
.../MyBatisSelectOneWithOutputHeaderTest.java | 42
4 files changed, 90 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/c88effa9/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
--
diff --git
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
index 0b0cd68..225f588 100644
---
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
+++
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
@@ -156,9 +156,14 @@ public class MyBatisConsumer extends
ScheduledBatchPollingConsumer {
private Exchange createExchange(Object data) {
final MyBatisEndpoint endpoint = getEndpoint();
final Exchange exchange =
endpoint.createExchange(ExchangePattern.InOnly);
+final String outputHeader = getEndpoint().getOutputHeader();
Message msg = exchange.getIn();
-msg.setBody(data);
+if(outputHeader != null) {
+ msg.setHeader(outputHeader, data);
+} else {
+ msg.setBody(data);
+}
msg.setHeader(MyBatisConstants.MYBATIS_STATEMENT_NAME,
endpoint.getStatement());
return exchange;
http://git-wip-us.apache.org/repos/asf/camel/blob/c88effa9/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
--
diff --git
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
index 50a6eb1..93a2c12 100644
---
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
+++
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
@@ -44,6 +44,8 @@ public class MyBatisEndpoint extends DefaultPollingEndpoint {
private StatementType statementType;
@UriParam
private int maxMessagesPerPoll;
+@UriParam
+private String outputHeader;
public MyBatisEndpoint() {
}
@@ -138,4 +140,19 @@ public class MyBatisEndpoint extends
DefaultPollingEndpoint {
this.maxMessagesPerPoll = maxMessagesPerPoll;
}
+ public String getOutputHeader() {
+ return outputHeader;
+ }
+
+/**
+ * Store the query result in a header instead of the message body.
+ * By default, outputHeader == null and the query result is stored in the
message body,
+ * any existing content in the message body is discarded.
+ * If outputHeader is set, the value is used as the name of the header to
store the
+ * query result and the original message body is preserved.
+ */
+ public void setOutputHeader(String outputHeader) {
+ this.outputHeader = outputHeader;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c88effa9/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
--
diff --git
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
index 6465636..f37c6d3 100644
---
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
+++
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
@@ -236,22 +236,35 @@ public class MyBatisProducer extends DefaultProducer {
// we should not set the body if its a stored procedure as the
result is already in its OUT parameter
MappedStatement ms =
[4/4] camel git commit: CAMEL-8192: Fixed CS
CAMEL-8192: Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9bd940d8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9bd940d8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9bd940d8
Branch: refs/heads/master
Commit: 9bd940d83d92fb7e0f03cc017e00cbca85222aec
Parents: 0edbf03
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Jan 2 08:36:01 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Jan 2 08:36:01 2015 +0100
--
.../component/mybatis/MyBatisConsumer.java | 8 ++--
.../component/mybatis/MyBatisEndpoint.java | 14 +++---
.../component/mybatis/MyBatisProducer.java | 46 ++--
.../MyBatisInsertWithOutputHeaderTest.java | 8 ++--
.../MyBatisSelectOneWithOutputHeaderTest.java | 24 --
5 files changed, 57 insertions(+), 43 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/9bd940d8/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
--
diff --git
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
index 225f588..a1a41ea 100644
---
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
+++
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
@@ -33,8 +33,6 @@ import org.slf4j.LoggerFactory;
/**
* Consumer to read data from a database.
- *
- * @version
*/
public class MyBatisConsumer extends ScheduledBatchPollingConsumer {
@@ -159,10 +157,10 @@ public class MyBatisConsumer extends
ScheduledBatchPollingConsumer {
final String outputHeader = getEndpoint().getOutputHeader();
Message msg = exchange.getIn();
-if(outputHeader != null) {
- msg.setHeader(outputHeader, data);
+if (outputHeader != null) {
+msg.setHeader(outputHeader, data);
} else {
- msg.setBody(data);
+msg.setBody(data);
}
msg.setHeader(MyBatisConstants.MYBATIS_STATEMENT_NAME,
endpoint.getStatement());
http://git-wip-us.apache.org/repos/asf/camel/blob/9bd940d8/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
--
diff --git
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
index c857226..ed0d128 100644
---
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
+++
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisEndpoint.java
@@ -140,9 +140,9 @@ public class MyBatisEndpoint extends DefaultPollingEndpoint
{
this.maxMessagesPerPoll = maxMessagesPerPoll;
}
- public String getOutputHeader() {
- return outputHeader;
- }
+public String getOutputHeader() {
+return outputHeader;
+}
/**
* Store the query result in a header instead of the message body.
@@ -153,8 +153,8 @@ public class MyBatisEndpoint extends DefaultPollingEndpoint
{
* also omit populating the default CamelMyBatisResult header since it
would be the same
* as outputHeader all the time.
*/
- public void setOutputHeader(String outputHeader) {
- this.outputHeader = outputHeader;
- }
-
+public void setOutputHeader(String outputHeader) {
+this.outputHeader = outputHeader;
+}
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9bd940d8/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
--
diff --git
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
index 602ae09..3e5f9cc 100644
---
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
+++
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisProducer.java
@@ -227,7 +227,7 @@ public class MyBatisProducer extends DefaultProducer {
private void doProcessResult(Exchange exchange, Object result, SqlSession
session) {
final String outputHeader = getEndpoint().getOutputHeader();
- if (endpoint.getStatementType() == StatementType.SelectList ||
camel git commit: [Spring Boot] Added converter bridge.
Repository: camel
Updated Branches:
refs/heads/master b01ba794b - 578625d72
[Spring Boot] Added converter bridge.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/578625d7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/578625d7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/578625d7
Branch: refs/heads/master
Commit: 578625d72b9fdd43ce860126b89fd524a648c24e
Parents: b01ba79
Author: Henryk Konsek hekon...@gmail.com
Authored: Thu Jan 1 20:54:19 2015 +0100
Committer: Henryk Konsek hekon...@gmail.com
Committed: Thu Jan 1 20:54:19 2015 +0100
--
.../spring/boot/CamelAutoConfiguration.java | 8 ++-
.../SpringConversionServiceConfiguration.java | 45 ++
.../camel/spring/boot/SpringTypeConverter.java | 42 +
.../boot/SpringConverterDelegationTest.java | 63
4 files changed, 156 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/578625d7/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
--
diff --git
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
index 9f1e9fa..4f24f7c 100644
---
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
+++
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
@@ -23,11 +23,11 @@ import org.apache.camel.TypeConverter;
import org.apache.camel.component.properties.PropertiesComponent;
import org.apache.camel.component.properties.PropertiesParser;
import org.apache.camel.spring.SpringCamelContext;
-import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
/**
* p
@@ -102,6 +102,7 @@ import org.springframework.context.annotation.Configuration;
*/
@Configuration
@EnableConfigurationProperties(CamelConfigurationProperties.class)
+@Import(SpringConversionServiceConfiguration.class)
public class CamelAutoConfiguration {
/**
@@ -110,9 +111,12 @@ public class CamelAutoConfiguration {
*/
@Bean
CamelContext camelContext(ApplicationContext applicationContext,
- CamelConfigurationProperties
configurationProperties) {
+ CamelConfigurationProperties
configurationProperties,
+ SpringTypeConverter springTypeConverter) {
CamelContext camelContext = new SpringCamelContext(applicationContext);
+
camelContext.getTypeConverterRegistry().addFallbackTypeConverter(springTypeConverter,
true);
+
if (!configurationProperties.isJmxEnabled()) {
camelContext.disableJMX();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/578625d7/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringConversionServiceConfiguration.java
--
diff --git
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringConversionServiceConfiguration.java
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringConversionServiceConfiguration.java
new file mode 100644
index 000..eb0dab0
--- /dev/null
+++
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringConversionServiceConfiguration.java
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spring.boot;
+
+import
