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

Detect Neo4j https driver url

Browse Source 
Closes gh-9549
This commit is contained in:
Stephane Nicoll
2017-06-23 11:39:39 +02:00
parent d77056639d
commit 90c4e7518b
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2016 the original author or authors.
* Copyright 2012-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -150,7 +150,7 @@ public class Neo4jProperties implements ApplicationContextAware {
if (scheme == null || scheme.equals("file")) {
return EMBEDDED_DRIVER;
}
if ("http".equals(scheme)) {
if ("http".equals(scheme) || "https".equals(scheme)) {
return HTTP_DRIVER;
}
if ("bolt".equals(scheme)) {

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 httpsUriUseHttpDriver() {
Neo4jProperties properties = load(true,
"spring.data.neo4j.uri=https://localhost:7474");
Configuration configuration = properties.createConfiguration();
assertDriver(configuration, Neo4jProperties.HTTP_DRIVER, "https://localhost:7474");
}
@Test
public void boltUriUseBoltDriver() {
Neo4jProperties properties = load(true,