Fix build for Java 21

itsallcode · Dec 10, 2023 · 07364b2 · 07364b2
1 parent 810f931
commit 07364b2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,7 @@ dependencies {
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(getPropertyWithDefault('javaVersion', '17'))
+        languageVersion = JavaLanguageVersion.of(getPropertyWithDefault('javaVersion', '21'))
     }
     withJavadocJar()
     withSourcesJar()

diff --git a/src/main/java/org/itsallcode/jdbc/resultset/RowMapper.java b/src/main/java/org/itsallcode/jdbc/resultset/RowMapper.java
@@ -64,7 +64,8 @@ public static <T> RowMapper<T> create(final SimpleRowMapper<T> mapper) {
     /**
      * Converts a single row from a {@link ResultSet} to a generic row type.
      * <p>
-     * Use this interface if you don't need the {@link Context}.
+     * Use this interface with method {@link RowMapper#create(SimpleRowMapper)} if
+     * you don't need the {@link Context}.
      * 
      * @param <T> generic row type
      */
@@ -83,6 +84,8 @@ public interface SimpleRowMapper<T> {
 
     /**
      * A simplified row mapper that gets a list of column values as input.
+     * 
+     * @param <T> generic row type
      */
     @FunctionalInterface
     public interface ColumnValuesConverter<T> {

diff --git a/src/test/java/org/itsallcode/jdbc/resultset/DelegatingResultSetTest.java b/src/test/java/org/itsallcode/jdbc/resultset/DelegatingResultSetTest.java
@@ -8,8 +8,7 @@
 
 import java.io.*;
 import java.math.BigDecimal;
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.*;
 import java.sql.*;
 import java.sql.Date;
 import java.util.*;
@@ -869,15 +868,15 @@ void getTimestampLabelCal() throws SQLException {
     }
 
     @Test
-    void getURLIndex() throws SQLException, MalformedURLException {
-        final URL url = new URL("https://example.com");
+    void getURLIndex() throws SQLException, MalformedURLException, URISyntaxException {
+        final URL url = new URI("https://example.com").toURL();
         when(resultSetMock.getURL(COL_INDEX)).thenReturn(url);
         assertSame(url, testee().getURL(COL_INDEX));
     }
 
     @Test
-    void getURLLabel() throws SQLException, MalformedURLException {
-        final URL url = new URL("https://example.com");
+    void getURLLabel() throws SQLException, MalformedURLException, URISyntaxException {
+        final URL url = new URI("https://example.com").toURL();
         when(resultSetMock.getURL(COL_LABEL)).thenReturn(url);
         assertSame(url, testee().getURL(COL_LABEL));
     }