Skip to content

Commit

Permalink
Merge pull request #20708 from dreis2211
Browse files Browse the repository at this point in the history
* gh-20708:
  Polish GroovyTemplateAutoConfiguration

Closes gh-20708
  • Loading branch information
wilkinsona committed Mar 31, 2020
2 parents e35bf8f + 798e21f commit ed2196f
Showing 1 changed file with 4 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -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");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -74,8 +74,7 @@ public static class GroovyMarkupConfiguration {

private final GroovyTemplateProperties properties;

public GroovyMarkupConfiguration(ApplicationContext applicationContext, GroovyTemplateProperties properties,
ObjectProvider<MarkupTemplateEngine> templateEngine) {
public GroovyMarkupConfiguration(ApplicationContext applicationContext, GroovyTemplateProperties properties) {
this.applicationContext = applicationContext;
this.properties = properties;
}
Expand All @@ -96,8 +95,8 @@ public void checkTemplateLocationExists() {
/**
* MarkupTemplateEngine could be loaded from groovy-templates or groovy-all.
* 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
* that we can skip the {@code /template} folder check for such cases.
* need templating support. This method attempts to check the source jar so that
* we can skip the {@code /template} folder check for such cases.
* @return true if the groovy-all jar is used
*/
private boolean isUsingGroovyAllJar() {
Expand Down

0 comments on commit ed2196f

Please sign in to comment.