diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HeapdumpMvcEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HeapdumpMvcEndpoint.java index 743059d383e6..f0ca61e69866 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HeapdumpMvcEndpoint.java +++ b/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; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/package-info.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/package-info.java index ac2c481a2be9..52744911fc10 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/package-info.java +++ b/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; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfiguration.java index e27b55571039..4cd2c5f4e497 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfiguration.java +++ b/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); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverFactory.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverFactory.java index 6ab4234766f0..e6500dab4fc5 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverFactory.java +++ b/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)); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java index 71fae492ffdc..dca862fccab3 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelectorTests.java +++ b/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 { } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitPropertiesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitPropertiesTests.java index 0dcd5fab8ada..946adee3bf38 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitPropertiesTests.java +++ b/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"); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfigurationTests.java index 0bbe42e7a8bb..75747dfc718f 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfigurationTests.java +++ b/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.>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 diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index 8aac8dbee85f..2646d3baffb8 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/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. diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index 4f5d15771882..dc0a9a39ae32 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/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] diff --git a/spring-boot-samples/README.adoc b/spring-boot-samples/README.adoc index 11c4c3cf13db..f5aeac729fd5 100644 --- a/spring-boot-samples/README.adoc +++ b/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 diff --git a/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/error.ftl b/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/error.ftl index 472b390a4ebd..b16ae5895bd6 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/error.ftl +++ b/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/error.ftl @@ -11,7 +11,7 @@
- Freemarker - + FreeMarker - Plain
  • Home
    • diff --git a/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/home.ftl b/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/home.ftl index fb648106603f..347990e0498d 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/home.ftl +++ b/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/home.ftl @@ -11,7 +11,7 @@
    - Freemarker - + FreeMarker - Plain
    • Home
      • diff --git a/spring-boot-starters/spring-boot-starter-freemarker/pom.xml b/spring-boot-starters/spring-boot-starter-freemarker/pom.xml index 83aa4e38f458..0f0b352f87bf 100644 --- a/spring-boot-starters/spring-boot-starter-freemarker/pom.xml +++ b/spring-boot-starters/spring-boot-starter-freemarker/pom.xml @@ -8,7 +8,7 @@ spring-boot-starter-freemarker Spring Boot FreeMarker Starter - Starter for building MVC web applications using Freemarker views + Starter for building MVC web applications using FreeMarker views http://projects.spring.io/spring-boot/ Pivotal Software, Inc. diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/json/AbstractJsonMarshalTester.java b/spring-boot-test/src/main/java/org/springframework/boot/test/json/AbstractJsonMarshalTester.java index b68f42e02425..e1b1cfd6a470 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/json/AbstractJsonMarshalTester.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/json/AbstractJsonMarshalTester.java @@ -304,8 +304,8 @@ private void closeQuietly(Closeable closeable) { private void verify() { Assert.state(this.resourceLoadClass != null, - "Unitialized JsonMarshalTester (ResourceLoadClass is null)"); - Assert.state(this.type != null, "Unitialized JsonMarshalTester (Type is null)"); + "Uninitialized JsonMarshalTester (ResourceLoadClass is null)"); + Assert.state(this.type != null, "Uninitialized JsonMarshalTester (Type is null)"); } /** diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/json/BasicJsonTester.java b/spring-boot-test/src/main/java/org/springframework/boot/test/json/BasicJsonTester.java index 4cf6d84f2460..ef8a1118f222 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/json/BasicJsonTester.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/json/BasicJsonTester.java @@ -49,7 +49,7 @@ public class BasicJsonTester { private JsonLoader loader; /** - * Create a new uninialized {@link BasicJsonTester} instance. + * Create a new uninitialized {@link BasicJsonTester} instance. */ protected BasicJsonTester() { } @@ -139,7 +139,7 @@ public JsonContent from(Resource source) { } private void verify() { - Assert.state(this.loader != null, "Unitialized BasicJsonTester"); + Assert.state(this.loader != null, "Uninitialized BasicJsonTester"); } private JsonContent getJsonContent(String json) {