KAFKA-17469: Moved share external interfaces to share module. (#17262)

Reviewers: Apoorv Mittal <apoorvmittal10@gmail.com>, David Arthur <mumrah@gmail.com>

build.gradle

@@ -1637,6 +1637,7 @@ project(':share-coordinator') {
     implementation project(':metadata')
     implementation project(':server')
     implementation project(':server-common')
+    implementation project(':share')
     implementation libs.slf4jApi
     implementation libs.metrics
 

checkstyle/import-control-share-coordinator.xml

@@ -56,7 +56,7 @@
             <allow pkg="org.apache.kafka.metadata" />
             <allow pkg="org.apache.kafka.server.common" />
             <allow pkg="org.apache.kafka.server.config" />
-            <allow pkg="org.apache.kafka.server.group.share" />
+            <allow pkg="org.apache.kafka.server.share" />
             <allow pkg="org.apache.kafka.server.record" />
             <allow pkg="org.apache.kafka.server.util" />
             <allow pkg="org.apache.kafka.server.util.timer" />

checkstyle/import-control-share.xml

@@ -33,6 +33,7 @@
   <!-- anyone can use public classes -->
   <allow pkg="org.apache.kafka.common" exact-match="true" />
   <allow pkg="org.apache.kafka.common.utils" />
+  <allow pkg="org.apache.kafka.common.annotation" />
 
   <!-- protocol, records and request/response utilities -->
   <allow pkg="org.apache.kafka.common.message" />

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.group.share.GroupTopicPartitionData;
+import org.apache.kafka.server.share.GroupTopicPartitionData;
-import org.apache.kafka.server.group.share.PartitionAllData;
+import org.apache.kafka.server.share.PartitionAllData;
-import org.apache.kafka.server.group.share.PartitionErrorData;
+import org.apache.kafka.server.share.PartitionErrorData;
-import org.apache.kafka.server.group.share.PartitionFactory;
+import org.apache.kafka.server.share.PartitionFactory;
-import org.apache.kafka.server.group.share.PartitionIdLeaderEpochData;
+import org.apache.kafka.server.share.PartitionIdLeaderEpochData;
-import org.apache.kafka.server.group.share.PartitionStateBatchData;
+import org.apache.kafka.server.share.PartitionStateBatchData;
-import org.apache.kafka.server.group.share.Persister;
+import org.apache.kafka.server.share.Persister;
-import org.apache.kafka.server.group.share.PersisterStateBatch;
+import org.apache.kafka.server.share.PersisterStateBatch;
-import org.apache.kafka.server.group.share.ReadShareGroupStateParameters;
+import org.apache.kafka.server.share.ReadShareGroupStateParameters;
-import org.apache.kafka.server.group.share.TopicData;
-import org.apache.kafka.server.group.share.WriteShareGroupStateParameters;
 import org.apache.kafka.server.share.ShareAcknowledgementBatch;
+import org.apache.kafka.server.share.TopicData;
+import org.apache.kafka.server.share.WriteShareGroupStateParameters;
 import org.apache.kafka.server.util.timer.Timer;
 import org.apache.kafka.server.util.timer.TimerTask;
 import org.apache.kafka.storage.internals.log.FetchPartitionData;

core/src/main/java/kafka/server/share/SharePartitionManager.java

@@ -38,8 +38,8 @@ import org.apache.kafka.common.requests.ShareFetchRequest;
 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.group.share.Persister;
 import org.apache.kafka.server.share.CachedSharePartition;
+import org.apache.kafka.server.share.Persister;
 import org.apache.kafka.server.share.ShareAcknowledgementBatch;
 import org.apache.kafka.server.share.context.FinalContext;
 import org.apache.kafka.server.share.context.ShareFetchContext;

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.group.share.{NoOpShareStatePersister, Persister}
+import org.apache.kafka.server.share.{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}

core/src/test/java/kafka/server/share/SharePartitionManagerTest.java

@@ -49,10 +49,10 @@ import org.apache.kafka.common.requests.ShareRequestMetadata;
 import org.apache.kafka.common.utils.ImplicitLinkedHashCollection;
 import org.apache.kafka.common.utils.MockTime;
 import org.apache.kafka.common.utils.Time;
-import org.apache.kafka.server.group.share.NoOpShareStatePersister;
-import org.apache.kafka.server.group.share.Persister;
 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.ShareAcknowledgementBatch;
 import org.apache.kafka.server.share.context.FinalContext;
 import org.apache.kafka.server.share.context.ShareFetchContext;

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.group.share.NoOpShareStatePersister;
+import org.apache.kafka.server.share.NoOpShareStatePersister;
-import org.apache.kafka.server.group.share.PartitionFactory;
+import org.apache.kafka.server.share.PartitionFactory;
-import org.apache.kafka.server.group.share.Persister;
+import org.apache.kafka.server.share.Persister;
-import org.apache.kafka.server.group.share.PersisterStateBatch;
+import org.apache.kafka.server.share.PersisterStateBatch;
-import org.apache.kafka.server.group.share.ReadShareGroupStateResult;
+import org.apache.kafka.server.share.ReadShareGroupStateResult;
-import org.apache.kafka.server.group.share.TopicData;
-import org.apache.kafka.server.group.share.WriteShareGroupStateResult;
 import org.apache.kafka.server.share.ShareAcknowledgementBatch;
+import org.apache.kafka.server.share.TopicData;
+import org.apache.kafka.server.share.WriteShareGroupStateResult;
 import org.apache.kafka.server.util.FutureUtils;
 import org.apache.kafka.server.util.timer.SystemTimer;
 import org.apache.kafka.server.util.timer.SystemTimerReaper;

share-coordinator/src/main/java/org/apache/kafka/coordinator/share/PersisterOffsetsStateBatch.java

@@ -19,7 +19,7 @@ package org.apache.kafka.coordinator.share;
 
 import org.apache.kafka.common.message.WriteShareGroupStateRequestData;
 import org.apache.kafka.coordinator.share.generated.ShareUpdateValue;
-import org.apache.kafka.server.group.share.PersisterStateBatch;
+import org.apache.kafka.server.share.PersisterStateBatch;
 
 import java.util.Objects;
 

share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorService.java

@@ -43,8 +43,8 @@ import org.apache.kafka.coordinator.common.runtime.MultiThreadedEventProcessor;
 import org.apache.kafka.coordinator.common.runtime.PartitionWriter;
 import org.apache.kafka.coordinator.share.metrics.ShareCoordinatorMetrics;
 import org.apache.kafka.server.config.ShareCoordinatorConfig;
-import org.apache.kafka.server.group.share.SharePartitionKey;
 import org.apache.kafka.server.record.BrokerCompressionType;
+import org.apache.kafka.server.share.SharePartitionKey;
 import org.apache.kafka.server.util.timer.Timer;
 
 import org.slf4j.Logger;

share-coordinator/src/main/java/org/apache/kafka/coordinator/share/ShareCoordinatorShard.java

@@ -47,8 +47,8 @@ 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.group.share.PartitionFactory;
+import org.apache.kafka.server.share.PartitionFactory;
-import org.apache.kafka.server.group.share.SharePartitionKey;
+import org.apache.kafka.server.share.SharePartitionKey;
 import org.apache.kafka.timeline.SnapshotRegistry;
 import org.apache.kafka.timeline.TimelineHashMap;
 

share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorShardTest.java

@@ -40,7 +40,7 @@ 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.group.share.SharePartitionKey;
+import org.apache.kafka.server.share.SharePartitionKey;
 import org.apache.kafka.timeline.SnapshotRegistry;
 
 import org.junit.jupiter.api.Test;

share/src/main/java/org/apache/kafka/server/share/DeleteShareGroupStateParameters.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 import org.apache.kafka.common.message.DeleteShareGroupStateRequestData;
 

share/src/main/java/org/apache/kafka/server/share/DeleteShareGroupStateResult.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 import org.apache.kafka.common.message.DeleteShareGroupStateResponseData;
 

share/src/main/java/org/apache/kafka/server/share/GroupTopicPartitionData.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 import java.util.List;
 import java.util.Objects;

share/src/main/java/org/apache/kafka/server/share/InitializeShareGroupStateParameters.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 import org.apache.kafka.common.message.InitializeShareGroupStateRequestData;
 

share/src/main/java/org/apache/kafka/server/share/InitializeShareGroupStateResult.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 import org.apache.kafka.common.message.InitializeShareGroupStateResponseData;
 

share/src/main/java/org/apache/kafka/server/share/NoOpShareStatePersister.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -111,4 +111,4 @@ public class NoOpShareStatePersister implements Persister {
     public void stop() {
         //noop
     }
-}
+}

share/src/main/java/org/apache/kafka/server/share/PartitionAllData.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 import java.util.List;
 

share/src/main/java/org/apache/kafka/server/share/PartitionData.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 import java.util.List;
 import java.util.Objects;

share/src/main/java/org/apache/kafka/server/share/PartitionErrorData.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 /**
  * This interface is implemented by classes used to contain the data for a partition with error data

share/src/main/java/org/apache/kafka/server/share/PartitionFactory.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 import org.apache.kafka.common.protocol.Errors;
 

share/src/main/java/org/apache/kafka/server/share/PartitionIdData.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 /**
  * This interface is implemented by classes used to contain the data for a partition with its partition index

share/src/main/java/org/apache/kafka/server/share/PartitionIdLeaderEpochData.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 /**
  * This interface is implemented by classes used to contain the data for a partition with its leader epoch

share/src/main/java/org/apache/kafka/server/share/PartitionInfoData.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 /**
  * This interface is implemented by classes used to contain the data for a partition in the

share/src/main/java/org/apache/kafka/server/share/PartitionStateBatchData.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 import java.util.List;
 

share/src/main/java/org/apache/kafka/server/share/PartitionStateData.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 /**
  * This interface is implemented by classes used to contain the data for a partition with the state epoch and

share/src/main/java/org/apache/kafka/server/share/PartitionStateErrorData.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 /**
  * This interface is implemented by classes used to contain the data for a partition with state and error data

share/src/main/java/org/apache/kafka/server/share/Persister.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 import org.apache.kafka.common.annotation.InterfaceStability;
 

share/src/main/java/org/apache/kafka/server/share/PersisterParameters.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 /**
  * Marker interface for parameter classes related to the {@link Persister} result classes.

share/src/main/java/org/apache/kafka/server/share/PersisterResult.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 /**
  * Marker interface for result classes related to the {@link Persister} result classes.

share/src/main/java/org/apache/kafka/server/share/PersisterStateBatch.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 import org.apache.kafka.common.message.ReadShareGroupStateResponseData;
 import org.apache.kafka.common.message.WriteShareGroupStateRequestData;

share/src/main/java/org/apache/kafka/server/share/ReadShareGroupStateParameters.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 import org.apache.kafka.common.message.ReadShareGroupStateRequestData;
 

share/src/main/java/org/apache/kafka/server/share/ReadShareGroupStateResult.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 import org.apache.kafka.common.message.ReadShareGroupStateResponseData;
 

share/src/main/java/org/apache/kafka/server/share/ReadShareGroupStateSummaryParameters.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 import org.apache.kafka.common.message.ReadShareGroupStateSummaryRequestData;
 

share/src/main/java/org/apache/kafka/server/share/ReadShareGroupStateSummaryResult.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 import org.apache.kafka.common.message.ReadShareGroupStateSummaryResponseData;
 

share/src/main/java/org/apache/kafka/server/share/SharePartitionKey.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 import org.apache.kafka.common.TopicIdPartition;
 import org.apache.kafka.common.Uuid;

share/src/main/java/org/apache/kafka/server/share/TopicData.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 import org.apache.kafka.common.Uuid;
 

share/src/main/java/org/apache/kafka/server/share/WriteShareGroupStateParameters.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 import org.apache.kafka.common.message.WriteShareGroupStateRequestData;
 

share/src/main/java/org/apache/kafka/server/share/WriteShareGroupStateResult.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.kafka.server.group.share;
+package org.apache.kafka.server.share;
 
 import org.apache.kafka.common.message.WriteShareGroupStateResponseData;