diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java index bbd105e413..d47c25f44f 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java @@ -374,11 +374,6 @@ public class EndpointWebMvcChildContextConfiguration { super(TomcatEmbeddedServletContainerFactory.class); } - @Override - public int getOrder() { - return 1; - } - @Override public void customize(TomcatEmbeddedServletContainerFactory container) { AccessLogValve accessLogValve = findAccessLogValve(container); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HalBrowserMvcEndpointServerServletPathIntegrationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HalBrowserMvcEndpointServerServletPathIntegrationTests.java index b9a0acf362..a9b73779a8 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HalBrowserMvcEndpointServerServletPathIntegrationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HalBrowserMvcEndpointServerServletPathIntegrationTests.java @@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo; /** - * Integration tests for {@link HalBrowserMvcEndpoint} when a custom server context path + * Integration tests for {@link HalBrowserMvcEndpoint} when a custom server servlet path * has been configured. * * @author Dave Syer diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/SpringBootRepositoryRestConfigurer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/SpringBootRepositoryRestConfigurer.java index 2c4b459dc7..ffb5d2977f 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/SpringBootRepositoryRestConfigurer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/SpringBootRepositoryRestConfigurer.java @@ -24,7 +24,7 @@ import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurerAdapt import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; /** - * A {@code RepositoryRestConfigurer} that applies that applies configuration items from + * A {@code RepositoryRestConfigurer} that applies configuration items from * the {@code spring.data.rest} namespace to Spring Data REST. Also, if a * {@link Jackson2ObjectMapperBuilder} is available, it is used to configure Spring Data * REST's {@link ObjectMapper ObjectMappers}. diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java index 83d3a3c57a..c9a3f58c19 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java @@ -256,7 +256,7 @@ public class LiquibaseAutoConfigurationTests { } @Test - public void testLiquibaseDateSource() { + public void testLiquibaseDataSource() { this.context.register(LiquibaseDataSourceConfiguration.class, EmbeddedDataSourceConfiguration.class, LiquibaseAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/install/Installer.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/install/Installer.java index e6021a3059..cd1fef0491 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/install/Installer.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/install/Installer.java @@ -92,15 +92,15 @@ class Installer { } public void install(List artifactIdentifiers) throws Exception { - File libDirectory = getDefaultExtDirectory(); - libDirectory.mkdirs(); - Log.info("Installing into: " + libDirectory); + File extDirectory = getDefaultExtDirectory(); + extDirectory.mkdirs(); + Log.info("Installing into: " + extDirectory); List artifactFiles = this.dependencyResolver.resolve(artifactIdentifiers); for (File artifactFile : artifactFiles) { int installCount = getInstallCount(artifactFile); if (installCount == 0) { FileCopyUtils.copy(artifactFile, - new File(libDirectory, artifactFile.getName())); + new File(extDirectory, artifactFile.getName())); } setInstallCount(artifactFile, installCount + 1); } diff --git a/spring-boot-starters/README.adoc b/spring-boot-starters/README.adoc index 8353816ec9..d45a81b1a3 100644 --- a/spring-boot-starters/README.adoc +++ b/spring-boot-starters/README.adoc @@ -100,7 +100,7 @@ do as they were designed before this was clarified. | Charon reverse proxy | https://github.com/mkopylec/charon-spring-boot-starter -| http://www.wiremock.org[WireMock] and Spring RESTDocs +| http://www.wiremock.org[WireMock] and Spring REST Docs | https://github.com/ePages-de/restdocs-wiremock | https://cxf.apache.org/docs/springboot.html[Apache CXF] diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java index 09dc9795ba..84407aa6dd 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java @@ -125,8 +125,8 @@ class DefinitionsParser { private Set getOrDeduceTypes(AnnotatedElement element, Class[] value) { Set types = new LinkedHashSet(); - for (Class type : value) { - types.add(ResolvableType.forClass(type)); + for (Class clazz : value) { + types.add(ResolvableType.forClass(clazz)); } if (types.isEmpty() && element instanceof Field) { types.add(ResolvableType.forField((Field) element)); diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java index 3da9b306fc..013eb67676 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java @@ -77,7 +77,7 @@ class MockDefinition extends Definition { /** * Return the type that should be mocked. - * @return the class to mock; never {@code null} + * @return the type to mock; never {@code null} */ public ResolvableType getTypeToMock() { return this.typeToMock; diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericService.java b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericService.java index 961a0d31f5..97b01fc360 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericService.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericService.java @@ -19,7 +19,7 @@ package org.springframework.boot.test.mock.mockito.example; /** * Example service interface for mocking tests. * - * @param The generic type + * @param the generic type * @author Phillip Webb */ public interface ExampleGenericService { diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericServiceCaller.java b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericServiceCaller.java index 794dd09931..7351b66c8c 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericServiceCaller.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/example/ExampleGenericServiceCaller.java @@ -42,7 +42,7 @@ public class ExampleGenericServiceCaller { } public String sayGreeting() { - return "I say " + +this.integerService.greeting() + " " + return "I say " + this.integerService.greeting() + " " + this.stringService.greeting(); }