From ba29788482b5ce8f62eec659349affc86e281835 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sun, 9 Dec 2018 11:43:28 +0100 Subject: [PATCH] Polish "Replace explicit generic type with diamond operator" Closes gh-15424 --- .../FreeMarkerAutoConfigurationServletIntegrationTests.java | 3 +-- .../thymeleaf/ThymeleafServletAutoConfigurationTests.java | 3 +-- .../autoconfigure/web/servlet/mockmvc/HateoasController.java | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) 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 bff1535b1e..d259f8dc0c 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 @@ -257,8 +257,7 @@ public class FreeMarkerAutoConfigurationServletIntegrationTests { @Bean public FilterRegistrationBean filterRegistration() { - return new FilterRegistrationBean<>( - new OrderedCharacterEncodingFilter()); + 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 cbdf8089b9..bc47193c4f 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 @@ -372,8 +372,7 @@ public class ThymeleafServletAutoConfigurationTests { @Bean public FilterRegistrationBean filterRegistration() { - return new FilterRegistrationBean<>( - new OrderedCharacterEncodingFilter()); + return new FilterRegistrationBean<>(new OrderedCharacterEncodingFilter()); } } 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 f4d95e03af..905b1e83eb 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.