Skip to content

Commit 9ebba3d

Browse files
committed
Use Neo4j product constant in more places
1 parent 9efd515 commit 9ebba3d

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

driver/src/main/java/org/neo4j/driver/internal/util/ServerVersion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class ServerVersion
3838
public static final ServerVersion v3_0_0 = new ServerVersion( NEO4J_PRODUCT, 3, 0, 0 );
3939
public static final ServerVersion vInDev = new ServerVersion( NEO4J_PRODUCT, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE );
4040

41-
private static final String NEO4J_IN_DEV_VERSION_STRING = "Neo4j/dev";
41+
private static final String NEO4J_IN_DEV_VERSION_STRING = NEO4J_PRODUCT + "/dev";
4242
private static final Pattern PATTERN =
4343
Pattern.compile( "([^/]+)/(\\d+)\\.(\\d+)(?:\\.)?(\\d*)(\\.|-|\\+)?([0-9A-Za-z-.]*)?" );
4444

driver/src/test/java/org/neo4j/driver/v1/util/cc/ClusterExtension.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
import static org.junit.jupiter.api.Assumptions.assumeTrue;
3636
import static org.neo4j.driver.internal.util.Neo4jFeature.CAUSAL_CLUSTER;
37+
import static org.neo4j.driver.internal.util.ServerVersion.NEO4J_PRODUCT;
3738
import static org.neo4j.driver.v1.util.Neo4jRunner.PASSWORD;
3839
import static org.neo4j.driver.v1.util.Neo4jRunner.TARGET_DIR;
3940
import static org.neo4j.driver.v1.util.Neo4jRunner.USER;
@@ -126,7 +127,7 @@ private static String parseNeo4jVersion()
126127
{
127128
String[] split = Neo4jRunner.NEOCTRL_ARGS.split( "\\s+" );
128129
String version = split[split.length - 1];
129-
ServerVersion serverVersion = ServerVersion.version( "Neo4j/" + version );
130+
ServerVersion serverVersion = ServerVersion.version( NEO4J_PRODUCT + "/" + version );
130131
assumeTrue( CAUSAL_CLUSTER.availableIn( serverVersion ), "Server version `" + version + "` does not support Casual Cluster" );
131132
return version;
132133
}

0 commit comments

Comments
 (0)