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 032a7cded45 Regen for commit c05c928da1b831c51c5d4617bbf81e0165b2bcf6
032a7cded45 is described below
commit 032a7cded45af18e442cb0010b4a0b48843851e4
Author: orpiske <orpi...@users.noreply.github.com>
AuthorDate: Tue May 31 13:04:38 2022 +0000
Regen for commit c05c928da1b831c51c5d4617bbf81e0165b2bcf6
Signed-off-by: GitHub <nore...@github.com>
---
.../java/org/apache/camel/resume/Cacheable.java | 10 +++++----
.../org/apache/camel/resume/Deserializable.java | 4 ++--
.../main/java/org/apache/camel/resume/Offset.java | 1 +
.../java/org/apache/camel/resume/OffsetKey.java | 3 +++
.../java/org/apache/camel/resume/Resumable.java | 2 +-
.../org/apache/camel/resume/ResumeStrategy.java | 5 +++--
.../java/org/apache/camel/resume/Serializable.java | 7 +++---
.../org/apache/camel/resume/cache/ResumeCache.java | 25 +++++++++++-----------
.../org/apache/camel/impl/engine/DefaultRoute.java | 2 +-
.../FileConsumerResumeFromOffsetStrategyTest.java | 3 ++-
10 files changed, 36 insertions(+), 26 deletions(-)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/resume/Cacheable.java
b/core/camel-api/src/main/java/org/apache/camel/resume/Cacheable.java
index 1b2e9cc5a36..157d3689fe0 100644
--- a/core/camel-api/src/main/java/org/apache/camel/resume/Cacheable.java
+++ b/core/camel-api/src/main/java/org/apache/camel/resume/Cacheable.java
@@ -26,21 +26,23 @@ public interface Cacheable {
/**
* Adds an offset key and value to the cache
- * @param key the key to add
- * @param offset the offset to add
- * @return true if added successfully (i.e.: the cache is not full) or
false otherwise
+ *
+ * @param key the key to add
+ * @param offset the offset to add
+ * @return true if added successfully (i.e.: the cache is not full)
or false otherwise
*/
boolean add(OffsetKey<?> key, Offset<?> offset);
/**
* Sets the cache in resume adapters and objects that cache their data
+ *
* @param cache A resume cache instance
*/
void setCache(ResumeCache<?> cache);
-
/**
* Gets the cache in resume adapters and objects that cache their data
+ *
* @return A resume cache instance
*/
ResumeCache<?> getCache();
diff --git
a/core/camel-api/src/main/java/org/apache/camel/resume/Deserializable.java
b/core/camel-api/src/main/java/org/apache/camel/resume/Deserializable.java
index 630dc7bc2d6..32af4c8f126 100644
--- a/core/camel-api/src/main/java/org/apache/camel/resume/Deserializable.java
+++ b/core/camel-api/src/main/java/org/apache/camel/resume/Deserializable.java
@@ -22,8 +22,8 @@ import java.nio.ByteBuffer;
public interface Deserializable {
- default Object deserializeObject(ByteBuffer buffer) {
- buffer.clear();
+ default Object deserializeObject(ByteBuffer buffer) {
+ buffer.clear();
int dataType = buffer.getInt();
switch (dataType) {
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 a6e5519f296..8b66d07f594 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
@@ -28,6 +28,7 @@ public interface Offset<T> extends Serializable {
/**
* Sets the current offset value
+ *
* @param offset the current offset value
*/
void update(T offset);
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 4299dbbdeef..72cf83b5793 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
@@ -21,17 +21,20 @@ import java.nio.ByteBuffer;
/**
* An interface to represent offset keys (addressable for an offset)
+ *
* @param <K> the type of the offset key
*/
public interface OffsetKey<K> extends Serializable {
/**
* Sets the key
+ *
* @param key the key valeu
*/
void setKey(K key);
/**
* Gets the key
+ *
* @return the key instance
*/
K getKey();
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 586616c960d..032a404a50c 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
@@ -29,7 +29,7 @@ public interface Resumable {
* Gets the offset key (i.e.: the addressable part of the resumable object)
*
* @return An OffsetKey instance with the addressable part of the object.
May return null or an EmptyOffset
- * depending on the type of the resumable
+ * depending on the type of the resumable
*/
OffsetKey<?> getOffsetKey();
diff --git
a/core/camel-api/src/main/java/org/apache/camel/resume/ResumeStrategy.java
b/core/camel-api/src/main/java/org/apache/camel/resume/ResumeStrategy.java
index a1ffc6c67cc..0c30dab50bf 100644
--- a/core/camel-api/src/main/java/org/apache/camel/resume/ResumeStrategy.java
+++ b/core/camel-api/src/main/java/org/apache/camel/resume/ResumeStrategy.java
@@ -27,7 +27,8 @@ public interface ResumeStrategy extends Service {
/**
* Sets an adapter for resuming operations with this strategy
- * @param adapter the component-specific resume adapter
+ *
+ * @param adapter the component-specific resume adapter
*/
void setAdapter(ResumeAdapter adapter);
@@ -47,9 +48,9 @@ public interface ResumeStrategy extends Service {
return clazz.cast(getAdapter());
}
-
/**
* Loads the cache with the data currently available in this strategy
+ *
* @throws Exception
*/
default void loadCache() throws Exception {
diff --git
a/core/camel-api/src/main/java/org/apache/camel/resume/Serializable.java
b/core/camel-api/src/main/java/org/apache/camel/resume/Serializable.java
index 1cf134eee55..d49724d280f 100644
--- a/core/camel-api/src/main/java/org/apache/camel/resume/Serializable.java
+++ b/core/camel-api/src/main/java/org/apache/camel/resume/Serializable.java
@@ -17,7 +17,6 @@
package org.apache.camel.resume;
-
import java.io.File;
import java.nio.ByteBuffer;
@@ -37,8 +36,9 @@ public interface Serializable {
/**
* Serializes this offset into a buffer of bytes
- * @param obj the object to serialize
- * @return a ByteBuffer instance with the serialized contents of this
object
+ *
+ * @param obj the object to serialize
+ * @return a ByteBuffer instance with the serialized contents of this
object
*/
default ByteBuffer serialize(Object obj) {
ObjectHelper.notNull(obj, "Cannot perform serialization on a null
object");
@@ -76,6 +76,7 @@ public interface Serializable {
/**
* Serializes this offset into a buffer of bytes
+ *
* @return a ByteBuffer instance with the serialized contents of this
object
*/
ByteBuffer serialize();
diff --git
a/core/camel-api/src/main/java/org/apache/camel/resume/cache/ResumeCache.java
b/core/camel-api/src/main/java/org/apache/camel/resume/cache/ResumeCache.java
index a6eb7737344..090492b32b4 100644
---
a/core/camel-api/src/main/java/org/apache/camel/resume/cache/ResumeCache.java
+++
b/core/camel-api/src/main/java/org/apache/camel/resume/cache/ResumeCache.java
@@ -31,21 +31,24 @@ public interface ResumeCache<K> {
/**
* If the specified key is not present, compute its value from the mapping
function (like Java's standard Map one)
- * @param key the key to get or associate with the value
- * @param mapping the mapping function used to compute the value
- * @return the value associated with the key (either the present or the
one computed from the mapping function)
+ *
+ * @param key the key to get or associate with the value
+ * @param mapping the mapping function used to compute the value
+ * @return the value associated with the key (either the present
or the one computed from the mapping
+ * function)
*/
Object computeIfAbsent(K key, Function<? super K, ? super Object> mapping);
/**
* If the specified key is present, compute a new value from the mapping
function (like Java's standard Map one)
- * @param key the key to get or associate with the value
- * @param remapping the remapping function used to compute the new value
- * @return the value associated with the key (either the present or the
one computed from the mapping function)
+ *
+ * @param key the key to get or associate with the value
+ * @param remapping the remapping function used to compute the new value
+ * @return the value associated with the key (either the present
or the one computed from the mapping
+ * function)
*/
Object computeIfPresent(K key, BiFunction<? super K, ? super Object, ?
super Object> remapping);
-
/**
* Whether the cache contains the key with the given entry value
*
@@ -75,17 +78,15 @@ public interface ResumeCache<K> {
*/
long capacity();
-
/**
* Gets the offset entry for the key
*
- * @param key the key
- * @param clazz the class object representing the value to be obtained
- * @return the offset value wrapped in an optional
+ * @param key the key
+ * @param clazz the class object representing the value to be obtained
+ * @return the offset value wrapped in an optional
*/
<T> T get(K key, Class<T> clazz);
-
/**
* Gets the offset entry for the key
*
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java
index f065ffcddc6..2c8bec8a09d 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoute.java
@@ -644,7 +644,7 @@ public class DefaultRoute extends ServiceSupport implements
Route {
}
if (consumer instanceof ResumeAware && resumeStrategy != null) {
- ResumeAdapter resumeAdapter =
AdapterHelper.eval(getCamelContext(),consumer);
+ ResumeAdapter resumeAdapter =
AdapterHelper.eval(getCamelContext(), consumer);
resumeStrategy.setAdapter(resumeAdapter);
((ResumeAware) consumer).setResumeStrategy(resumeStrategy);
}
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 9ffe7489dc9..1c038f4a639 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
@@ -74,7 +74,8 @@ public class FileConsumerResumeFromOffsetStrategyTest extends
ContextTestSupport
}
}
- private static class FailResumeAdapter implements FileResumeAdapter,
DirectoryEntriesResumeAdapter,UpdatableConsumerResumeStrategy<Resumable> {
+ private static class FailResumeAdapter
+ implements FileResumeAdapter, DirectoryEntriesResumeAdapter,
UpdatableConsumerResumeStrategy<Resumable> {
private boolean called;
@Override
