Skip to content

KAFKA-19809 CheckStyle version upgrade: 10.20.2 -->> 12.0.1 #20726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: trunk
Choose a base branch
from
Open

KAFKA-19809 CheckStyle version upgrade: 10.20.2 -->> 12.0.1 #20726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9eb45d
KAFKA-19809 CheckStyle version upgrade: 10.20.2 -->> 12.0.1
dejan2609 Oct 18, 2025
6f8bd4a
KAFKA-19809 CheckStyle version 12.1.0
dejan2609 Oct 20, 2025
24aa451
KAFKA-19809 CheckStyle version 12.1.1
dejan2609 Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions checkstyle/checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
</module>
<module name="ClassDataAbstractionCoupling">
<!-- default is 7 -->
<property name="max" value="25"/>
<property name="max" value="27"/>
Copy link
Contributor Author

@dejan2609 dejan2609 Oct 19, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Options:

  1. increase limit (like here)
  2. create a baseline (skip/suppress this check for existing cases/classes)
  3. change existing classes and keep the old property value max limit

<property name="excludeClassesRegexps" value="AtomicInteger"/>
</module>
<module name="BooleanExpressionComplexity">
Expand All @@ -136,7 +136,7 @@

<module name="ClassFanOutComplexity">
<!-- default is 20 -->
<property name="max" value="52"/>
<property name="max" value="55"/>
Copy link
Contributor Author

@dejan2609 dejan2609 Oct 19, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In a similar case, we also have three options:

  1. increase limit (like here)
  2. create a baseline (skip/suppress this check for existing cases/classes)
  3. change existing classes and keep the old property value max limit

</module>
<module name="CyclomaticComplexity">
<!-- default is 10-->
Expand Down
4 changes: 4 additions & 0 deletions checkstyle/suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,4 +371,8 @@

<!-- Add the new suppression rule for JaasTestUtils.java -->
<suppress checks="ImportControl" files="(JaasTestUtils).java" />

<suppress checks="FinalLocalVariable" files="."/>
<suppress checks="FinalParameters" files="."/>
Copy link
Contributor Author

@dejan2609 dejan2609 Oct 19, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From my POV both of these checks are overzealous and hence I turned them off, but I'm open to a discussion.

Related links:


</suppressions>
2 changes: 1 addition & 1 deletion clients/src/main/java/org/apache/kafka/common/requests/TxnOffsetCommitRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public Builder(final TxnOffsetCommitRequestData data) {
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);
Expand Down
2 changes: 1 addition & 1 deletion gradle/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.1",
commonsLang: "3.18.0",
commonsValidator: "1.10.0",
classgraph: "4.8.179",
Expand Down
4 changes: 2 additions & 2 deletions ...coordinator/src/main/java/org/apache/kafka/coordinator/group/GroupCoordinatorService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2343,11 +2343,11 @@ private OffsetFetchResponseData.OffsetFetchResponseGroup handleOffsetFetchExcept
// 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,
Expand Down
10 changes: 5 additions & 5 deletions metadata/src/main/java/org/apache/kafka/controller/DelegationTokenControlManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ DelegationTokenControlManager build() {
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);
}
}

Expand Down