You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2015/01/10 08:50:08 UTC
[1/2] camel git commit: Fixed the CS error of camel-flatpack
Repository: camel
Updated Branches:
refs/heads/master 22d596737 -> 21f69939d
Fixed the CS error of camel-flatpack
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/21f69939
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/21f69939
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/21f69939
Branch: refs/heads/master
Commit: 21f69939ddb463b18fa603e36510f0011aba2a2c
Parents: 68a0d0f
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Jan 9 21:51:30 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Jan 9 21:51:52 2015 +0800
----------------------------------------------------------------------
.../org/apache/camel/component/flatpack/FlatpackEndpoint.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/21f69939/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java b/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java
index a8789cc..3d24363 100644
--- a/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java
+++ b/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java
@@ -49,14 +49,14 @@ import org.apache.camel.util.ResourceHelper;
*/
@UriEndpoint(scheme = "flatpack", consumerClass = FlatpackConsumer.class, label = "transformation")
public class FlatpackEndpoint extends DefaultPollingEndpoint {
+ @UriPath
+ protected String resourceUri;
private LoadBalancer loadBalancer = new RoundRobinLoadBalancer();
private ParserFactory parserFactory = DefaultParserFactory.getInstance();
-
+
@UriPath
private FlatpackType type;
- @UriPath
- protected String resourceUri;
@UriParam(defaultValue = "true")
private boolean splitRows = true;
[2/2] camel git commit: Fixed CS errors of camel-mybatis
Posted by ni...@apache.org.
Fixed CS errors of camel-mybatis
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/68a0d0f9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/68a0d0f9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/68a0d0f9
Branch: refs/heads/master
Commit: 68a0d0f96fbf416178f8d2b37bc3fc0074f40641
Parents: 22d5967
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Jan 9 21:51:04 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Jan 9 21:51:52 2015 +0800
----------------------------------------------------------------------
.../apache/camel/component/mybatis/MyBatisEndpoint.java | 12 ++++++------
.../apache/camel/component/mybatis/MyBatisProducer.java | 12 ++++++------
.../MyBatisInsertWithInputAndOutputHeaderTest.java | 8 ++++----
.../mybatis/MyBatisInsertWithInputHeaderTest.java | 4 ++--
.../MyBatisSelectOneWithInputAndOutputHeaderTest.java | 8 ++++----
.../mybatis/MyBatisSelectOneWithInputHeaderTest.java | 2 +-
6 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/68a0d0f9/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 0a2dbbf..ea77ec2 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
@@ -159,9 +159,9 @@ public class MyBatisEndpoint extends DefaultPollingEndpoint {
this.outputHeader = outputHeader;
}
- public String getInputHeader() {
- return inputHeader;
- }
+ public String getInputHeader() {
+ return inputHeader;
+ }
/**
* User the header value for input parameters instead of the message body.
@@ -169,9 +169,9 @@ public class MyBatisEndpoint extends DefaultPollingEndpoint {
* If outputHeader is set, the value is used and query parameters will be taken from the
* header instead of the body.
*/
- public void setInputHeader(String inputHeader) {
- this.inputHeader = inputHeader;
- }
+ public void setInputHeader(String inputHeader) {
+ this.inputHeader = inputHeader;
+ }
http://git-wip-us.apache.org/repos/asf/camel/blob/68a0d0f9/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 dbe2fbd..6989a57 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
@@ -283,12 +283,12 @@ public class MyBatisProducer extends DefaultProducer {
}
private Object getInput(final Exchange exchange) {
- final String inputHeader = getEndpoint().getInputHeader();
- if(inputHeader != null) {
- return exchange.getIn().getHeader(inputHeader);
- } else {
- return exchange.getIn().getBody();
- }
+ final String inputHeader = getEndpoint().getInputHeader();
+ if (inputHeader != null) {
+ return exchange.getIn().getHeader(inputHeader);
+ } else {
+ return exchange.getIn().getBody();
+ }
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/68a0d0f9/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithInputAndOutputHeaderTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithInputAndOutputHeaderTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithInputAndOutputHeaderTest.java
index 1202f12..b18bdc8 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithInputAndOutputHeaderTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithInputAndOutputHeaderTest.java
@@ -22,10 +22,10 @@ import org.junit.Test;
public class MyBatisInsertWithInputAndOutputHeaderTest extends MyBatisTestSupport {
- private static final String TEST_CASE_INPUT_HEADER_NAME = "testCaseInputHeader";
- private static final String TEST_CASE_OUTPUT_HEADER_NAME = "testCaseOutputHeader";
- private static final String RETAINED_BODY = "not an account";
-
+ private static final String TEST_CASE_INPUT_HEADER_NAME = "testCaseInputHeader";
+ private static final String TEST_CASE_OUTPUT_HEADER_NAME = "testCaseOutputHeader";
+ private static final String RETAINED_BODY = "not an account";
+
@Test
public void testInsert() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
http://git-wip-us.apache.org/repos/asf/camel/blob/68a0d0f9/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithInputHeaderTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithInputHeaderTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithInputHeaderTest.java
index 9b84361..2aeeb2e 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithInputHeaderTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithInputHeaderTest.java
@@ -22,8 +22,8 @@ import org.junit.Test;
public class MyBatisInsertWithInputHeaderTest extends MyBatisTestSupport {
- private static final String TEST_CASE_HEADER_NAME = "testCaseHeader";
-
+ private static final String TEST_CASE_HEADER_NAME = "testCaseHeader";
+
@Test
public void testInsert() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
http://git-wip-us.apache.org/repos/asf/camel/blob/68a0d0f9/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithInputAndOutputHeaderTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithInputAndOutputHeaderTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithInputAndOutputHeaderTest.java
index 87901af..6f79293 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithInputAndOutputHeaderTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithInputAndOutputHeaderTest.java
@@ -22,11 +22,11 @@ import org.junit.Test;
public class MyBatisSelectOneWithInputAndOutputHeaderTest extends MyBatisTestSupport {
- private static final String TEST_CASE_INPUT_HEADER_NAME = "testCaseInputHeader";
- private static final String TEST_CASE_OUTPUT_HEADER_NAME = "testCaseOutputHeader";
- private static final int TEST_ACCOUNT_ID = 456;
+ private static final String TEST_CASE_INPUT_HEADER_NAME = "testCaseInputHeader";
+ private static final String TEST_CASE_OUTPUT_HEADER_NAME = "testCaseOutputHeader";
+ private static final int TEST_ACCOUNT_ID = 456;
private static final int TEST_ACCOUNT_ID_BAD = 999;
-
+
@Test
public void testSelectOne() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
http://git-wip-us.apache.org/repos/asf/camel/blob/68a0d0f9/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithInputHeaderTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithInputHeaderTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithInputHeaderTest.java
index 8e6b46f..b2e60f3 100644
--- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithInputHeaderTest.java
+++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithInputHeaderTest.java
@@ -25,7 +25,7 @@ public class MyBatisSelectOneWithInputHeaderTest extends MyBatisTestSupport {
private static final String TEST_CASE_HEADER_NAME = "testCaseHeader";
private static final int TEST_ACCOUNT_ID = 456;
private static final int TEST_ACCOUNT_ID_BAD = 999;
-
+
@Test
public void testSelectOne() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");