Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6746 from xenoterracide:neo4j-bolt

Browse Source 
* pr/6746:
  Polish contribution
  Detect Neo4j bolt driver
This commit is contained in:
Stephane Nicoll
2016-08-26 14:25:45 +02:00
parent b9104c9337 47c568a24d
commit 62bc955ba7
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jProperties.java
View File

@@ -45,6 +45,8 @@ public class Neo4jProperties implements ApplicationContextAware {
static final String DEFAULT_HTTP_URI = "http://localhost:7474";
static final String BOLT_DRIVER = "org.neo4j.ogm.drivers.bolt.driver.BoltDriver";
/**
* URI used by the driver. Auto-detected by default.
*/
@@ -151,6 +153,9 @@ public class Neo4jProperties implements ApplicationContextAware {
if ("http".equals(scheme)) {
return HTTP_DRIVER;
}
if ("bolt".equals(scheme)) {
return BOLT_DRIVER;
}
throw new IllegalArgumentException(
"Could not deduce driver to use based on URI '" + uri + "'");
}

8
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java
View File

@@ -71,6 +71,14 @@ public class Neo4jPropertiesTests {
assertDriver(configuration, Neo4jProperties.HTTP_DRIVER, "http://localhost:7474");
}
@Test
public void boltUriUseBoltDriver() {
Neo4jProperties properties = load(true,
"spring.data.neo4j.uri=bolt://localhost:7687");
Configuration configuration = properties.createConfiguration();
assertDriver(configuration, Neo4jProperties.BOLT_DRIVER, "bolt://localhost:7687");
}
@Test
public void fileUriUseEmbeddedServer() {
Neo4jProperties properties = load(true,