Merge pull request #16478 from dreis2211

* pr/16478:
  Fix Thymeleaf deprecations

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());
 		}
 
 	}

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());
 		}
 
 	}