diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheViewResolverTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheViewResolverTests.java index 7ed58b454484..9dfc543fba9c 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheViewResolverTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheViewResolverTests.java @@ -16,10 +16,10 @@ package org.springframework.boot.autoconfigure.mustache.web; +import java.io.ByteArrayInputStream; import java.io.InputStream; import java.util.Locale; -import org.fusesource.hawtbuf.ByteArrayInputStream; import org.junit.Before; import org.junit.Test; 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 8f1a64e7ec21..88ac4b99762b 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -1824,8 +1824,8 @@ inside a war will break Spring Boot applications. If you need to perform servlet context initialization in a Spring Boot application, you should register a bean that implements the `org.springframework.boot.context.embedded.ServletContextInitializer` interface. The -single `onStartup` method provides access to the `ServletContext`, and can easily be used -as an adapter to an existing `WebApplicationInitializer if necessary. +single `onStartup` method provides access to the `ServletContext`, and can easily be used +as an adapter to an existing `WebApplicationInitializer` if necessary. diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/main/java/org/springframework/boot/launchscript/LaunchVerficationController.java b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/main/java/org/springframework/boot/launchscript/LaunchVerificationController.java similarity index 95% rename from spring-boot-integration-tests/spring-boot-launch-script-tests/src/main/java/org/springframework/boot/launchscript/LaunchVerficationController.java rename to spring-boot-integration-tests/spring-boot-launch-script-tests/src/main/java/org/springframework/boot/launchscript/LaunchVerificationController.java index d5f0d697488f..ce5dbd6f97a9 100644 --- a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/main/java/org/springframework/boot/launchscript/LaunchVerficationController.java +++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/main/java/org/springframework/boot/launchscript/LaunchVerificationController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController -public class LaunchVerficationController { +public class LaunchVerificationController { @RequestMapping("/") public String verifyLaunch() { diff --git a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java index f79c69096b68..73a3f68a9ad2 100644 --- a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java +++ b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java @@ -829,7 +829,7 @@ private void handleRunFailure(ConfigurableApplicationContext context, } try { try { - handeExitCode(context, exception); + handleExitCode(context, exception); listeners.finished(context, exception); } finally { @@ -856,7 +856,7 @@ protected void registerLoggedException(Throwable exception) { } } - private void handeExitCode(ConfigurableApplicationContext context, + private void handleExitCode(ConfigurableApplicationContext context, Throwable exception) { int exitCode = getExitCodeFromException(context, exception); if (exitCode != 0) {