This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1e76dd62c01ee474e962c73db11c38a55c32154f Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Tue Mar 1 11:15:22 2022 +0100 CAMEL-15562: use the service interface to avoid overlap in life cycle management --- .../component/aws2/kinesis/consumer/KinesisResumeStrategy.java | 10 ++++++++++ .../consumer/KinesisUserConfigurationResumeStrategy.java | 5 ----- .../component/couchdb/consumer/CouchDbResumeStrategy.java | 10 ++++++++++ .../couchdb/consumer/LatestUpdateSequenceResumeStrategy.java | 5 ----- .../kafka/consumer/support/KafkaConsumerResumeStrategy.java | 10 ++++++++++ .../consumer/support/OffsetKafkaConsumerResumeStrategy.java | 5 ----- .../kafka/consumer/support/ResumeStrategyFactory.java | 5 ----- .../support/SeekPolicyKafkaConsumerResumeStrategy.java | 5 ----- .../integration/KafkaConsumerWithResumeRouteStrategyIT.java | 6 ------ .../src/main/java/org/apache/camel/ResumeStrategy.java | 9 +-------- .../file/FileConsumerResumeFromOffsetStrategyTest.java | 7 ++++++- .../camel/component/file/FileConsumerResumeStrategyTest.java | 7 ++++++- 12 files changed, 43 insertions(+), 41 deletions(-) diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisResumeStrategy.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisResumeStrategy.java index 6c3ae6f..0592bfb 100644 --- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisResumeStrategy.java +++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisResumeStrategy.java @@ -23,4 +23,14 @@ import software.amazon.awssdk.services.kinesis.model.GetShardIteratorRequest; public interface KinesisResumeStrategy extends ResumeStrategy { void setRequestBuilder(GetShardIteratorRequest.Builder builder); + + @Override + default void start() { + + } + + @Override + default void stop() { + + } } diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisUserConfigurationResumeStrategy.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisUserConfigurationResumeStrategy.java index e5c92fc..5633443 100644 --- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisUserConfigurationResumeStrategy.java +++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisUserConfigurationResumeStrategy.java @@ -46,9 +46,4 @@ public class KinesisUserConfigurationResumeStrategy implements KinesisResumeStra resumable.startingSequenceNumber(configuration.getSequenceNumber()); } } - - @Override - public void start() throws Exception { - - } } diff --git a/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/consumer/CouchDbResumeStrategy.java b/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/consumer/CouchDbResumeStrategy.java index 14d87d4..3a92a04 100644 --- a/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/consumer/CouchDbResumeStrategy.java +++ b/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/consumer/CouchDbResumeStrategy.java @@ -24,4 +24,14 @@ import org.apache.camel.ResumeStrategy; */ public interface CouchDbResumeStrategy extends ResumeStrategy { void setResumable(CouchDbResumable resumable); + + @Override + default void start() { + + } + + @Override + default void stop() { + + } } diff --git a/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/consumer/LatestUpdateSequenceResumeStrategy.java b/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/consumer/LatestUpdateSequenceResumeStrategy.java index 04679d8..277d842 100644 --- a/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/consumer/LatestUpdateSequenceResumeStrategy.java +++ b/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/consumer/LatestUpdateSequenceResumeStrategy.java @@ -36,9 +36,4 @@ public final class LatestUpdateSequenceResumeStrategy implements CouchDbResumeSt resumable.updateLastOffset(clientWrapper.getLatestUpdateSequence()); } - - @Override - public void start() throws Exception { - - } } diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/KafkaConsumerResumeStrategy.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/KafkaConsumerResumeStrategy.java index 35eb879..97f25e0 100644 --- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/KafkaConsumerResumeStrategy.java +++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/KafkaConsumerResumeStrategy.java @@ -33,4 +33,14 @@ public interface KafkaConsumerResumeStrategy extends ResumeStrategy { default void resume(KafkaResumable resumable) { } + + @Override + default void start() { + + } + + @Override + default void stop() { + + } } diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/OffsetKafkaConsumerResumeStrategy.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/OffsetKafkaConsumerResumeStrategy.java index 3875184..4502831 100644 --- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/OffsetKafkaConsumerResumeStrategy.java +++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/OffsetKafkaConsumerResumeStrategy.java @@ -73,9 +73,4 @@ public class OffsetKafkaConsumerResumeStrategy implements KafkaConsumerResumeStr public void resume(KafkaResumable resumable) { resume(); } - - @Override - public void start() throws Exception { - - } } diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/ResumeStrategyFactory.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/ResumeStrategyFactory.java index d1656f86..c4fdb6d 100644 --- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/ResumeStrategyFactory.java +++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/ResumeStrategyFactory.java @@ -41,11 +41,6 @@ public final class ResumeStrategyFactory { public void resume() { } - - @Override - public void start() throws Exception { - - } } private static final NoOpKafkaConsumerResumeStrategy NO_OP_RESUME_STRATEGY = new NoOpKafkaConsumerResumeStrategy(); diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/SeekPolicyKafkaConsumerResumeStrategy.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/SeekPolicyKafkaConsumerResumeStrategy.java index 46fd974..91db91b 100644 --- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/SeekPolicyKafkaConsumerResumeStrategy.java +++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/SeekPolicyKafkaConsumerResumeStrategy.java @@ -58,9 +58,4 @@ public class SeekPolicyKafkaConsumerResumeStrategy implements KafkaConsumerResum public void resume(KafkaResumable resumable) { resume(); } - - @Override - public void start() throws Exception { - - } } diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerWithResumeRouteStrategyIT.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerWithResumeRouteStrategyIT.java index aeb5de3..c6a27ca 100644 --- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerWithResumeRouteStrategyIT.java +++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerWithResumeRouteStrategyIT.java @@ -111,13 +111,7 @@ public class KafkaConsumerWithResumeRouteStrategyIT extends BaseEmbeddedKafkaTes } @Override - public void stop() { - - } - - @Override public void init() { - Service.super.init(); LOG.warn("Init was called"); } diff --git a/core/camel-api/src/main/java/org/apache/camel/ResumeStrategy.java b/core/camel-api/src/main/java/org/apache/camel/ResumeStrategy.java index a271cd4..f23e762 100644 --- a/core/camel-api/src/main/java/org/apache/camel/ResumeStrategy.java +++ b/core/camel-api/src/main/java/org/apache/camel/ResumeStrategy.java @@ -21,7 +21,7 @@ package org.apache.camel; * Defines a strategy for handling resume operations. Implementations can define different ways to handle how to resume * processing records. */ -public interface ResumeStrategy { +public interface ResumeStrategy extends Service { /** * A consumer, iterator or value class that can be used to set the index position from which to resume from. The @@ -29,11 +29,4 @@ public interface ResumeStrategy { * */ void resume(); - - /** - * Starts the resume strategy - * - * @throws Exception - */ - void start() throws Exception; } diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerResumeFromOffsetStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerResumeFromOffsetStrategyTest.java index fdf0315..2db4785 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerResumeFromOffsetStrategyTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerResumeFromOffsetStrategyTest.java @@ -50,7 +50,12 @@ public class FileConsumerResumeFromOffsetStrategyTest extends ContextTestSupport } @Override - public void start() throws Exception { + public void start() { + + } + + @Override + public void stop() { } } diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerResumeStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerResumeStrategyTest.java index 5adb2dd..bf662ee 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerResumeStrategyTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerResumeStrategyTest.java @@ -51,7 +51,12 @@ public class FileConsumerResumeStrategyTest extends ContextTestSupport { } @Override - public void start() throws Exception { + public void start() { + + } + + @Override + public void stop() { } }
