Skip to content

Polish #6817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Polish #6817

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -374,11 +374,6 @@ static class TomcatAccessLogCustomizer
super(TomcatEmbeddedServletContainerFactory.class);
}

@Override
public int getOrder() {
return 1;
}

@Override
public void customize(TomcatEmbeddedServletContainerFactory container) {
AccessLogValve accessLogValve = findAccessLogValve(container);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
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}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ public void testRollbackFile() throws Exception {
}

@Test
public void testLiquibaseDateSource() {
public void testLiquibaseDataSource() {
this.context.register(LiquibaseDataSourceConfiguration.class,
EmbeddedDataSourceConfiguration.class, LiquibaseAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@ private void saveInstallCounts() throws IOException {
}

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);
}
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-starters/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ private void addDefinition(AnnotatedElement element, Definition definition,
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));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ private Set<Class<?>> asClassSet(Class<?>[] classes) {

/**
* 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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
/**
* Example service interface for mocking tests.
*
* @param <T> The generic type
* @param <T> the generic type
* @author Phillip Webb
*/
public interface ExampleGenericService<T> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public ExampleGenericService<String> getStringService() {
}

public String sayGreeting() {
return "I say " + +this.integerService.greeting() + " "
return "I say " + this.integerService.greeting() + " "
+ this.stringService.greeting();
}

Expand Down