From 8172a0eefbf8052212418cc1007fb9493d9d1a76 Mon Sep 17 00:00:00 2001 From: Robsdedude Date: Fri, 2 Aug 2024 12:17:33 +0200 Subject: [PATCH 1/2] Add host-only factory using default port to ServerAddress --- driver/clirr-ignored-differences.xml | 6 ++++++ .../main/java/org/neo4j/driver/net/ServerAddress.java | 10 ++++++++++ .../java/org/neo4j/driver/net/ServerAddressTest.java | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/driver/clirr-ignored-differences.xml b/driver/clirr-ignored-differences.xml index d0beec3a05..e72439e80b 100644 --- a/driver/clirr-ignored-differences.xml +++ b/driver/clirr-ignored-differences.xml @@ -627,4 +627,10 @@ java.util.Optional rawClassification() + + org/neo4j/driver/net/ServerAddress + 7012 + org.neo4j.driver.net.ServerAddress of(java.lang.String) + + diff --git a/driver/src/main/java/org/neo4j/driver/net/ServerAddress.java b/driver/src/main/java/org/neo4j/driver/net/ServerAddress.java index 66ddcfb0d7..f3652978bd 100644 --- a/driver/src/main/java/org/neo4j/driver/net/ServerAddress.java +++ b/driver/src/main/java/org/neo4j/driver/net/ServerAddress.java @@ -47,4 +47,14 @@ public interface ServerAddress { static ServerAddress of(String host, int port) { return new BoltServerAddress(host, port); } + + /** + * Create a new address with the given host using the default bolt port. + * + * @param host the host portion. Should not be {@code null}. + * @return new server address with the specified host and default bolt port. + */ + static ServerAddress of(String host) { + return ServerAddress.of(host, BoltServerAddress.DEFAULT_PORT); + } } diff --git a/driver/src/test/java/org/neo4j/driver/net/ServerAddressTest.java b/driver/src/test/java/org/neo4j/driver/net/ServerAddressTest.java index f40fa9b37a..414971501c 100644 --- a/driver/src/test/java/org/neo4j/driver/net/ServerAddressTest.java +++ b/driver/src/test/java/org/neo4j/driver/net/ServerAddressTest.java @@ -20,6 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.Test; +import org.neo4j.driver.internal.BoltServerAddress; class ServerAddressTest { @Test @@ -34,6 +35,13 @@ void shouldFailToCreateAddressWithInvalidHost() { assertThrows(NullPointerException.class, () -> ServerAddress.of(null, 9999)); } + @Test + void shouldCreateAddressWithDefaultPort() { + var address = ServerAddress.of("my.database.example.com"); + assertEquals("my.database.example.com", address.host()); + assertEquals(BoltServerAddress.DEFAULT_PORT, address.port()); + } + @Test void shouldFailToCreateAddressWithInvalidPort() { assertThrows(IllegalArgumentException.class, () -> ServerAddress.of("hello.graphs.com", -42)); From a1349240c8ec99af16c8e5331b70fc4af7f63242 Mon Sep 17 00:00:00 2001 From: Robsdedude Date: Mon, 5 Aug 2024 09:12:00 +0200 Subject: [PATCH 2/2] Docs comment: add since tag Co-authored-by: Dmitriy Tverdiakov <11927660+injectives@users.noreply.github.com> --- driver/src/main/java/org/neo4j/driver/net/ServerAddress.java | 1 + 1 file changed, 1 insertion(+) diff --git a/driver/src/main/java/org/neo4j/driver/net/ServerAddress.java b/driver/src/main/java/org/neo4j/driver/net/ServerAddress.java index f3652978bd..1f0f78ff37 100644 --- a/driver/src/main/java/org/neo4j/driver/net/ServerAddress.java +++ b/driver/src/main/java/org/neo4j/driver/net/ServerAddress.java @@ -53,6 +53,7 @@ static ServerAddress of(String host, int port) { * * @param host the host portion. Should not be {@code null}. * @return new server address with the specified host and default bolt port. + * @since 5.24.0 */ static ServerAddress of(String host) { return ServerAddress.of(host, BoltServerAddress.DEFAULT_PORT);