Merge pull request #20708 from dreis2211

* gh-20708:
  Polish GroovyTemplateAutoConfiguration

Closes gh-20708
pull/20747/head
Andy Wilkinson 5 years ago
commit ed2196fd56

@ -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() {

Loading…
Cancel
Save