root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #16478 from dreis2211

Browse Source 
* pr/16478:
  Fix Thymeleaf deprecations
pull/16480/head
Stephane Nicoll 6 years ago
parent 84735f58f3 7042884042
commit 424d98ce3e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

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

@ -21,7 +21,7 @@ import java.util.Collections;
import java.util.Locale; import java.util.Locale;
import nz.net.ultraq.thymeleaf.LayoutDialect; 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.Rule;
import org.junit.Test; import org.junit.Test;
import org.thymeleaf.TemplateEngine; import org.thymeleaf.TemplateEngine;
@ -262,7 +262,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
this.contextRunner.withUserConfiguration(LayoutDialectConfiguration.class) this.contextRunner.withUserConfiguration(LayoutDialectConfiguration.class)
.run((context) -> assertThat(ReflectionTestUtils.getField( .run((context) -> assertThat(ReflectionTestUtils.getField(
context.getBean(LayoutDialect.class), "sortingStrategy")) context.getBean(LayoutDialect.class), "sortingStrategy"))
.isInstanceOf(GroupingStrategy.class)); .isInstanceOf(GroupingRespectLayoutTitleStrategy.class));
} }
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@ -270,7 +270,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
@Bean @Bean
public LayoutDialect layoutDialect() { public LayoutDialect layoutDialect() {
return new LayoutDialect(new GroupingStrategy()); return new LayoutDialect(new GroupingRespectLayoutTitleStrategy());
} }
} }

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

@ -25,7 +25,7 @@ import java.util.Map;
import javax.servlet.DispatcherType; import javax.servlet.DispatcherType;
import nz.net.ultraq.thymeleaf.LayoutDialect; 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.Rule;
import org.junit.Test; import org.junit.Test;
import org.thymeleaf.TemplateEngine; import org.thymeleaf.TemplateEngine;
@ -349,7 +349,7 @@ public class ThymeleafServletAutoConfigurationTests {
this.contextRunner.withUserConfiguration(LayoutDialectConfiguration.class) this.contextRunner.withUserConfiguration(LayoutDialectConfiguration.class)
.run((context) -> assertThat(ReflectionTestUtils.getField( .run((context) -> assertThat(ReflectionTestUtils.getField(
context.getBean(LayoutDialect.class), "sortingStrategy")) context.getBean(LayoutDialect.class), "sortingStrategy"))
.isInstanceOf(GroupingStrategy.class)); .isInstanceOf(GroupingRespectLayoutTitleStrategy.class));
} }
@Test @Test
@ -369,7 +369,7 @@ public class ThymeleafServletAutoConfigurationTests {
@Bean @Bean
public LayoutDialect layoutDialect() { public LayoutDialect layoutDialect() {
return new LayoutDialect(new GroupingStrategy()); return new LayoutDialect(new GroupingRespectLayoutTitleStrategy());
} }
} }

Write Preview
Loading…
Cancel
Save