From 704288404240597dd6448930e68b6bbfbed8f4c6 Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Sat, 6 Apr 2019 19:12:20 +0200 Subject: [PATCH] Fix Thymeleaf deprecations Closes gh-16478 --- .../thymeleaf/ThymeleafReactiveAutoConfigurationTests.java | 6 +++--- .../thymeleaf/ThymeleafServletAutoConfigurationTests.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java index 0a83e08ccba..6cd2d12c2c7 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.Locale; import nz.net.ultraq.thymeleaf.LayoutDialect; -import nz.net.ultraq.thymeleaf.decorators.strategies.GroupingStrategy; +import nz.net.ultraq.thymeleaf.decorators.strategies.GroupingRespectLayoutTitleStrategy; import org.junit.Rule; import org.junit.Test; import org.thymeleaf.TemplateEngine; @@ -262,7 +262,7 @@ public class ThymeleafReactiveAutoConfigurationTests { this.contextRunner.withUserConfiguration(LayoutDialectConfiguration.class) .run((context) -> assertThat(ReflectionTestUtils.getField( context.getBean(LayoutDialect.class), "sortingStrategy")) - .isInstanceOf(GroupingStrategy.class)); + .isInstanceOf(GroupingRespectLayoutTitleStrategy.class)); } @Configuration(proxyBeanMethods = false) @@ -270,7 +270,7 @@ public class ThymeleafReactiveAutoConfigurationTests { @Bean public LayoutDialect layoutDialect() { - return new LayoutDialect(new GroupingStrategy()); + return new LayoutDialect(new GroupingRespectLayoutTitleStrategy()); } } 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 fba4d0cb7b9..146cd3a0da6 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 @@ -25,7 +25,7 @@ import java.util.Map; import javax.servlet.DispatcherType; import nz.net.ultraq.thymeleaf.LayoutDialect; -import nz.net.ultraq.thymeleaf.decorators.strategies.GroupingStrategy; +import nz.net.ultraq.thymeleaf.decorators.strategies.GroupingRespectLayoutTitleStrategy; import org.junit.Rule; import org.junit.Test; import org.thymeleaf.TemplateEngine; @@ -349,7 +349,7 @@ public class ThymeleafServletAutoConfigurationTests { this.contextRunner.withUserConfiguration(LayoutDialectConfiguration.class) .run((context) -> assertThat(ReflectionTestUtils.getField( context.getBean(LayoutDialect.class), "sortingStrategy")) - .isInstanceOf(GroupingStrategy.class)); + .isInstanceOf(GroupingRespectLayoutTitleStrategy.class)); } @Test @@ -369,7 +369,7 @@ public class ThymeleafServletAutoConfigurationTests { @Bean public LayoutDialect layoutDialect() { - return new LayoutDialect(new GroupingStrategy()); + return new LayoutDialect(new GroupingRespectLayoutTitleStrategy()); } }