Polish

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/TraceProperties.java

@@ -46,8 +46,8 @@ public class TraceProperties {
 	}
 
 	/**
-	 * Items to be included in the trace. Defaults to request/response headers (including cookies)
+	 * Items to be included in the trace. Defaults to request/response headers (including
-	 * and errors.
+	 * cookies) and errors.
 	 */
 	private Set<Include> include = new HashSet<Include>(DEFAULT_INCLUDES);
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java

@@ -73,7 +73,8 @@ public class CassandraDataAutoConfiguration {
 		this.beanFactory = beanFactory;
 		this.properties = properties;
 		this.cluster = cluster;
-		this.propertyResolver = new RelaxedPropertyResolver(environment, "spring.data.cassandra.");
+		this.propertyResolver = new RelaxedPropertyResolver(environment,
+				"spring.data.cassandra.");
 	}
 
 	@Bean
@@ -105,8 +106,8 @@ public class CassandraDataAutoConfiguration {
 		session.setCluster(this.cluster);
 		session.setConverter(converter);
 		session.setKeyspaceName(this.properties.getKeyspaceName());
-		SchemaAction schemaAction = this.propertyResolver
+		SchemaAction schemaAction = this.propertyResolver.getProperty("schemaAction",
-				.getProperty("schemaAction", SchemaAction.class, SchemaAction.NONE);
+				SchemaAction.class, SchemaAction.NONE);
 		session.setSchemaAction(schemaAction);
 		return session;
 	}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfiguration.java

@@ -53,9 +53,9 @@ import org.springframework.web.servlet.view.groovy.GroovyMarkupViewResolver;
 @ConditionalOnClass(LiteDeviceDelegatingViewResolver.class)
 @ConditionalOnProperty(prefix = "spring.mobile.devicedelegatingviewresolver", name = "enabled", havingValue = "true")
 @EnableConfigurationProperties(DeviceDelegatingViewResolverProperties.class)
