Polish contribution

Closes gh-6746

Author: snicoll

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

@@ -47,8 +47,6 @@ public class Neo4jProperties implements ApplicationContextAware {
 
 	static final String BOLT_DRIVER = "org.neo4j.ogm.drivers.bolt.driver.BoltDriver";
 
-	static final String DEFAULT_BOLT_URI = "bolt://localhost:7687";
-
 	/**
 	 * URI used by the driver. Auto-detected by default.
 	 */
@@ -173,11 +171,6 @@ private void configureDriverWithDefaults(DriverConfiguration driverConfiguration
 			driverConfiguration.setDriverClassName(EMBEDDED_DRIVER);
 			return;
 		}
-		if (ClassUtils.isPresent(BOLT_DRIVER, this.classLoader)) {
-			driverConfiguration.setDriverClassName(BOLT_DRIVER);
-			driverConfiguration.setURI( DEFAULT_BOLT_URI );
-			return;
-		}
 		driverConfiguration.setDriverClassName(HTTP_DRIVER);
 		driverConfiguration.setURI(DEFAULT_HTTP_URI);
 	}

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

@@ -18,8 +18,6 @@
 
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.EnumSet;
-import java.util.Set;
 
 import com.hazelcast.util.Base64;
 import org.junit.After;
@@ -31,6 +29,7 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.test.util.EnvironmentTestUtils;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -51,45 +50,38 @@ public void close() {
 
 	@Test
 	public void defaultUseEmbeddedInMemoryIfAvailable() {
-		Neo4jProperties properties = load(EnumSet.of( AvailableDriver.EMBEDDED ));
+		Neo4jProperties properties = load(true);
 		Configuration configuration = properties.createConfiguration();
 		assertDriver(configuration, Neo4jProperties.EMBEDDED_DRIVER, null);
 	}
 
 	@Test
-	public void defaultUseBoltIfAvailableAndEmbeddedNot() {
-		Neo4jProperties properties = load(EnumSet.of( AvailableDriver.BOLT ));
-		Configuration configuration = properties.createConfiguration();
-		assertDriver(configuration, Neo4jProperties.BOLT_DRIVER, "bolt://localhost:7687");
-	}
-
-	@Test
-	public void defaultUseHttpIfEmbeddedAndBoltIsNotAvailable() {
-		Neo4jProperties properties = load(EnumSet.noneOf( AvailableDriver.class ));
+	public void defaultUseHttpDriverIfEmbeddedDriverIsNotAvailable() {
+		Neo4jProperties properties = load(false);
 		Configuration configuration = properties.createConfiguration();
 		assertDriver(configuration, Neo4jProperties.HTTP_DRIVER,
 				Neo4jProperties.DEFAULT_HTTP_URI);
 	}
 
 	@Test
 	public void httpUriUseHttpServer() {
-		Neo4jProperties properties = load(EnumSet.of( AvailableDriver.EMBEDDED ),
+		Neo4jProperties properties = load(true,
 				"spring.data.neo4j.uri=http://localhost:7474");
 		Configuration configuration = properties.createConfiguration();
 		assertDriver(configuration, Neo4jProperties.HTTP_DRIVER, "http://localhost:7474");
 	}
 
 	@Test
-	public void boltUriUseBolt() {
-		Neo4jProperties properties = load(EnumSet.of( AvailableDriver.EMBEDDED, AvailableDriver.BOLT ),
+	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(EnumSet.of( AvailableDriver.EMBEDDED ),
+		Neo4jProperties properties = load(true,
 				"spring.data.neo4j.uri=file://var/tmp/graph.db");
 		Configuration configuration = properties.createConfiguration();
 		assertDriver(configuration, Neo4jProperties.EMBEDDED_DRIVER,
@@ -98,7 +90,7 @@ public void fileUriUseEmbeddedServer() {
 
 	@Test
 	public void credentialsAreSet() {
-		Neo4jProperties properties = load(EnumSet.of( AvailableDriver.EMBEDDED ),
+		Neo4jProperties properties = load(true,
 				"spring.data.neo4j.uri=http://localhost:7474",
 				"spring.data.neo4j.username=user", "spring.data.neo4j.password=secret");
 		Configuration configuration = properties.createConfiguration();
@@ -108,7 +100,7 @@ public void credentialsAreSet() {
 
 	@Test
 	public void credentialsAreSetFromUri() {
-		Neo4jProperties properties = load(EnumSet.of( AvailableDriver.EMBEDDED ),
+		Neo4jProperties properties = load(true,
 				"spring.data.neo4j.uri=http://user:secret@my-server:7474");
 		Configuration configuration = properties.createConfiguration();
 		assertDriver(configuration, Neo4jProperties.HTTP_DRIVER,
@@ -118,7 +110,7 @@ public void credentialsAreSetFromUri() {
 
 	@Test
 	public void embeddedModeDisabledUseHttpUri() {
-		Neo4jProperties properties = load(EnumSet.of( AvailableDriver.EMBEDDED ),
+		Neo4jProperties properties = load(true,
 				"spring.data.neo4j.embedded.enabled=false");
 		Configuration configuration = properties.createConfiguration();
 		assertDriver(configuration, Neo4jProperties.HTTP_DRIVER,
@@ -127,7 +119,7 @@ public void embeddedModeDisabledUseHttpUri() {
 
 	@Test
 	public void embeddedModeWithRelativeLocation() {
-		Neo4jProperties properties = load(EnumSet.of( AvailableDriver.EMBEDDED ),
+		Neo4jProperties properties = load(true,
 				"spring.data.neo4j.uri=target/neo4j/my.db");
 		Configuration configuration = properties.createConfiguration();
 		assertDriver(configuration, Neo4jProperties.EMBEDDED_DRIVER,
@@ -159,15 +151,20 @@ private static void assertCredentials(Configuration actual, String username,
 		}
 	}
 
-	public Neo4jProperties load( final Set<AvailableDriver> availableDrivers, String... environment) {
+	public Neo4jProperties load(final boolean embeddedAvailable, String... environment) {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.setClassLoader(new URLClassLoader(new URL[0], getClass().getClassLoader()) {
 
 			@Override
 			protected Class<?> loadClass(String name, boolean resolve)
 					throws ClassNotFoundException {
-				if ( AvailableDriver.shouldLoad( availableDrivers, name )) {
-					return AvailableDriver.loadClass( name );
+				if (name.equals(Neo4jProperties.EMBEDDED_DRIVER)) {
+					if (embeddedAvailable) {
+						return TestEmbeddedDriver.class;
+					}
+					else {
+						throw new ClassNotFoundException();
+					}
 				}
 				return super.loadClass(name, resolve);
 			}
@@ -186,42 +183,8 @@ static class TestConfiguration {
 
 	}
 
-	private enum AvailableDriver {
-		EMBEDDED( Neo4jProperties.EMBEDDED_DRIVER, TestEmbeddedDriver.class ),
-		BOLT( Neo4jProperties.BOLT_DRIVER, TestBoltDriver.class );
-
-		private final String driverName;
-		private final Class<?> driverStub;
-
-		AvailableDriver( final String driverName, final Class<?> driverStub ) {
-			this.driverName = driverName;
-			this.driverStub = driverStub;
-		}
-
-		public static boolean shouldLoad( Set<AvailableDriver> availableDrivers, String name ) {
-			for ( AvailableDriver driver : availableDrivers ) {
-				if ( driver.driverName.equals( name ) ) {
-					return true;
-				}
-			}
-			return false;
-		}
-
-		public static Class<?> loadClass( String className ) throws ClassNotFoundException {
-			for ( AvailableDriver driver : AvailableDriver.values() ) {
-				if ( driver.driverName.equals( className ) ) {
-					return driver.driverStub;
-				}
-			}
-			throw new ClassNotFoundException();
-		}
-	}
-
 	private static class TestEmbeddedDriver {
 
 	}
 
-	private static class TestBoltDriver {
-	}
-
 }