From c1e7aa77dee3902c5a7b0e57e7f025cb1fb29e12 Mon Sep 17 00:00:00 2001
From: David Jacot <djacot@confluent.io>
Date: Tue, 14 May 2024 09:05:32 +0200
Subject: [PATCH] MINOR: Move `group-coordinator` import control to its own
 file (#15934)

Follow the pattern used by the other modules.

Reviewers: Chia-Ping Tsai <chia7712@gmail.com>
---
 build.gradle                                  |  4 +
 .../import-control-group-coordinator.xml      | 81 +++++++++++++++++++
 checkstyle/import-control.xml                 | 32 --------
 3 files changed, 85 insertions(+), 32 deletions(-)
 create mode 100644 checkstyle/import-control-group-coordinator.xml

diff --git a/build.gradle b/build.gradle
index 1bdf8f36ed7..4134073b0aa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1360,6 +1360,10 @@ project(':group-coordinator') {
     enabled = false
   }
 
+  checkstyle {
+    configProperties = checkstyleConfigProperties("import-control-group-coordinator.xml")
+  }
+
   task processMessages(type:JavaExec) {
     mainClass = "org.apache.kafka.message.MessageGenerator"
     classpath = configurations.generator
diff --git a/checkstyle/import-control-group-coordinator.xml b/checkstyle/import-control-group-coordinator.xml
new file mode 100644
index 00000000000..c7e1202d92c
--- /dev/null
+++ b/checkstyle/import-control-group-coordinator.xml
@@ -0,0 +1,81 @@
+<!DOCTYPE import-control PUBLIC
+        "-//Puppy Crawl//DTD Import Control 1.1//EN"
+        "http://www.puppycrawl.com/dtds/import_control_1_1.dtd">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<import-control pkg="org.apache.kafka">
+
+    <!-- THINK HARD ABOUT THE LAYERING OF THE PROJECT BEFORE CHANGING THIS FILE -->
+
+    <!-- common library dependencies -->
+    <allow pkg="java" />
+    <allow pkg="javax.management" />
+    <allow pkg="org.slf4j" />
+    <allow pkg="org.junit" />
+    <allow pkg="org.mockito" />
+    <allow pkg="org.opentest4j" />
+    <allow pkg="java.security" />
+    <allow pkg="javax.net.ssl" />
+    <allow pkg="javax.security" />
+    <allow pkg="javax.crypto" />
+    <allow pkg="net.jqwik.api" />
+
+    <!-- no one depends on the server -->
+    <disallow pkg="kafka" />
+
+    <!-- anyone can use public classes -->
+    <allow pkg="org.apache.kafka.common" exact-match="true" />
+    <allow pkg="org.apache.kafka.common.security" />
+    <allow pkg="org.apache.kafka.common.serialization" />
+    <allow pkg="org.apache.kafka.common.utils" />
+    <allow pkg="org.apache.kafka.common.errors" exact-match="true" />
+    <allow pkg="org.apache.kafka.common.memory" />
+
+    <subpackage name="coordinator">
+        <subpackage name="group">
+            <allow pkg="org.apache.kafka.clients.consumer" />
+            <allow pkg="org.apache.kafka.common.annotation" />
+            <allow pkg="org.apache.kafka.common.config" />
+            <allow pkg="org.apache.kafka.common.internals" />
+            <allow pkg="org.apache.kafka.common.message" />
+            <allow pkg="org.apache.kafka.common.metadata" />
+            <allow pkg="org.apache.kafka.common.network" />
+            <allow pkg="org.apache.kafka.common.protocol" />
+            <allow pkg="org.apache.kafka.common.record" />
+            <allow pkg="org.apache.kafka.common.requests" />
+            <allow pkg="org.apache.kafka.coordinator.group" />
+            <allow pkg="org.apache.kafka.deferred" />
+            <allow pkg="org.apache.kafka.image"/>
+            <allow pkg="org.apache.kafka.server.common"/>
+            <allow pkg="org.apache.kafka.server.record"/>
+            <allow pkg="org.apache.kafka.server.util"/>
+            <allow pkg="org.apache.kafka.storage.internals.log"/>
+            <allow pkg="org.apache.kafka.test" />
+            <allow pkg="org.apache.kafka.timeline" />
+            <subpackage name="metrics">
+                <allow pkg="com.yammer.metrics"/>
+                <allow pkg="org.apache.kafka.common.metrics" />
+                <allow pkg="org.apache.kafka.server.metrics" />
+            </subpackage>
+            <subpackage name="generated">
+                <allow pkg="com.fasterxml.jackson" />
+            </subpackage>
+        </subpackage>
+    </subpackage>
+
+</import-control>
diff --git a/checkstyle/import-control.xml b/checkstyle/import-control.xml
index 71cb83dab8f..b44a2eb79d3 100644
--- a/checkstyle/import-control.xml
+++ b/checkstyle/import-control.xml
@@ -234,38 +234,6 @@
     </subpackage>
   </subpackage>
 
-  <subpackage name="coordinator">
-    <subpackage name="group">
-      <allow pkg="org.apache.kafka.clients.consumer" />
-      <allow pkg="org.apache.kafka.common.annotation" />
-      <allow pkg="org.apache.kafka.common.config" />
-      <allow pkg="org.apache.kafka.common.internals" />
-      <allow pkg="org.apache.kafka.common.message" />
-      <allow pkg="org.apache.kafka.common.metadata" />
-      <allow pkg="org.apache.kafka.common.network" />
-      <allow pkg="org.apache.kafka.common.protocol" />
-      <allow pkg="org.apache.kafka.common.record" />
-      <allow pkg="org.apache.kafka.common.requests" />
-      <allow pkg="org.apache.kafka.coordinator.group" />
-      <allow pkg="org.apache.kafka.deferred" />
-      <allow pkg="org.apache.kafka.image"/>
-      <allow pkg="org.apache.kafka.server.common"/>
-      <allow pkg="org.apache.kafka.server.record"/>
-      <allow pkg="org.apache.kafka.server.util"/>
-      <allow pkg="org.apache.kafka.storage.internals.log"/>
-      <allow pkg="org.apache.kafka.test" />
-      <allow pkg="org.apache.kafka.timeline" />
-      <subpackage name="metrics">
-        <allow pkg="com.yammer.metrics"/>
-        <allow pkg="org.apache.kafka.common.metrics" />
-        <allow pkg="org.apache.kafka.server.metrics" />
-      </subpackage>
-      <subpackage name="generated">
-        <allow pkg="com.fasterxml.jackson" />
-      </subpackage>
-    </subpackage>
-  </subpackage>
-
   <subpackage name="server">
     <allow pkg="org.apache.kafka.common" />