Polish

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

@@ -16,6 +16,8 @@
 
 package org.springframework.boot.autoconfigure.web;
 
+import reactor.core.support.Assert;
+
 import org.springframework.beans.BeansException;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -80,14 +82,11 @@ public class ServerPropertiesAutoConfiguration {
 			// a single bean
 			String[] serverPropertiesBeans = this.applicationContext
 					.getBeanNamesForType(ServerProperties.class);
-			if (serverPropertiesBeans.length == 0) {
+			Assert.state(serverPropertiesBeans.length != 0,
-				throw new IllegalStateException("No ServerProperties bean registered");
+					"No ServerProperties registered");
-			}
+			Assert.state(serverPropertiesBeans.length == 1,
-			if (serverPropertiesBeans.length > 1) {
+					"Multiple ServerProperties registered " + StringUtils
-				throw new IllegalStateException(
+							.arrayToCommaDelimitedString(serverPropertiesBeans));
-						"Multiple ServerProperties beans registered " + StringUtils
-								.arrayToCommaDelimitedString(serverPropertiesBeans));
-			}
 		}
 
 	}

spring-boot-integration-tests/spring-boot-configuration-processor-tests/pom.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -34,7 +33,6 @@
 			<!-- this override is required to reproduce an issue -->
 			<version>2.0.1.Final</version>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-configuration-processor</artifactId>

spring-boot-integration-tests/spring-boot-configuration-processor-tests/src/test/java/org/springframework/boot/configurationprocessor/tests/ConfigurationProcessorIntegrationTests.java

@@ -44,8 +44,8 @@ public class ConfigurationProcessorIntegrationTests {
 				"META-INF/spring-configuration-metadata.json");
 		assertThat(resource.exists()).isTrue();
 		// Make sure the right file is detected
-		assertThat(resource.getURL().toString()).contains(
+		assertThat(resource.getURL().toString())
-				"spring-boot-configuration-processor-tests");
+				.contains("spring-boot-configuration-processor-tests");
 		repository = ConfigurationMetadataRepositoryJsonBuilder
 				.create(resource.getInputStream()).build();
 
