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
The following commit(s) were added to refs/heads/main by this push:
new 54a20904319 CAMEL-18161: renamed a few methods to follow a single
naming pattern
54a20904319 is described below
commit 54a209043196b2e2b96abaf69aa31ddbc42338ad
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Fri Jun 3 13:11:39 2022 +0200
CAMEL-18161: renamed a few methods to follow a single naming pattern
---
.../aws2/kinesis/consumer/KinesisDefaultResumeAdapter.java | 4 ++--
.../camel/component/aws2/kinesis/consumer/KinesisOffset.java | 2 +-
.../camel/component/couchdb/CouchDbChangesetTracker.java | 2 +-
.../apache/camel/component/file/GenericFileConverter.java | 4 ++--
.../file/consumer/adapters/AbstractFileResumeAdapter.java | 2 +-
.../consumer/adapters/DefaultFileOffsetResumeAdapter.java | 2 +-
.../camel/component/file/consumer/adapters/FileOffset.java | 2 +-
.../file/consumer/adapters/FileResumeAdapterDelegate.java | 2 +-
.../camel/component/file/consumer/adapters/FileSet.java | 2 +-
.../resume/kafka/SingleNodeKafkaResumeStrategy.java | 2 +-
.../integration/KafkaConsumerWithResumeRouteStrategyIT.java | 6 +++---
.../src/main/java/org/apache/camel/resume/Offset.java | 4 ++--
.../src/main/java/org/apache/camel/resume/OffsetKey.java | 12 ++++++------
.../src/main/java/org/apache/camel/resume/Resumable.java | 2 +-
.../apache/camel/processor/resume/ResumableCompletion.java | 4 ++--
.../java/org/apache/camel/support/resume/OffsetKeys.java | 8 ++++----
.../main/java/org/apache/camel/support/resume/Offsets.java | 2 +-
.../java/org/apache/camel/support/resume/Resumables.java | 4 ++--
18 files changed, 33 insertions(+), 33 deletions(-)
diff --git
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisDefaultResumeAdapter.java
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisDefaultResumeAdapter.java
index 9f75642e9c3..aee041eb9e5 100644
---
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisDefaultResumeAdapter.java
+++
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisDefaultResumeAdapter.java
@@ -53,7 +53,7 @@ public class KinesisDefaultResumeAdapter implements
KinesisResumeAdapter, Cachea
return;
}
- final String sequenceNumber = offset.offset();
+ final String sequenceNumber = offset.getValue();
LOG.info("Resuming from offset {} for key", sequenceNumber,
streamName);
resumable.shardIteratorType(ShardIteratorType.AFTER_SEQUENCE_NUMBER);
@@ -68,7 +68,7 @@ public class KinesisDefaultResumeAdapter implements
KinesisResumeAdapter, Cachea
@Override
public boolean add(OffsetKey<?> key, Offset<?> offset) {
- add(key.getKey(), offset.offset());
+ add(key.getValue(), offset.getValue());
return true;
}
diff --git
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisOffset.java
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisOffset.java
index e7fdd9f84ed..f31dcecdb29 100644
---
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisOffset.java
+++
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/consumer/KinesisOffset.java
@@ -35,7 +35,7 @@ public class KinesisOffset implements Offset<String> {
}
@Override
- public String offset() {
+ public String getValue() {
return offset;
}
}
diff --git
a/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbChangesetTracker.java
b/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbChangesetTracker.java
index 3b239cea610..f398bc1e9b1 100644
---
a/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbChangesetTracker.java
+++
b/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbChangesetTracker.java
@@ -68,7 +68,7 @@ public class CouchDbChangesetTracker implements Runnable {
LOG.debug("Last sequence [{}]", resumable.getLastOffset());
changes =
couchClient.changes().style(endpoint.getStyle()).includeDocs(true)
-
.since(resumable.getLastOffset().offset()).heartBeat(endpoint.getHeartbeat()).continuousChanges();
+
.since(resumable.getLastOffset().getValue()).heartBeat(endpoint.getHeartbeat()).continuousChanges();
}
@Override
diff --git
a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileConverter.java
b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileConverter.java
index cffc53d5034..26aefd3d407 100644
---
a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileConverter.java
+++
b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileConverter.java
@@ -122,7 +122,7 @@ public final class GenericFileConverter {
LOG.debug("Read file {} (no charset)", f);
}
InputStream inputStream = IOHelper.toInputStream(f, charset);
- inputStream.skip(file.getLastOffset().offset());
+ inputStream.skip(file.getLastOffset().getValue());
return inputStream;
}
@@ -197,7 +197,7 @@ public final class GenericFileConverter {
reader = IOHelper.toReader(f,
ExchangeHelper.getCharsetName(exchange));
}
- reader.skip(file.getLastOffset().offset());
+ reader.skip(file.getLastOffset().getValue());
return reader;
}
return null;
diff --git
a/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/AbstractFileResumeAdapter.java
b/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/AbstractFileResumeAdapter.java
index 0195a9325f1..b221167210e 100644
---
a/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/AbstractFileResumeAdapter.java
+++
b/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/AbstractFileResumeAdapter.java
@@ -47,7 +47,7 @@ abstract class AbstractFileResumeAdapter implements
FileResumeAdapter, Cacheable
@Override
public final boolean add(OffsetKey<?> key, Offset<?> offset) {
- return add(key.getKey(), offset.offset());
+ return add(key.getValue(), offset.getValue());
}
protected abstract boolean add(Object key, Object offset);
diff --git
a/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/DefaultFileOffsetResumeAdapter.java
b/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/DefaultFileOffsetResumeAdapter.java
index 51ac52f7933..68cafb9ddab 100644
---
a/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/DefaultFileOffsetResumeAdapter.java
+++
b/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/DefaultFileOffsetResumeAdapter.java
@@ -69,7 +69,7 @@ class DefaultFileOffsetResumeAdapter extends
AbstractFileResumeAdapter implement
return;
}
- Object offsetObj = lastOffset.offset();
+ Object offsetObj = lastOffset.getValue();
if (offsetObj == null) {
return;
}
diff --git
a/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/FileOffset.java
b/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/FileOffset.java
index 26ec8477d64..8c7e181b4b9 100644
---
a/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/FileOffset.java
+++
b/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/FileOffset.java
@@ -40,7 +40,7 @@ public class FileOffset implements Offset<Long> {
}
@Override
- public Long offset() {
+ public Long getValue() {
return offset;
}
}
diff --git
a/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/FileResumeAdapterDelegate.java
b/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/FileResumeAdapterDelegate.java
index f75e51d199b..f666cb1cff0 100644
---
a/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/FileResumeAdapterDelegate.java
+++
b/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/FileResumeAdapterDelegate.java
@@ -48,7 +48,7 @@ public class FileResumeAdapterDelegate
@Override
public boolean add(OffsetKey<?> key, Offset<?> offset) {
- Object offsetObj = offset.offset();
+ Object offsetObj = offset.getValue();
if (offsetObj instanceof Long) {
return fileOffsetResumeAdapter.add(key, offset);
diff --git
a/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/FileSet.java
b/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/FileSet.java
index e4502fc7c35..3b678d17e9b 100644
---
a/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/FileSet.java
+++
b/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/FileSet.java
@@ -49,7 +49,7 @@ public class FileSet implements Offset<File> {
}
@Override
- public File offset() {
+ public File getValue() {
return null;
}
}
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/processor/resume/kafka/SingleNodeKafkaResumeStrategy.java
b/components/camel-kafka/src/main/java/org/apache/camel/processor/resume/kafka/SingleNodeKafkaResumeStrategy.java
index 0274fbd2e30..206293826f7 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/processor/resume/kafka/SingleNodeKafkaResumeStrategy.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/processor/resume/kafka/SingleNodeKafkaResumeStrategy.java
@@ -181,7 +181,7 @@ public class SingleNodeKafkaResumeStrategy<T extends
Resumable> implements Kafka
OffsetKey<?> key = offset.getOffsetKey();
Offset<?> offsetValue = offset.getLastOffset();
- LOG.debug("Updating offset on Kafka with key {} to {}", key.getKey(),
offsetValue.offset());
+ LOG.debug("Updating offset on Kafka with key {} to {}",
key.getValue(), offsetValue.getValue());
ByteBuffer keyBuffer = key.serialize();
ByteBuffer valueBuffer = offsetValue.serialize();
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 7397109fb3a..0f7ab577cbf 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
@@ -99,7 +99,7 @@ public class KafkaConsumerWithResumeRouteStrategyIT extends
BaseEmbeddedKafkaTes
OffsetKey<?> addressable = offset.getOffsetKey();
if (addressable != null) {
offsetAddressableNull = false;
- offsetAddressableEmpty = addressable.getKey() == null;
+ offsetAddressableEmpty = addressable.getValue() ==
null;
}
@@ -107,9 +107,9 @@ public class KafkaConsumerWithResumeRouteStrategyIT extends
BaseEmbeddedKafkaTes
if (offsetValue != null) {
offsetValueNull = false;
- if (offsetValue.offset() != null) {
+ if (offsetValue.getValue() != null) {
offsetValueEmpty = false;
- lastOffset = (int) offsetValue.offset();
+ lastOffset = (int) offsetValue.getValue();
}
}
}
diff --git a/core/camel-api/src/main/java/org/apache/camel/resume/Offset.java
b/core/camel-api/src/main/java/org/apache/camel/resume/Offset.java
index 8b66d07f594..72cd1d052e6 100644
--- a/core/camel-api/src/main/java/org/apache/camel/resume/Offset.java
+++ b/core/camel-api/src/main/java/org/apache/camel/resume/Offset.java
@@ -38,10 +38,10 @@ public interface Offset<T> extends Serializable {
*
* @return the offset value
*/
- T offset();
+ T getValue();
@Override
default ByteBuffer serialize() {
- return serialize(offset());
+ return serialize(getValue());
}
}
diff --git
a/core/camel-api/src/main/java/org/apache/camel/resume/OffsetKey.java
b/core/camel-api/src/main/java/org/apache/camel/resume/OffsetKey.java
index 72cf83b5793..cd1078c376f 100644
--- a/core/camel-api/src/main/java/org/apache/camel/resume/OffsetKey.java
+++ b/core/camel-api/src/main/java/org/apache/camel/resume/OffsetKey.java
@@ -26,21 +26,21 @@ import java.nio.ByteBuffer;
*/
public interface OffsetKey<K> extends Serializable {
/**
- * Sets the key
+ * Sets the key value
*
- * @param key the key valeu
+ * @param key the key value
*/
- void setKey(K key);
+ void setValue(K key);
/**
- * Gets the key
+ * Gets the key value
*
* @return the key instance
*/
- K getKey();
+ K getValue();
@Override
default ByteBuffer serialize() {
- return serialize(getKey());
+ return serialize(getValue());
}
}
diff --git
a/core/camel-api/src/main/java/org/apache/camel/resume/Resumable.java
b/core/camel-api/src/main/java/org/apache/camel/resume/Resumable.java
index 032a404a50c..37b474a84fb 100644
--- a/core/camel-api/src/main/java/org/apache/camel/resume/Resumable.java
+++ b/core/camel-api/src/main/java/org/apache/camel/resume/Resumable.java
@@ -34,7 +34,7 @@ public interface Resumable {
OffsetKey<?> getOffsetKey();
/**
- * Gets the last offset value
+ * Gets the last offset
*
* @return the last offset value according to the interface and type
implemented
*/
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/resume/ResumableCompletion.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/resume/ResumableCompletion.java
index a2185ccfc65..c4675683332 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/resume/ResumableCompletion.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/resume/ResumableCompletion.java
@@ -52,7 +52,7 @@ public class ResumableCompletion implements Synchronization {
if (LOG.isTraceEnabled()) {
LOG.trace("Processing the resumable: {}",
resumable.getOffsetKey());
- LOG.trace("Processing the resumable of type: {}",
resumable.getLastOffset().offset());
+ LOG.trace("Processing the resumable of type: {}",
resumable.getLastOffset().getValue());
}
if (resumeStrategy instanceof UpdatableConsumerResumeStrategy) {
@@ -82,7 +82,7 @@ public class ResumableCompletion implements Synchronization {
String logMessage = String.format(
"Skipping offset update with address '%s' and offset value
'%s' due to failure in processing: %s",
- resumable.getOffsetKey(),
resumable.getLastOffset().offset(), e.getMessage());
+ resumable.getOffsetKey(),
resumable.getLastOffset().getValue(), e.getMessage());
if (LOG.isDebugEnabled() || CamelLogger.shouldLog(LOG,
loggingLevel)) {
CamelLogger.log(LOG, LoggingLevel.DEBUG, logMessage, e);
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/resume/OffsetKeys.java
b/core/camel-support/src/main/java/org/apache/camel/support/resume/OffsetKeys.java
index 4e3e640396d..beb872d0609 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/resume/OffsetKeys.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/resume/OffsetKeys.java
@@ -39,12 +39,12 @@ public final class OffsetKeys {
}
@Override
- public void setKey(T key) {
+ public void setValue(T key) {
this.key = key;
}
@Override
- public T getKey() {
+ public T getValue() {
return key;
}
}
@@ -62,12 +62,12 @@ public final class OffsetKeys {
}
@Override
- public void setKey(T key) {
+ public void setValue(T key) {
throw new UnsupportedOperationException("This object is
unmodifiable");
}
@Override
- public T getKey() {
+ public T getValue() {
return key;
}
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/resume/Offsets.java
b/core/camel-support/src/main/java/org/apache/camel/support/resume/Offsets.java
index 46403d4c66a..ab0a25afa6c 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/resume/Offsets.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/resume/Offsets.java
@@ -36,7 +36,7 @@ public final class Offsets {
}
@Override
- public T offset() {
+ public T getValue() {
return offset;
}
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/resume/Resumables.java
b/core/camel-support/src/main/java/org/apache/camel/support/resume/Resumables.java
index 7478735d739..b27a5493997 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/resume/Resumables.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/resume/Resumables.java
@@ -71,12 +71,12 @@ public final class Resumables {
private final K key = addressable;
@Override
- public void setKey(K key) {
+ public void setValue(K key) {
throw new UnsupportedOperationException("Setting offset
keys for anonymous resumables is unsupported");
}
@Override
- public K getKey() {
+ public K getValue() {
return key;
}
};
