Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6487 from Johnny Lim

Browse Source 
* gh-6487:
  Polish
This commit is contained in:
Andy Wilkinson
2016-07-27 12:29:52 +01:00
parent eb444f547f 9627d0ed66
commit 267532b0c5
15 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@@ -71,11 +71,11 @@ public class DeviceDelegatingViewResolverAutoConfiguration {
@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);

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

@@ -69,7 +69,7 @@ public class DeviceDelegatingViewResolverFactory {
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));

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

@@ -63,7 +63,7 @@ public class ImportAutoConfigurationImportSelectorTests {
@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 class ImportAutoConfigurationImportSelectorTests {
@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 class ImportAutoConfigurationImportSelectorTests {
}
@ImportAutoConfiguration(FreeMarkerAutoConfiguration.class)
static class ImportFreemarker {
static class ImportFreeMarker {
}

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

@@ -205,15 +205,15 @@ public class RabbitPropertiesTests {
@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");
}

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

@@ -88,14 +88,14 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests {
}
@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

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

@@ -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.

2
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@@ -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]

2
spring-boot-samples/README.adoc
View File

@@ -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

2
spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/error.ftl
View File

@@ -11,7 +11,7 @@
<div class="container">
<div class="navbar">
<div class="navbar-inner">
<a class="brand" href="http://www.thymeleaf.org"> Freemarker -
<a class="brand" href="http://freemarker.org/"> FreeMarker -
Plain </a>
<ul class="nav">
<li><a href="${home}"> Home </a></li>

2
spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/home.ftl
View File

@@ -11,7 +11,7 @@
<div class="container">
<div class="navbar">
<div class="navbar-inner">
<a class="brand" href="http://www.thymeleaf.org"> Freemarker -
<a class="brand" href="http://freemarker.org/"> FreeMarker -
Plain </a>
<ul class="nav">
<li><a href="${home}"> Home </a></li>

2
spring-boot-starters/spring-boot-starter-freemarker/pom.xml
View File

@@ -8,7 +8,7 @@
</parent>
<artifactId>spring-boot-starter-freemarker</artifactId>
<name>Spring Boot FreeMarker Starter</name>
<description>Starter for building MVC web applications using Freemarker views</description>
<description>Starter for building MVC web applications using FreeMarker views</description>
<url>http://projects.spring.io/spring-boot/</url>
<organization>
<name>Pivotal Software, Inc.</name>

4
spring-boot-test/src/main/java/org/springframework/boot/test/json/AbstractJsonMarshalTester.java
View File

@@ -304,8 +304,8 @@ public abstract class AbstractJsonMarshalTester<T> {
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)");
}
/**

4
spring-boot-test/src/main/java/org/springframework/boot/test/json/BasicJsonTester.java
View File

@@ -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 class BasicJsonTester {
}
private void verify() {
Assert.state(this.loader != null, "Unitialized BasicJsonTester");
Assert.state(this.loader != null, "Uninitialized BasicJsonTester");
}
private JsonContent<Object> getJsonContent(String json) {