-@AutoConfigureAfter({WebMvcAutoConfiguration.class, FreeMarkerAutoConfiguration.class,
+@AutoConfigureAfter({ WebMvcAutoConfiguration.class, FreeMarkerAutoConfiguration.class,
 		GroovyTemplateAutoConfiguration.class, MustacheAutoConfiguration.class,
-		ThymeleafAutoConfiguration.class})
+		ThymeleafAutoConfiguration.class })
 public class DeviceDelegatingViewResolverAutoConfiguration {
 
 	@Configuration

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverFactory.java

@@ -21,8 +21,8 @@ import org.springframework.mobile.device.view.LiteDeviceDelegatingViewResolver;
 import org.springframework.web.servlet.ViewResolver;
 
 /**
- * A factory for {@link LiteDeviceDelegatingViewResolver} that applies customizations
+ * A factory for {@link LiteDeviceDelegatingViewResolver} that applies customizations of
- * of {@link DeviceDelegatingViewResolverProperties}.
+ * {@link DeviceDelegatingViewResolverProperties}.
  *
  * @author Stephane Nicoll
  * @since 1.4.0
@@ -31,7 +31,8 @@ public class DeviceDelegatingViewResolverFactory {
 
 	private final DeviceDelegatingViewResolverProperties properties;
 
-	public DeviceDelegatingViewResolverFactory(DeviceDelegatingViewResolverProperties properties) {
+	public DeviceDelegatingViewResolverFactory(
+			DeviceDelegatingViewResolverProperties properties) {
 		this.properties = properties;
 	}
 
@@ -42,8 +43,8 @@ public class DeviceDelegatingViewResolverFactory {
 	 * @param delegatingOrder the order of the {@link LiteDeviceDelegatingViewResolver}
 	 * @return a {@link LiteDeviceDelegatingViewResolver} handling the specified resolver
 	 */
-	public LiteDeviceDelegatingViewResolver createViewResolver(
+	public LiteDeviceDelegatingViewResolver createViewResolver(ViewResolver delegate,
-			ViewResolver delegate, int delegatingOrder) {
+			int delegatingOrder) {
 		LiteDeviceDelegatingViewResolver resolver = new LiteDeviceDelegatingViewResolver(
 				delegate);
 		resolver.setEnableFallback(this.properties.isEnableFallback());
@@ -67,7 +68,8 @@ public class DeviceDelegatingViewResolverFactory {
 	 */
 	public LiteDeviceDelegatingViewResolver createViewResolver(ViewResolver delegate) {
 		if (!(delegate instanceof Ordered)) {
-			throw new IllegalStateException("ViewResolver " + delegate + "should implement " + Ordered.class.getName());
+			throw new IllegalStateException("ViewResolver " + delegate
+					+ "should implement " + Ordered.class.getName());
 		}
 		int delegateOrder = ((Ordered) delegate).getOrder();
 		return createViewResolver(delegate, adjustOrder(delegateOrder));

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/authserver/AuthorizationServerProperties.java

@@ -28,22 +28,22 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 public class AuthorizationServerProperties {
 
 	/**
-	 * A Spring Security access rule for the check token endpoint (e.g. a SpEL expression
+	 * Spring Security access rule for the check token endpoint (e.g. a SpEL expression
 	 * like "isAuthenticated()") . Default is empty, which is interpreted as "denyAll()"
 	 * (no access).
 	 */
 	private String checkTokenAccess;
 
 	/**
-	 * A Spring Security access rule for the token key endpoint (e.g. a SpEL expression
+	 * Spring Security access rule for the token key endpoint (e.g. a SpEL expression like
-	 * like "isAuthenticated()"). Default is empty, which is interpreted as "denyAll()"
+	 * "isAuthenticated()"). Default is empty, which is interpreted as "denyAll()" (no
-	 * (no access).
+	 * access).
 	 */
 	private String tokenKeyAccess;
 
 	/**
-	 * The realm name for client authentication. If an unauthenticated request comes in to
+	 * Realm name for client authentication. If an unauthenticated request comes in to the
-	 * the token endpoint, it will respond with a challenge including this name.
+	 * token endpoint, it will respond with a challenge including this name.
 	 */
 	private String realm;
 

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java

@@ -429,8 +429,7 @@ public class WebMvcAutoConfiguration {
 				for (HandlerExceptionResolver resolver : exceptionResolvers) {
 					if (resolver instanceof AbstractHandlerExceptionResolver) {
 						((AbstractHandlerExceptionResolver) resolver)
-								.setWarnLogCategory(resolver.getClass()
+								.setWarnLogCategory(resolver.getClass().getName());
-										.getName());
 					}
 				}
 			}

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java

@@ -71,14 +71,12 @@ public class CassandraDataAutoConfigurationIntegrationTests {
 		this.context = new AnnotationConfigApplicationContext();
 		String cityPackage = City.class.getPackage().getName();
 		AutoConfigurationPackages.register(this.context, cityPackage);
-
 		EnvironmentTestUtils.addEnvironment(this.context,
-				"spring.data.cassandra.schemaAction:RECREATE_DROP_UNUSED", "spring.data.cassandra.keyspaceName:boot_test");
+				"spring.data.cassandra.schemaAction:RECREATE_DROP_UNUSED",
-
+				"spring.data.cassandra.keyspaceName:boot_test");
 		this.context.register(CassandraAutoConfiguration.class,
 				CassandraDataAutoConfiguration.class);
 		this.context.refresh();
-
 		CassandraSessionFactoryBean bean = this.context
 				.getBean(CassandraSessionFactoryBean.class);
 		assertThat(bean.getSchemaAction()).isEqualTo(SchemaAction.RECREATE_DROP_UNUSED);

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraTestServer.java

@@ -91,7 +91,8 @@ public class CassandraTestServer implements TestRule {
 
 		@Override
 		public void evaluate() throws Throwable {
-			Assume.assumeTrue("Skipping test due to Cassandra not being available", false);
+			Assume.assumeTrue("Skipping test due to Cassandra not being available",
+					false);
 		}
 
 	}

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfigurationTests.java

@@ -79,7 +79,8 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests {
 	@Test
 	public void deviceDelegatingJspResourceViewResolver() throws Exception {
 		load("spring.mobile.devicedelegatingviewresolver.enabled:true");
-		assertThat(this.context.getBeansOfType(LiteDeviceDelegatingViewResolver.class)).hasSize(1);
+		assertThat(this.context.getBeansOfType(LiteDeviceDelegatingViewResolver.class))
+				.hasSize(1);
 		InternalResourceViewResolver internalResourceViewResolver = this.context
 				.getBean(InternalResourceViewResolver.class);
 		assertLiteDeviceDelegatingViewResolver(internalResourceViewResolver,
@@ -90,8 +91,10 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests {
 	public void deviceDelegatingFreemarkerViewResolver() throws Exception {
 		load(Collections.<Class<?>>singletonList(FreeMarkerAutoConfiguration.class),
 				"spring.mobile.devicedelegatingviewresolver.enabled:true");
-		assertThat(this.context.getBeansOfType(LiteDeviceDelegatingViewResolver.class)).hasSize(2);
+		assertThat(this.context.getBeansOfType(LiteDeviceDelegatingViewResolver.class))
-		assertLiteDeviceDelegatingViewResolver(this.context.getBean(FreeMarkerViewResolver.class),
+				.hasSize(2);
+		assertLiteDeviceDelegatingViewResolver(
+				this.context.getBean(FreeMarkerViewResolver.class),
 				"deviceDelegatingFreemarkerViewResolver");
 	}
 
@@ -99,8 +102,10 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests {
 	public void deviceDelegatingGroovyMarkupViewResolver() throws Exception {
 		load(Collections.<Class<?>>singletonList(GroovyTemplateAutoConfiguration.class),
 				"spring.mobile.devicedelegatingviewresolver.enabled:true");
-		assertThat(this.context.getBeansOfType(LiteDeviceDelegatingViewResolver.class)).hasSize(2);
+		assertThat(this.context.getBeansOfType(LiteDeviceDelegatingViewResolver.class))
-		assertLiteDeviceDelegatingViewResolver(this.context.getBean(GroovyMarkupViewResolver.class),
+				.hasSize(2);
+		assertLiteDeviceDelegatingViewResolver(
+				this.context.getBean(GroovyMarkupViewResolver.class),
 				"deviceDelegatingGroovyMarkupViewResolver");
 	}
 
@@ -108,8 +113,10 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests {
 	public void deviceDelegatingMustacheViewResolver() throws Exception {
 		load(Collections.<Class<?>>singletonList(MustacheAutoConfiguration.class),
 				"spring.mobile.devicedelegatingviewresolver.enabled:true");
-		assertThat(this.context.getBeansOfType(LiteDeviceDelegatingViewResolver.class)).hasSize(2);
+		assertThat(this.context.getBeansOfType(LiteDeviceDelegatingViewResolver.class))
-		assertLiteDeviceDelegatingViewResolver(this.context.getBean(MustacheViewResolver.class),
+				.hasSize(2);
+		assertLiteDeviceDelegatingViewResolver(
+				this.context.getBean(MustacheViewResolver.class),
 				"deviceDelegatingMustacheViewResolver");
 	}
 
@@ -117,26 +124,30 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests {
 	public void deviceDelegatingThymeleafViewResolver() throws Exception {
 		load(Collections.<Class<?>>singletonList(ThymeleafAutoConfiguration.class),
 				"spring.mobile.devicedelegatingviewresolver.enabled:true");
-		assertThat(this.context.getBeansOfType(LiteDeviceDelegatingViewResolver.class)).hasSize(2);
+		assertThat(this.context.getBeansOfType(LiteDeviceDelegatingViewResolver.class))
-		assertLiteDeviceDelegatingViewResolver(this.context.getBean(ThymeleafViewResolver.class),
+				.hasSize(2);
+		assertLiteDeviceDelegatingViewResolver(
+				this.context.getBean(ThymeleafViewResolver.class),
 				"deviceDelegatingThymeleafViewResolver");
 	}
 
-	public void assertLiteDeviceDelegatingViewResolver(ViewResolver delegate, String delegatingBeanName) {
+	public void assertLiteDeviceDelegatingViewResolver(ViewResolver delegate,
+			String delegatingBeanName) {
 		LiteDeviceDelegatingViewResolver deviceDelegatingViewResolver = this.context
 				.getBean(delegatingBeanName, LiteDeviceDelegatingViewResolver.class);
-		assertThat(deviceDelegatingViewResolver.getViewResolver())
+		assertThat(deviceDelegatingViewResolver.getViewResolver()).isSameAs(delegate);
-				.isSameAs(delegate);
 		assertThat(deviceDelegatingViewResolver.getOrder())
 				.isEqualTo(((Ordered) delegate).getOrder() - 1);
 	}
 
 	@Test
 	public void deviceDelegatingViewResolverDisabled() throws Exception {
-		load(Arrays.asList(FreeMarkerAutoConfiguration.class, GroovyTemplateAutoConfiguration.class,
+		load(Arrays.asList(FreeMarkerAutoConfiguration.class,
-				MustacheAutoConfiguration.class, ThymeleafAutoConfiguration.class),
+				GroovyTemplateAutoConfiguration.class, MustacheAutoConfiguration.class,
+				ThymeleafAutoConfiguration.class),
 				"spring.mobile.devicedelegatingviewresolver.enabled:false");
-		assertThat(this.context.getBeansOfType(LiteDeviceDelegatingViewResolver.class)).hasSize(0);
+		assertThat(this.context.getBeansOfType(LiteDeviceDelegatingViewResolver.class))
+				.hasSize(0);
 	}
 
 	@Test

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java

@@ -48,7 +48,7 @@ public class MongoPropertiesTests {
 		// gh-1572
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
 		EnvironmentTestUtils.addEnvironment(context, "spring.data.mongodb.password:word");
-		context.register(Conf.class);
+		context.register(Config.class);
 		context.refresh();
 		MongoProperties properties = context.getBean(MongoProperties.class);
 		assertThat(properties.getPassword()).isEqualTo("word".toCharArray());
@@ -123,50 +123,58 @@ public class MongoPropertiesTests {
 
 	@Test
 	public void allMongoClientOptionsCanBeSet() throws UnknownHostException {
-		MongoClientOptions mco = MongoClientOptions.builder()
+		MongoClientOptions.Builder builder = MongoClientOptions.builder();
-				.alwaysUseMBeans(true)
+		builder.alwaysUseMBeans(true);
-				.connectionsPerHost(101)
+		builder.connectionsPerHost(101);
-				.connectTimeout(10001)
+		builder.connectTimeout(10001);
-				.cursorFinalizerEnabled(false)
+		builder.cursorFinalizerEnabled(false);
-				.description("test")
+		builder.description("test");
-				.maxWaitTime(120001)
+		builder.maxWaitTime(120001);
-				.socketKeepAlive(true)
+		builder.socketKeepAlive(true);
-				.socketTimeout(1000)
+		builder.socketTimeout(1000);
-				.threadsAllowedToBlockForConnectionMultiplier(6)
+		builder.threadsAllowedToBlockForConnectionMultiplier(6);
-				.minConnectionsPerHost(0)
+		builder.minConnectionsPerHost(0);
-				.maxConnectionIdleTime(60000)
+		builder.maxConnectionIdleTime(60000);
-				.maxConnectionLifeTime(60000)
+		builder.maxConnectionLifeTime(60000);
-				.heartbeatFrequency(10001)
+		builder.heartbeatFrequency(10001);
-				.minHeartbeatFrequency(501)
+		builder.minHeartbeatFrequency(501);
-				.heartbeatConnectTimeout(20001)
+		builder.heartbeatConnectTimeout(20001);
-				.heartbeatSocketTimeout(20001)
+		builder.heartbeatSocketTimeout(20001);
-				.localThreshold(20)
+		builder.localThreshold(20);
-				.requiredReplicaSetName("testReplicaSetName")
+		builder.requiredReplicaSetName("testReplicaSetName");
-				.build();
+		MongoClientOptions options = builder.build();
-
 		MongoProperties properties = new MongoProperties();
-		MongoClient client = properties.createMongoClient(mco, null);
+		MongoClient client = properties.createMongoClient(options, null);
-		MongoClientOptions wrappedMco = client.getMongoClientOptions();
+		MongoClientOptions wrapped = client.getMongoClientOptions();
-
+		assertThat(wrapped.isAlwaysUseMBeans()).isEqualTo(options.isAlwaysUseMBeans());
-		assertThat(wrappedMco.isAlwaysUseMBeans()).isEqualTo(mco.isAlwaysUseMBeans());
+		assertThat(wrapped.getConnectionsPerHost())
-		assertThat(wrappedMco.getConnectionsPerHost()).isEqualTo(mco.getConnectionsPerHost());
+				.isEqualTo(options.getConnectionsPerHost());
-		assertThat(wrappedMco.getConnectTimeout()).isEqualTo(mco.getConnectTimeout());
+		assertThat(wrapped.getConnectTimeout()).isEqualTo(options.getConnectTimeout());
-		assertThat(wrappedMco.isCursorFinalizerEnabled()).isEqualTo(mco.isCursorFinalizerEnabled());
+		assertThat(wrapped.isCursorFinalizerEnabled())
-		assertThat(wrappedMco.getDescription()).isEqualTo(mco.getDescription());
+				.isEqualTo(options.isCursorFinalizerEnabled());
-		assertThat(wrappedMco.getMaxWaitTime()).isEqualTo(mco.getMaxWaitTime());
+		assertThat(wrapped.getDescription()).isEqualTo(options.getDescription());
-		assertThat(wrappedMco.getSocketTimeout()).isEqualTo(mco.getSocketTimeout());
+		assertThat(wrapped.getMaxWaitTime()).isEqualTo(options.getMaxWaitTime());
-		assertThat(wrappedMco.isSocketKeepAlive()).isEqualTo(mco.isSocketKeepAlive());
+		assertThat(wrapped.getSocketTimeout()).isEqualTo(options.getSocketTimeout());
-		assertThat(wrappedMco.getThreadsAllowedToBlockForConnectionMultiplier()).isEqualTo(
+		assertThat(wrapped.isSocketKeepAlive()).isEqualTo(options.isSocketKeepAlive());
-				mco.getThreadsAllowedToBlockForConnectionMultiplier());
+		assertThat(wrapped.getThreadsAllowedToBlockForConnectionMultiplier())
-		assertThat(wrappedMco.getMinConnectionsPerHost()).isEqualTo(mco.getMinConnectionsPerHost());
+				.isEqualTo(options.getThreadsAllowedToBlockForConnectionMultiplier());
-		assertThat(wrappedMco.getMaxConnectionIdleTime()).isEqualTo(mco.getMaxConnectionIdleTime());
+		assertThat(wrapped.getMinConnectionsPerHost())
-		assertThat(wrappedMco.getMaxConnectionLifeTime()).isEqualTo(mco.getMaxConnectionLifeTime());
+				.isEqualTo(options.getMinConnectionsPerHost());
-		assertThat(wrappedMco.getHeartbeatFrequency()).isEqualTo(mco.getHeartbeatFrequency());
+		assertThat(wrapped.getMaxConnectionIdleTime())
-		assertThat(wrappedMco.getMinHeartbeatFrequency()).isEqualTo(mco.getMinHeartbeatFrequency());
+				.isEqualTo(options.getMaxConnectionIdleTime());
-		assertThat(wrappedMco.getHeartbeatConnectTimeout()).isEqualTo(mco.getHeartbeatConnectTimeout());
+		assertThat(wrapped.getMaxConnectionLifeTime())
-		assertThat(wrappedMco.getHeartbeatSocketTimeout()).isEqualTo(mco.getHeartbeatSocketTimeout());
+				.isEqualTo(options.getMaxConnectionLifeTime());
-		assertThat(wrappedMco.getLocalThreshold()).isEqualTo(mco.getLocalThreshold());
+		assertThat(wrapped.getHeartbeatFrequency())
-		assertThat(wrappedMco.getRequiredReplicaSetName()).isEqualTo(mco.getRequiredReplicaSetName());
+				.isEqualTo(options.getHeartbeatFrequency());
+		assertThat(wrapped.getMinHeartbeatFrequency())
+				.isEqualTo(options.getMinHeartbeatFrequency());
+		assertThat(wrapped.getHeartbeatConnectTimeout())
+				.isEqualTo(options.getHeartbeatConnectTimeout());
+		assertThat(wrapped.getHeartbeatSocketTimeout())
+				.isEqualTo(options.getHeartbeatSocketTimeout());
+		assertThat(wrapped.getLocalThreshold()).isEqualTo(options.getLocalThreshold());
+		assertThat(wrapped.getRequiredReplicaSetName())
+				.isEqualTo(options.getRequiredReplicaSetName());
 	}
 
 	private List<ServerAddress> extractServerAddresses(MongoClient client) {
@@ -192,7 +200,7 @@ public class MongoPropertiesTests {
 
 	@Configuration
 	@EnableConfigurationProperties(MongoProperties.class)
-	static class Conf {
+	static class Config {
 
 	}
 

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java

@@ -541,20 +541,22 @@ public class WebMvcAutoConfigurationTests {
 	}
 
 	private void testLogResolvedExceptionCustomization(final boolean expected) {
-		HandlerExceptionResolver exceptionResolver = this.context.getBean(
+		HandlerExceptionResolver exceptionResolver = this.context
-				HandlerExceptionResolver.class);
+				.getBean(HandlerExceptionResolver.class);
-		assertThat(exceptionResolver).isInstanceOf(HandlerExceptionResolverComposite.class);
+		assertThat(exceptionResolver)
-		List<HandlerExceptionResolver> delegates =
+				.isInstanceOf(HandlerExceptionResolverComposite.class);
-				((HandlerExceptionResolverComposite) exceptionResolver).getExceptionResolvers();
+		List<HandlerExceptionResolver> delegates = ((HandlerExceptionResolverComposite) exceptionResolver)
+				.getExceptionResolvers();
 		for (HandlerExceptionResolver delegate : delegates) {
 			if (delegate instanceof AbstractHandlerMethodAdapter) {
-				assertThat(new DirectFieldAccessor(delegate).getPropertyValue("warnLogger"))
+				assertThat(
-						.is(new Condition<Object>() {
+						new DirectFieldAccessor(delegate).getPropertyValue("warnLogger"))
-							@Override
+								.is(new Condition<Object>() {
-							public boolean matches(Object value) {
+									@Override
-								return (expected ? value != null : value == null);
+									public boolean matches(Object value) {
-							}
+										return (expected ? value != null : value == null);
-						});
+									}
+								});
 			}
 		}
 	}

spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadata.java

@@ -19,8 +19,10 @@ package org.springframework.boot.configurationprocessor.metadata;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.Set;
 
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedMultiValueMap;
@@ -37,7 +39,12 @@ import org.springframework.util.ObjectUtils;
  */
 public class ConfigurationMetadata {
 
-	private static final List<Character> SEPARATORS = Arrays.asList('-', '_');
+	private static final Set<Character> SEPARATORS;
+
+	static {
+		List<Character> chars = Arrays.asList('-', '_');
+		SEPARATORS = Collections.unmodifiableSet(new HashSet<Character>(chars));
+	}
 
 	private final MultiValueMap<String, ItemMetadata> items;
 
@@ -159,23 +166,23 @@ public class ConfigurationMetadata {
 	}
 
 	static String toDashedCase(String name) {
-		StringBuilder sb = new StringBuilder();
+		StringBuilder dashed = new StringBuilder();
 		Character previous = null;
 		for (char current : name.toCharArray()) {
 			if (SEPARATORS.contains(current)) {
-				sb.append("-");
+				dashed.append("-");
 			}
 			else if (Character.isUpperCase(current) && previous != null
 					&& !SEPARATORS.contains(previous)) {
-				sb.append("-").append(current);
+				dashed.append("-").append(current);
 			}
 			else {
-				sb.append(current);
+				dashed.append(current);
 			}
 			previous = current;
 
 		}
-		return sb.toString().toLowerCase();
+		return dashed.toString().toLowerCase();
 	}
 
 	private static <T extends Comparable<T>> List<T> flattenValues(

spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java

@@ -259,6 +259,7 @@ public class PropertiesConfigurationFactoryTests {
 		public void setFooDLQBar(String fooDLQBar) {
 			this.fooDLQBar = fooDLQBar;
 		}
+
 	}
 
 }