@@ -53,8 +53,8 @@ public class ConfigurationProcessorIntegrationTests {
 
 	@Test
 	public void extractTypeFromAnnotatedGetter() {
-		ConfigurationMetadataProperty property = repository.getAllProperties().get(
+		ConfigurationMetadataProperty property = repository.getAllProperties()
-				"annotated.name");
+				.get("annotated.name");
 		assertThat(property).isNotNull();
 		assertThat(property.getType()).isEqualTo("java.lang.String");
 	}

spring-boot-test/src/main/java/org/springframework/boot/test/json/DuplicateJsonObjectContextCustomizerFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -75,8 +75,9 @@ class DuplicateJsonObjectContextCustomizerFactory implements ContextCustomizerFa
 		}
 
 		private void logDuplicateJsonObjectsWarning(List<URL> jsonObjects) {
-			StringBuilder message = new StringBuilder(String.format("%n%nFound multiple occurrences of"
+			StringBuilder message = new StringBuilder(
-					+ " org.json.JSONObject on the class path:%n%n"));
+					String.format("%n%nFound multiple occurrences of"
+							+ " org.json.JSONObject on the class path:%n%n"));
 			for (URL jsonObject : jsonObjects) {
 				message.append(String.format("\t%s%n", jsonObject));
 			}

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

@@ -168,7 +168,6 @@ class TypeUtils {
 		return WRAPPER_TO_PRIMITIVE.get(type.toString());
 	}
 
-
 	/**
 	 * A visitor that extracts the full qualified name of a type, including generic
 	 * information.
@@ -188,21 +187,24 @@ class TypeUtils {
 				return getQualifiedName(enclosingElement) + "$"
 						+ type.asElement().getSimpleName().toString();
 			}
-			StringBuilder sb  = new StringBuilder();
+			StringBuilder name = new StringBuilder();
-			sb.append(getQualifiedName(type.asElement()));
+			name.append(getQualifiedName(type.asElement()));
 			if (!type.getTypeArguments().isEmpty()) {
-				sb.append("<");
+				appendTypeArguments(type, name);
-				Iterator<?> it = type.getTypeArguments().iterator();
-				while (it.hasNext()) {
-					sb.append(it.next());
-					if (it.hasNext()) {
-						sb.append(",");
-					}
-				}
-				sb.append(">");
-
 			}
-			return sb.toString();
+			return name.toString();
+		}
+
+		private void appendTypeArguments(DeclaredType type, StringBuilder name) {
+			name.append("<");
+			Iterator<?> iterator = type.getTypeArguments().iterator();
+			while (iterator.hasNext()) {
+				name.append(iterator.next());
+				if (iterator.hasNext()) {
+					name.append(",");
+				}
+			}
+			name.append(">");
 		}
 
 		@Override
@@ -223,7 +225,7 @@ class TypeUtils {
 			if (enclosingElement != null) {
 				return getQualifiedName(enclosingElement) + "$"
 						+ ((DeclaredType) element.asType()).asElement().getSimpleName()
-						.toString();
+								.toString();
 			}
 			if (element instanceof TypeElement) {
 				return ((TypeElement) element).getQualifiedName().toString();

spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java

@@ -261,12 +261,12 @@ public class ConfigurationMetadataAnnotationProcessorTests {
 	@Test
 	public void parseArrayConfig() throws Exception {
 		ConfigurationMetadata metadata = compile(SimpleArrayProperties.class);
-		assertThat(metadata).has(Metadata.withGroup("array")
+		assertThat(metadata)
-				.ofType(SimpleArrayProperties.class));
+				.has(Metadata.withGroup("array").ofType(SimpleArrayProperties.class));
-		assertThat(metadata).has(Metadata.withProperty("array.primitive",
+		assertThat(metadata)
-				"java.lang.Integer[]"));
+				.has(Metadata.withProperty("array.primitive", "java.lang.Integer[]"));
-		assertThat(metadata).has(Metadata.withProperty("array.simple",
+		assertThat(metadata)
-				"java.lang.String[]"));
+				.has(Metadata.withProperty("array.simple", "java.lang.String[]"));
 		assertThat(metadata).has(Metadata.withProperty("array.inner",
 				"org.springframework.boot.configurationsample.simple.SimpleArrayProperties$Holder[]"));
 		assertThat(metadata).has(Metadata.withProperty("array.name-to-integer",
@@ -464,8 +464,8 @@ public class ConfigurationMetadataAnnotationProcessorTests {
 	@Test
 	public void wildcardTypes() throws IOException {
 		ConfigurationMetadata metadata = compile(WildcardConfig.class);
-		assertThat(metadata).has(Metadata.withGroup("wildcard")
+		assertThat(metadata)
-				.ofType(WildcardConfig.class));
+				.has(Metadata.withGroup("wildcard").ofType(WildcardConfig.class));
 		assertThat(metadata).has(Metadata.withProperty("wildcard.string-to-number")
 				.ofType("java.util.Map<java.lang.String,? extends java.lang.Number>")
 				.fromSource(WildcardConfig.class));

spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleCollectionProperties.java

@@ -89,6 +89,7 @@ public class SimpleCollectionProperties {
 
 	public static class Holder<T> {
 
+		@SuppressWarnings("unused")
 		private T target;
 
 		public void setTarget(T target) {

spring-boot/src/test/java/org/springframework/boot/liquibase/LiquibaseServiceLocatorApplicationListenerTests.java

@@ -68,8 +68,8 @@ public class LiquibaseServiceLocatorApplicationListenerTests {
 		SpringApplication application = new SpringApplication(Conf.class);
 		application.setWebEnvironment(false);
 		DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
-		resourceLoader.setClassLoader(new ClassHidingClassLoader(
+		resourceLoader.setClassLoader(
-				CustomResolverServiceLocator.class));
+				new ClassHidingClassLoader(CustomResolverServiceLocator.class));
 		application.setResourceLoader(resourceLoader);
 		this.context = application.run();
 		Object resolver = getServiceLocator();
@@ -93,7 +93,8 @@ public class LiquibaseServiceLocatorApplicationListenerTests {
 		private final List<Class<?>> hiddenClasses;
 
 		private ClassHidingClassLoader(Class<?>... hiddenClasses) {
-			super(new URL[0], LiquibaseServiceLocatorApplicationListenerTests.class.getClassLoader());
+			super(new URL[0], LiquibaseServiceLocatorApplicationListenerTests.class
+					.getClassLoader());
 			this.hiddenClasses = Arrays.asList(hiddenClasses);
 		}