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/04/21 17:10:40 UTC
[2/2] camel git commit: Fixed CS. This closes #953.
Fixed CS. This closes #953.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/aee808a6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aee808a6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aee808a6
Branch: refs/heads/master
Commit: aee808a686afac2b9bafd0f7dca8fcca094072c9
Parents: 87c48d9
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Apr 21 17:10:30 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 21 17:10:30 2016 +0200
----------------------------------------------------------------------
.../component/aws/kinesis/KinesisConsumer.java | 17 ++++++++---------
.../component/aws/kinesis/KinesisEndpoint.java | 9 +++------
.../component/aws/kinesis/KinesisConsumerTest.java | 2 +-
3 files changed, 12 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/aee808a6/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisConsumer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisConsumer.java
index bb27cf9..1addcdf 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisConsumer.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisConsumer.java
@@ -100,12 +100,11 @@ public class KinesisConsumer extends ScheduledBatchPollingConsumer {
String shardId;
//If ShardId supplied use it, else choose first one
- if(!getEndpoint().getShardId().isEmpty()){
+ if (!getEndpoint().getShardId().isEmpty()) {
shardId = getEndpoint().getShardId();
- }
- else{
+ } else {
DescribeStreamRequest req1 = new DescribeStreamRequest()
- .withStreamName(getEndpoint().getStreamName());
+ .withStreamName(getEndpoint().getStreamName());
DescribeStreamResult res1 = getClient().describeStream(req1);
shardId = res1.getStreamDescription().getShards().get(0).getShardId();
}
@@ -116,7 +115,7 @@ public class KinesisConsumer extends ScheduledBatchPollingConsumer {
.withShardId(shardId)
.withShardIteratorType(getEndpoint().getIteratorType());
- if(hasSequenceNumber()){
+ if (hasSequenceNumber()) {
req.withStartingSequenceNumber(getEndpoint().getSequenceNumber());
}
@@ -135,9 +134,9 @@ public class KinesisConsumer extends ScheduledBatchPollingConsumer {
return exchanges;
}
- private boolean hasSequenceNumber(){
- return !getEndpoint().getSequenceNumber().isEmpty() &&
- (getEndpoint().getIteratorType().equals(ShardIteratorType.AFTER_SEQUENCE_NUMBER)
- || getEndpoint().getIteratorType().equals(ShardIteratorType.AT_SEQUENCE_NUMBER));
+ private boolean hasSequenceNumber() {
+ return !getEndpoint().getSequenceNumber().isEmpty()
+ && (getEndpoint().getIteratorType().equals(ShardIteratorType.AFTER_SEQUENCE_NUMBER)
+ || getEndpoint().getIteratorType().equals(ShardIteratorType.AT_SEQUENCE_NUMBER));
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/aee808a6/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java
index 014c3f9..833a230 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/kinesis/KinesisEndpoint.java
@@ -45,13 +45,10 @@ public class KinesisEndpoint extends ScheduledPollEndpoint {
private int maxResultsPerRequest = 1;
@UriParam(label = "consumer", description = "Defines where in the Kinesis stream to start getting records")
private ShardIteratorType iteratorType = ShardIteratorType.TRIM_HORIZON;
-
@UriParam(label = "consumer", description = "Defines which shardId in the Kinesis stream to get records from")
- private String shardId ="";
-
+ private String shardId = "";
@UriParam(label = "consumer", description = "The sequence number to start polling from")
- private String sequenceNumber="";
-
+ private String sequenceNumber = "";
public KinesisEndpoint(String uri, String streamName, KinesisComponent component) {
super(uri, component);
@@ -60,7 +57,7 @@ public class KinesisEndpoint extends ScheduledPollEndpoint {
@Override
protected void doStart() throws Exception {
- if((iteratorType.equals(ShardIteratorType.AFTER_SEQUENCE_NUMBER) || iteratorType.equals(ShardIteratorType.AT_SEQUENCE_NUMBER)) && sequenceNumber.isEmpty()){
+ if ((iteratorType.equals(ShardIteratorType.AFTER_SEQUENCE_NUMBER) || iteratorType.equals(ShardIteratorType.AT_SEQUENCE_NUMBER)) && sequenceNumber.isEmpty()) {
throw new IllegalArgumentException("Sequence Number must be specified with iterator Types AFTER_SEQUENCE_NUMBER or AT_SEQUENCE_NUMBER");
}
super.doStart();
http://git-wip-us.apache.org/repos/asf/camel/blob/aee808a6/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerTest.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerTest.java
index 5376850..96de49b 100644
--- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerTest.java
+++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/kinesis/KinesisConsumerTest.java
@@ -44,10 +44,10 @@ import org.mockito.runners.MockitoJUnitRunner;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.never;
@RunWith(MockitoJUnitRunner.class)
public class KinesisConsumerTest {