Merge pull request #12205 from izeye:polish-20180224

* pr/12205:
  Polish

Author: snicoll

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapProperties.java

@@ -44,7 +44,7 @@ public class EmbeddedLdapProperties {
 	private Credential credential = new Credential();
 
 	/**
-	 * List of base DN.
+	 * List of base DNs.
 	 */
 	@Delimiter(Delimiter.NONE)
 	private List<String> baseDn = new ArrayList<>();

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryCustomizer.java

@@ -57,8 +57,7 @@ public void customize(ConfigurableServletWebServerFactory factory) {
 				.to(factory::setDisplayName);
 		map.from(this.serverProperties.getServlet()::getSession).to(factory::setSession);
 		map.from(this.serverProperties::getSsl).to(factory::setSsl);
-		map.from(this.serverProperties::getServlet).as(ServerProperties.Servlet::getJsp)
-				.to(factory::setJsp);
+		map.from(this.serverProperties.getServlet()::getJsp).to(factory::setJsp);
 		map.from(this.serverProperties::getCompression).to(factory::setCompression);
 		map.from(this.serverProperties::getHttp2).to(factory::setHttp2);
 		map.from(this.serverProperties::getServerHeader).to(factory::setServerHeader);

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfigurationTests.java

@@ -82,7 +82,7 @@ public void hikariAutoConfiguredWithoutDataSourceName()
 		assertThat(this.context.getBean(HikariDataSource.class).isRegisterMbeans())
 				.isTrue();
 		// We can't rely on the number of MBeans so we're checking that the pool and pool
-		// config mBeans were registered
+		// config MBeans were registered
 		assertThat(mBeanServer
 				.queryMBeans(new ObjectName("com.zaxxer.hikari:type=*"), null).size())
 						.isEqualTo(existingInstances.size() + 2);

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoaderTests.java

@@ -144,14 +144,14 @@ public void loadClassFromParent() throws Exception {
 	public void getDeletedResource() {
 		String name = PACKAGE_PATH + "/Sample.txt";
 		this.updatedFiles.addFile(name, new ClassLoaderFile(Kind.DELETED, null));
-		assertThat(this.reloadClassLoader.getResource(name)).isEqualTo(null);
+		assertThat(this.reloadClassLoader.getResource(name)).isNull();
 	}
 
 	@Test
 	public void getDeletedResourceAsStream() {
 		String name = PACKAGE_PATH + "/Sample.txt";
 		this.updatedFiles.addFile(name, new ClassLoaderFile(Kind.DELETED, null));
-		assertThat(this.reloadClassLoader.getResourceAsStream(name)).isEqualTo(null);
+		assertThat(this.reloadClassLoader.getResourceAsStream(name)).isNull();
 	}
 
 	@Test

spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -370,7 +370,7 @@ content into your application. Rather, pick only the properties that you need.
 	spring.ldap.username= # Login username of the server.
 
 	# EMBEDDED LDAP ({sc-spring-boot-autoconfigure}/ldap/embedded/EmbeddedLdapProperties.{sc-ext}[EmbeddedLdapProperties])
-	spring.ldap.embedded.base-dn= # List of base DN.
+	spring.ldap.embedded.base-dn= # List of base DNs.
 	spring.ldap.embedded.credential.username= # Embedded LDAP username.
 	spring.ldap.embedded.credential.password= # Embedded LDAP password.
 	spring.ldap.embedded.ldif=classpath:schema.ldif # Schema (LDIF) script resource reference.

spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -4466,7 +4466,7 @@ In yaml files, you can use the yaml list notation:
 	  - dc=pivotal,dc=io
 ----
 
-in properties files, you must include the index as part of the property name:
+In properties files, you must include the index as part of the property name:
 
 [source,properties,indent=0]
 ----

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/Deprecation.java

@@ -65,7 +65,7 @@ public void setReason(String reason) {
 	 * A single-line, single-sentence reason why the related property is deprecated, if
 	 * any.
 	 * @return the short deprecation reason
-	 * @see #getShortReason()
+	 * @see #getReason()
 	 */
 	public String getShortReason() {
 		return this.shortReason;

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/JsonReaderTests.java

@@ -121,7 +121,7 @@ public void metadataHints() throws IOException {
 		assertThat(valueHint.getDescription()).isEqualTo("One.");
 		ValueHint valueHint2 = hint.getValueHints().get(1);
 		assertThat(valueHint2.getValue()).isEqualTo("two");
-		assertThat(valueHint2.getDescription()).isEqualTo(null);
+		assertThat(valueHint2.getDescription()).isNull();
 
 		assertThat(hint.getValueProviders()).hasSize(2);
 		ValueProvider valueProvider = hint.getValueProviders().get(0);
@@ -175,7 +175,7 @@ public void deprecatedMetadata() throws IOException {
 		assertProperty(item3, "spring.server.name", "spring.server.name", String.class,
 				null);
 		assertThat(item3.isDeprecated()).isFalse();
-		assertThat(item3.getDeprecation()).isEqualTo(null);
+		assertThat(item3.getDeprecation()).isNull();
 
 		ConfigurationMetadataItem item4 = items.get(3);
 		assertProperty(item4, "spring.server-name", "spring.server-name", String.class,

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/java/org/springframework/boot/configurationmetadata/SentenceExtractorTests.java

@@ -67,7 +67,7 @@ public void extractFirstSentenceNoDotMultipleLines() {
 
 	@Test
 	public void extractFirstSentenceNull() {
-		assertThat(this.extractor.getFirstSentence(null)).isEqualTo(null);
+		assertThat(this.extractor.getFirstSentence(null)).isNull();
 	}
 
 }

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/RepackagerTests.java

@@ -209,7 +209,7 @@ public void noMainClassAndLayoutIsNoneWithNoMain() throws Exception {
 		repackager.repackage(file, NO_LIBRARIES);
 		Manifest actualManifest = getManifest(file);
 		assertThat(actualManifest.getMainAttributes().getValue("Main-Class"))
-				.isEqualTo(null);
+				.isNull();
 		assertThat(hasLauncherClasses(file)).isFalse();
 	}