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 || endpoint.getStatementType() == StatementType.SelectOne) { + if (endpoint.getStatementType() == StatementType.SelectList || endpoint.getStatementType() == StatementType.SelectOne) { Message answer = exchange.getIn(); if (ExchangeHelper.isOutCapable(exchange)) { answer = exchange.getOut(); @@ -242,34 +242,34 @@ public class MyBatisProducer extends DefaultProducer { LOG.trace("Setting result as existing body as MyBatis statement type is Callable, and there was no result."); answer.setBody(exchange.getIn().getBody()); } else { - if(outputHeader != null) { - // set the result as header for insert - LOG.trace("Setting result as header [{}]: {}", outputHeader, result); - answer.setHeader(outputHeader, result); - } else { - // set the result as body for insert - LOG.trace("Setting result as body: {}", result); - answer.setBody(result); - answer.setHeader(MyBatisConstants.MYBATIS_RESULT, result); - } + if (outputHeader != null) { + // set the result as header for insert + LOG.trace("Setting result as header [{}]: {}", outputHeader, result); + answer.setHeader(outputHeader, result); + } else { + // set the result as body for insert + LOG.trace("Setting result as body: {}", result); + answer.setBody(result); + answer.setHeader(MyBatisConstants.MYBATIS_RESULT, result); + } } } else { - if(outputHeader != null) { - LOG.trace("Setting result as header [{}]: {}", outputHeader, result); - answer.setHeader(outputHeader, result); - } else { - // set the result as body for insert - LOG.trace("Setting result as body: {}", result); - answer.setBody(result); - answer.setHeader(MyBatisConstants.MYBATIS_RESULT, result); - } + if (outputHeader != null) { + LOG.trace("Setting result as header [{}]: {}", outputHeader, result); + answer.setHeader(outputHeader, result); + } else { + // set the result as body for insert + LOG.trace("Setting result as body: {}", result); + answer.setBody(result); + answer.setHeader(MyBatisConstants.MYBATIS_RESULT, result); + } } answer.setHeader(MyBatisConstants.MYBATIS_STATEMENT_NAME, statement); } else { Message msg = exchange.getIn(); - if(outputHeader != null) { - msg.setHeader(outputHeader, result); + if (outputHeader != null) { + msg.setHeader(outputHeader, result); } else { msg.setHeader(MyBatisConstants.MYBATIS_RESULT, result); } @@ -281,5 +281,5 @@ public class MyBatisProducer extends DefaultProducer { public MyBatisEndpoint getEndpoint() { return (MyBatisEndpoint) super.getEndpoint(); } - + } http://git-wip-us.apache.org/repos/asf/camel/blob/9bd940d8/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 index 8feeded..9197720 100644 --- 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 @@ -22,9 +22,9 @@ import org.junit.Test; public class MyBatisInsertWithOutputHeaderTest extends MyBatisTestSupport { - private static final String TEST_CASE_HEADER_NAME = "testCaseHeader"; - private static final int TEST_ACCOUNT_ID = 444; - + private static final String TEST_CASE_HEADER_NAME = "testCaseHeader"; + private static final int TEST_ACCOUNT_ID = 444; + @Test public void testInsert() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); @@ -32,7 +32,7 @@ public class MyBatisInsertWithOutputHeaderTest extends MyBatisTestSupport { mock.message(0).body().isInstanceOf(Account.class); mock.message(0).header(TEST_CASE_HEADER_NAME).isEqualTo(1); mock.message(0).header(MyBatisConstants.MYBATIS_RESULT).isNull(); - + Account account = new Account(); account.setId(TEST_ACCOUNT_ID); account.setFirstName("Willem"); http://git-wip-us.apache.org/repos/asf/camel/blob/9bd940d8/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithOutputHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithOutputHeaderTest.java b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithOutputHeaderTest.java index c095511..90eff04 100644 --- a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithOutputHeaderTest.java +++ b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisSelectOneWithOutputHeaderTest.java @@ -1,3 +1,19 @@ +/** + * 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; import org.apache.camel.builder.RouteBuilder; @@ -6,9 +22,9 @@ import org.junit.Test; public class MyBatisSelectOneWithOutputHeaderTest extends MyBatisTestSupport { - private static final String TEST_CASE_HEADER_NAME = "testCaseHeader"; - private static final int TEST_ACCOUNT_ID = 456; - + private static final String TEST_CASE_HEADER_NAME = "testCaseHeader"; + private static final int TEST_ACCOUNT_ID = 456; + @Test public void testSelectOneWithOutputHeader() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); @@ -38,5 +54,5 @@ public class MyBatisSelectOneWithOutputHeaderTest extends MyBatisTestSupport { } }; } - + }
