Merge pull request #6487 from Johnny Lim

* gh-6487:
  Polish

Author: wilkinsona

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

@@ -56,7 +56,7 @@
  */
 @ConfigurationProperties("endpoints.heapdump")
 @HypermediaDisabled
-public class HeapdumpMvcEndpoint extends AbstractMvcEndpoint implements MvcEndpoint {
+public class HeapdumpMvcEndpoint extends AbstractMvcEndpoint {
 
 	private final long timeout;
 

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

@@ -15,6 +15,6 @@
  */
 
 /**
- * Auto-configuration for Freemarker.
+ * Auto-configuration for FreeMarker.
  */
 package org.springframework.boot.autoconfigure.freemarker;

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

@@ -71,11 +71,11 @@ public DeviceDelegatingViewResolverFactory deviceDelegatingViewResolverFactory(
 
 	@Configuration
 	@ConditionalOnClass(FreeMarkerViewResolver.class)
-	protected static class DeviceDelegatingFreemarkerViewResolverConfiguration {
+	protected static class DeviceDelegatingFreeMarkerViewResolverConfiguration {
 
 		@Bean
 		@ConditionalOnBean(FreeMarkerViewResolver.class)
-		public LiteDeviceDelegatingViewResolver deviceDelegatingFreemarkerViewResolver(
+		public LiteDeviceDelegatingViewResolver deviceDelegatingFreeMarkerViewResolver(
 				DeviceDelegatingViewResolverFactory factory,
 				FreeMarkerViewResolver viewResolver) {
 			return factory.createViewResolver(viewResolver);

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

@@ -69,7 +69,7 @@ public LiteDeviceDelegatingViewResolver createViewResolver(ViewResolver delegate
 	public LiteDeviceDelegatingViewResolver createViewResolver(ViewResolver delegate) {
 		if (!(delegate instanceof Ordered)) {
 			throw new IllegalStateException("ViewResolver " + delegate
-					+ "should implement " + Ordered.class.getName());
+					+ " should implement " + Ordered.class.getName());
 		}
 		int delegateOrder = ((Ordered) delegate).getOrder();
 		return createViewResolver(delegate, adjustOrder(delegateOrder));

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java

@@ -63,7 +63,7 @@ public void setup() {
 	@Test
 	public void importsAreSelected() throws Exception {
 		AnnotationMetadata annotationMetadata = new SimpleMetadataReaderFactory()
-				.getMetadataReader(ImportFreemarker.class.getName())
+				.getMetadataReader(ImportFreeMarker.class.getName())
 				.getAnnotationMetadata();
 		String[] imports = this.importSelector.selectImports(annotationMetadata);
 		assertThat(imports).containsExactly(FreeMarkerAutoConfiguration.class.getName());
@@ -72,7 +72,7 @@ public void importsAreSelected() throws Exception {
 	@Test
 	public void propertyExclusionsAreNotApplied() throws Exception {
 		AnnotationMetadata annotationMetadata = new SimpleMetadataReaderFactory()
-				.getMetadataReader(ImportFreemarker.class.getName())
+				.getMetadataReader(ImportFreeMarker.class.getName())
 				.getAnnotationMetadata();
 		this.importSelector.selectImports(annotationMetadata);
 		verifyZeroInteractions(this.environment);
@@ -98,7 +98,7 @@ public void selfAnnotatingAnnotationDoesNotCauseStackOverflow() throws IOExcepti
 	}
 
 	@ImportAutoConfiguration(FreeMarkerAutoConfiguration.class)
-	static class ImportFreemarker {
+	static class ImportFreeMarker {
 
 	}
 

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitPropertiesTests.java

@@ -205,15 +205,15 @@ public void addressesDefaultsToNull() {
 	@Test
 	public void customAddresses() {
 		this.properties.setAddresses(
-				"user:secrect@rabbit1.example.com:1234/alpha,rabbit2.example.com");
+				"user:secret@rabbit1.example.com:1234/alpha,rabbit2.example.com");
 		assertThat(this.properties.getAddresses()).isEqualTo(
-				"user:secrect@rabbit1.example.com:1234/alpha,rabbit2.example.com");
+				"user:secret@rabbit1.example.com:1234/alpha,rabbit2.example.com");
 	}
 
 	@Test
 	public void determineAddressesReturnsAddressesWithJustHostAndPort() {
 		this.properties.setAddresses(
-				"user:secrect@rabbit1.example.com:1234/alpha,rabbit2.example.com");
+				"user:secret@rabbit1.example.com:1234/alpha,rabbit2.example.com");
 		assertThat(this.properties.determineAddresses())
 				.isEqualTo("rabbit1.example.com:1234,rabbit2.example.com:5672");
 	}

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

@@ -88,14 +88,14 @@ public void deviceDelegatingJspResourceViewResolver() throws Exception {
 	}
 
 	@Test
-	public void deviceDelegatingFreemarkerViewResolver() throws Exception {
+	public void deviceDelegatingFreeMarkerViewResolver() throws Exception {
 		load(Collections.<Class<?>>singletonList(FreeMarkerAutoConfiguration.class),
 				"spring.mobile.devicedelegatingviewresolver.enabled:true");
 		assertThat(this.context.getBeansOfType(LiteDeviceDelegatingViewResolver.class))
 				.hasSize(2);
 		assertLiteDeviceDelegatingViewResolver(
 				this.context.getBean(FreeMarkerViewResolver.class),
-				"deviceDelegatingFreemarkerViewResolver");
+				"deviceDelegatingFreeMarkerViewResolver");
 	}
 
 	@Test

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

@@ -551,7 +551,7 @@ content into your application; rather pick only the properties that you need.
 	spring.data.cassandra.reconnection-policy= # Reconnection policy class.
 	spring.data.cassandra.retry-policy= # Class name of the retry policy.
 	spring.data.cassandra.serial-consistency-level= # Queries serial consistency level.
-	spring.data.cassandra.schema-action= # Schema action to take at startup.
+	spring.data.cassandra.schema-action=none # Schema action to take at startup.
 	spring.data.cassandra.ssl=false # Enable SSL support.
 	spring.data.cassandra.username= # Login user of the server.
 

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

@@ -746,7 +746,7 @@ only contain one entry (with name "`my another name`" and description `null`). T
 configuration _will not_ add a second `MyPojo` instance to the list, and it won't merge
 the items.
 
-When a collection is specified in multiples profiles, the one with highest priority is
+When a collection is specified in multiple profiles, the one with highest priority is
 used (and only that one):
 
 [source,yaml,indent=0]

spring-boot-samples/README.adoc

@@ -229,7 +229,7 @@ The following sample applications are provided:
 | Web application packaged as a war file
 
 | link:spring-boot-sample-web-freemarker[spring-boot-sample-web-freemarker]
-| Web application that uses Freemarker templates
+| Web application that uses FreeMarker templates
 
 | link:spring-boot-sample-web-groovy-templates[spring-boot-sample-web-groovy-templates]
 | Web application that uses Groovy templates