build: build on Java 21 (#1645)

The target version is 17.

Author: injectives

benchkit-backend/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <artifactId>neo4j-java-driver-parent</artifactId>
         <groupId>org.neo4j.driver</groupId>
-        <version>5.28-SNAPSHOT</version>
+        <version>6.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>benchkit-backend</artifactId>

bundle/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.neo4j.driver</groupId>
     <artifactId>neo4j-java-driver-parent</artifactId>
-    <version>5.28-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 

driver/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.neo4j.driver</groupId>
     <artifactId>neo4j-java-driver-parent</artifactId>
-    <version>5.28-SNAPSHOT</version>
+    <version>6.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>neo4j-java-driver</artifactId>

driver/src/main/java/org/neo4j/driver/BookmarkManagerConfig.java

@@ -99,6 +99,8 @@ public BookmarkManagerConfigBuilder withInitialBookmarks(Set<Bookmark> initialBo
          * Provide bookmarks consumer.
          * <p>
          * The consumer will be called outside bookmark manager's synchronisation lock.
+         * <p>
+         * If serialization of {@link BookmarkManager} is required, the instance supplied MUST implement {@link java.io.Serializable}.
          *
          * @param bookmarksConsumer bookmarks consumer
          * @return this builder
@@ -115,6 +117,8 @@ public BookmarkManagerConfigBuilder withBookmarksConsumer(Consumer<Set<Bookmark>
          * by the bookmark manager.
          * <p>
          * The supplier will be called outside bookmark manager's synchronisation lock.
+         * <p>
+         * If serialization of {@link BookmarkManager} is required, the instance supplied MUST implement {@link java.io.Serializable}.
          *
          * @param bookmarksSupplier the bookmarks supplier
          * @return this builder

driver/src/main/java/org/neo4j/driver/Config.java

@@ -221,7 +221,9 @@ public long maxConnectionLifetimeMillis() {
     }
 
     /**
-     * @return the configured connection timeout value in milliseconds.
+     * Returns the configured connection timeout value in milliseconds.
+     *
+     * @return the configured connection timeout value in milliseconds
      */
     public int connectionTimeoutMillis() {
         return connectionTimeoutMillis;
@@ -246,14 +248,18 @@ public long connectionAcquisitionTimeoutMillis() {
     }
 
     /**
-     * @return indicator for encrypted communication.
+     * Returns indicator for encrypted communication.
+     *
+     * @return indicator for encrypted communication
      */
     public boolean encrypted() {
         return securitySettings.encrypted();
     }
 
     /**
-     * @return the strategy to use to determine the authenticity of an encryption certificate provided by the Neo4j instance we are connecting to.
+     * Returns the strategy to use to determine the authenticity of an encryption certificate provided by the Neo4j instance we are connecting to.
+     *
+     * @return the strategy to use to determine the authenticity of an encryption certificate provided by the Neo4j instance we are connecting to
      */
     public TrustStrategy trustStrategy() {
         return securitySettings.trustStrategy();
@@ -278,7 +284,9 @@ public static ConfigBuilder builder() {
     }
 
     /**
-     * @return A config with all default settings
+     * Returns the config with all default settings.
+     *
+     * @return the config with all default settings
      */
     public static Config defaultConfig() {
         return EMPTY;
@@ -358,7 +366,9 @@ public int eventLoopThreads() {
     }
 
     /**
-     * @return if the metrics is enabled or not on this driver.
+     * Returns whether the metrics is enabled or not on this driver.
+     *
+     * @return if the metrics is enabled or not on this driver
      */
     public boolean isMetricsEnabled() {
         return this.metricsAdapter != MetricsAdapter.DEV_NULL;
@@ -374,6 +384,8 @@ public MetricsAdapter metricsAdapter() {
     }
 
     /**
+     * Returns the user_agent configured for this driver.
+     *
      * @return the user_agent configured for this driver
      */
     public String userAgent() {
@@ -915,6 +927,7 @@ public enum Strategy {
         /**
          * The configured certificate files.
          */
+        @SuppressWarnings("serial")
         private final List<File> certFiles;
         /**
          * The flag indicating if hostname verification is enabled for this trust strategy.

driver/src/main/java/org/neo4j/driver/Logging.java

@@ -18,6 +18,7 @@
 
 import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING;
 
+import java.io.Serializable;
 import java.util.logging.ConsoleHandler;
 import java.util.logging.Level;
 import org.neo4j.driver.internal.logging.ConsoleLogging;
@@ -82,7 +83,7 @@
  * @see Logger
  * @see Config.ConfigBuilder#withLogging(Logging)
  */
-public interface Logging {
+public interface Logging extends Serializable {
     /**
      * Obtain a {@link Logger} instance by class, its name will be the fully qualified name of the class.
      *

driver/src/main/java/org/neo4j/driver/Query.java

@@ -78,20 +78,26 @@ public Query(String text) {
     }
 
     /**
+     * Returns the query text.
+     *
      * @return the query text
      */
     public String text() {
         return text;
     }
 
     /**
+     * Returns the parameter map.
+     *
      * @return the parameter map
      */
     public Value parameters() {
         return parameters;
     }
 
     /**
+     * Returns a new Query object with updated text.
+     *
      * @param newText the new query text
      * @return a new Query object with updated text
      */
@@ -100,6 +106,8 @@ public Query withText(String newText) {
     }
 
     /**
+     * Returns a new Query object with updated parameters.
+     *
      * @param newParameters the new parameter map
      * @return a new Query object with updated parameters
      */
@@ -108,6 +116,8 @@ public Query withParameters(Value newParameters) {
     }
 
     /**
+     * Returns a new Query object with updated parameters.
+     *
      * @param newParameters the new parameter map
      * @return a new Query object with updated parameters
      */

driver/src/main/java/org/neo4j/driver/QueryConfig.java

@@ -67,6 +67,7 @@ public final class QueryConfig implements Serializable {
      * The transaction metadata.
      * @since 5.16
      */
+    @SuppressWarnings("serial")
     private final Map<String, Serializable> metadata;
 
     /**

driver/src/main/java/org/neo4j/driver/SessionConfig.java

@@ -45,6 +45,7 @@ public final class SessionConfig implements Serializable {
     /**
      * The initial bookmarks.
      */
+    @SuppressWarnings("serial")
     private final Iterable<Bookmark> bookmarks;
     /**
      * The default type of access.

driver/src/main/java/org/neo4j/driver/TransactionConfig.java

@@ -72,6 +72,7 @@ public final class TransactionConfig implements Serializable {
     /**
      * The transaction metadata.
      */
+    @SuppressWarnings("serial")
     private final Map<String, Object> metadata;
 
     // Values are not serializable, hence, we keep a transient volatile map of them around