Skip to content

Update modernizer Java version to 25 #873

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
ebyhr merged 2 commits into from
Jan 27, 2026
Merged

Update modernizer Java version to 25 #873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d907e6
Replace StringReader with Reader.of
ebyhr Jan 27, 2026
a534cdd
Update modernizer Java version to 25
ebyhr Jan 24, 2026
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 gateway-ha/src/main/java/io/trino/gateway/proxyserver/MultiReadHttpServletRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.StringReader;
import java.io.Reader;
import java.nio.charset.StandardCharsets;

public class MultiReadHttpServletRequest
Expand Down Expand Up @@ -87,6 +87,6 @@ public int read(byte[] b)
public BufferedReader getReader()
throws IOException
{
return new BufferedReader(new StringReader(new String(content, StandardCharsets.UTF_8)));
return new BufferedReader(Reader.of(new String(content, StandardCharsets.UTF_8)));
}
}
4 changes: 2 additions & 2 deletions gateway-ha/src/test/java/io/trino/gateway/ha/router/TestRoutingGroupSelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import java.io.BufferedWriter;
import java.io.File;
import java.io.IOException;
import java.io.StringReader;
import java.io.Reader;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Arrays;
Expand Down Expand Up @@ -526,7 +526,7 @@ uno as (SELECT c1 FROM dos)
TrinoQueryProperties trinoQueryPropertiesWithDefaults = getTrinoQueryProps(mockRequestNoDefaults);
Set<QualifiedName> tablesWithDefaults = trinoQueryPropertiesWithDefaults.getTables();
assertThat(tablesWithDefaults).containsExactly(QualifiedName.of("cat", "schem", "tbl1"));
when(mockRequestNoDefaults.getReader()).thenReturn(new BufferedReader(new StringReader(query)));
when(mockRequestNoDefaults.getReader()).thenReturn(new BufferedReader(Reader.of(query)));

TrinoQueryProperties trinoQueryPropertiesNoDefaults = (TrinoQueryProperties) mockRequestNoDefaults.getAttribute(TRINO_QUERY_PROPERTIES);
Set<QualifiedName> tablesNoDefaults = trinoQueryPropertiesNoDefaults.getTables();
Expand Down
4 changes: 2 additions & 2 deletions gateway-ha/src/test/java/io/trino/gateway/ha/util/QueryRequestMock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
import java.io.Reader;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
Expand Down Expand Up @@ -118,7 +118,7 @@ public int read()
}
});

when(mockRequest.getReader()).thenReturn(new BufferedReader(new StringReader(query)));
when(mockRequest.getReader()).thenReturn(new BufferedReader(Reader.of(query)));
when(mockRequest.getQueryString()).thenReturn("");
return this;
}
Expand Down
13 changes: 12 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<air.java.version>25.0.0</air.java.version>
<air.check.skip-spotbugs>true</air.check.skip-spotbugs>
<air.check.skip-pmd>true</air.check.skip-pmd>
<air.modernizer.java-version>8</air.modernizer.java-version>
<air.modernizer.java-version>25</air.modernizer.java-version>
<air.release.preparation-goals>clean verify -DskipTests</air.release.preparation-goals>
</properties>

Expand Down Expand Up @@ -101,6 +101,17 @@

<build>
<plugins>
<plugin>
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-plugin</artifactId>
<configuration>
<exclusions>
<!-- Modernizer emits false-positive warnings even when presence is guaranteed -->
<exclusion>java/util/Optional.get:()Ljava/lang/Object;</exclusion>
</exclusions>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down