Skip to content

Commit 57eb5fd

Browse files
authored
KAFKA-14587: Move AclCommand to tools (apache#17880)
Reviewers: Chia-Ping Tsai <[email protected]>
1 parent e41373c commit 57eb5fd

File tree

9 files changed

+750
-705
lines changed

9 files changed

+750
-705
lines changed

bin/kafka-acls.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
exec $(dirname $0)/kafka-run-class.sh kafka.admin.AclCommand "$@"
17+
exec $(dirname $0)/kafka-run-class.sh org.apache.kafka.tools.AclCommand "$@"

bin/windows/kafka-acls.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1414
rem See the License for the specific language governing permissions and
1515
rem limitations under the License.
1616

17-
"%~dp0kafka-run-class.bat" kafka.admin.AclCommand %*
17+
"%~dp0kafka-run-class.bat" org.apache.kafka.tools.AclCommand %*

checkstyle/import-control.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,8 @@
290290
<allow pkg="org.apache.kafka.server.util" />
291291
<allow pkg="kafka.admin" />
292292
<allow pkg="kafka.server" />
293+
<allow pkg="org.apache.kafka.metadata.authorizer" />
294+
<allow pkg="org.apache.kafka.security.authorizer" />
293295
<allow pkg="org.apache.kafka.storage.internals" />
294296
<allow pkg="org.apache.kafka.server.config" />
295297
<allow pkg="org.apache.kafka.server.common" />

checkstyle/suppressions.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,11 +269,11 @@
269269
<suppress checks="ClassDataAbstractionCoupling"
270270
files="VerifiableConsumer.java"/>
271271
<suppress checks="CyclomaticComplexity"
272-
files="(ConsoleConsumer|DefaultMessageFormatter|StreamsResetter|ProducerPerformance|Agent).java"/>
272+
files="(AclCommand|ConsoleConsumer|DefaultMessageFormatter|StreamsResetter|ProducerPerformance|Agent).java"/>
273273
<suppress checks="BooleanExpressionComplexity"
274274
files="(StreamsResetter|DefaultMessageFormatter).java"/>
275275
<suppress checks="NPathComplexity"
276-
files="(DefaultMessageFormatter|ProducerPerformance|StreamsResetter|Agent|TransactionalMessageCopier|ReplicaVerificationTool|LineMessageReader).java"/>
276+
files="(AclCommand|DefaultMessageFormatter|ProducerPerformance|StreamsResetter|Agent|TransactionalMessageCopier|ReplicaVerificationTool|LineMessageReader).java"/>
277277
<suppress checks="ImportControl"
278278
files="SignalLogger.java"/>
279279
<suppress checks="IllegalImport"

clients/src/main/java/org/apache/kafka/server/authorizer/Authorizer.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ public interface Authorizer extends Configurable, Closeable {
112112
* to process the update synchronously on the request thread.
113113
*
114114
* @param requestContext Request context if the ACL is being created by a broker to handle
115-
* a client request to create ACLs. This may be null if ACLs are created directly in ZooKeeper
116-
* using AclCommand.
115+
* a client request to create ACLs.
117116
* @param aclBindings ACL bindings to create
118117
*
119118
* @return Create result for each ACL binding in the same order as in the input list. Each result
@@ -131,8 +130,7 @@ public interface Authorizer extends Configurable, Closeable {
131130
* Refer to the authorizer implementation docs for details on concurrent update guarantees.
132131
*
133132
* @param requestContext Request context if the ACL is being deleted by a broker to handle
134-
* a client request to delete ACLs. This may be null if ACLs are deleted directly in ZooKeeper
135-
* using AclCommand.
133+
* a client request to delete ACLs.
136134
* @param aclBindingFilters Filters to match ACL bindings that are to be deleted
137135
*
138136
* @return Delete result for each filter in the same order as in the input list.

0 commit comments

Comments
 (0)