Polish

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfiguration.java

@@ -53,8 +53,8 @@ public class InfluxDbAutoConfiguration {
 		if (Strings.isNullOrEmpty(this.properties.getUser())) {
 			return InfluxDBFactory.connect(this.properties.getUrl());
 		}
-		return InfluxDBFactory.connect(this.properties.getUrl(), this.properties.getUser(),
+		return InfluxDBFactory.connect(this.properties.getUrl(),
-				this.properties.getPassword());
+				this.properties.getUser(), this.properties.getPassword());
 	}
 
 }

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

@@ -91,12 +91,10 @@ public class MixedNeo4jRepositoriesAutoConfigurationTests {
 		assertThat(this.context.getBean(CityRepository.class)).isNotNull();
 	}
 
-	private void load(Class config, String... environment) {
+	private void load(Class<?> config, String... environment) {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
-		TestPropertyValues.of(environment)
+		TestPropertyValues.of(environment).and("spring.datasource.initialize", "false")
-				.and("spring.datasource.initialize", "false")
+				.and("spring.data.neo4j.uri", "http://localhost:8989").applyTo(ctx);
-				.and("spring.data.neo4j.uri", "http://localhost:8989")
-				.applyTo(ctx);
 		ctx.register(config);
 		ctx.register(DataSourceAutoConfiguration.class,
 				HibernateJpaAutoConfiguration.class,

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java

@@ -86,7 +86,8 @@ public class RedisAutoConfigurationTests {
 	@Test
 	public void testCustomizeRedisConfiguration() {
 		load(CustomConfiguration.class);
-		LettuceConnectionFactory cf = this.context.getBean(LettuceConnectionFactory.class);
+		LettuceConnectionFactory cf = this.context
+				.getBean(LettuceConnectionFactory.class);
 		assertThat(cf.isUseSsl()).isTrue();
 	}
 

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfigurationTests.java

@@ -50,8 +50,7 @@ public class InfluxDbAutoConfigurationTests {
 
 	@Test
 	public void influxDbCanBeCustomized() {
-		load("spring.influx.url=http://localhost",
+		load("spring.influx.url=http://localhost", "spring.influx.password:password",
-				"spring.influx.password:password",
 				"spring.influx.user:user");
 		assertThat(this.context.getBeansOfType(InfluxDB.class)).hasSize(1);
 	}