This is an automated email from the ASF dual-hosted git repository.
chia7712 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 89aa87c13f6 KAFKA-19809 CheckStyle version upgrade: 10 -->> 12 (#20726)
89aa87c13f6 is described below
commit 89aa87c13f66e20ef89960dfa2c1fa75e224fcfe
Author: Dejan Stojadinović <[email protected]>
AuthorDate: Fri Dec 12 15:46:41 2025 +0100
KAFKA-19809 CheckStyle version upgrade: 10 -->> 12 (#20726)
Jira ticket: KAFKA-19809
Related link: https://checkstyle.org/releasenotes.html#Release_12.2.0
:warning: quick and dirty (aka skeleton) solution
Reviews are welcome!
Relates to: https://github.com/checkstyle/checkstyle/issues/16003
Reviewers: Chia-Ping Tsai <[email protected]>
---
checkstyle/checkstyle.xml | 4 ++--
checkstyle/suppressions.xml | 4 ++++
.../apache/kafka/common/requests/TxnOffsetCommitRequest.java | 2 +-
gradle/dependencies.gradle | 2 +-
.../kafka/coordinator/group/GroupCoordinatorService.java | 4 ++--
.../apache/kafka/controller/DelegationTokenControlManager.java | 10 +++++-----
6 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
index fb98ef0d4df..7f4f27eeb8c 100644
--- a/checkstyle/checkstyle.xml
+++ b/checkstyle/checkstyle.xml
@@ -125,7 +125,7 @@
</module>
<module name="ClassDataAbstractionCoupling">
<!-- default is 7 -->
- <property name="max" value="25"/>
+ <property name="max" value="28"/>
<property name="excludeClassesRegexps" value="AtomicInteger"/>
</module>
<module name="BooleanExpressionComplexity">
@@ -135,7 +135,7 @@
<module name="ClassFanOutComplexity">
<!-- default is 20 -->
- <property name="max" value="52"/>
+ <property name="max" value="55"/>
</module>
<module name="CyclomaticComplexity">
<!-- default is 10-->
diff --git a/checkstyle/suppressions.xml b/checkstyle/suppressions.xml
index c09526fbb91..e821674bfb6 100644
--- a/checkstyle/suppressions.xml
+++ b/checkstyle/suppressions.xml
@@ -373,4 +373,8 @@
<!-- Add the new suppression rule for JaasTestUtils.java -->
<suppress checks="ImportControl" files="(JaasTestUtils).java" />
+
+ <suppress checks="FinalLocalVariable" files="."/>
+ <suppress checks="FinalParameters" files="."/>
+
</suppressions>
diff --git
a/clients/src/main/java/org/apache/kafka/common/requests/TxnOffsetCommitRequest.java
b/clients/src/main/java/org/apache/kafka/common/requests/TxnOffsetCommitRequest.java
index 3724c4ccc09..8d9f4d8f39c 100644
---
a/clients/src/main/java/org/apache/kafka/common/requests/TxnOffsetCommitRequest.java
+++
b/clients/src/main/java/org/apache/kafka/common/requests/TxnOffsetCommitRequest.java
@@ -96,7 +96,7 @@ public class TxnOffsetCommitRequest extends AbstractRequest {
public TxnOffsetCommitRequest build(short version) {
if (version < 3 && groupMetadataSet()) {
throw new UnsupportedVersionException("Broker doesn't support
group metadata commit API on version " + version
- + ", minimum supported request version is 3 which requires
brokers to be on version 2.5 or above.");
+ + ", minimum supported request version is 3 which requires
brokers to be on version 2.5 or above.");
}
if (!isTransactionV2Enabled) {
version = (short) Math.min(version,
LAST_STABLE_VERSION_BEFORE_TRANSACTION_V2);
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 423e1fde330..a11b01f33db 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -56,7 +56,7 @@ versions += [
bcpkix: "1.80",
caffeine: "3.2.0",
bndlib: "7.1.0",
- checkstyle: project.hasProperty('checkstyleVersion') ? checkstyleVersion :
"10.20.2",
+ checkstyle: project.hasProperty('checkstyleVersion') ? checkstyleVersion :
"12.2.0",
commonsValidator: "1.10.1",
classgraph: "4.8.179",
gradle: "9.2.1",
diff --git
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java
index 83f1b0ca5e0..701e58f96c8 100644
---
a/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java
+++
b/group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java
@@ -2418,11 +2418,11 @@ public class GroupCoordinatorService implements
GroupCoordinator {
// NOT_ENOUGH_REPLICAS and REQUEST_TIMED_OUT to
COORDINATOR_NOT_AVAILABLE,
// COORDINATOR_NOT_AVAILABLE is also not handled by
consumers on versions prior to
// 3.9.
- OffsetFetchResponse.groupError(
+ OffsetFetchResponse.groupError(
request,
Errors.NOT_COORDINATOR,
context.requestVersion()
- );
+ );
default -> handleOperationException(
operationName,
request,
diff --git
a/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java
b/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java
index 050313d156f..4f9436637f0 100644
---
a/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java
+++
b/metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java
@@ -100,11 +100,11 @@ public class DelegationTokenControlManager {
if (logContext == null) logContext = new LogContext();
if (tokenCache == null) tokenCache = new
DelegationTokenCache(Set.of());
return new DelegationTokenControlManager(
- logContext,
- tokenCache,
- tokenSecretKeyString,
- tokenDefaultMaxLifetimeMs,
- tokenDefaultRenewLifetimeMs);
+ logContext,
+ tokenCache,
+ tokenSecretKeyString,
+ tokenDefaultMaxLifetimeMs,
+ tokenDefaultRenewLifetimeMs);
}
}
