This is an automated email from the ASF dual-hosted git repository.
davidarthur pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new d173842d364 KAFKA-17469: Move persister related classes to persister
pkg. (#17349)
d173842d364 is described below
commit d173842d36413e011252220c01f0da294f179d63
Author: Sushant Mahajan <[email protected]>
AuthorDate: Thu Oct 3 20:30:22 2024 +0530
KAFKA-17469: Move persister related classes to persister pkg. (#17349)
Reviewers: Andrew Schofield <[email protected]>, David Arthur
<[email protected]>
---
.../java/kafka/server/share/SharePartition.java | 22 +++++++++++-----------
.../kafka/server/share/SharePartitionManager.java | 2 +-
.../src/main/scala/kafka/server/BrokerServer.scala | 2 +-
.../server/share/SharePartitionManagerTest.java | 4 ++--
.../kafka/server/share/SharePartitionTest.java | 14 +++++++-------
.../share/PersisterStateBatchCombiner.java | 2 +-
.../coordinator/share/ShareCoordinatorShard.java | 5 ++---
.../kafka/coordinator/share/ShareGroupOffset.java | 2 +-
.../share/PersisterStateBatchCombinerTest.java | 2 +-
.../share/ShareCoordinatorRecordHelpersTest.java | 2 +-
.../share/ShareCoordinatorShardTest.java | 2 +-
.../DeleteShareGroupStateParameters.java | 2 +-
.../DeleteShareGroupStateResult.java | 2 +-
.../{ => persister}/GroupTopicPartitionData.java | 2 +-
.../InitializeShareGroupStateParameters.java | 2 +-
.../InitializeShareGroupStateResult.java | 2 +-
.../{ => persister}/NoOpShareStatePersister.java | 2 +-
.../share/{ => persister}/PartitionAllData.java | 2 +-
.../share/{ => persister}/PartitionData.java | 2 +-
.../share/{ => persister}/PartitionErrorData.java | 2 +-
.../share/{ => persister}/PartitionFactory.java | 2 +-
.../share/{ => persister}/PartitionIdData.java | 2 +-
.../PartitionIdLeaderEpochData.java | 2 +-
.../share/{ => persister}/PartitionInfoData.java | 2 +-
.../{ => persister}/PartitionStateBatchData.java | 2 +-
.../share/{ => persister}/PartitionStateData.java | 2 +-
.../{ => persister}/PartitionStateErrorData.java | 2 +-
.../server/share/{ => persister}/Persister.java | 2 +-
.../share/{ => persister}/PersisterParameters.java | 2 +-
.../share/{ => persister}/PersisterResult.java | 2 +-
.../share/{ => persister}/PersisterStateBatch.java | 2 +-
.../ReadShareGroupStateParameters.java | 2 +-
.../{ => persister}/ReadShareGroupStateResult.java | 2 +-
.../ReadShareGroupStateSummaryParameters.java | 2 +-
.../ReadShareGroupStateSummaryResult.java | 2 +-
.../server/share/{ => persister}/TopicData.java | 2 +-
.../WriteShareGroupStateParameters.java | 2 +-
.../WriteShareGroupStateResult.java | 2 +-
38 files changed, 56 insertions(+), 57 deletions(-)
diff --git a/core/src/main/java/kafka/server/share/SharePartition.java
b/core/src/main/java/kafka/server/share/SharePartition.java
index e70dad78f93..4fd1e635609 100644
--- a/core/src/main/java/kafka/server/share/SharePartition.java
+++ b/core/src/main/java/kafka/server/share/SharePartition.java
@@ -32,18 +32,18 @@ import
org.apache.kafka.common.message.ShareFetchResponseData.AcquiredRecords;
import org.apache.kafka.common.protocol.Errors;
import org.apache.kafka.common.record.RecordBatch;
import org.apache.kafka.common.utils.Time;
-import org.apache.kafka.server.share.GroupTopicPartitionData;
-import org.apache.kafka.server.share.PartitionAllData;
-import org.apache.kafka.server.share.PartitionErrorData;
-import org.apache.kafka.server.share.PartitionFactory;
-import org.apache.kafka.server.share.PartitionIdLeaderEpochData;
-import org.apache.kafka.server.share.PartitionStateBatchData;
-import org.apache.kafka.server.share.Persister;
-import org.apache.kafka.server.share.PersisterStateBatch;
-import org.apache.kafka.server.share.ReadShareGroupStateParameters;
-import org.apache.kafka.server.share.TopicData;
-import org.apache.kafka.server.share.WriteShareGroupStateParameters;
import org.apache.kafka.server.share.acknowledge.ShareAcknowledgementBatch;
+import org.apache.kafka.server.share.persister.GroupTopicPartitionData;
+import org.apache.kafka.server.share.persister.PartitionAllData;
+import org.apache.kafka.server.share.persister.PartitionErrorData;
+import org.apache.kafka.server.share.persister.PartitionFactory;
+import org.apache.kafka.server.share.persister.PartitionIdLeaderEpochData;
+import org.apache.kafka.server.share.persister.PartitionStateBatchData;
+import org.apache.kafka.server.share.persister.Persister;
+import org.apache.kafka.server.share.persister.PersisterStateBatch;
+import org.apache.kafka.server.share.persister.ReadShareGroupStateParameters;
+import org.apache.kafka.server.share.persister.TopicData;
+import org.apache.kafka.server.share.persister.WriteShareGroupStateParameters;
import org.apache.kafka.server.storage.log.FetchPartitionData;
import org.apache.kafka.server.util.timer.Timer;
import org.apache.kafka.server.util.timer.TimerTask;
diff --git a/core/src/main/java/kafka/server/share/SharePartitionManager.java
b/core/src/main/java/kafka/server/share/SharePartitionManager.java
index 09001872174..7b13a32c9c9 100644
--- a/core/src/main/java/kafka/server/share/SharePartitionManager.java
+++ b/core/src/main/java/kafka/server/share/SharePartitionManager.java
@@ -39,13 +39,13 @@ import
org.apache.kafka.common.requests.ShareRequestMetadata;
import org.apache.kafka.common.utils.ImplicitLinkedHashCollection;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.server.share.CachedSharePartition;
-import org.apache.kafka.server.share.Persister;
import org.apache.kafka.server.share.SharePartitionKey;
import org.apache.kafka.server.share.acknowledge.ShareAcknowledgementBatch;
import org.apache.kafka.server.share.context.FinalContext;
import org.apache.kafka.server.share.context.ShareFetchContext;
import org.apache.kafka.server.share.context.ShareSessionContext;
import org.apache.kafka.server.share.fetch.ShareFetchData;
+import org.apache.kafka.server.share.persister.Persister;
import org.apache.kafka.server.share.session.ShareSession;
import org.apache.kafka.server.share.session.ShareSessionCache;
import org.apache.kafka.server.share.session.ShareSessionKey;
diff --git a/core/src/main/scala/kafka/server/BrokerServer.scala
b/core/src/main/scala/kafka/server/BrokerServer.scala
index 132748d4761..90fd297ef08 100644
--- a/core/src/main/scala/kafka/server/BrokerServer.scala
+++ b/core/src/main/scala/kafka/server/BrokerServer.scala
@@ -47,7 +47,7 @@ import org.apache.kafka.server.{AssignmentsManager,
ClientMetricsManager, NodeTo
import org.apache.kafka.server.authorizer.Authorizer
import org.apache.kafka.server.common.{ApiMessageAndVersion,
DirectoryEventHandler, TopicIdPartition}
import org.apache.kafka.server.config.ConfigType
-import org.apache.kafka.server.share.{NoOpShareStatePersister, Persister}
+import org.apache.kafka.server.share.persister.{NoOpShareStatePersister,
Persister}
import org.apache.kafka.server.log.remote.storage.RemoteLogManagerConfig
import org.apache.kafka.server.metrics.{ClientMetricsReceiverPlugin,
KafkaYammerMetrics}
import org.apache.kafka.server.network.{EndpointReadyFutures,
KafkaAuthorizerServerInfo}
diff --git
a/core/src/test/java/kafka/server/share/SharePartitionManagerTest.java
b/core/src/test/java/kafka/server/share/SharePartitionManagerTest.java
index c6424a04d08..da8328b8f26 100644
--- a/core/src/test/java/kafka/server/share/SharePartitionManagerTest.java
+++ b/core/src/test/java/kafka/server/share/SharePartitionManagerTest.java
@@ -51,14 +51,14 @@ import org.apache.kafka.common.utils.MockTime;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.server.share.CachedSharePartition;
import org.apache.kafka.server.share.ErroneousAndValidPartitionData;
-import org.apache.kafka.server.share.NoOpShareStatePersister;
-import org.apache.kafka.server.share.Persister;
import org.apache.kafka.server.share.SharePartitionKey;
import org.apache.kafka.server.share.acknowledge.ShareAcknowledgementBatch;
import org.apache.kafka.server.share.context.FinalContext;
import org.apache.kafka.server.share.context.ShareFetchContext;
import org.apache.kafka.server.share.context.ShareSessionContext;
import org.apache.kafka.server.share.fetch.ShareFetchData;
+import org.apache.kafka.server.share.persister.NoOpShareStatePersister;
+import org.apache.kafka.server.share.persister.Persister;
import org.apache.kafka.server.share.session.ShareSession;
import org.apache.kafka.server.share.session.ShareSessionCache;
import org.apache.kafka.server.share.session.ShareSessionKey;
diff --git a/core/src/test/java/kafka/server/share/SharePartitionTest.java
b/core/src/test/java/kafka/server/share/SharePartitionTest.java
index 9643e939611..15c5df8a341 100644
--- a/core/src/test/java/kafka/server/share/SharePartitionTest.java
+++ b/core/src/test/java/kafka/server/share/SharePartitionTest.java
@@ -37,14 +37,14 @@ import org.apache.kafka.common.record.MemoryRecordsBuilder;
import org.apache.kafka.common.record.TimestampType;
import org.apache.kafka.common.utils.MockTime;
import org.apache.kafka.common.utils.Time;
-import org.apache.kafka.server.share.NoOpShareStatePersister;
-import org.apache.kafka.server.share.PartitionFactory;
-import org.apache.kafka.server.share.Persister;
-import org.apache.kafka.server.share.PersisterStateBatch;
-import org.apache.kafka.server.share.ReadShareGroupStateResult;
-import org.apache.kafka.server.share.TopicData;
-import org.apache.kafka.server.share.WriteShareGroupStateResult;
import org.apache.kafka.server.share.acknowledge.ShareAcknowledgementBatch;
+import org.apache.kafka.server.share.persister.NoOpShareStatePersister;
+import org.apache.kafka.server.share.persister.PartitionFactory;
+import org.apache.kafka.server.share.persister.Persister;
+import org.apache.kafka.server.share.persister.PersisterStateBatch;
+import org.apache.kafka.server.share.persister.ReadShareGroupStateResult;
+import org.apache.kafka.server.share.persister.TopicData;
+import org.apache.kafka.server.share.persister.WriteShareGroupStateResult;
import org.apache.kafka.server.storage.log.FetchPartitionData;
import org.apache.kafka.server.util.FutureUtils;
import org.apache.kafka.server.util.timer.SystemTimer;
diff --git
a/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/PersisterStateBatchCombiner.java
b/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/PersisterStateBatchCombiner.java
index 67f21e4c1c7..a2010c761f5 100644
---
a/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/PersisterStateBatchCombiner.java
+++
b/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/PersisterStateBatchCombiner.java
@@ -17,7 +17,7 @@
package org.apache.kafka.coordinator.share;
-import org.apache.kafka.server.share.PersisterStateBatch;
+import org.apache.kafka.server.share.persister.PersisterStateBatch;
import java.util.ArrayList;
import java.util.Iterator;
diff --git
a/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorShard.java
b/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorShard.java
index 3e4c39f0106..ef4b90e0218 100644
---
a/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorShard.java
+++
b/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorShard.java
@@ -47,9 +47,9 @@ import org.apache.kafka.image.MetadataDelta;
import org.apache.kafka.image.MetadataImage;
import org.apache.kafka.server.common.ApiMessageAndVersion;
import org.apache.kafka.server.config.ShareCoordinatorConfig;
-import org.apache.kafka.server.share.PartitionFactory;
-import org.apache.kafka.server.share.PersisterStateBatch;
import org.apache.kafka.server.share.SharePartitionKey;
+import org.apache.kafka.server.share.persister.PartitionFactory;
+import org.apache.kafka.server.share.persister.PersisterStateBatch;
import org.apache.kafka.timeline.SnapshotRegistry;
import org.apache.kafka.timeline.TimelineHashMap;
@@ -75,7 +75,6 @@ public class ShareCoordinatorShard implements
CoordinatorShard<CoordinatorRecord
public static final Exception NULL_TOPIC_ID = new Exception("The topic id
cannot be null.");
public static final Exception NEGATIVE_PARTITION_ID = new Exception("The
partition id cannot be a negative number.");
- public static final Exception UNEXPECTED_CURRENT_STATE = new
Exception("Unexpected current state was found.");
public static class Builder implements
CoordinatorShardBuilder<ShareCoordinatorShard, CoordinatorRecord> {
private ShareCoordinatorConfig config;
diff --git
a/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareGroupOffset.java
b/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareGroupOffset.java
index 8e678098d66..d7868f0cc63 100644
---
a/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareGroupOffset.java
+++
b/share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareGroupOffset.java
@@ -20,7 +20,7 @@ package org.apache.kafka.coordinator.share;
import org.apache.kafka.common.message.WriteShareGroupStateRequestData;
import org.apache.kafka.coordinator.share.generated.ShareSnapshotValue;
import org.apache.kafka.coordinator.share.generated.ShareUpdateValue;
-import org.apache.kafka.server.share.PersisterStateBatch;
+import org.apache.kafka.server.share.persister.PersisterStateBatch;
import java.util.Collections;
import java.util.LinkedHashSet;
diff --git
a/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/PersisterStateBatchCombinerTest.java
b/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/PersisterStateBatchCombinerTest.java
index d02ec616d10..6541e9479fd 100644
---
a/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/PersisterStateBatchCombinerTest.java
+++
b/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/PersisterStateBatchCombinerTest.java
@@ -17,7 +17,7 @@
package org.apache.kafka.coordinator.share;
-import org.apache.kafka.server.share.PersisterStateBatch;
+import org.apache.kafka.server.share.persister.PersisterStateBatch;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
diff --git
a/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorRecordHelpersTest.java
b/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorRecordHelpersTest.java
index ee1547212fc..ac3a8fe11b8 100644
---
a/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorRecordHelpersTest.java
+++
b/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorRecordHelpersTest.java
@@ -23,7 +23,7 @@ import
org.apache.kafka.coordinator.share.generated.ShareSnapshotValue;
import org.apache.kafka.coordinator.share.generated.ShareUpdateKey;
import org.apache.kafka.coordinator.share.generated.ShareUpdateValue;
import org.apache.kafka.server.common.ApiMessageAndVersion;
-import org.apache.kafka.server.share.PersisterStateBatch;
+import org.apache.kafka.server.share.persister.PersisterStateBatch;
import org.junit.jupiter.api.Test;
diff --git
a/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorShardTest.java
b/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorShardTest.java
index 15763d1af1f..0423ca6fe1c 100644
---
a/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorShardTest.java
+++
b/share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorShardTest.java
@@ -40,8 +40,8 @@ import org.apache.kafka.image.TopicImage;
import org.apache.kafka.metadata.PartitionRegistration;
import org.apache.kafka.server.common.ApiMessageAndVersion;
import org.apache.kafka.server.config.ShareCoordinatorConfig;
-import org.apache.kafka.server.share.PersisterStateBatch;
import org.apache.kafka.server.share.SharePartitionKey;
+import org.apache.kafka.server.share.persister.PersisterStateBatch;
import org.apache.kafka.timeline.SnapshotRegistry;
import org.junit.jupiter.api.Test;
diff --git
a/share/src/main/java/org/apache/kafka/server/share/DeleteShareGroupStateParameters.java
b/share/src/main/java/org/apache/kafka/server/share/persister/DeleteShareGroupStateParameters.java
similarity index 98%
rename from
share/src/main/java/org/apache/kafka/server/share/DeleteShareGroupStateParameters.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/DeleteShareGroupStateParameters.java
index 59e5886f101..8565d485947 100644
---
a/share/src/main/java/org/apache/kafka/server/share/DeleteShareGroupStateParameters.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/DeleteShareGroupStateParameters.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
import org.apache.kafka.common.message.DeleteShareGroupStateRequestData;
diff --git
a/share/src/main/java/org/apache/kafka/server/share/DeleteShareGroupStateResult.java
b/share/src/main/java/org/apache/kafka/server/share/persister/DeleteShareGroupStateResult.java
similarity index 98%
rename from
share/src/main/java/org/apache/kafka/server/share/DeleteShareGroupStateResult.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/DeleteShareGroupStateResult.java
index 264e203800f..5ed3dacc535 100644
---
a/share/src/main/java/org/apache/kafka/server/share/DeleteShareGroupStateResult.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/DeleteShareGroupStateResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
import org.apache.kafka.common.message.DeleteShareGroupStateResponseData;
diff --git
a/share/src/main/java/org/apache/kafka/server/share/GroupTopicPartitionData.java
b/share/src/main/java/org/apache/kafka/server/share/persister/GroupTopicPartitionData.java
similarity index 98%
rename from
share/src/main/java/org/apache/kafka/server/share/GroupTopicPartitionData.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/GroupTopicPartitionData.java
index f0e1809ac46..f8bf091596d 100644
---
a/share/src/main/java/org/apache/kafka/server/share/GroupTopicPartitionData.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/GroupTopicPartitionData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
import java.util.List;
import java.util.Objects;
diff --git
a/share/src/main/java/org/apache/kafka/server/share/InitializeShareGroupStateParameters.java
b/share/src/main/java/org/apache/kafka/server/share/persister/InitializeShareGroupStateParameters.java
similarity index 98%
rename from
share/src/main/java/org/apache/kafka/server/share/InitializeShareGroupStateParameters.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/InitializeShareGroupStateParameters.java
index a1e4cc663e2..59ec501bbcc 100644
---
a/share/src/main/java/org/apache/kafka/server/share/InitializeShareGroupStateParameters.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/InitializeShareGroupStateParameters.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
import org.apache.kafka.common.message.InitializeShareGroupStateRequestData;
diff --git
a/share/src/main/java/org/apache/kafka/server/share/InitializeShareGroupStateResult.java
b/share/src/main/java/org/apache/kafka/server/share/persister/InitializeShareGroupStateResult.java
similarity index 98%
rename from
share/src/main/java/org/apache/kafka/server/share/InitializeShareGroupStateResult.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/InitializeShareGroupStateResult.java
index 744679736ff..d616820c30a 100644
---
a/share/src/main/java/org/apache/kafka/server/share/InitializeShareGroupStateResult.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/InitializeShareGroupStateResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
import org.apache.kafka.common.message.InitializeShareGroupStateResponseData;
diff --git
a/share/src/main/java/org/apache/kafka/server/share/NoOpShareStatePersister.java
b/share/src/main/java/org/apache/kafka/server/share/persister/NoOpShareStatePersister.java
similarity index 99%
rename from
share/src/main/java/org/apache/kafka/server/share/NoOpShareStatePersister.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/NoOpShareStatePersister.java
index 900b25efdd0..f2c7e56b2b5 100644
---
a/share/src/main/java/org/apache/kafka/server/share/NoOpShareStatePersister.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/NoOpShareStatePersister.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
import java.util.ArrayList;
import java.util.Collections;
diff --git
a/share/src/main/java/org/apache/kafka/server/share/PartitionAllData.java
b/share/src/main/java/org/apache/kafka/server/share/persister/PartitionAllData.java
similarity index 96%
rename from
share/src/main/java/org/apache/kafka/server/share/PartitionAllData.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/PartitionAllData.java
index 2a9f55dd5f6..b3d12611673 100644
--- a/share/src/main/java/org/apache/kafka/server/share/PartitionAllData.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/PartitionAllData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
import java.util.List;
diff --git
a/share/src/main/java/org/apache/kafka/server/share/PartitionData.java
b/share/src/main/java/org/apache/kafka/server/share/persister/PartitionData.java
similarity index 99%
rename from share/src/main/java/org/apache/kafka/server/share/PartitionData.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/PartitionData.java
index e424619d8eb..61b1d3a621f 100644
--- a/share/src/main/java/org/apache/kafka/server/share/PartitionData.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/PartitionData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
import java.util.List;
import java.util.Objects;
diff --git
a/share/src/main/java/org/apache/kafka/server/share/PartitionErrorData.java
b/share/src/main/java/org/apache/kafka/server/share/persister/PartitionErrorData.java
similarity index 95%
rename from
share/src/main/java/org/apache/kafka/server/share/PartitionErrorData.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/PartitionErrorData.java
index 4fb9f83fc52..b9757b53e92 100644
--- a/share/src/main/java/org/apache/kafka/server/share/PartitionErrorData.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/PartitionErrorData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
/**
* This interface is implemented by classes used to contain the data for a
partition with error data
diff --git
a/share/src/main/java/org/apache/kafka/server/share/PartitionFactory.java
b/share/src/main/java/org/apache/kafka/server/share/persister/PartitionFactory.java
similarity index 98%
rename from
share/src/main/java/org/apache/kafka/server/share/PartitionFactory.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/PartitionFactory.java
index 5adf87c3c27..7336547e8d6 100644
--- a/share/src/main/java/org/apache/kafka/server/share/PartitionFactory.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/PartitionFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
import org.apache.kafka.common.protocol.Errors;
diff --git
a/share/src/main/java/org/apache/kafka/server/share/PartitionIdData.java
b/share/src/main/java/org/apache/kafka/server/share/persister/PartitionIdData.java
similarity index 95%
rename from
share/src/main/java/org/apache/kafka/server/share/PartitionIdData.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/PartitionIdData.java
index feb288bb13c..87824483c13 100644
--- a/share/src/main/java/org/apache/kafka/server/share/PartitionIdData.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/PartitionIdData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
/**
* This interface is implemented by classes used to contain the data for a
partition with its partition index
diff --git
a/share/src/main/java/org/apache/kafka/server/share/PartitionIdLeaderEpochData.java
b/share/src/main/java/org/apache/kafka/server/share/persister/PartitionIdLeaderEpochData.java
similarity index 95%
rename from
share/src/main/java/org/apache/kafka/server/share/PartitionIdLeaderEpochData.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/PartitionIdLeaderEpochData.java
index aa9da7428e6..12040ce37a8 100644
---
a/share/src/main/java/org/apache/kafka/server/share/PartitionIdLeaderEpochData.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/PartitionIdLeaderEpochData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
/**
* This interface is implemented by classes used to contain the data for a
partition with its leader epoch
diff --git
a/share/src/main/java/org/apache/kafka/server/share/PartitionInfoData.java
b/share/src/main/java/org/apache/kafka/server/share/persister/PartitionInfoData.java
similarity index 95%
rename from
share/src/main/java/org/apache/kafka/server/share/PartitionInfoData.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/PartitionInfoData.java
index 3c4ef895368..966c41ad69f 100644
--- a/share/src/main/java/org/apache/kafka/server/share/PartitionInfoData.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/PartitionInfoData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
/**
* This interface is implemented by classes used to contain the data for a
partition in the
diff --git
a/share/src/main/java/org/apache/kafka/server/share/PartitionStateBatchData.java
b/share/src/main/java/org/apache/kafka/server/share/persister/PartitionStateBatchData.java
similarity index 96%
rename from
share/src/main/java/org/apache/kafka/server/share/PartitionStateBatchData.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/PartitionStateBatchData.java
index dfd06cb5dd8..326b6e2ca56 100644
---
a/share/src/main/java/org/apache/kafka/server/share/PartitionStateBatchData.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/PartitionStateBatchData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
import java.util.List;
diff --git
a/share/src/main/java/org/apache/kafka/server/share/PartitionStateData.java
b/share/src/main/java/org/apache/kafka/server/share/persister/PartitionStateData.java
similarity index 95%
rename from
share/src/main/java/org/apache/kafka/server/share/PartitionStateData.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/PartitionStateData.java
index f1690ff4d32..1a7ee0bf088 100644
--- a/share/src/main/java/org/apache/kafka/server/share/PartitionStateData.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/PartitionStateData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
/**
* This interface is implemented by classes used to contain the data for a
partition with the state epoch and
diff --git
a/share/src/main/java/org/apache/kafka/server/share/PartitionStateErrorData.java
b/share/src/main/java/org/apache/kafka/server/share/persister/PartitionStateErrorData.java
similarity index 95%
rename from
share/src/main/java/org/apache/kafka/server/share/PartitionStateErrorData.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/PartitionStateErrorData.java
index af238751392..39960f95cc6 100644
---
a/share/src/main/java/org/apache/kafka/server/share/PartitionStateErrorData.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/PartitionStateErrorData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
/**
* This interface is implemented by classes used to contain the data for a
partition with state and error data
diff --git a/share/src/main/java/org/apache/kafka/server/share/Persister.java
b/share/src/main/java/org/apache/kafka/server/share/persister/Persister.java
similarity index 98%
rename from share/src/main/java/org/apache/kafka/server/share/Persister.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/Persister.java
index 2dc53e1c92c..63782a927ac 100644
--- a/share/src/main/java/org/apache/kafka/server/share/Persister.java
+++ b/share/src/main/java/org/apache/kafka/server/share/persister/Persister.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
import org.apache.kafka.common.annotation.InterfaceStability;
diff --git
a/share/src/main/java/org/apache/kafka/server/share/PersisterParameters.java
b/share/src/main/java/org/apache/kafka/server/share/persister/PersisterParameters.java
similarity index 95%
rename from
share/src/main/java/org/apache/kafka/server/share/PersisterParameters.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/PersisterParameters.java
index f3c481570d2..21de01625cb 100644
--- a/share/src/main/java/org/apache/kafka/server/share/PersisterParameters.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/PersisterParameters.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
/**
* Marker interface for parameter classes related to the {@link Persister}
result classes.
diff --git
a/share/src/main/java/org/apache/kafka/server/share/PersisterResult.java
b/share/src/main/java/org/apache/kafka/server/share/persister/PersisterResult.java
similarity index 95%
rename from
share/src/main/java/org/apache/kafka/server/share/PersisterResult.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/PersisterResult.java
index 94eb481d2ac..b9e11e63ab2 100644
--- a/share/src/main/java/org/apache/kafka/server/share/PersisterResult.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/PersisterResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
/**
* Marker interface for result classes related to the {@link Persister} result
classes.
diff --git
a/share/src/main/java/org/apache/kafka/server/share/PersisterStateBatch.java
b/share/src/main/java/org/apache/kafka/server/share/persister/PersisterStateBatch.java
similarity index 98%
rename from
share/src/main/java/org/apache/kafka/server/share/PersisterStateBatch.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/PersisterStateBatch.java
index 95bee3e4ce3..b3bfe746320 100644
--- a/share/src/main/java/org/apache/kafka/server/share/PersisterStateBatch.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/PersisterStateBatch.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
import org.apache.kafka.common.message.ReadShareGroupStateResponseData;
import org.apache.kafka.common.message.WriteShareGroupStateRequestData;
diff --git
a/share/src/main/java/org/apache/kafka/server/share/ReadShareGroupStateParameters.java
b/share/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateParameters.java
similarity index 98%
rename from
share/src/main/java/org/apache/kafka/server/share/ReadShareGroupStateParameters.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateParameters.java
index 225de97de6a..c146d120520 100644
---
a/share/src/main/java/org/apache/kafka/server/share/ReadShareGroupStateParameters.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateParameters.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
import org.apache.kafka.common.message.ReadShareGroupStateRequestData;
diff --git
a/share/src/main/java/org/apache/kafka/server/share/ReadShareGroupStateResult.java
b/share/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateResult.java
similarity index 98%
rename from
share/src/main/java/org/apache/kafka/server/share/ReadShareGroupStateResult.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateResult.java
index ce80d60d265..8efde249b74 100644
---
a/share/src/main/java/org/apache/kafka/server/share/ReadShareGroupStateResult.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
import org.apache.kafka.common.message.ReadShareGroupStateResponseData;
diff --git
a/share/src/main/java/org/apache/kafka/server/share/ReadShareGroupStateSummaryParameters.java
b/share/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateSummaryParameters.java
similarity index 98%
rename from
share/src/main/java/org/apache/kafka/server/share/ReadShareGroupStateSummaryParameters.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateSummaryParameters.java
index 728b176b77d..cb0efd25e9e 100644
---
a/share/src/main/java/org/apache/kafka/server/share/ReadShareGroupStateSummaryParameters.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateSummaryParameters.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
import org.apache.kafka.common.message.ReadShareGroupStateSummaryRequestData;
diff --git
a/share/src/main/java/org/apache/kafka/server/share/ReadShareGroupStateSummaryResult.java
b/share/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateSummaryResult.java
similarity index 98%
rename from
share/src/main/java/org/apache/kafka/server/share/ReadShareGroupStateSummaryResult.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateSummaryResult.java
index 4f56fe2cfab..7172c6acef7 100644
---
a/share/src/main/java/org/apache/kafka/server/share/ReadShareGroupStateSummaryResult.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/ReadShareGroupStateSummaryResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
import org.apache.kafka.common.message.ReadShareGroupStateSummaryResponseData;
diff --git a/share/src/main/java/org/apache/kafka/server/share/TopicData.java
b/share/src/main/java/org/apache/kafka/server/share/persister/TopicData.java
similarity index 97%
rename from share/src/main/java/org/apache/kafka/server/share/TopicData.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/TopicData.java
index 4d31d9f7265..ddaeed7932a 100644
--- a/share/src/main/java/org/apache/kafka/server/share/TopicData.java
+++ b/share/src/main/java/org/apache/kafka/server/share/persister/TopicData.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
import org.apache.kafka.common.Uuid;
diff --git
a/share/src/main/java/org/apache/kafka/server/share/WriteShareGroupStateParameters.java
b/share/src/main/java/org/apache/kafka/server/share/persister/WriteShareGroupStateParameters.java
similarity index 98%
rename from
share/src/main/java/org/apache/kafka/server/share/WriteShareGroupStateParameters.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/WriteShareGroupStateParameters.java
index 7b4bbbbc770..7d4f8065423 100644
---
a/share/src/main/java/org/apache/kafka/server/share/WriteShareGroupStateParameters.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/WriteShareGroupStateParameters.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
import org.apache.kafka.common.message.WriteShareGroupStateRequestData;
diff --git
a/share/src/main/java/org/apache/kafka/server/share/WriteShareGroupStateResult.java
b/share/src/main/java/org/apache/kafka/server/share/persister/WriteShareGroupStateResult.java
similarity index 98%
rename from
share/src/main/java/org/apache/kafka/server/share/WriteShareGroupStateResult.java
rename to
share/src/main/java/org/apache/kafka/server/share/persister/WriteShareGroupStateResult.java
index b96ec217b6d..8db6f1c6910 100644
---
a/share/src/main/java/org/apache/kafka/server/share/WriteShareGroupStateResult.java
+++
b/share/src/main/java/org/apache/kafka/server/share/persister/WriteShareGroupStateResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.kafka.server.share;
+package org.apache.kafka.server.share.persister;
import org.apache.kafka.common.message.WriteShareGroupStateResponseData;
