Closes gh-6817
This commit is contained in:
Johnny Lim 2016-09-05 13:47:42 +09:00 committed by Stephane Nicoll
parent b7da0bd301
commit 4b9f6869f0
10 changed files with 13 additions and 18 deletions

View File

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

View File

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

View File

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

View File

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

View File

@ -92,15 +92,15 @@ class Installer {
}
public void install(List<String> artifactIdentifiers) throws Exception {
File libDirectory = getDefaultExtDirectory();
libDirectory.mkdirs();
Log.info("Installing into: " + libDirectory);
File extDirectory = getDefaultExtDirectory();
extDirectory.mkdirs();
Log.info("Installing into: " + extDirectory);
List<File> 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);
}

View File

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

View File

@ -125,8 +125,8 @@ class DefinitionsParser {
private Set<ResolvableType> getOrDeduceTypes(AnnotatedElement element,
Class<?>[] value) {
Set<ResolvableType> types = new LinkedHashSet<ResolvableType>();
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));

View File

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

View File

@ -19,7 +19,7 @@ package org.springframework.boot.test.mock.mockito.example;
/**
* Example service interface for mocking tests.
*
* @param <T> The generic type
* @param <T> the generic type
* @author Phillip Webb
*/
public interface ExampleGenericService<T> {

View File

@ -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();
}