This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new 6d8ba99f60b CAMEL-19665: camel-couchbase should be batch poll consumer 6d8ba99f60b is described below commit 6d8ba99f60b559c662125a86c19e83ca83ef0bad Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Fri Dec 27 14:22:38 2024 +0100 CAMEL-19665: camel-couchbase should be batch poll consumer --- .../java/org/apache/camel/component/couchbase/CouchbaseConsumer.java | 5 +++-- .../couchbase/integration/CouchbaseIntegrationTestBase.java | 1 - .../apache/camel/test/infra/couchbase/services/container.properties | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java index fde0271f3ad..27461c357cd 100644 --- a/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java +++ b/components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseConsumer.java @@ -64,7 +64,9 @@ public class CouchbaseConsumer extends ScheduledBatchPollingConsumer implements } @Override - protected void doInit() { + protected void doInit() throws Exception { + super.doInit(); + Scope scope; if (endpoint.getScope() != null) { scope = bucket.scope(endpoint.getScope()); @@ -104,7 +106,6 @@ public class CouchbaseConsumer extends ScheduledBatchPollingConsumer implements @Override protected void doStart() throws Exception { super.doStart(); - ResumeStrategyHelper.resume(getEndpoint().getCamelContext(), this, resumeStrategy, COUCHBASE_RESUME_ACTION); } diff --git a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/CouchbaseIntegrationTestBase.java b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/CouchbaseIntegrationTestBase.java index 851cc87ade8..257f9c5821b 100644 --- a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/CouchbaseIntegrationTestBase.java +++ b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/CouchbaseIntegrationTestBase.java @@ -20,7 +20,6 @@ package org.apache.camel.component.couchbase.integration; import java.time.Duration; import java.util.Collections; -import com.couchbase.client.java.Bucket; import com.couchbase.client.java.Cluster; import com.couchbase.client.java.manager.bucket.BucketSettings; import com.couchbase.client.java.manager.bucket.BucketType; diff --git a/test-infra/camel-test-infra-couchbase/src/test/resources/org/apache/camel/test/infra/couchbase/services/container.properties b/test-infra/camel-test-infra-couchbase/src/test/resources/org/apache/camel/test/infra/couchbase/services/container.properties index 26d9cb91af2..4d9be46e6bb 100644 --- a/test-infra/camel-test-infra-couchbase/src/test/resources/org/apache/camel/test/infra/couchbase/services/container.properties +++ b/test-infra/camel-test-infra-couchbase/src/test/resources/org/apache/camel/test/infra/couchbase/services/container.properties @@ -15,4 +15,4 @@ ## limitations under the License. ## --------------------------------------------------------------------------- ## tested against 2.1.2, 2.2.0 & 2.3.1 -couchbase.container=couchbase/server:7.2.5 \ No newline at end of file +couchbase.container=couchbase/server:7.6.2 \ No newline at end of file