root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge branch '2.2.x' 

Closes gh-20741
This commit is contained in:
Andy Wilkinson 2020-03-31 11:59:22 +01:00
parent 56af3534f0 ed2196fd56
commit c282f76633
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfiguration.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -74,8 +74,7 @@ public class GroovyTemplateAutoConfiguration {
private final GroovyTemplateProperties properties; private final GroovyTemplateProperties properties;
public GroovyMarkupConfiguration(ApplicationContext applicationContext, GroovyTemplateProperties properties, public GroovyMarkupConfiguration(ApplicationContext applicationContext, GroovyTemplateProperties properties) {
ObjectProvider<MarkupTemplateEngine> templateEngine) {
this.applicationContext = applicationContext; this.applicationContext = applicationContext;
this.properties = properties; this.properties = properties;
} }
@ -96,8 +95,8 @@ public class GroovyTemplateAutoConfiguration {
/** /**
* MarkupTemplateEngine could be loaded from groovy-templates or groovy-all. * MarkupTemplateEngine could be loaded from groovy-templates or groovy-all.
* Unfortunately it's quite common for people to use groovy-all and not actually * Unfortunately it's quite common for people to use groovy-all and not actually
* need templating support. This method check attempts to check the source jar so * need templating support. This method attempts to check the source jar so that
* that we can skip the {@code /template} folder check for such cases. * we can skip the {@code /template} folder check for such cases.
* @return true if the groovy-all jar is used * @return true if the groovy-all jar is used
*/ */
private boolean isUsingGroovyAllJar() { private boolean isUsingGroovyAllJar() {