root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Replace explicit generic type with diamond operator 

See gh-15424
This commit is contained in:
igor-suhorukov 2018-12-08 15:27:31 +03:00 committed by Stephane Nicoll
parent f040459ae5
commit a2ebba8db1
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java
View File

@ -439,7 +439,7 @@ public class ConditionalOnBeanTests {
@Bean
public TestParameterizedContainer<OtherExampleBean> otherExampleBean() {
return new TestParameterizedContainer<OtherExampleBean>();
return new TestParameterizedContainer<>();
}
}
@ -449,7 +449,7 @@ public class ConditionalOnBeanTests {
@Bean
public TestParameterizedContainer<CustomExampleBean> customExampleBean() {
return new TestParameterizedContainer<CustomExampleBean>();
return new TestParameterizedContainer<>();
}
}
@ -482,7 +482,7 @@ public class ConditionalOnBeanTests {
@Bean
@ConditionalOnBean(parameterizedContainer = TestParameterizedContainer.class)
public TestParameterizedContainer<CustomExampleBean> conditionalCustomExampleBean() {
return new TestParameterizedContainer<CustomExampleBean>();
return new TestParameterizedContainer<>();
}
}

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java
View File

@ -741,7 +741,7 @@ public class ConditionalOnMissingBeanTests {
@Bean
public TestParameterizedContainer<OtherExampleBean> otherExampleBean() {
return new TestParameterizedContainer<OtherExampleBean>();
return new TestParameterizedContainer<>();
}
}
@ -751,7 +751,7 @@ public class ConditionalOnMissingBeanTests {
@Bean
public TestParameterizedContainer<CustomExampleBean> customExampleBean() {
return new TestParameterizedContainer<CustomExampleBean>();
return new TestParameterizedContainer<>();
}
}
@ -784,7 +784,7 @@ public class ConditionalOnMissingBeanTests {
@Bean
@ConditionalOnMissingBean(parameterizedContainer = TestParameterizedContainer.class)
public TestParameterizedContainer<CustomExampleBean> conditionalCustomExampleBean() {
return new TestParameterizedContainer<CustomExampleBean>();
return new TestParameterizedContainer<>();
}
}

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationServletIntegrationTests.java
View File

@ -243,7 +243,7 @@ public class FreeMarkerAutoConfigurationServletIntegrationTests {
@Bean
public FilterRegistrationBean<ResourceUrlEncodingFilter> filterRegistration() {
FilterRegistrationBean<ResourceUrlEncodingFilter> bean = new FilterRegistrationBean<ResourceUrlEncodingFilter>(
FilterRegistrationBean<ResourceUrlEncodingFilter> bean = new FilterRegistrationBean<>(
new ResourceUrlEncodingFilter());
bean.setDispatcherTypes(EnumSet.of(DispatcherType.INCLUDE));
return bean;
@ -257,7 +257,7 @@ public class FreeMarkerAutoConfigurationServletIntegrationTests {
@Bean
public FilterRegistrationBean<OrderedCharacterEncodingFilter> filterRegistration() {
return new FilterRegistrationBean<OrderedCharacterEncodingFilter>(
return new FilterRegistrationBean<>(
new OrderedCharacterEncodingFilter());
}

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java
View File

@ -358,7 +358,7 @@ public class ThymeleafServletAutoConfigurationTests {
@Bean
public FilterRegistrationBean<ResourceUrlEncodingFilter> filterRegistration() {
FilterRegistrationBean<ResourceUrlEncodingFilter> bean = new FilterRegistrationBean<ResourceUrlEncodingFilter>(
FilterRegistrationBean<ResourceUrlEncodingFilter> bean = new FilterRegistrationBean<>(
new ResourceUrlEncodingFilter());
bean.setDispatcherTypes(EnumSet.of(DispatcherType.INCLUDE));
return bean;
@ -372,7 +372,7 @@ public class ThymeleafServletAutoConfigurationTests {
@Bean
public FilterRegistrationBean<OrderedCharacterEncodingFilter> filterRegistration() {
return new FilterRegistrationBean<OrderedCharacterEncodingFilter>(
return new FilterRegistrationBean<>(
new OrderedCharacterEncodingFilter());
}

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ConditionalOnMissingFilterBeanTests.java
View File

@ -154,7 +154,7 @@ public class ConditionalOnMissingFilterBeanTests {
@Bean
public FilterRegistrationBean<OtherFilter> myOtherFilter() {
return new FilterRegistrationBean<OtherFilter>(new OtherFilter());
return new FilterRegistrationBean<>(new OtherFilter());
}
}
@ -164,7 +164,7 @@ public class ConditionalOnMissingFilterBeanTests {
@Bean
public FilterRegistrationBean<TestFilter> myTestFilter() {
return new FilterRegistrationBean<TestFilter>(new TestFilter());
return new FilterRegistrationBean<>(new TestFilter());
}
}
@ -197,7 +197,7 @@ public class ConditionalOnMissingFilterBeanTests {
@Bean
@ConditionalOnMissingFilterBean
public FilterRegistrationBean<TestFilter> testFilter() {
return new FilterRegistrationBean<TestFilter>(new TestFilter());
return new FilterRegistrationBean<>(new TestFilter());
}
}

2
spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FileSystemWatcherTests.java
View File

@ -50,7 +50,7 @@ public class FileSystemWatcherTests {
private FileSystemWatcher watcher;
private List<Set<ChangedFiles>> changes = Collections
.synchronizedList(new ArrayList<Set<ChangedFiles>>());
.synchronizedList(new ArrayList<>());
@Rule
public TemporaryFolder temp = new TemporaryFolder();

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/HateoasController.java
View File

@ -35,7 +35,7 @@ class HateoasController {
@RequestMapping("/resource")
public Resource<Map<String, String>> resource() {
return new Resource<>(new HashMap<String, String>(),
return new Resource<>(new HashMap<>(),
new Link("self", "http://api.example.com"));
}

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConversionServiceDeducer.java
View File

@ -81,7 +81,7 @@ class ConversionServiceDeducer {
private <T> List<T> beans(Class<T> type, String qualifier,
ListableBeanFactory beanFactory) {
return new ArrayList<T>(BeanFactoryAnnotationUtils
return new ArrayList<>(BeanFactoryAnnotationUtils
.qualifiedBeansOfType(beanFactory, type, qualifier).values());
}