From dda0b3e2a16a9321ccf25fa34d129b7c687311d7 Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Tue, 19 Mar 2019 20:48:04 +0100 Subject: [PATCH] Remove explicit types Closes gh-16265 --- .../autoconfigure/jersey/JerseyAutoConfigurationTests.java | 3 +-- .../web/servlet/WebMvcAutoConfigurationTests.java | 3 +-- .../data/neo4j/DataNeo4jTestIntegrationTests.java | 2 +- .../data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java | 2 +- .../neo4j/DataNeo4jTestWithIncludeFilterIntegrationTests.java | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationTests.java index 6ec75f1484e..8fb72975654 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationTests.java @@ -97,8 +97,7 @@ public class JerseyAutoConfigurationTests { @Bean public FilterRegistrationBean customRequestContextFilterRegistration() { - return new FilterRegistrationBean( - new RequestContextFilter()); + return new FilterRegistrationBean<>(new RequestContextFilter()); } } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java index f77183d49aa..03783b267d8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java @@ -1276,8 +1276,7 @@ public class WebMvcAutoConfigurationTests { @Bean public FilterRegistrationBean customRequestContextFilterRegistration() { - return new FilterRegistrationBean( - new RequestContextFilter()); + return new FilterRegistrationBean<>(new RequestContextFilter()); } } diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestIntegrationTests.java index 9e6e7728fc3..efee0964f0d 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestIntegrationTests.java @@ -48,7 +48,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class DataNeo4jTestIntegrationTests { @ClassRule - public static SkippableContainer> neo4j = new SkippableContainer>( + public static SkippableContainer> neo4j = new SkippableContainer<>( () -> new Neo4jContainer<>().withAdminPassword(null)); @Autowired diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java index 88f8cce04a6..8fdca527a15 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java @@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class DataNeo4jTestPropertiesIntegrationTests { @ClassRule - public static SkippableContainer> neo4j = new SkippableContainer>( + public static SkippableContainer> neo4j = new SkippableContainer<>( () -> new Neo4jContainer<>().withAdminPassword(null)); @Autowired diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestWithIncludeFilterIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestWithIncludeFilterIntegrationTests.java index 6cf33739405..c34ef35501a 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestWithIncludeFilterIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestWithIncludeFilterIntegrationTests.java @@ -45,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class DataNeo4jTestWithIncludeFilterIntegrationTests { @ClassRule - public static SkippableContainer> neo4j = new SkippableContainer>( + public static SkippableContainer> neo4j = new SkippableContainer<>( () -> new Neo4jContainer<>().withAdminPassword(null)); @Autowired