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 0676679baac CAMEL-20212: Move MemoryStateRepository and
FileStateRepository to camel-support
0676679baac is described below
commit 0676679baac191ea478d761c04f647470234a597
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Dec 11 08:06:00 2023 +0100
CAMEL-20212: Move MemoryStateRepository and FileStateRepository to
camel-support
---
.../commit/KafkaConsumerAsyncWithOffsetRepoCommitIT.java | 2 +-
.../commit/KafkaConsumerSyncWithOffsetRepoCommitIT.java | 2 +-
.../processor/state}/FileStateRepositoryTest.java | 5 ++---
.../processor/state}/MemoryStateRepositoryTest.java | 3 +--
.../camel/support/processor/state}/FileStateRepository.java | 2 +-
.../camel/support/processor/state}/MemoryStateRepository.java | 2 +-
.../modules/ROOT/pages/camel-4x-upgrade-guide-4_3.adoc | 9 +++++++--
.../java/org/apache/camel/main/download/StubBeanRepository.java | 2 +-
8 files changed, 15 insertions(+), 12 deletions(-)
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/KafkaConsumerAsyncWithOffsetRepoCommitIT.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/KafkaConsumerAsyncWithOffsetRepoCommitIT.java
index 36fecc03aab..03de867b44b 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/KafkaConsumerAsyncWithOffsetRepoCommitIT.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/KafkaConsumerAsyncWithOffsetRepoCommitIT.java
@@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kafka.KafkaConstants;
import org.apache.camel.component.kafka.consumer.KafkaManualCommit;
import org.apache.camel.component.kafka.integration.common.KafkaTestUtil;
-import org.apache.camel.impl.engine.MemoryStateRepository;
+import org.apache.camel.support.processor.state.MemoryStateRepository;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/KafkaConsumerSyncWithOffsetRepoCommitIT.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/KafkaConsumerSyncWithOffsetRepoCommitIT.java
index 8e8842d1327..3bc008d5a4c 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/KafkaConsumerSyncWithOffsetRepoCommitIT.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/commit/KafkaConsumerSyncWithOffsetRepoCommitIT.java
@@ -21,7 +21,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kafka.KafkaConstants;
import org.apache.camel.component.kafka.consumer.KafkaManualCommit;
import org.apache.camel.component.kafka.integration.common.KafkaTestUtil;
-import org.apache.camel.impl.engine.MemoryStateRepository;
+import org.apache.camel.support.processor.state.MemoryStateRepository;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/FileStateRepositoryTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/processor/state/FileStateRepositoryTest.java
similarity index 96%
rename from
core/camel-core/src/test/java/org/apache/camel/impl/FileStateRepositoryTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/support/processor/state/FileStateRepositoryTest.java
index af51264d4de..2022636a0e2 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/FileStateRepositoryTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/processor/state/FileStateRepositoryTest.java
@@ -14,16 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl;
+package org.apache.camel.support.processor.state;
import java.io.File;
import org.apache.camel.TestSupport;
-import org.apache.camel.impl.engine.FileStateRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static
org.apache.camel.impl.engine.FileStateRepository.fileStateRepository;
+import static
org.apache.camel.support.processor.state.FileStateRepository.fileStateRepository;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/MemoryStateRepositoryTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/processor/state/MemoryStateRepositoryTest.java
similarity index 95%
rename from
core/camel-core/src/test/java/org/apache/camel/impl/MemoryStateRepositoryTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/support/processor/state/MemoryStateRepositoryTest.java
index d2c33538d2f..b927453fc50 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/MemoryStateRepositoryTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/processor/state/MemoryStateRepositoryTest.java
@@ -14,9 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl;
+package org.apache.camel.support.processor.state;
-import org.apache.camel.impl.engine.MemoryStateRepository;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/FileStateRepository.java
b/core/camel-support/src/main/java/org/apache/camel/support/processor/state/FileStateRepository.java
similarity index 99%
rename from
core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/FileStateRepository.java
rename to
core/camel-support/src/main/java/org/apache/camel/support/processor/state/FileStateRepository.java
index b379ed7d934..1c4aa0f5148 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/FileStateRepository.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/processor/state/FileStateRepository.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.engine;
+package org.apache.camel.support.processor.state;
import java.io.File;
import java.io.FileOutputStream;
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/MemoryStateRepository.java
b/core/camel-support/src/main/java/org/apache/camel/support/processor/state/MemoryStateRepository.java
similarity index 97%
rename from
core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/MemoryStateRepository.java
rename to
core/camel-support/src/main/java/org/apache/camel/support/processor/state/MemoryStateRepository.java
index 9b674fc3202..918f88e16e1 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/MemoryStateRepository.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/processor/state/MemoryStateRepository.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.engine;
+package org.apache.camel.support.processor.state;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_3.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_3.adoc
index b6c939905ac..63d3b3ad05a 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_3.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_3.adoc
@@ -6,6 +6,12 @@ from both 4.0 to 4.1 and 4.1 to 4.2.
== Upgrading Camel 4.2 to 4.3
+=== camel-core
+
+Moved class `org.apache.camel.impl.engine.MemoryStateRepository` from
camel-base-engine to
`org.apache.camel.support.processor.state.MemoryStateRepository` in
camel-support.
+
+Moved class `org.apache.camel.impl.engine.FileStateRepository` from
camel-base-engine to
`org.apache.camel.support.processor.state.FileStateRepository` in camel-support.
+
=== Resequence EIP
The configuration for batch and stream has been renamed from `batch-config` to
`batchConfig` and `stream-config` to `streamConfig`.
@@ -155,5 +161,4 @@ This option is only intended for the Load Balancer EIP.
This makes the YAML sche
=== camel-hdfs
-The HDFS component has been deprecated and it will be removed in 4.4.0. More
information at CAMEL-20196 issue.
-
+The HDFS component has been deprecated, and planned to be removed in 4.4 (see
CAMEL-20196).
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/StubBeanRepository.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/StubBeanRepository.java
index 5dc962cd32c..4457d3abb61 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/StubBeanRepository.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/StubBeanRepository.java
@@ -21,7 +21,6 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import org.apache.camel.impl.engine.MemoryStateRepository;
import org.apache.camel.processor.DefaultClaimCheckRepository;
import org.apache.camel.processor.aggregate.MemoryAggregationRepository;
import org.apache.camel.spi.AggregationRepository;
@@ -31,6 +30,7 @@ import org.apache.camel.spi.IdempotentRepository;
import org.apache.camel.spi.StateRepository;
import org.apache.camel.support.PatternHelper;
import
org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository;
+import org.apache.camel.support.processor.state.MemoryStateRepository;
public class StubBeanRepository implements BeanRepository {
