Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Thymeleaf Layout Dialect 3.0.0

Browse Source 
Closes gh-28057
This commit is contained in:
Andy Wilkinson
2021-09-17 13:31:21 +01:00
parent d2f03baf32
commit 74eed94a14
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2021 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.
@@ -21,7 +21,7 @@ import java.util.LinkedHashMap;
import javax.servlet.DispatcherType;
import com.github.mxab.thymeleaf.extras.dataattribute.dialect.DataAttributeDialect;
import nz.net.ultraq.thymeleaf.LayoutDialect;
import nz.net.ultraq.thymeleaf.layoutdialect.LayoutDialect;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.thymeleaf.dialect.IDialect;

10
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2021 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.
@@ -20,8 +20,8 @@ import java.io.File;
import java.util.Collections;
import java.util.Locale;
import nz.net.ultraq.thymeleaf.LayoutDialect;
import nz.net.ultraq.thymeleaf.decorators.strategies.GroupingRespectLayoutTitleStrategy;
import nz.net.ultraq.thymeleaf.layoutdialect.LayoutDialect;
import nz.net.ultraq.thymeleaf.layoutdialect.decorators.strategies.GroupingStrategy;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.thymeleaf.TemplateEngine;
@@ -219,7 +219,7 @@ class ThymeleafReactiveAutoConfigurationTests {
this.contextRunner.withUserConfiguration(LayoutDialectConfiguration.class)
.run((context) -> assertThat(
ReflectionTestUtils.getField(context.getBean(LayoutDialect.class), "sortingStrategy"))
.isInstanceOf(GroupingRespectLayoutTitleStrategy.class));
.isInstanceOf(GroupingStrategy.class));
}
@Configuration(proxyBeanMethods = false)
@@ -227,7 +227,7 @@ class ThymeleafReactiveAutoConfigurationTests {
@Bean
LayoutDialect layoutDialect() {
return new LayoutDialect(new GroupingRespectLayoutTitleStrategy());
return new LayoutDialect(new GroupingStrategy());
}
}

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

@@ -24,8 +24,8 @@ import java.util.Map;
import javax.servlet.DispatcherType;
import nz.net.ultraq.thymeleaf.LayoutDialect;
import nz.net.ultraq.thymeleaf.decorators.strategies.GroupingRespectLayoutTitleStrategy;
import nz.net.ultraq.thymeleaf.layoutdialect.LayoutDialect;
import nz.net.ultraq.thymeleaf.layoutdialect.decorators.strategies.GroupingStrategy;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.thymeleaf.TemplateEngine;
@@ -303,7 +303,7 @@ class ThymeleafServletAutoConfigurationTests {
this.contextRunner.withUserConfiguration(LayoutDialectConfiguration.class)
.run((context) -> assertThat(
ReflectionTestUtils.getField(context.getBean(LayoutDialect.class), "sortingStrategy"))
.isInstanceOf(GroupingRespectLayoutTitleStrategy.class));
.isInstanceOf(GroupingStrategy.class));
}
@Test
@@ -320,7 +320,7 @@ class ThymeleafServletAutoConfigurationTests {
@Bean
LayoutDialect layoutDialect() {
return new LayoutDialect(new GroupingRespectLayoutTitleStrategy());
return new LayoutDialect(new GroupingStrategy());
}
}

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@@ -1764,7 +1764,7 @@ bom {
]
}
}
library("Thymeleaf Layout Dialect", "2.5.3") {
library("Thymeleaf Layout Dialect", "3.0.0") {
group("nz.net.ultraq.thymeleaf") {
modules = [
"thymeleaf-layout-dialect"