Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Andy Wilkinson
2018-01-22 11:30:49 +00:00
parent fbb1ba1bb3
commit 66164bff14
8 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/JmxEndpointsSupplier.java
View File

@@ -24,6 +24,7 @@ import org.springframework.boot.actuate.endpoint.EndpointsSupplier;
* @author Phillip Webb
* @since 2.0.0
*/
@FunctionalInterface
public interface JmxEndpointsSupplier extends EndpointsSupplier<ExposableJmxEndpoint> {
}

1
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/PathMappedEndpoint.java
View File

@@ -26,6 +26,7 @@ import org.springframework.boot.actuate.endpoint.ExposableEndpoint;
* @since 2.0.0
* @see PathMapper
*/
@FunctionalInterface
public interface PathMappedEndpoint {
/**

1
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/WebEndpointsSupplier.java
View File

@@ -24,6 +24,7 @@ import org.springframework.boot.actuate.endpoint.EndpointsSupplier;
* @author Phillip Webb
* @since 2.0.0
*/
@FunctionalInterface
public interface WebEndpointsSupplier extends EndpointsSupplier<ExposableWebEndpoint> {
}

1
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/annotation/ControllerEndpointsSupplier.java
View File

@@ -24,6 +24,7 @@ import org.springframework.boot.actuate.endpoint.EndpointsSupplier;
* @author Phillip Webb
* @since 2.0.0
*/
@FunctionalInterface
public interface ControllerEndpointsSupplier
extends EndpointsSupplier<ExposableControllerEndpoint> {

3
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/reactive/AbstractWebFluxEndpointHandlerMapping.java
View File

@@ -238,8 +238,9 @@ public abstract class AbstractWebFluxEndpointHandlerMapping
}
/**
* An reactive web operation that can be handled by WebFlux.
* A reactive web operation that can be handled by WebFlux.
*/
@FunctionalInterface
protected interface ReactiveWebOperation {
Mono<ResponseEntity<Object>> handle(ServerWebExchange exchange,

3
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/servlet/AbstractWebMvcEndpointHandlerMapping.java
View File

@@ -214,8 +214,9 @@ public abstract class AbstractWebMvcEndpointHandlerMapping
}
/**
* An reactive web operation that can be handled by WebFlux.
* A servlet web operation that can be handled by Spring MVC.
*/
@FunctionalInterface
protected interface ServletWebOperation {
Object handle(HttpServletRequest request, Map<String, String> body);

30
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/reactive/ControllerEndpointHandlerMappingIntegrationTests.java
View File

@@ -68,31 +68,27 @@ public class ControllerEndpointHandlerMappingIntegrationTests {
@Test
public void get() {
this.contextRunner.run(withWebTestClient(webTestClient -> {
webTestClient.get().uri("/actuator/example/one").accept(MediaType.TEXT_PLAIN)
.exchange().expectStatus().isOk().expectHeader()
.contentTypeCompatibleWith(MediaType.TEXT_PLAIN)
.expectBody(String.class).isEqualTo("One");
}));
this.contextRunner.run(withWebTestClient(
(webTestClient) -> webTestClient.get().uri("/actuator/example/one")
.accept(MediaType.TEXT_PLAIN).exchange().expectStatus().isOk()
.expectHeader().contentTypeCompatibleWith(MediaType.TEXT_PLAIN)
.expectBody(String.class).isEqualTo("One")));
}
@Test
public void getWithUnacceptableContentType() {
this.contextRunner.run(withWebTestClient(webTestClient -> {
webTestClient.get().uri("/actuator/example/one")
.accept(MediaType.APPLICATION_JSON).exchange().expectStatus()
.isEqualTo(HttpStatus.NOT_ACCEPTABLE);
}));
this.contextRunner.run(withWebTestClient((webTestClient) -> webTestClient.get()
.uri("/actuator/example/one").accept(MediaType.APPLICATION_JSON)
.exchange().expectStatus().isEqualTo(HttpStatus.NOT_ACCEPTABLE)));
}
@Test
public void post() {
this.contextRunner.run(withWebTestClient(webTestClient -> {
webTestClient.post().uri("/actuator/example/two")
.syncBody(Collections.singletonMap("id", "test")).exchange()
.expectStatus().isCreated().expectHeader()
.valueEquals(HttpHeaders.LOCATION, "/example/test");
}));
this.contextRunner.run(withWebTestClient(
(webTestClient) -> webTestClient.post().uri("/actuator/example/two")
.syncBody(Collections.singletonMap("id", "test")).exchange()
.expectStatus().isCreated().expectHeader()
.valueEquals(HttpHeaders.LOCATION, "/example/test")));
}
private ContextConsumer<AssertableReactiveWebApplicationContext> withWebTestClient(

30
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/servlet/ControllerEndpointHandlerMappingIntegrationTests.java
View File

@@ -67,31 +67,27 @@ public class ControllerEndpointHandlerMappingIntegrationTests {
@Test
public void get() {
this.contextRunner.run(withWebTestClient(webTestClient -> {
webTestClient.get().uri("/actuator/example/one").accept(MediaType.TEXT_PLAIN)
.exchange().expectStatus().isOk().expectHeader()
.contentTypeCompatibleWith(MediaType.TEXT_PLAIN)
.expectBody(String.class).isEqualTo("One");
}));
this.contextRunner.run(withWebTestClient(
(webTestClient) -> webTestClient.get().uri("/actuator/example/one")
.accept(MediaType.TEXT_PLAIN).exchange().expectStatus().isOk()
.expectHeader().contentTypeCompatibleWith(MediaType.TEXT_PLAIN)
.expectBody(String.class).isEqualTo("One")));
}
@Test
public void getWithUnacceptableContentType() {
this.contextRunner.run(withWebTestClient(webTestClient -> {
webTestClient.get().uri("/actuator/example/one")
.accept(MediaType.APPLICATION_JSON).exchange().expectStatus()
.isEqualTo(HttpStatus.NOT_ACCEPTABLE);
}));
this.contextRunner.run(withWebTestClient((webTestClient) -> webTestClient.get()
.uri("/actuator/example/one").accept(MediaType.APPLICATION_JSON)
.exchange().expectStatus().isEqualTo(HttpStatus.NOT_ACCEPTABLE)));
}
@Test
public void post() {
this.contextRunner.run(withWebTestClient(webTestClient -> {
webTestClient.post().uri("/actuator/example/two")
.syncBody(Collections.singletonMap("id", "test")).exchange()
.expectStatus().isCreated().expectHeader()
.valueEquals(HttpHeaders.LOCATION, "/example/test");
}));
this.contextRunner.run(withWebTestClient(
(webTestClient) -> webTestClient.post().uri("/actuator/example/two")
.syncBody(Collections.singletonMap("id", "test")).exchange()
.expectStatus().isCreated().expectHeader()
.valueEquals(HttpHeaders.LOCATION, "/example/test")));
}
private ContextConsumer<AssertableWebApplicationContext> withWebTestClient(