From 8c4e6f766c3e91d617f4363ab5002d171b9a029d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 13 Aug 2020 13:22:34 +0100 Subject: [PATCH] Revert "Merge pull request #21060 from dsyer" This reverts commit 6547ea56f9a6e90ce886c4ba73ca852ccb648bec, reversing changes made to e9e4a34e622ba3652d4f65e3a1433bed725907fc. Fixes gh-22039 --- .../MustacheEnvironmentCollector.java | 40 +++---------------- .../MustacheStandaloneIntegrationTests.java | 40 +------------------ 2 files changed, 7 insertions(+), 73 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheEnvironmentCollector.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheEnvironmentCollector.java index 373a1d636439..c560f9a71e24 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheEnvironmentCollector.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheEnvironmentCollector.java @@ -19,7 +19,6 @@ import com.samskivert.mustache.DefaultCollector; import com.samskivert.mustache.Mustache.Collector; import com.samskivert.mustache.Mustache.VariableFetcher; -import com.samskivert.mustache.Template; import org.springframework.context.EnvironmentAware; import org.springframework.core.env.ConfigurableEnvironment; @@ -36,6 +35,8 @@ public class MustacheEnvironmentCollector extends DefaultCollector implements En private ConfigurableEnvironment environment; + private final VariableFetcher propertyFetcher = new PropertyVariableFetcher(); + @Override public void setEnvironment(Environment environment) { this.environment = (ConfigurableEnvironment) environment; @@ -43,49 +44,20 @@ public void setEnvironment(Environment environment) { @Override public VariableFetcher createFetcher(Object ctx, String name) { - VariableFetcher nativeFetcher = super.createFetcher(ctx, name); - if (nativeFetcher != null) { - return new PropertyVariableFetcher(nativeFetcher); + VariableFetcher fetcher = super.createFetcher(ctx, name); + if (fetcher != null) { + return fetcher; } if (this.environment.containsProperty(name)) { - return new PropertyVariableFetcher(); + return this.propertyFetcher; } return null; } - /** - * {@link VariableFetcher} that also checks the {@link Environment}. - */ private class PropertyVariableFetcher implements VariableFetcher { - private final VariableFetcher nativeFetcher; - - PropertyVariableFetcher() { - this.nativeFetcher = null; - } - - PropertyVariableFetcher(VariableFetcher delegate) { - this.nativeFetcher = delegate; - } - @Override public Object get(Object ctx, String name) { - Object result = getFromNativeFetcher(ctx, name); - result = (result != null) ? result : getFromEnvironment(name); - return (result != null) ? result : Template.NO_FETCHER_FOUND; - } - - private Object getFromNativeFetcher(Object ctx, String name) { - try { - Object result = (this.nativeFetcher != null) ? this.nativeFetcher.get(ctx, name) : null; - return (result != Template.NO_FETCHER_FOUND) ? result : null; - } - catch (Exception ex) { - return null; - } - } - - private Object getFromEnvironment(String name) { return MustacheEnvironmentCollector.this.environment.getProperty(name); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheStandaloneIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheStandaloneIntegrationTests.java index 66e1b85ef8f1..2fc1dc8fdce6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheStandaloneIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheStandaloneIntegrationTests.java @@ -37,7 +37,7 @@ * @author Dave Syer */ @DirtiesContext -@SpringBootTest(webEnvironment = WebEnvironment.NONE, properties = { "env.FOO=There", "foo=World", "bar.name=Bar" }) +@SpringBootTest(webEnvironment = WebEnvironment.NONE, properties = { "env.FOO=There", "foo=World" }) class MustacheStandaloneIntegrationTests { @Autowired @@ -60,53 +60,15 @@ void environmentCollectorCompoundKeyStandard() { .isEqualTo("Hello: There"); } - @Test - void environmentCollectorCompoundKeyStandardMap() { - assertThat(this.compiler.standardsMode(true).compile("Hello: {{env.foo}}") - .execute(Collections.singletonMap("world", "World"))).isEqualTo("Hello: There"); - } - - @Test - void environmentCollectorCompoundKeyWithBean() { - assertThat(this.compiler.compile("Hello: {{foo.name}}").execute(Collections.singletonMap("foo", new Foo()))) - .isEqualTo("Hello: Foo"); - } - - @Test - void environmentCollectorCompoundKeyWithBeanPrefersEnvironment() { - assertThat(this.compiler.compile("Hello: {{bar.name}}").execute(Collections.singletonMap("bar", new Foo()))) - .isEqualTo("Hello: Bar"); - } - @Test void environmentCollectorSimpleKey() { assertThat(this.compiler.compile("Hello: {{foo}}").execute(new Object())).isEqualTo("Hello: World"); } - @Test - void environmentCollectorSimpleKeyMap() { - assertThat(this.compiler.compile("Hello: {{foo}}").execute(Collections.singletonMap("world", "Foo"))) - .isEqualTo("Hello: World"); - } - @Configuration(proxyBeanMethods = false) @Import({ MustacheAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) static class Application { } - static class Foo { - - private String name = "Foo"; - - String getName() { - return this.name; - } - - void setName(String name) { - this.name = name; - } - - } - }