Skip to content

chore(java): Update Spotless and Checkstyle to allow building with JDK25 #3476

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

Merged
chaokunyang merged 1 commit into from
Mar 14, 2026
+10 −19
Merged

chore(java): Update Spotless and Checkstyle to allow building with JDK25 #3476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion java/checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,6 @@
value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
</module>
<module name="JavadocMethod">
<property name="scope" value="public"/>
Copy link
Contributor Author

@stevenschlansker stevenschlansker Mar 13, 2026

Choose a reason for hiding this comment

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

cannot initialize module TreeWalker - cannot initialize module JavadocMethod - Property 'scope' does not exist, please check the documentation

<property name="allowMissingParamTags" value="true"/>
<property name="allowMissingReturnTag" value="true"/>
<property name="allowedAnnotations" value="Override, Test"/>
Expand Down
2 changes: 1 addition & 1 deletion java/fory-core/src/main/java/org/apache/fory/Fory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,7 +1090,7 @@ public <T> T copyObject(T obj) {
case ClassResolver.HASHMAP_ID:
copy = hashMapSerializer.copy((HashMap) obj);
break;
// todo: add fastpath for other types.
// todo: add fastpath for other types.
default:
copy = copyObject(obj, typeInfo.getSerializer());
}
Expand Down
4 changes: 2 additions & 2 deletions java/fory-core/src/main/java/org/apache/fory/util/MurmurHash3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ public static int murmurhash3_x86_32(byte[] data, int offset, int len, int seed)
switch (len & 0x03) {
case 3:
k1 = (data[roundedEnd + 2] & 0xff) << 16;
// fallthrough
// fallthrough
case 2:
k1 |= (data[roundedEnd + 1] & 0xff) << 8;
// fallthrough
// fallthrough
case 1:
k1 |= (data[roundedEnd] & 0xff);
k1 *= c1;
Expand Down
6 changes: 3 additions & 3 deletions java/fory-format/src/main/java/org/apache/fory/format/encoder/Encoders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ public static <E, C extends Collection<E>> void registerCustomCollectionFactory(
*
* @param token TypeToken instance which explicit specified the type.
* @param <T> T is a array type, can be a nested list type.
* @return
* @return the array encoder
*/
public static <T extends Collection<?>> ArrayEncoder<T> arrayEncoder(TypeRef<T> token) {
return arrayEncoder(token, null);
Expand All @@ -170,7 +170,7 @@ public static <T extends Collection<?>> ArrayEncoder<T> arrayEncoder(
*
* @param token TypeToken instance which explicit specified the type.
* @param <T> T is a array type, can be a nested list type.
* @return
* @return the map encoder
*/
public static <T extends Map> MapEncoder<T> mapEncoder(TypeRef<T> token) {
return mapEncoder(token, null);
Expand All @@ -180,7 +180,7 @@ public static <T extends Map> MapEncoder<T> mapEncoder(TypeRef<T> token) {
* The underlying implementation uses array, only supported {@link Map} format, because generic
* type such as List is erased to simply List, so a bean class input param is required.
*
* @return
* @return the map encoder
*/
@SuppressWarnings("unchecked")
public static <T extends Map, K, V> MapEncoder<T> mapEncoder(
Expand Down
16 changes: 4 additions & 12 deletions java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<janino.version>3.1.12</janino.version>
<commons_codec.version>1.13</commons_codec.version>
<fory.java.rootdir>${basedir}</fory.java.rootdir>
<maven-spotless-plugin.version>2.41.1</maven-spotless-plugin.version>
<maven-spotless-plugin.version>3.3.0</maven-spotless-plugin.version>
<lombok.version>1.18.38</lombok.version>
</properties>

Expand Down Expand Up @@ -224,14 +224,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.0</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>8.29</version>
</dependency>
</dependencies>
<version>3.6.0</version>
<executions>
<execution>
<id>validate</id>
Expand All @@ -245,7 +238,6 @@
<configuration>
<configLocation>${fory.java.rootdir}/checkstyle.xml</configLocation>
<suppressionsLocation>${fory.java.rootdir}/checkstyle-suppressions.xml</suppressionsLocation>
<encoding>UTF-8</encoding>
Copy link
Contributor Author

@stevenschlansker stevenschlansker Mar 13, 2026

Choose a reason for hiding this comment

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

Warning: Parameter 'encoding' is unknown for plugin 'maven-checkstyle-plugin:3.6.0:check (default-cli)'

Copy link
Contributor Author

@stevenschlansker stevenschlansker Mar 13, 2026

Choose a reason for hiding this comment

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

(the default is source encoding, so this should be okay I think?)

<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<failOnViolation>true</failOnViolation>
Expand All @@ -261,8 +253,8 @@
<configuration>
<java>
<googleJavaFormat>
<!-- 1.19.1 support JDK21 -->
<version>1.19.1</version>
<!-- 1.35 support JDK25 -->
<version>1.35.0</version>
<style>GOOGLE</style>
</googleJavaFormat>
</java>
Expand Down
Loading