commit
b803384348
|
@ -374,11 +374,6 @@ public class EndpointWebMvcChildContextConfiguration {
|
||||||
super(TomcatEmbeddedServletContainerFactory.class);
|
super(TomcatEmbeddedServletContainerFactory.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getOrder() {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void customize(TomcatEmbeddedServletContainerFactory container) {
|
public void customize(TomcatEmbeddedServletContainerFactory container) {
|
||||||
AccessLogValve accessLogValve = findAccessLogValve(container);
|
AccessLogValve accessLogValve = findAccessLogValve(container);
|
||||||
|
|
|
@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||||
import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
|
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.
|
* has been configured.
|
||||||
*
|
*
|
||||||
* @author Dave Syer
|
* @author Dave Syer
|
||||||
|
|
|
@ -24,7 +24,7 @@ import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurerAdapt
|
||||||
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
|
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
|
* the {@code spring.data.rest} namespace to Spring Data REST. Also, if a
|
||||||
* {@link Jackson2ObjectMapperBuilder} is available, it is used to configure Spring Data
|
* {@link Jackson2ObjectMapperBuilder} is available, it is used to configure Spring Data
|
||||||
* REST's {@link ObjectMapper ObjectMappers}.
|
* REST's {@link ObjectMapper ObjectMappers}.
|
||||||
|
|
|
@ -256,7 +256,7 @@ public class LiquibaseAutoConfigurationTests {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testLiquibaseDateSource() {
|
public void testLiquibaseDataSource() {
|
||||||
this.context.register(LiquibaseDataSourceConfiguration.class,
|
this.context.register(LiquibaseDataSourceConfiguration.class,
|
||||||
EmbeddedDataSourceConfiguration.class, LiquibaseAutoConfiguration.class,
|
EmbeddedDataSourceConfiguration.class, LiquibaseAutoConfiguration.class,
|
||||||
PropertyPlaceholderAutoConfiguration.class);
|
PropertyPlaceholderAutoConfiguration.class);
|
||||||
|
|
|
@ -92,15 +92,15 @@ class Installer {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void install(List<String> artifactIdentifiers) throws Exception {
|
public void install(List<String> artifactIdentifiers) throws Exception {
|
||||||
File libDirectory = getDefaultExtDirectory();
|
File extDirectory = getDefaultExtDirectory();
|
||||||
libDirectory.mkdirs();
|
extDirectory.mkdirs();
|
||||||
Log.info("Installing into: " + libDirectory);
|
Log.info("Installing into: " + extDirectory);
|
||||||
List<File> artifactFiles = this.dependencyResolver.resolve(artifactIdentifiers);
|
List<File> artifactFiles = this.dependencyResolver.resolve(artifactIdentifiers);
|
||||||
for (File artifactFile : artifactFiles) {
|
for (File artifactFile : artifactFiles) {
|
||||||
int installCount = getInstallCount(artifactFile);
|
int installCount = getInstallCount(artifactFile);
|
||||||
if (installCount == 0) {
|
if (installCount == 0) {
|
||||||
FileCopyUtils.copy(artifactFile,
|
FileCopyUtils.copy(artifactFile,
|
||||||
new File(libDirectory, artifactFile.getName()));
|
new File(extDirectory, artifactFile.getName()));
|
||||||
}
|
}
|
||||||
setInstallCount(artifactFile, installCount + 1);
|
setInstallCount(artifactFile, installCount + 1);
|
||||||
}
|
}
|
||||||
|
|
|
@ -100,7 +100,7 @@ do as they were designed before this was clarified.
|
||||||
| Charon reverse proxy
|
| Charon reverse proxy
|
||||||
| https://github.com/mkopylec/charon-spring-boot-starter
|
| 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://github.com/ePages-de/restdocs-wiremock
|
||||||
|
|
||||||
| https://cxf.apache.org/docs/springboot.html[Apache CXF]
|
| https://cxf.apache.org/docs/springboot.html[Apache CXF]
|
||||||
|
|
|
@ -125,8 +125,8 @@ class DefinitionsParser {
|
||||||
private Set<ResolvableType> getOrDeduceTypes(AnnotatedElement element,
|
private Set<ResolvableType> getOrDeduceTypes(AnnotatedElement element,
|
||||||
Class<?>[] value) {
|
Class<?>[] value) {
|
||||||
Set<ResolvableType> types = new LinkedHashSet<ResolvableType>();
|
Set<ResolvableType> types = new LinkedHashSet<ResolvableType>();
|
||||||
for (Class<?> type : value) {
|
for (Class<?> clazz : value) {
|
||||||
types.add(ResolvableType.forClass(type));
|
types.add(ResolvableType.forClass(clazz));
|
||||||
}
|
}
|
||||||
if (types.isEmpty() && element instanceof Field) {
|
if (types.isEmpty() && element instanceof Field) {
|
||||||
types.add(ResolvableType.forField((Field) element));
|
types.add(ResolvableType.forField((Field) element));
|
||||||
|
|
|
@ -77,7 +77,7 @@ class MockDefinition extends Definition {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the type that should be mocked.
|
* 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() {
|
public ResolvableType getTypeToMock() {
|
||||||
return this.typeToMock;
|
return this.typeToMock;
|
||||||
|
|
|
@ -19,7 +19,7 @@ package org.springframework.boot.test.mock.mockito.example;
|
||||||
/**
|
/**
|
||||||
* Example service interface for mocking tests.
|
* Example service interface for mocking tests.
|
||||||
*
|
*
|
||||||
* @param <T> The generic type
|
* @param <T> the generic type
|
||||||
* @author Phillip Webb
|
* @author Phillip Webb
|
||||||
*/
|
*/
|
||||||
public interface ExampleGenericService<T> {
|
public interface ExampleGenericService<T> {
|
||||||
|
|
|
@ -42,7 +42,7 @@ public class ExampleGenericServiceCaller {
|
||||||
}
|
}
|
||||||
|
|
||||||
public String sayGreeting() {
|
public String sayGreeting() {
|
||||||
return "I say " + +this.integerService.greeting() + " "
|
return "I say " + this.integerService.greeting() + " "
|
||||||
+ this.stringService.greeting();
|
+ this.stringService.greeting();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue