Polish

Author: philwebb

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/RequestMappingEndpoint.java

@@ -110,18 +110,23 @@ protected void extractHandlerMappings(ApplicationContext applicationContext,
 					.getBeansOfType(AbstractUrlHandlerMapping.class);
 			for (String name : mappings.keySet()) {
 				AbstractUrlHandlerMapping mapping = mappings.get(name);
-				if (AopUtils.isCglibProxy(mapping)) {
-					// The getHandlerMap() method is final so it cannot be cglibbed
-					continue;
-				}
-				Map<String, Object> handlers = mapping.getHandlerMap();
+				Map<String, Object> handlers = getHandlerMap(mapping);
 				for (String key : handlers.keySet()) {
 					result.put(key, Collections.singletonMap("bean", name));
 				}
 			}
 		}
 	}
 
+	private Map<String, Object> getHandlerMap(AbstractUrlHandlerMapping mapping) {
+		if (AopUtils.isCglibProxy(mapping)) {
+			// If the AbstractUrlHandlerMapping is a cglib proxy we can't call
+			// the final getHandlerMap() method.
+			return Collections.emptyMap();
+		}
+		return mapping.getHandlerMap();
+	}
+
 	protected void extractHandlerMappings(
 			Collection<AbstractUrlHandlerMapping> handlerMappings,
 			Map<String, Object> result) {

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/RequestMappingEndpointTests.java

@@ -38,6 +38,8 @@
 import static org.junit.Assert.assertTrue;
 
 /**
+ * Tests for {@link RequestMappingEndpoint}.
+ *
  * @author Dave Syer
  */
 public class RequestMappingEndpointTests {

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointsTests.java

@@ -23,11 +23,14 @@
 import static org.junit.Assert.assertEquals;
 
 /**
+ * Tests for {@link MvcEndpoints}.
+ *
  * @author Dave Syer
  */
 public class MvcEndpointsTests {
 
 	private MvcEndpoints endpoints = new MvcEndpoints();
+
 	private StaticApplicationContext context = new StaticApplicationContext();
 
 	@Test

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerProperties.java

@@ -48,23 +48,10 @@ public class FreeMarkerProperties extends AbstractTemplateViewResolverProperties
 	 */
 	private String[] templateLoaderPath = new String[] { DEFAULT_TEMPLATE_LOADER_PATH };
 
-	/**
-	 * Switches off MVC view resolution if set to false (default true).
-	 */
-	private boolean enabled = true;
-
 	public FreeMarkerProperties() {
 		super(DEFAULT_PREFIX, DEFAULT_SUFFIX);
 	}
 
-	public boolean isEnabled() {
-		return this.enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
 	public Map<String, String> getSettings() {
 		return this.settings;
 	}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateProperties.java

@@ -50,19 +50,6 @@ public class GroovyTemplateProperties extends AbstractViewResolverProperties {
 	 */
 	private Map<String, Object> configuration = new HashMap<String, Object>();
 
-	/**
-	 * Switches off MVC view resolution if set to false (default true).
-	 */
-	private boolean enabled = true;
-
-	public boolean isEnabled() {
-		return this.enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
 	public String getPrefix() {
 		return this.prefix;
 	}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractViewResolverProperties.java

@@ -29,6 +29,11 @@
  */
 public abstract class AbstractViewResolverProperties {
 
+	/**
+	 * Enable MVC view resolution for this technology.
+	 */
+	private boolean enabled = true;
+
 	/**
 	 * Enable template caching.
 	 */
@@ -54,6 +59,14 @@ public abstract class AbstractViewResolverProperties {
 	 */
 	private boolean checkTemplateLocation = true;
 
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	public boolean isEnabled() {
+		return this.enabled;
+	}
+
 	public void setCheckTemplateLocation(boolean checkTemplateLocation) {
 		this.checkTemplateLocation = checkTemplateLocation;
 	}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafProperties.java

@@ -77,7 +77,7 @@ public class ThymeleafProperties {
 	private String[] excludedViewNames;
 
 	/**
-	 * Switches off MVC view resolution if set to false (default true).
+	 * Enable MVC Thymeleaf view resolution.
 	 */
 	private boolean enabled = true;
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/velocity/VelocityProperties.java

@@ -71,23 +71,10 @@ public class VelocityProperties extends AbstractTemplateViewResolverProperties {
 	 */
 	private boolean preferFileSystemAccess = true;
 
-	/**
-	 * Switches off MVC view resolution if set to false (default true).
-	 */
-	private boolean enabled = true;
-
 	public VelocityProperties() {
 		super(DEFAULT_PREFIX, DEFAULT_SUFFIX);
 	}
 
-	public boolean isEnabled() {
-		return this.enabled;
-	}
-
-	public void setEnabled(boolean enabled) {
-		this.enabled = enabled;
-	}
-
 	public String getDateToolAttribute() {
 		return this.dateToolAttribute;
 	}

spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java

@@ -234,7 +234,6 @@ public void bindPropertiesToTarget() throws BindException {
 	}
 
 	private void doBindPropertiesToTarget() throws BindException {
-
 		RelaxedDataBinder dataBinder = (this.targetName != null ? new RelaxedDataBinder(
 				this.target, this.targetName) : new RelaxedDataBinder(this.target));
 		if (this.validator != null) {
@@ -247,7 +246,15 @@ private void doBindPropertiesToTarget() throws BindException {
 		dataBinder.setIgnoreInvalidFields(this.ignoreInvalidFields);
 		dataBinder.setIgnoreUnknownFields(this.ignoreUnknownFields);
 		customizeBinder(dataBinder);
+		Set<String> names = getNames();
+		PropertyValues propertyValues = getPropertyValues(names);
+		dataBinder.bind(propertyValues);
+		if (this.validator != null) {
+			validate(dataBinder);
+		}
+	}
 
+	private Set<String> getNames() {
 		Set<String> names = new HashSet<String>();
 		if (this.target != null) {
 			PropertyDescriptor[] descriptors = BeanUtils
@@ -262,17 +269,15 @@ private void doBindPropertiesToTarget() throws BindException {
 				}
 			}
 		}
-		PropertyNamePatternsMatcher patterns = new DefaultPropertyNamePatternsMatcher(
-				names);
-
-		PropertyValues propertyValues = (this.properties != null ? new MutablePropertyValues(
-				this.properties) : new PropertySourcesPropertyValues(
-				this.propertySources, patterns, names));
-		dataBinder.bind(propertyValues);
+		return names;
+	}
 
-		if (this.validator != null) {
-			validate(dataBinder);
+	private PropertyValues getPropertyValues(Set<String> names) {
+		if (this.properties != null) {
+			return new MutablePropertyValues(this.properties);
 		}
+		return new PropertySourcesPropertyValues(this.propertySources,
+				new DefaultPropertyNamePatternsMatcher(names), names);
 	}
 
 	private void validate(RelaxedDataBinder dataBinder) throws BindException {

spring-boot/src/main/java/org/springframework/boot/bind/SimplePropertyNamePatternsMatcher.java

@@ -40,4 +40,5 @@ public SimplePropertyNamePatternsMatcher(Collection<String> patterns) {
 	public boolean matches(String propertyName) {
 		return PatternMatchUtils.simpleMatch(this.patterns, propertyName);
 	}
+
 }