Skip to content

Update Neo4jSettings for 5.0 server #1254

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
merged 1 commit into from
Jun 28, 2022
Merged

Update Neo4jSettings for 5.0 server #1254

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 24 additions & 4 deletions driver/src/test/java/org/neo4j/driver/util/Neo4jSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,19 @@ public class Neo4jSettings {

static final int TEST_JVM_ID = Integer.getInteger("testJvmId", 0);

private static final int DEFAULT_HTTP_PORT = 7000;
private static final int DEFAULT_HTTPS_PORT = 8000;
private static final int DEFAULT_BOLT_PORT = 9000;
private static final int DEFAULT_HTTP_PORT = 12000;
private static final int DEFAULT_HTTPS_PORT = 13000;
private static final int DEFAULT_BOLT_PORT = 14000;
private static final int DEFAULT_DISCOVERY_LISTEN_PORT = 15000;
private static final int DEFAULT_RAFT_ADVERTISED_PORT = 16000;
private static final int DEFAULT_TX_LISTEN_PORT = 17000;

static final int CURRENT_HTTP_PORT = DEFAULT_HTTP_PORT + TEST_JVM_ID;
private static final int CURRENT_HTTPS_PORT = DEFAULT_HTTPS_PORT + TEST_JVM_ID;
static final int CURRENT_BOLT_PORT = DEFAULT_BOLT_PORT + TEST_JVM_ID;
static final int CURRENT_DISCOVERY_LISTEN_PORT = DEFAULT_DISCOVERY_LISTEN_PORT + TEST_JVM_ID;
static final int CURRENT_RAFT_ADVERTISED_PORT = DEFAULT_RAFT_ADVERTISED_PORT + TEST_JVM_ID;
static final int CURRENT_TX_LISTEN_PORT = DEFAULT_TX_LISTEN_PORT + TEST_JVM_ID;

private static final String WINDOWS_SERVICE_NAME = "neo4j-" + TEST_JVM_ID;

Expand All @@ -66,6 +72,20 @@ public class Neo4jSettings {
":" + CURRENT_HTTPS_PORT,
"dbms.connector.bolt.listen_address",
":" + CURRENT_BOLT_PORT,
"dbms.cluster.discovery.initial_members",
"localhost:" + CURRENT_DISCOVERY_LISTEN_PORT,
"server.discovery.listen_address",
":" + CURRENT_DISCOVERY_LISTEN_PORT,
"cluster.raft_advertised_address",
":" + CURRENT_RAFT_ADVERTISED_PORT,
"cluster.raft_listen_address",
":" + CURRENT_RAFT_ADVERTISED_PORT,
"cluster.transaction_listen_address",
":" + CURRENT_TX_LISTEN_PORT,
"cluster.transaction_advertised_address",
":" + CURRENT_TX_LISTEN_PORT,
"server.cluster.advertised_address",
":" + CURRENT_TX_LISTEN_PORT,
"dbms.windows_service_name",
WINDOWS_SERVICE_NAME,
DATA_DIR,
Expand All @@ -76,7 +96,7 @@ public class Neo4jSettings {
DEFAULT_BOLT_TLS_LEVEL,
LISTEN_ADDR,
IPV6_ENABLED_ADDR),
Collections.<String>emptySet());
Collections.emptySet());

public enum BoltTlsLevel {
OPTIONAL,
Expand Down