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/03/14 19:29:31 UTC
[6/6] camel git commit: Fix checkstyle violations
Fix checkstyle violations
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ad649118
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ad649118
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ad649118
Branch: refs/heads/master
Commit: ad64911833e72932be6b9fa48cc4663d2bd5fe95
Parents: 19785de
Author: Quinn Stevenson <qu...@pronoia-solutions.com>
Authored: Thu Mar 10 13:57:36 2016 -0700
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Mar 14 19:23:15 2016 +0100
----------------------------------------------------------------------
.../camel/component/dataset/DataSetEndpoint.java | 2 +-
.../camel/component/dataset/DataSetConsumerTest.java | 13 ++++++-------
.../camel/component/dataset/DataSetProducerTest.java | 9 ++++-----
3 files changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ad649118/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
index 008eb95..d05f5a9 100644
--- a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
@@ -234,7 +234,7 @@ public class DataSetEndpoint extends MockEndpoint implements Service {
}
protected void assertMessageExpected(long index, Exchange expected, Exchange actual) throws Exception {
- if ( null != actual.getIn().getHeader(Exchange.DATASET_INDEX)) {
+ if (null != actual.getIn().getHeader(Exchange.DATASET_INDEX)) {
long actualCounter = ExchangeHelper.getMandatoryHeader(actual, Exchange.DATASET_INDEX, Long.class);
assertEquals("Header: " + Exchange.DATASET_INDEX, index, actualCounter, actual);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ad649118/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumerTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumerTest.java b/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumerTest.java
index 93c4014..b255c6e 100644
--- a/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumerTest.java
@@ -19,19 +19,18 @@ package org.apache.camel.component.dataset;
import javax.naming.Context;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
/**
* @version
*/
public class DataSetConsumerTest extends ContextTestSupport {
- static final String dataSetName = "foo";
- static final String dataSetUri = "dataset://" + dataSetName;
- static final String resultUri = "mock://result";
-
protected SimpleDataSet dataSet = new SimpleDataSet(20);
+ final String dataSetName = "foo";
+ final String dataSetUri = "dataset://" + dataSetName;
+ final String resultUri = "mock://result";
+
@Override
protected Context createJndiContext() throws Exception {
Context context = super.createJndiContext();
@@ -53,7 +52,7 @@ public class DataSetConsumerTest extends ContextTestSupport {
});
context.start();
- assertEquals( "expectedMessageCount should be -1 for a consumer-only endpoint", -1, getMockEndpoint(dataSetUri).getExpectedCount());
+ assertEquals("expectedMessageCount should be -1 for a consumer-only endpoint", -1, getMockEndpoint(dataSetUri).getExpectedCount());
getMockEndpoint(resultUri).expectedMessageCount((int)dataSet.getSize());
@@ -74,7 +73,7 @@ public class DataSetConsumerTest extends ContextTestSupport {
});
context.start();
- assertEquals( "expectedMessageCount should be the same as the DataSet size for a consumer-producer endpoint", dataSet.getSize(), getMockEndpoint(dataSetUri).getExpectedCount());
+ assertEquals("expectedMessageCount should be the same as the DataSet size for a consumer-producer endpoint", dataSet.getSize(), getMockEndpoint(dataSetUri).getExpectedCount());
getMockEndpoint(resultUri).expectedMessageCount((int)dataSet.getSize());
http://git-wip-us.apache.org/repos/asf/camel/blob/ad649118/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetProducerTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetProducerTest.java b/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetProducerTest.java
index de04767..c076e04 100644
--- a/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetProducerTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetProducerTest.java
@@ -20,18 +20,17 @@ import javax.naming.Context;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
-import org.apache.camel.builder.RouteBuilder;
/**
* @version
*/
public class DataSetProducerTest extends ContextTestSupport {
- static final String dataSetName = "foo";
- static final String dataSetUri = "dataset://" + dataSetName;
- static final String resultUri = "mock://result";
-
protected SimpleDataSet dataSet = new SimpleDataSet(20);
+ final String dataSetName = "foo";
+ final String dataSetUri = "dataset://" + dataSetName;
+ final String resultUri = "mock://result";
+
@Override
protected Context createJndiContext() throws Exception {
Context context = super.createJndiContext();