To record

Author: injectives

driver/src/main/java/org/neo4j/driver/internal/InternalPath.java

@@ -34,31 +34,7 @@
  * {@link Path} implementation that directly contains all nodes and relationships.
  */
 public class InternalPath implements Path, AsValue {
-    public static class SelfContainedSegment implements Segment {
-        private final Node start;
-        private final Relationship relationship;
-        private final Node end;
-
-        public SelfContainedSegment(Node start, Relationship relationship, Node end) {
-            this.start = start;
-            this.relationship = relationship;
-            this.end = end;
-        }
-
-        @Override
-        public Node start() {
-            return start;
-        }
-
-        @Override
-        public Relationship relationship() {
-            return relationship;
-        }
-
-        @Override
-        public Node end() {
-            return end;
-        }
+    public record SelfContainedSegment(Node start, Relationship relationship, Node end) implements Segment {
 
         @Override
         public boolean equals(Object other) {
@@ -73,14 +49,6 @@ public boolean equals(Object other) {
             return start.equals(that.start) && end.equals(that.end) && relationship.equals(that.relationship);
         }
 
-        @Override
-        public int hashCode() {
-            var result = start.hashCode();
-            result = 31 * result + relationship.hashCode();
-            result = 31 * result + end.hashCode();
-            return result;
-        }
-
         @Override
         @SuppressWarnings("deprecation")
         public String toString() {

driver/src/main/java/org/neo4j/driver/internal/InternalPoint2D.java

@@ -18,34 +18,9 @@
  */
 package org.neo4j.driver.internal;
 
-import java.util.Objects;
 import org.neo4j.driver.types.Point;
 
-public class InternalPoint2D implements Point {
-    private final int srid;
-    private final double x;
-    private final double y;
-
-    public InternalPoint2D(int srid, double x, double y) {
-        this.srid = srid;
-        this.x = x;
-        this.y = y;
-    }
-
-    @Override
-    public int srid() {
-        return srid;
-    }
-
-    @Override
-    public double x() {
-        return x;
-    }
-
-    @Override
-    public double y() {
-        return y;
-    }
+public record InternalPoint2D(int srid, double x, double y) implements Point {
 
     @Override
     public double z() {
@@ -64,11 +39,6 @@ public boolean equals(Object o) {
         return srid == that.srid && Double.compare(that.x, x) == 0 && Double.compare(that.y, y) == 0;
     }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(srid, x, y);
-    }
-
     @Override
     public String toString() {
         return "Point{" + "srid=" + srid + ", x=" + x + ", y=" + y + '}';

driver/src/main/java/org/neo4j/driver/internal/InternalPoint3D.java

@@ -18,41 +18,9 @@
  */
 package org.neo4j.driver.internal;
 
-import java.util.Objects;
 import org.neo4j.driver.types.Point;
 
-public class InternalPoint3D implements Point {
-    private final int srid;
-    private final double x;
-    private final double y;
-    private final double z;
-
-    public InternalPoint3D(int srid, double x, double y, double z) {
-        this.srid = srid;
-        this.x = x;
-        this.y = y;
-        this.z = z;
-    }
-
-    @Override
-    public int srid() {
-        return srid;
-    }
-
-    @Override
-    public double x() {
-        return x;
-    }
-
-    @Override
-    public double y() {
-        return y;
-    }
-
-    @Override
-    public double z() {
-        return z;
-    }
+public record InternalPoint3D(int srid, double x, double y, double z) implements Point {
 
     @Override
     public boolean equals(Object o) {
@@ -69,11 +37,6 @@ public boolean equals(Object o) {
                 && Double.compare(that.z, z) == 0;
     }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(srid, x, y, z);
-    }
-
     @Override
     public String toString() {
         return "Point{" + "srid=" + srid + ", x=" + x + ", y=" + y + ", z=" + z + '}';

driver/src/main/java/org/neo4j/driver/internal/SecuritySettings.java

@@ -21,28 +21,18 @@
 import java.io.Serializable;
 import org.neo4j.driver.Config;
 
-public class SecuritySettings implements Serializable {
+public record SecuritySettings(boolean encrypted, Config.TrustStrategy trustStrategy) implements Serializable {
     private static final long serialVersionUID = 4494615367164106576L;
 
     private static final boolean DEFAULT_ENCRYPTED = false;
     private static final Config.TrustStrategy DEFAULT_TRUST_STRATEGY = Config.TrustStrategy.trustSystemCertificates();
     public static final SecuritySettings DEFAULT = new SecuritySettings(DEFAULT_ENCRYPTED, DEFAULT_TRUST_STRATEGY);
-    private final boolean encrypted;
-    private final Config.TrustStrategy trustStrategy;
 
     public SecuritySettings(boolean encrypted, Config.TrustStrategy trustStrategy) {
         this.encrypted = encrypted;
         this.trustStrategy = trustStrategy == null ? DEFAULT_TRUST_STRATEGY : trustStrategy;
     }
 
-    public boolean encrypted() {
-        return encrypted;
-    }
-
-    public Config.TrustStrategy trustStrategy() {
-        return trustStrategy;
-    }
-
     public static class SecuritySettingsBuilder {
         private boolean isCustomized = false;
         private boolean encrypted;

driver/src/main/java/org/neo4j/driver/internal/async/pool/PoolSettings.java

@@ -20,51 +20,23 @@
 
 import java.util.concurrent.TimeUnit;
 
-public class PoolSettings {
+public record PoolSettings(
+        int maxConnectionPoolSize,
+        long connectionAcquisitionTimeout,
+        long maxConnectionLifetime,
+        long idleTimeBeforeConnectionTest) {
     public static final int NOT_CONFIGURED = -1;
 
     public static final int DEFAULT_MAX_CONNECTION_POOL_SIZE = 100;
     public static final long DEFAULT_IDLE_TIME_BEFORE_CONNECTION_TEST = NOT_CONFIGURED;
     public static final long DEFAULT_MAX_CONNECTION_LIFETIME = TimeUnit.HOURS.toMillis(1);
     public static final long DEFAULT_CONNECTION_ACQUISITION_TIMEOUT = TimeUnit.SECONDS.toMillis(60);
 
-    private final int maxConnectionPoolSize;
-    private final long connectionAcquisitionTimeout;
-    private final long maxConnectionLifetime;
-    private final long idleTimeBeforeConnectionTest;
-
-    public PoolSettings(
-            int maxConnectionPoolSize,
-            long connectionAcquisitionTimeout,
-            long maxConnectionLifetime,
-            long idleTimeBeforeConnectionTest) {
-        this.maxConnectionPoolSize = maxConnectionPoolSize;
-        this.connectionAcquisitionTimeout = connectionAcquisitionTimeout;
-        this.maxConnectionLifetime = maxConnectionLifetime;
-        this.idleTimeBeforeConnectionTest = idleTimeBeforeConnectionTest;
-    }
-
-    public long idleTimeBeforeConnectionTest() {
-        return idleTimeBeforeConnectionTest;
-    }
-
     public boolean idleTimeBeforeConnectionTestEnabled() {
         return idleTimeBeforeConnectionTest >= 0;
     }
 
-    public long maxConnectionLifetime() {
-        return maxConnectionLifetime;
-    }
-
     public boolean maxConnectionLifetimeEnabled() {
         return maxConnectionLifetime > 0;
     }
-
-    public int maxConnectionPoolSize() {
-        return maxConnectionPoolSize;
-    }
-
-    public long connectionAcquisitionTimeout() {
-        return connectionAcquisitionTimeout;
-    }
 }

driver/src/main/java/org/neo4j/driver/internal/cluster/RoutingTableRegistryImpl.java

@@ -86,9 +86,9 @@ public RoutingTableRegistryImpl(
     @Override
     public CompletionStage<RoutingTableHandler> ensureRoutingTable(ConnectionContext context) {
         return ensureDatabaseNameIsCompleted(context).thenCompose(ctxAndHandler -> {
-            var completedContext = ctxAndHandler.getContext();
-            var handler = ctxAndHandler.getHandler() != null
-                    ? ctxAndHandler.getHandler()
+            var completedContext = ctxAndHandler.context();
+            var handler = ctxAndHandler.handler() != null
+                    ? ctxAndHandler.handler()
                     : getOrCreate(Futures.joinNowOrElseThrow(
                             completedContext.databaseNameFuture(), PENDING_DATABASE_NAME_EXCEPTION_SUPPLIER));
             return handler.ensureRoutingTable(completedContext).thenApply(ignored -> handler);
@@ -235,12 +235,7 @@ RoutingTableHandler newInstance(DatabaseName databaseName, RoutingTableRegistry
         }
     }
 
-    private static class Principal {
-        private final String id;
-
-        private Principal(String id) {
-            this.id = id;
-        }
+    private record Principal(String id) {
 
         @Override
         public boolean equals(Object o) {
@@ -253,28 +248,7 @@ public boolean equals(Object o) {
             var principal = (Principal) o;
             return Objects.equals(id, principal.id);
         }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(id);
-        }
     }
 
-    private static class ConnectionContextAndHandler {
-        private final ConnectionContext context;
-        private final RoutingTableHandler handler;
-
-        private ConnectionContextAndHandler(ConnectionContext context, RoutingTableHandler handler) {
-            this.context = context;
-            this.handler = handler;
-        }
-
-        public ConnectionContext getContext() {
-            return context;
-        }
-
-        public RoutingTableHandler getHandler() {
-            return handler;
-        }
-    }
+    private record ConnectionContextAndHandler(ConnectionContext context, RoutingTableHandler handler) {}
 }

driver/src/main/java/org/neo4j/driver/internal/messaging/encode/RouteMessageEncoder.java

@@ -37,8 +37,8 @@ public void encode(Message message, ValuePacker packer) throws IOException {
         checkArgument(message, RouteMessage.class);
         var routeMessage = (RouteMessage) message;
         packer.packStructHeader(3, message.signature());
-        packer.pack(routeMessage.getRoutingContext());
-        packer.pack(value(routeMessage.getBookmarks().stream().map(Bookmark::value)));
-        packer.pack(routeMessage.getDatabaseName());
+        packer.pack(routeMessage.routingContext());
+        packer.pack(value(routeMessage.bookmarks().stream().map(Bookmark::value)));
+        packer.pack(routeMessage.databaseName());
     }
 }

driver/src/main/java/org/neo4j/driver/internal/messaging/encode/RouteV44MessageEncoder.java

@@ -40,14 +40,14 @@ public void encode(Message message, ValuePacker packer) throws IOException {
         checkArgument(message, RouteMessage.class);
         var routeMessage = (RouteMessage) message;
         packer.packStructHeader(3, message.signature());
-        packer.pack(routeMessage.getRoutingContext());
-        packer.pack(value(routeMessage.getBookmarks().stream().map(Bookmark::value)));
+        packer.pack(routeMessage.routingContext());
+        packer.pack(value(routeMessage.bookmarks().stream().map(Bookmark::value)));
 
         Map<String, Value> params;
-        if (routeMessage.getImpersonatedUser() != null && routeMessage.getDatabaseName() == null) {
-            params = Collections.singletonMap("imp_user", value(routeMessage.getImpersonatedUser()));
-        } else if (routeMessage.getDatabaseName() != null) {
-            params = Collections.singletonMap("db", value(routeMessage.getDatabaseName()));
+        if (routeMessage.impersonatedUser() != null && routeMessage.databaseName() == null) {
+            params = Collections.singletonMap("imp_user", value(routeMessage.impersonatedUser()));
+        } else if (routeMessage.databaseName() != null) {
+            params = Collections.singletonMap("db", value(routeMessage.databaseName()));
         } else {
             params = Collections.emptyMap();
         }

driver/src/main/java/org/neo4j/driver/internal/messaging/request/RouteMessage.java

@@ -33,12 +33,10 @@
  * <p>
  * This message is used to fetch this routing information.
  */
-public class RouteMessage implements Message {
+public record RouteMessage(
+        Map<String, Value> routingContext, Set<Bookmark> bookmarks, String databaseName, String impersonatedUser)
+        implements Message {
     public static final byte SIGNATURE = 0x66;
-    private final Map<String, Value> routingContext;
-    private final Set<Bookmark> bookmarks;
-    private final String databaseName;
-    private final String impersonatedUser;
 
     /**
      * Constructor
@@ -56,22 +54,6 @@ public RouteMessage(
         this.impersonatedUser = impersonatedUser;
     }
 
-    public Map<String, Value> getRoutingContext() {
-        return routingContext;
-    }
-
-    public Set<Bookmark> getBookmarks() {
-        return bookmarks;
-    }
-
-    public String getDatabaseName() {
-        return databaseName;
-    }
-
-    public String getImpersonatedUser() {
-        return impersonatedUser;
-    }
-
     @Override
     public byte signature() {
         return SIGNATURE;