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

Polish

Browse Source
This commit is contained in:
Andy Wilkinson
2018-10-18 15:51:20 +01:00
parent cefc7842d6
commit 22e722d9f9
7 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
View File

@@ -78,6 +78,7 @@ import org.springframework.util.StringUtils;
* @author Dominic Gunn
* @since 1.1.0
*/
@SuppressWarnings("deprecation")
@Configuration
@ConditionalOnClass(Flyway.class)
@ConditionalOnBean(DataSource.class)
@@ -98,7 +99,6 @@ public class FlywayAutoConfiguration {
return new FlywaySchemaManagementProvider(flyways);
}
@SuppressWarnings("deprecation")
@Configuration
@ConditionalOnMissingBean(Flyway.class)
@EnableConfigurationProperties({ DataSourceProperties.class, FlywayProperties.class })

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywaySchemaManagementProvider.java
View File

@@ -42,7 +42,8 @@ class FlywaySchemaManagementProvider implements SchemaManagementProvider {
@Override
public SchemaManagement getSchemaManagement(DataSource dataSource) {
return StreamSupport.stream(this.flywayInstances.spliterator(), false)
.map(Flyway::getDataSource).filter(dataSource::equals).findFirst()
.map((flyway) -> flyway.getConfiguration().getDataSource())
.filter(dataSource::equals).findFirst()
.map((managedDataSource) -> SchemaManagement.MANAGED)
.orElse(SchemaManagement.UNMANAGED);
}

1
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/influx/InfluxDbAutoConfiguration.java
View File

@@ -50,7 +50,6 @@ public class InfluxDbAutoConfiguration {
private final OkHttpClient.Builder builder;
@SuppressWarnings("deprecation")
public InfluxDbAutoConfiguration(InfluxDbProperties properties,
ObjectProvider<InfluxDbOkHttpClientBuilderProvider> builder,
ObjectProvider<OkHttpClient.Builder> deprecatedBuilder) {

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayPropertiesTests.java
View File

@@ -132,9 +132,9 @@ public class FlywayPropertiesTests {
"dryRunOutputAsFileName", "errorHandlers", "errorHandlersAsClassNames",
"errorOverrides", "licenseKey", "oracleSqlplus", "stream",
"undoSqlMigrationPrefix");
List<String> configurationKeys = new ArrayList(configuration.keySet());
List<String> configurationKeys = new ArrayList<>(configuration.keySet());
Collections.sort(configurationKeys);
List<String> propertiesKeys = new ArrayList(properties.keySet());
List<String> propertiesKeys = new ArrayList<>(properties.keySet());
Collections.sort(propertiesKeys);
assertThat(configurationKeys).isEqualTo(propertiesKeys);
}