From a2ebba8db1b00ed2b237d77d908e1cff9f41db0f Mon Sep 17 00:00:00 2001 From: igor-suhorukov Date: Sat, 8 Dec 2018 15:27:31 +0300 Subject: [PATCH] Replace explicit generic type with diamond operator See gh-15424 --- .../autoconfigure/condition/ConditionalOnBeanTests.java | 6 +++--- .../condition/ConditionalOnMissingBeanTests.java | 6 +++--- .../FreeMarkerAutoConfigurationServletIntegrationTests.java | 4 ++-- .../thymeleaf/ThymeleafServletAutoConfigurationTests.java | 4 ++-- .../web/servlet/ConditionalOnMissingFilterBeanTests.java | 6 +++--- .../boot/devtools/filewatch/FileSystemWatcherTests.java | 2 +- .../web/servlet/mockmvc/HateoasController.java | 2 +- .../boot/context/properties/ConversionServiceDeducer.java | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java index 5c0b27c39bf..c03057f3c52 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java @@ -439,7 +439,7 @@ public class ConditionalOnBeanTests { @Bean public TestParameterizedContainer otherExampleBean() { - return new TestParameterizedContainer(); + return new TestParameterizedContainer<>(); } } @@ -449,7 +449,7 @@ public class ConditionalOnBeanTests { @Bean public TestParameterizedContainer customExampleBean() { - return new TestParameterizedContainer(); + return new TestParameterizedContainer<>(); } } @@ -482,7 +482,7 @@ public class ConditionalOnBeanTests { @Bean @ConditionalOnBean(parameterizedContainer = TestParameterizedContainer.class) public TestParameterizedContainer conditionalCustomExampleBean() { - return new TestParameterizedContainer(); + return new TestParameterizedContainer<>(); } } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java index 31f14d88fa5..2296ca361b8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java @@ -741,7 +741,7 @@ public class ConditionalOnMissingBeanTests { @Bean public TestParameterizedContainer otherExampleBean() { - return new TestParameterizedContainer(); + return new TestParameterizedContainer<>(); } } @@ -751,7 +751,7 @@ public class ConditionalOnMissingBeanTests { @Bean public TestParameterizedContainer customExampleBean() { - return new TestParameterizedContainer(); + return new TestParameterizedContainer<>(); } } @@ -784,7 +784,7 @@ public class ConditionalOnMissingBeanTests { @Bean @ConditionalOnMissingBean(parameterizedContainer = TestParameterizedContainer.class) public TestParameterizedContainer conditionalCustomExampleBean() { - return new TestParameterizedContainer(); + return new TestParameterizedContainer<>(); } } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationServletIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationServletIntegrationTests.java index 38c36cd1212..bff1535b1e3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationServletIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationServletIntegrationTests.java @@ -243,7 +243,7 @@ public class FreeMarkerAutoConfigurationServletIntegrationTests { @Bean public FilterRegistrationBean filterRegistration() { - FilterRegistrationBean bean = new FilterRegistrationBean( + FilterRegistrationBean bean = new FilterRegistrationBean<>( new ResourceUrlEncodingFilter()); bean.setDispatcherTypes(EnumSet.of(DispatcherType.INCLUDE)); return bean; @@ -257,7 +257,7 @@ public class FreeMarkerAutoConfigurationServletIntegrationTests { @Bean public FilterRegistrationBean filterRegistration() { - return new FilterRegistrationBean( + return new FilterRegistrationBean<>( new OrderedCharacterEncodingFilter()); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java index d068b191c26..cbdf8089b94 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java @@ -358,7 +358,7 @@ public class ThymeleafServletAutoConfigurationTests { @Bean public FilterRegistrationBean filterRegistration() { - FilterRegistrationBean bean = new FilterRegistrationBean( + FilterRegistrationBean bean = new FilterRegistrationBean<>( new ResourceUrlEncodingFilter()); bean.setDispatcherTypes(EnumSet.of(DispatcherType.INCLUDE)); return bean; @@ -372,7 +372,7 @@ public class ThymeleafServletAutoConfigurationTests { @Bean public FilterRegistrationBean filterRegistration() { - return new FilterRegistrationBean( + return new FilterRegistrationBean<>( new OrderedCharacterEncodingFilter()); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ConditionalOnMissingFilterBeanTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ConditionalOnMissingFilterBeanTests.java index 7220d85b1f5..41fd8bb9049 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ConditionalOnMissingFilterBeanTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ConditionalOnMissingFilterBeanTests.java @@ -154,7 +154,7 @@ public class ConditionalOnMissingFilterBeanTests { @Bean public FilterRegistrationBean myOtherFilter() { - return new FilterRegistrationBean(new OtherFilter()); + return new FilterRegistrationBean<>(new OtherFilter()); } } @@ -164,7 +164,7 @@ public class ConditionalOnMissingFilterBeanTests { @Bean public FilterRegistrationBean myTestFilter() { - return new FilterRegistrationBean(new TestFilter()); + return new FilterRegistrationBean<>(new TestFilter()); } } @@ -197,7 +197,7 @@ public class ConditionalOnMissingFilterBeanTests { @Bean @ConditionalOnMissingFilterBean public FilterRegistrationBean testFilter() { - return new FilterRegistrationBean(new TestFilter()); + return new FilterRegistrationBean<>(new TestFilter()); } } diff --git a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FileSystemWatcherTests.java b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FileSystemWatcherTests.java index e42fce7c327..90ac96c904e 100644 --- a/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FileSystemWatcherTests.java +++ b/spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FileSystemWatcherTests.java @@ -50,7 +50,7 @@ public class FileSystemWatcherTests { private FileSystemWatcher watcher; private List> changes = Collections - .synchronizedList(new ArrayList>()); + .synchronizedList(new ArrayList<>()); @Rule public TemporaryFolder temp = new TemporaryFolder(); diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/HateoasController.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/HateoasController.java index 6d6e35c6c6a..f4d95e03af7 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/HateoasController.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/HateoasController.java @@ -35,7 +35,7 @@ class HateoasController { @RequestMapping("/resource") public Resource> resource() { - return new Resource<>(new HashMap(), + return new Resource<>(new HashMap<>(), new Link("self", "http://api.example.com")); } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConversionServiceDeducer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConversionServiceDeducer.java index 8dfbd54f811..f5b6a06c04c 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConversionServiceDeducer.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConversionServiceDeducer.java @@ -81,7 +81,7 @@ class ConversionServiceDeducer { private List beans(Class type, String qualifier, ListableBeanFactory beanFactory) { - return new ArrayList(BeanFactoryAnnotationUtils + return new ArrayList<>(BeanFactoryAnnotationUtils .qualifiedBeansOfType(beanFactory, type, qualifier).values()); }