You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2022/05/03 13:59:20 UTC

[camel] branch regen_bot updated (0208c0c65c6 -> a68c2607e5f)

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel.git


    from 0208c0c65c6 CAMEL-18035: camel-jbang - Run * should better detect what is Camel routes and what are misc files
     add 70bf8befe16 CAMEL-17762: fixed resumable javadoc
     add a68c2607e5f CAMEL-17762: rework the resume strategy to separate concerns

No new revisions were added by this update.

Summary of changes:
 .../org/apache/camel/catalog/models/pausable.json  |   2 +-
 .../org/apache/camel/catalog/models/resumable.json |   2 +-
 .../apache/camel/component/feed/EntryFilter.java   |  14 +-
 .../component/feed/FeedEntryPollingConsumer.java   |  24 ++-
 .../AtomEntryPollingConsumerWithResumeTest.java    |   3 +-
 .../component/aws2/kinesis/Kinesis2Consumer.java   |  26 ++-
 ...sumeStrategy.java => KinesisResumeAdapter.java} |  23 +--
 ... => KinesisUserConfigurationResumeAdapter.java} |   4 +-
 .../caffeine/resume/multi/CaffeineCache.java       |  98 +++++++++
 .../caffeine/resume/single/CaffeineCache.java      |  93 +++++++++
 .../component/cassandra/CassandraConsumer.java     |  20 +-
 ...meStrategy.java => CassandraResumeAdapter.java} |  16 +-
 .../CassandraComponentResumeStrategyIT.java        |   9 +-
 .../component/couchbase/CouchbaseConsumer.java     |  18 +-
 ...meStrategy.java => CouchbaseResumeAdapter.java} |  16 +-
 .../integration/ConsumeResumeStrategyIT.java       |  16 +-
 components/camel-couchdb/pom.xml                   |   4 +
 .../component/couchdb/CouchDbChangesetTracker.java |  15 +-
 .../camel/component/couchdb/CouchDbConsumer.java   |  12 +-
 .../couchdb/consumer/CouchDbResumable.java         |   4 +-
 ...sumeStrategy.java => CouchDbResumeAdapter.java} |  21 +-
 .../consumer/CouchDbResumeStrategyFactory.java     |   8 +-
 ...java => LatestUpdateSequenceResumeAdapter.java} |   4 +-
 .../apache/camel/component/file/FileConsumer.java  |  37 ++--
 .../apache/camel/component/file/GenericFile.java   |   2 +-
 ...rResumeStrategy.java => FileResumeAdapter.java} |   6 +-
 .../component/file/consumer/FileResumeSet.java     |   2 +-
 ...sumeStrategy.java => FileSetResumeAdapter.java} |   7 +-
 .../file/consumer/GenericFileResumable.java        |   2 +-
 ...Strategy.java => GenericFileResumeAdapter.java} |  15 +-
 .../adapters/DefaultFileSetResumeAdapter.java      |  65 ++++++
 .../adapters/DefaultGenericFileResumeAdapter.java  |  64 ++++++
 .../camel/component/kafka/KafkaConsumer.java       |  14 +-
 .../camel/component/kafka/KafkaFetchRecords.java   |   4 +-
 .../errorhandler/KafkaConsumerListener.java        |   2 +-
 ...rategy.java => KafkaConsumerResumeAdapter.java} |  33 +--
 .../kafka/consumer/support/KafkaOffset.java        |   2 +-
 .../kafka/consumer/support/KafkaResumable.java     |   4 +-
 ....java => OffsetKafkaConsumerResumeAdapter.java} |  21 +-
 .../support/PartitionAssignmentListener.java       |  11 +-
 .../consumer/support/ResumeStrategyFactory.java    |  30 ++-
 ...a => SeekPolicyKafkaConsumerResumeAdapter.java} |  20 +-
 .../resume/kafka/KafkaResumeStrategy.java          |  22 +-
 .../resume/kafka/MultiNodeKafkaResumeStrategy.java | 152 ++++++++++++++
 .../camel/processor/resume/kafka/RecordError.java} |  31 ++-
 ...egy.java => SingleNodeKafkaResumeStrategy.java} | 227 ++++++++++++++-------
 .../KafkaConsumerWithResumeRouteStrategyIT.java    |  99 ++++-----
 .../camel/component/master/MasterConsumer.java     |   4 +-
 .../src/main/java/org/apache/camel/Route.java      |   2 +
 .../camel/{ => resume}/ConsumerListener.java       |   2 +-
 .../camel/{ => resume}/ConsumerListenerAware.java  |   2 +-
 .../java/org/apache/camel/{ => resume}/Offset.java |   2 +-
 .../org/apache/camel/{ => resume}/Resumable.java   |   4 +-
 .../apache/camel/{ => resume}/ResumableSet.java    |   2 +-
 .../ResumeAdapter.java}                            |  16 +-
 .../org/apache/camel/{ => resume}/ResumeAware.java |   2 +-
 .../apache/camel/{ => resume}/ResumeStrategy.java  |  23 ++-
 .../UpdatableConsumerResumeStrategy.java           |   2 +-
 .../apache/camel/resume/cache/MultiEntryCache.java |  11 +-
 .../camel/{ => resume/cache}/ResumeCache.java      |  20 +-
 .../cache/SingleEntryCache.java}                   |  21 +-
 .../org/apache/camel/impl/engine/DefaultRoute.java |   8 +-
 .../docs/modules/eips/pages/resume-strategies.adoc | 139 ++++---------
 .../resources/org/apache/camel/model/pausable.json |   2 +-
 .../org/apache/camel/model/resumable.json          |   2 +-
 .../org/apache/camel/model/PausableDefinition.java |   4 +-
 .../apache/camel/model/ProcessorDefinition.java    |   4 +-
 .../apache/camel/model/ResumableDefinition.java    |   4 +-
 .../apache/camel/processor/PausableProcessor.java  |   2 +-
 .../processor/resume/DelegatingResumeAdapter.java  | 181 ++++++++++++++++
 .../processor/resume/DelegatingResumeStrategy.java | 102 ---------
 .../processor/resume/ResumableCompletion.java      |   6 +-
 .../camel/processor/resume/ResumableProcessor.java |   9 +-
 .../processor/resume/TransientResumeStrategy.java  |  33 +--
 .../org/apache/camel/reifier/PausableReifier.java  |   2 +-
 .../org/apache/camel/reifier/ResumableReifier.java |   2 +-
 .../FileConsumerResumeFromOffsetStrategyTest.java  |  27 ++-
 .../file/FileConsumerResumeStrategyTest.java       |  17 +-
 .../main/java/org/apache/camel/resume/Offsets.java |   2 -
 .../java/org/apache/camel/resume/Resumables.java   |   3 -
 80 files changed, 1305 insertions(+), 681 deletions(-)
 rename components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/{KinesisResumeStrategy.java => KinesisResumeAdapter.java} (75%)
 rename components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/{KinesisUserConfigurationResumeStrategy.java => KinesisUserConfigurationResumeAdapter.java} (91%)
 create mode 100644 components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/resume/multi/CaffeineCache.java
 create mode 100644 components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/resume/single/CaffeineCache.java
 rename components/camel-cassandraql/src/main/java/org/apache/camel/component/cassandra/consumer/support/{CassandraResumeStrategy.java => CassandraResumeAdapter.java} (81%)
 copy components/camel-couchbase/src/main/java/org/apache/camel/component/couchbase/{CouchbaseResumeStrategy.java => CouchbaseResumeAdapter.java} (79%)
 rename components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/consumer/{CouchDbResumeStrategy.java => CouchDbResumeAdapter.java} (76%)
 rename components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/consumer/{LatestUpdateSequenceResumeStrategy.java => LatestUpdateSequenceResumeAdapter.java} (88%)
 copy components/camel-file/src/main/java/org/apache/camel/component/file/consumer/{FileConsumerResumeStrategy.java => FileResumeAdapter.java} (85%)
 rename components/camel-file/src/main/java/org/apache/camel/component/file/consumer/{FileSetResumeStrategy.java => FileSetResumeAdapter.java} (79%)
 rename components/camel-file/src/main/java/org/apache/camel/component/file/consumer/{FileConsumerResumeStrategy.java => GenericFileResumeAdapter.java} (66%)
 create mode 100644 components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/DefaultFileSetResumeAdapter.java
 create mode 100644 components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/DefaultGenericFileResumeAdapter.java
 rename components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/{KafkaConsumerResumeStrategy.java => KafkaConsumerResumeAdapter.java} (65%)
 rename components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/{OffsetKafkaConsumerResumeStrategy.java => OffsetKafkaConsumerResumeAdapter.java} (82%)
 rename components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/{SeekPolicyKafkaConsumerResumeStrategy.java => SeekPolicyKafkaConsumerResumeAdapter.java} (80%)
 copy core/camel-api/src/main/java/org/apache/camel/Offset.java => components/camel-kafka/src/main/java/org/apache/camel/processor/resume/kafka/KafkaResumeStrategy.java (63%)
 create mode 100644 components/camel-kafka/src/main/java/org/apache/camel/processor/resume/kafka/MultiNodeKafkaResumeStrategy.java
 rename components/{camel-couchbase/src/main/java/org/apache/camel/component/couchbase/CouchbaseResumeStrategy.java => camel-kafka/src/main/java/org/apache/camel/processor/resume/kafka/RecordError.java} (58%)
 rename components/camel-kafka/src/main/java/org/apache/camel/processor/resume/kafka/{AbstractKafkaResumeStrategy.java => SingleNodeKafkaResumeStrategy.java} (55%)
 rename core/camel-api/src/main/java/org/apache/camel/{ => resume}/ConsumerListener.java (98%)
 rename core/camel-api/src/main/java/org/apache/camel/{ => resume}/ConsumerListenerAware.java (97%)
 rename core/camel-api/src/main/java/org/apache/camel/{ => resume}/Offset.java (96%)
 rename core/camel-api/src/main/java/org/apache/camel/{ => resume}/Resumable.java (94%)
 rename core/camel-api/src/main/java/org/apache/camel/{ => resume}/ResumableSet.java (98%)
 copy core/camel-api/src/main/java/org/apache/camel/{ResumeStrategy.java => resume/ResumeAdapter.java} (62%)
 rename core/camel-api/src/main/java/org/apache/camel/{ => resume}/ResumeAware.java (97%)
 copy core/camel-api/src/main/java/org/apache/camel/{ => resume}/ResumeStrategy.java (65%)
 rename core/camel-api/src/main/java/org/apache/camel/{ => resume}/UpdatableConsumerResumeStrategy.java (97%)
 rename components/camel-file/src/main/java/org/apache/camel/component/file/consumer/GenericFileResumeStrategy.java => core/camel-api/src/main/java/org/apache/camel/resume/cache/MultiEntryCache.java (71%)
 rename core/camel-api/src/main/java/org/apache/camel/{ => resume/cache}/ResumeCache.java (76%)
 rename core/camel-api/src/main/java/org/apache/camel/{ResumeStrategy.java => resume/cache/SingleEntryCache.java} (67%)
 create mode 100644 core/camel-core-processor/src/main/java/org/apache/camel/processor/resume/DelegatingResumeAdapter.java
 delete mode 100644 core/camel-core-processor/src/main/java/org/apache/camel/processor/resume/DelegatingResumeStrategy.java
 copy components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/KafkaResumable.java => core/camel-core-processor/src/main/java/org/apache/camel/processor/resume/TransientResumeStrategy.java (54%)