Skip to content

Commit 4e633c7

Browse files
committed
KAFKA-19809 CheckStyle version upgrade: 10.20.2 -->> 12.1.2
related link: https://checkstyle.org/releasenotes.html#Release_12.1.2
1 parent b73b1ae commit 4e633c7

File tree

6 files changed

+15
-11
lines changed

6 files changed

+15
-11
lines changed

checkstyle/checkstyle.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
</module>
126126
<module name="ClassDataAbstractionCoupling">
127127
<!-- default is 7 -->
128-
<property name="max" value="25"/>
128+
<property name="max" value="28"/>
129129
<property name="excludeClassesRegexps" value="AtomicInteger"/>
130130
</module>
131131
<module name="BooleanExpressionComplexity">
@@ -135,7 +135,7 @@
135135

136136
<module name="ClassFanOutComplexity">
137137
<!-- default is 20 -->
138-
<property name="max" value="52"/>
138+
<property name="max" value="55"/>
139139
</module>
140140
<module name="CyclomaticComplexity">
141141
<!-- default is 10-->

checkstyle/suppressions.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,4 +371,8 @@
371371

372372
<!-- Add the new suppression rule for JaasTestUtils.java -->
373373
<suppress checks="ImportControl" files="(JaasTestUtils).java" />
374+
375+
<suppress checks="FinalLocalVariable" files="."/>
376+
<suppress checks="FinalParameters" files="."/>
377+
374378
</suppressions>

clients/src/main/java/org/apache/kafka/common/requests/TxnOffsetCommitRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public Builder(final TxnOffsetCommitRequestData data) {
9696
public TxnOffsetCommitRequest build(short version) {
9797
if (version < 3 && groupMetadataSet()) {
9898
throw new UnsupportedVersionException("Broker doesn't support group metadata commit API on version " + version
99-
+ ", minimum supported request version is 3 which requires brokers to be on version 2.5 or above.");
99+
+ ", minimum supported request version is 3 which requires brokers to be on version 2.5 or above.");
100100
}
101101
if (!isTransactionV2Enabled) {
102102
version = (short) Math.min(version, LAST_STABLE_VERSION_BEFORE_TRANSACTION_V2);

gradle/dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ versions += [
5656
bcpkix: "1.80",
5757
caffeine: "3.2.0",
5858
bndlib: "7.1.0",
59-
checkstyle: project.hasProperty('checkstyleVersion') ? checkstyleVersion : "10.20.2",
59+
checkstyle: project.hasProperty('checkstyleVersion') ? checkstyleVersion : "12.1.2",
6060
commonsLang: "3.18.0",
6161
commonsValidator: "1.10.0",
6262
classgraph: "4.8.179",

group-coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2455,11 +2455,11 @@ private OffsetFetchResponseData.OffsetFetchResponseGroup handleOffsetFetchExcept
24552455
// NOT_ENOUGH_REPLICAS and REQUEST_TIMED_OUT to COORDINATOR_NOT_AVAILABLE,
24562456
// COORDINATOR_NOT_AVAILABLE is also not handled by consumers on versions prior to
24572457
// 3.9.
2458-
OffsetFetchResponse.groupError(
2458+
OffsetFetchResponse.groupError(
24592459
request,
24602460
Errors.NOT_COORDINATOR,
24612461
context.requestVersion()
2462-
);
2462+
);
24632463
default -> handleOperationException(
24642464
operationName,
24652465
request,

metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ DelegationTokenControlManager build() {
100100
if (logContext == null) logContext = new LogContext();
101101
if (tokenCache == null) tokenCache = new DelegationTokenCache(Set.of());
102102
return new DelegationTokenControlManager(
103-
logContext,
104-
tokenCache,
105-
tokenSecretKeyString,
106-
tokenDefaultMaxLifetimeMs,
107-
tokenDefaultRenewLifetimeMs);
103+
logContext,
104+
tokenCache,
105+
tokenSecretKeyString,
106+
tokenDefaultMaxLifetimeMs,
107+
tokenDefaultRenewLifetimeMs);
108108
}
109109
}
110110

0 commit comments

Comments
 (0)