From 942da8bdd3879498dec68121a2e965a3f2525c2c Mon Sep 17 00:00:00 2001
From: mackeprm <maximilian.mackeprang@motor-talk-gmbh.de>
Date: Tue, 29 Sep 2015 15:04:43 +0200
Subject: [PATCH 1/2] Support configuration of defaultValue and
 emptyStringIsFalse

This commit adds support for configuring defaultValue and
emptyStringIsFalse to MustacheCompilerFactoryBean.

Closes gh-4057
---
 .../mustache/MustacheCompilerFactoryBean.java  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheCompilerFactoryBean.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheCompilerFactoryBean.java
index 63a81f60c6..561b7a8bbc 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheCompilerFactoryBean.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheCompilerFactoryBean.java
@@ -48,6 +48,10 @@ public class MustacheCompilerFactoryBean implements FactoryBean<Mustache.Compile
 
 	private Compiler compiler;
 
+	private String defaultValue;
+
+	private Boolean emptyStringIsFalse;
+
 	public void setDelims(String delims) {
 		this.delims = delims;
 	}
@@ -68,6 +72,14 @@ public class MustacheCompilerFactoryBean implements FactoryBean<Mustache.Compile
 		this.collector = collector;
 	}
 
+	public void setDefaultValue(String defaultValue) {
+		this.defaultValue = defaultValue;
+	}
+
+	public void setEmptyStringIsFalse(Boolean emptyStringIsFalse) {
+		this.emptyStringIsFalse = emptyStringIsFalse;
+	}
+
 	@Override
 	public Mustache.Compiler getObject() throws Exception {
 		this.compiler = Mustache.compiler();
@@ -86,6 +98,12 @@ public class MustacheCompilerFactoryBean implements FactoryBean<Mustache.Compile
 		if (this.collector != null) {
 			this.compiler = this.compiler.withCollector(this.collector);
 		}
+		if (this.defaultValue != null) {
+		this.compiler = this.compiler.defaultValue(this.defaultValue);
+		}
+		if (this.emptyStringIsFalse != null) {
+		this.compiler = this.compiler.emptyStringIsFalse(this.emptyStringIsFalse);
+		}
 		return this.compiler;
 	}
 

From f86eed864626b8ce1a448d76dc481a835412161d Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Fri, 2 Oct 2015 09:03:26 +0100
Subject: [PATCH 2/2] Polish contribution

---
 .../autoconfigure/mustache/MustacheCompilerFactoryBean.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheCompilerFactoryBean.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheCompilerFactoryBean.java
index 561b7a8bbc..260502d6ba 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheCompilerFactoryBean.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheCompilerFactoryBean.java
@@ -99,10 +99,10 @@ public class MustacheCompilerFactoryBean implements FactoryBean<Mustache.Compile
 			this.compiler = this.compiler.withCollector(this.collector);
 		}
 		if (this.defaultValue != null) {
-		this.compiler = this.compiler.defaultValue(this.defaultValue);
+			this.compiler = this.compiler.defaultValue(this.defaultValue);
 		}
 		if (this.emptyStringIsFalse != null) {
-		this.compiler = this.compiler.emptyStringIsFalse(this.emptyStringIsFalse);
+			this.compiler = this.compiler.emptyStringIsFalse(this.emptyStringIsFalse);
 		}
 		return this.compiler;
 	}