Browse Source

Merge pull request #3130 from eddumelendez/typos

* typos:
  Fix typos
pull/3131/merge
Stephane Nicoll 11 years ago
parent
commit
820de5aa9e
  1. 2
      spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpoint.java
  2. 2
      spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/HealthEndpointTests.java
  3. 2
      spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheResourceTemplateLoader.java
  4. 2
      spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfigurationTests.java
  5. 2
      spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java
  6. 2
      spring-boot-cli/src/main/java/org/springframework/boot/cli/command/NoArgumentsException.java
  7. 4
      spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/LocalDebugPortAvailableCondition.java
  8. 2
      spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartScope.java
  9. 2
      spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java
  10. 4
      spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/LocalDebugPortAvailableConditionTests.java
  11. 2
      spring-boot-samples/spring-boot-sample-jersey1/src/main/java/sample/jersey1/SampleJersey1Application.java
  12. 2
      spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/Handler.java
  13. 2
      spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/RandomAccessDataFileTests.java

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

@ -89,7 +89,7 @@ public class HealthMvcEndpoint implements MvcEndpoint, EnvironmentAware { @@ -89,7 +89,7 @@ public class HealthMvcEndpoint implements MvcEndpoint, EnvironmentAware {
}
/**
* Add specfic status mappings to the existing set.
* Add specific status mappings to the existing set.
* @param statusMapping a map of status code to {@link HttpStatus}
*/
public void addStatusMapping(Map<String, HttpStatus> statusMapping) {

2
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/HealthEndpointTests.java

@ -45,7 +45,7 @@ public class HealthEndpointTests extends AbstractEndpointTests<HealthEndpoint> { @@ -45,7 +45,7 @@ public class HealthEndpointTests extends AbstractEndpointTests<HealthEndpoint> {
@Test
public void invoke() throws Exception {
// As FINE isn't configured in the order we get UNKOWN
// As FINE isn't configured in the order we get UNKNOWN
assertThat(getEndpointBean().invoke().getStatus(), equalTo(Status.UNKNOWN));
}

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheResourceTemplateLoader.java

@ -31,7 +31,7 @@ import com.samskivert.mustache.Mustache.TemplateLoader; @@ -31,7 +31,7 @@ import com.samskivert.mustache.Mustache.TemplateLoader;
* Mustache TemplateLoader implementation that uses a prefix, suffix and the Spring
* Resource abstraction to load a template from a file, classpath, URL etc. A
* TemplateLoader is needed in the Compiler when you want to render partials (i.e.
* tiles-like fetaures).
* tiles-like features).
*
* @author Dave Syer
* @since 1.2.2

2
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfigurationTests.java

@ -113,7 +113,7 @@ public class MailSenderAutoConfigurationTests { @@ -113,7 +113,7 @@ public class MailSenderAutoConfigurationTests {
}
@Test
public void smptHostWithJavaMailProperties() {
public void smtpHostWithJavaMailProperties() {
load(EmptyConfig.class, "spring.mail.host:localhost",
"spring.mail.properties.mail.smtp.auth:true");
JavaMailSenderImpl bean = (JavaMailSenderImpl) this.context

2
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java

@ -215,7 +215,7 @@ public class MultipartAutoConfigurationTests { @@ -215,7 +215,7 @@ public class MultipartAutoConfigurationTests {
}
@Test
public void containerWithCustomMulipartResolver() throws Exception {
public void containerWithCustomMultipartResolver() throws Exception {
this.context = new AnnotationConfigEmbeddedWebApplicationContext(
ContainerWithCustomMultipartResolver.class, BaseConfiguration.class);
MultipartResolver multipartResolver = this.context

2
spring-boot-cli/src/main/java/org/springframework/boot/cli/command/NoArgumentsException.java

@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
package org.springframework.boot.cli.command;
/**
* Exception used to indicate that no arguemnts were specified.
* Exception used to indicate that no arguments were specified.
*
* @author Phillip Webb
*/

4
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/LocalDebugPortAvailableCondition.java

@ -40,9 +40,9 @@ class LocalDebugPortAvailableCondition extends SpringBootCondition { @@ -40,9 +40,9 @@ class LocalDebugPortAvailableCondition extends SpringBootCondition {
port = RemoteDevToolsProperties.Debug.DEFAULT_LOCAL_PORT;
}
if (isPortAvailable(port)) {
return ConditionOutcome.match("Local debug port availble");
return ConditionOutcome.match("Local debug port available");
}
return ConditionOutcome.noMatch("Local debug port unavailble");
return ConditionOutcome.noMatch("Local debug port unavailable");
}
private boolean isPortAvailable(int port) {

2
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartScope.java

@ -25,7 +25,7 @@ import java.lang.annotation.Target; @@ -25,7 +25,7 @@ import java.lang.annotation.Target;
import org.springframework.context.annotation.Scope;
/**
* Restart {@code @Scope} Annotation used to indicate that a bean shoul remain beteen
* Restart {@code @Scope} Annotation used to indicate that a bean should remain between
* restarts.
*
* @author Phillip Webb

2
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java

@ -545,7 +545,7 @@ public class Restarter { @@ -545,7 +545,7 @@ public class Restarter {
}
/**
* {@link ThreadFactory} that creates a leak safe thead.
* {@link ThreadFactory} that creates a leak safe thread.
*/
private class LeakSafeThreadFactory implements ThreadFactory {

4
spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/LocalDebugPortAvailableConditionTests.java

@ -47,7 +47,7 @@ public class LocalDebugPortAvailableConditionTests { @@ -47,7 +47,7 @@ public class LocalDebugPortAvailableConditionTests {
public void portAvailable() throws Exception {
ConditionOutcome outcome = getOutcome();
assertThat(outcome.isMatch(), equalTo(true));
assertThat(outcome.getMessage(), equalTo("Local debug port availble"));
assertThat(outcome.getMessage(), equalTo("Local debug port available"));
}
@Test
@ -57,7 +57,7 @@ public class LocalDebugPortAvailableConditionTests { @@ -57,7 +57,7 @@ public class LocalDebugPortAvailableConditionTests {
ConditionOutcome outcome = getOutcome();
serverSocket.close();
assertThat(outcome.isMatch(), equalTo(false));
assertThat(outcome.getMessage(), equalTo("Local debug port unavailble"));
assertThat(outcome.getMessage(), equalTo("Local debug port unavailable"));
}
private ConditionOutcome getOutcome() {

2
spring-boot-samples/spring-boot-sample-jersey1/src/main/java/sample/jersey1/SampleJersey1Application.java

@ -39,7 +39,7 @@ public class SampleJersey1Application { @@ -39,7 +39,7 @@ public class SampleJersey1Application {
}
@Bean
// Not needed if Spring Web MVC is also present on claspath
// Not needed if Spring Web MVC is also present on classpath
public TomcatEmbeddedServletContainerFactory tomcatEmbeddedServletContainerFactory() {
return new TomcatEmbeddedServletContainerFactory();
}

2
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/Handler.java

@ -38,7 +38,7 @@ import java.util.logging.Logger; @@ -38,7 +38,7 @@ import java.util.logging.Logger;
*/
public class Handler extends URLStreamHandler {
// NOTE: in order to be found as a URL protocol hander, this class must be public,
// NOTE: in order to be found as a URL protocol handler, this class must be public,
// must be named Handler and must be in a package ending '.jar'
private static final String FILE_PROTOCOL = "file:";

2
spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/RandomAccessDataFileTests.java

@ -128,7 +128,7 @@ public class RandomAccessDataFileTests { @@ -128,7 +128,7 @@ public class RandomAccessDataFileTests {
}
@Test
public void intputStreamReadNullBytesWithOffset() throws Exception {
public void inputStreamReadNullBytesWithOffset() throws Exception {
this.thrown.expect(NullPointerException.class);
this.thrown.expectMessage("Bytes must not be null");
this.inputStream.read(null, 0, 1);

Loading…
Cancel
Save