Refined Jackson configuration enhancements

Issue: SPR-12594
Issue: SPR-12634

spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java

@@ -49,6 +49,7 @@ import org.springframework.beans.FatalBeanException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * A builder used to create {@link ObjectMapper} instances with a fluent API.
@@ -74,7 +75,7 @@ import org.springframework.util.ClassUtils;
  */
 public class Jackson2ObjectMapperBuilder {
 
-	private boolean createXmlMapper;
+	private boolean createXmlMapper = false;
 
 	private DateFormat dateFormat;
 
@@ -100,7 +101,7 @@ public class Jackson2ObjectMapperBuilder {
 
 	private Class<? extends Module>[] moduleClasses;
 
-	private boolean findModulesViaServiceLoader;
+	private boolean findModulesViaServiceLoader = false;
 
 	private boolean findWellKnownModules = true;
 
@@ -153,6 +154,17 @@ public class Jackson2ObjectMapperBuilder {
 		return this;
 	}
 
+	/**
+	 * Override the default {@link Locale} to use for formatting.
+	 * Default value used is {@link Locale#getDefault()}.
+	 * @param localeString the locale ID as a String representation
+	 * @since 4.1.5
+	 */
+	public Jackson2ObjectMapperBuilder locale(String localeString) {
+		this.locale = StringUtils.parseLocaleString(localeString);
+		return this;
+	}
+
 	/**
 	 * Override the default {@link TimeZone} to use for formatting.
 	 * Default value used is UTC (NOT local timezone).
@@ -166,11 +178,11 @@ public class Jackson2ObjectMapperBuilder {
 	/**
 	 * Override the default {@link TimeZone} to use for formatting.
 	 * Default value used is UTC (NOT local timezone).
-	 * @param zoneId the time-zone ID
+	 * @param timeZoneString the zone ID as a String representation
 	 * @since 4.1.5
 	 */
-	public Jackson2ObjectMapperBuilder timeZone(String zoneId) {
-		this.timeZone = TimeZone.getTimeZone(zoneId);
+	public Jackson2ObjectMapperBuilder timeZone(String timeZoneString) {
+		this.timeZone = StringUtils.parseTimeZoneString(timeZoneString);
 		return this;
 	}
 
@@ -528,8 +540,8 @@ public class Jackson2ObjectMapperBuilder {
 		else if (this.findWellKnownModules) {
 			registerWellKnownModulesIfAvailable(objectMapper);
 		}
+
 		if (this.modules != null) {
-			// Complete list of modules given
 			for (Module module : this.modules) {
 				// Using Jackson 2.0+ registerModule method, not Jackson 2.2+ registerModules
 				objectMapper.registerModule(module);

spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java

@@ -191,16 +191,6 @@ public class Jackson2ObjectMapperFactoryBean implements FactoryBean<ObjectMapper
 		this.builder.timeZone(timeZone);
 	}
 
-	/**
-	 * Override the default {@link TimeZone} to use for formatting.
-	 * Default value used is UTC (NOT local timezone).
-	 * @param zoneId the time-zone ID
-	 * @since 4.1.5
-	 */
-	public void setTimeZone(String zoneId) {
-		this.builder.timeZone(zoneId);
-	}
-
 	/**
 	 * Set an {@link AnnotationIntrospector} for both serialization and deserialization.
 	 */