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

Avoid using classes from spring-web in core web endpoint infrastructure

Browse Source 
Closes gh-10358
This commit is contained in:
Andy Wilkinson
2017-09-25 14:04:14 +01:00
parent 3fcaa9765c
commit 32102c693b
7 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/EndpointAutoConfiguration.java
View File

@@ -63,7 +63,7 @@ public class EndpointAutoConfiguration {
static class EndpointWebConfiguration {
private static final List<String> MEDIA_TYPES = Arrays
.asList(ActuatorMediaType.V2_JSON_VALUE, "application/json");
.asList(ActuatorMediaType.V2_JSON, "application/json");
private final ApplicationContext applicationContext;

22
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/http/ActuatorMediaType.java
View File

@@ -16,10 +16,8 @@
package org.springframework.boot.actuate.endpoint.http;
import org.springframework.http.MediaType;
/**
* {@link MediaType MediaTypes} that can be consumed and produced by Actuator endpoints.
* Media types that can be consumed and produced by Actuator endpoints.
*
* @author Andy Wilkinson
* @author Madhura Bhave
@@ -28,24 +26,14 @@ import org.springframework.http.MediaType;
public final class ActuatorMediaType {
/**
* {@link String} equivalent of {@link #V1_JSON}.
* Constant for the Actuator V1 media type.
*/
public static final String V1_JSON_VALUE = "application/vnd.spring-boot.actuator.v1+json";
public static final String V1_JSON = "application/vnd.spring-boot.actuator.v1+json";
/**
* {@link String} equivalent of {@link #V2_JSON}.
* Constant for the Actuator V2 media type.
*/
public static final String V2_JSON_VALUE = "application/vnd.spring-boot.actuator.v2+json";
/**
* The {@code application/vnd.spring-boot.actuator.v1+json} media type.
*/
public static final MediaType V1_JSON = MediaType.valueOf(V1_JSON_VALUE);
/**
* The {@code application/vnd.spring-boot.actuator.v2+json} media type.
*/
public static final MediaType V2_JSON = MediaType.valueOf(V2_JSON_VALUE);
public static final String V2_JSON = "application/vnd.spring-boot.actuator.v2+json";
private ActuatorMediaType() {
}

2
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/test/JerseyEndpointsRunner.java
View File

@@ -91,7 +91,7 @@ class JerseyEndpointsRunner extends AbstractWebEndpointRunner {
private void customize(ResourceConfig config) {
List<String> mediaTypes = Arrays.asList(MediaType.APPLICATION_JSON_VALUE,
ActuatorMediaType.V2_JSON_VALUE);
ActuatorMediaType.V2_JSON);
WebAnnotationEndpointDiscoverer discoverer = new WebAnnotationEndpointDiscoverer(
this.applicationContext,
new ConversionServiceOperationParameterMapper(), (id) -> null,

2
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/test/WebFluxEndpointsRunner.java
View File

@@ -98,7 +98,7 @@ class WebFluxEndpointsRunner extends AbstractWebEndpointRunner {
@Bean
public WebFluxEndpointHandlerMapping webEndpointReactiveHandlerMapping() {
List<String> mediaTypes = Arrays.asList(MediaType.APPLICATION_JSON_VALUE,
ActuatorMediaType.V2_JSON_VALUE);
ActuatorMediaType.V2_JSON);
WebAnnotationEndpointDiscoverer discoverer = new WebAnnotationEndpointDiscoverer(
this.applicationContext,
new ConversionServiceOperationParameterMapper(), (id) -> null,

2
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/test/WebMvcEndpointRunner.java
View File

@@ -81,7 +81,7 @@ class WebMvcEndpointRunner extends AbstractWebEndpointRunner {
@Bean
public WebMvcEndpointHandlerMapping webEndpointServletHandlerMapping() {
List<String> mediaTypes = Arrays.asList(MediaType.APPLICATION_JSON_VALUE,
ActuatorMediaType.V2_JSON_VALUE);
ActuatorMediaType.V2_JSON);
WebAnnotationEndpointDiscoverer discoverer = new WebAnnotationEndpointDiscoverer(
this.applicationContext,
new ConversionServiceOperationParameterMapper(), (id) -> null,

8
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logger/LoggersEndpointWebIntegrationTests.java
View File

@@ -116,7 +116,7 @@ public class LoggersEndpointWebIntegrationTests {
@Test
public void setLoggerUsingActuatorV2JsonShouldSetLogLevel() throws Exception {
client.post().uri("/application/loggers/ROOT")
.contentType(ActuatorMediaType.V2_JSON)
.contentType(MediaType.parseMediaType(ActuatorMediaType.V2_JSON))
.syncBody(Collections.singletonMap("configuredLevel", "debug")).exchange()
.expectStatus().isNoContent();
verify(this.loggingSystem).setLogLevel("ROOT", LogLevel.DEBUG);
@@ -134,7 +134,7 @@ public class LoggersEndpointWebIntegrationTests {
@Test
public void setLoggerWithNullLogLevel() throws Exception {
client.post().uri("/application/loggers/ROOT")
.contentType(ActuatorMediaType.V2_JSON)
.contentType(MediaType.parseMediaType(ActuatorMediaType.V2_JSON))
.syncBody(Collections.singletonMap("configuredLevel", null)).exchange()
.expectStatus().isNoContent();
verify(this.loggingSystem).setLogLevel("ROOT", null);
@@ -143,8 +143,8 @@ public class LoggersEndpointWebIntegrationTests {
@Test
public void setLoggerWithNoLogLevel() throws Exception {
client.post().uri("/application/loggers/ROOT")
.contentType(ActuatorMediaType.V2_JSON).syncBody(Collections.emptyMap())
.exchange().expectStatus().isNoContent();
.contentType(MediaType.parseMediaType(ActuatorMediaType.V2_JSON))
.syncBody(Collections.emptyMap()).exchange().expectStatus().isNoContent();
verify(this.loggingSystem).setLogLevel("ROOT", null);
}

10
spring-boot-parent/src/checkstyle/import-control.xml
View File

@@ -30,17 +30,19 @@
</subpackage>
<!-- Endpoint infrastructure -->
<subpackage name="endpoint">
<subpackage name="actuate.endpoint">
<disallow pkg="org.springframework.http" />
<disallow pkg="org.springframework.web" />
<subpackage name="web">
<allow pkg="org.springframework.http" />
<allow pkg="org.springframework.web" />
<subpackage name="mvc">
<subpackage name="servlet">
<disallow pkg="org.springframework.web.reactive" />
<allow pkg="org.springframework.http" />
<allow pkg="org.springframework.web" />
</subpackage>
<subpackage name="reactive">
<disallow pkg="org.springframework.web.servlet" />
<allow pkg="org.springframework.http" />
<allow pkg="org.springframework.web" />
</subpackage>
</subpackage>
</subpackage>