fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/flyway/FlywayEndpointTests.java
View File

@ -82,6 +82,7 @@ public class FlywayEndpointTests {
@Configuration @Configuration
public static class BaselinedFlywayConfig { public static class BaselinedFlywayConfig {
@SuppressWarnings("deprecation")
@Bean @Bean
public FlywayMigrationStrategy baseliningMigrationStrategy() { public FlywayMigrationStrategy baseliningMigrationStrategy() {
return (flyway) -> { return (flyway) -> {

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 * @author Dominic Gunn
* @since 1.1.0 * @since 1.1.0
*/ */
@SuppressWarnings("deprecation")
@Configuration @Configuration
@ConditionalOnClass(Flyway.class) @ConditionalOnClass(Flyway.class)
@ConditionalOnBean(DataSource.class) @ConditionalOnBean(DataSource.class)
@ -98,7 +99,6 @@ public class FlywayAutoConfiguration {
return new FlywaySchemaManagementProvider(flyways); return new FlywaySchemaManagementProvider(flyways);
} }
@SuppressWarnings("deprecation")
@Configuration @Configuration
@ConditionalOnMissingBean(Flyway.class) @ConditionalOnMissingBean(Flyway.class)
@EnableConfigurationProperties({ DataSourceProperties.class, FlywayProperties.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 @Override
public SchemaManagement getSchemaManagement(DataSource dataSource) { public SchemaManagement getSchemaManagement(DataSource dataSource) {
return StreamSupport.stream(this.flywayInstances.spliterator(), false) 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) .map((managedDataSource) -> SchemaManagement.MANAGED)
.orElse(SchemaManagement.UNMANAGED); .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; private final OkHttpClient.Builder builder;
@SuppressWarnings("deprecation")
public InfluxDbAutoConfiguration(InfluxDbProperties properties, public InfluxDbAutoConfiguration(InfluxDbProperties properties,
ObjectProvider<InfluxDbOkHttpClientBuilderProvider> builder, ObjectProvider<InfluxDbOkHttpClientBuilderProvider> builder,
ObjectProvider<OkHttpClient.Builder> deprecatedBuilder) { 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", "dryRunOutputAsFileName", "errorHandlers", "errorHandlersAsClassNames",
"errorOverrides", "licenseKey", "oracleSqlplus", "stream", "errorOverrides", "licenseKey", "oracleSqlplus", "stream",
"undoSqlMigrationPrefix"); "undoSqlMigrationPrefix");
List<String> configurationKeys = new ArrayList(configuration.keySet()); List<String> configurationKeys = new ArrayList<>(configuration.keySet());
Collections.sort(configurationKeys); Collections.sort(configurationKeys);
List<String> propertiesKeys = new ArrayList(properties.keySet()); List<String> propertiesKeys = new ArrayList<>(properties.keySet());
Collections.sort(propertiesKeys); Collections.sort(propertiesKeys);
assertThat(configurationKeys).isEqualTo(propertiesKeys); assertThat(configurationKeys).isEqualTo(propertiesKeys);
} }

1
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/DeferredLogTests.java
View File

@ -171,6 +171,7 @@ public class DeferredLogTests {
verifyZeroInteractions(log2); verifyZeroInteractions(log2);
} }
@SuppressWarnings("unchecked")
@Test @Test
public void switchTo() { public void switchTo() {
DirectFieldAccessor deferredLogFieldAccessor = new DirectFieldAccessor( DirectFieldAccessor deferredLogFieldAccessor = new DirectFieldAccessor(

4
spring-boot-samples/spring-boot-sample-web-method-security/src/test/java/sample/security/method/SampleMethodSecurityApplicationTests.java
View File

@ -34,7 +34,7 @@ import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.http.client.support.BasicAuthorizationInterceptor; import org.springframework.http.client.support.BasicAuthenticationInterceptor;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
@ -112,7 +112,7 @@ public class SampleMethodSecurityApplicationTests {
@Test @Test
public void testManagementAuthorizedAccess() { public void testManagementAuthorizedAccess() {
BasicAuthorizationInterceptor basicAuthInterceptor = new BasicAuthorizationInterceptor( BasicAuthenticationInterceptor basicAuthInterceptor = new BasicAuthenticationInterceptor(
"admin", "admin"); "admin", "admin");
this.restTemplate.getRestTemplate().getInterceptors().add(basicAuthInterceptor); this.restTemplate.getRestTemplate().getInterceptors().add(basicAuthInterceptor);
try { try {