From f43aa9444d8dcde37226152d5b06a3911a655c10 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 20 Sep 2017 11:22:45 +0200 Subject: [PATCH] Polish "Remove usage of `HttpStatus` in Web Endpoints" Closes gh-10350 --- .../audit/AuditEventsWebEndpointExtension.java | 2 +- .../endpoint/web/WebEndpointResponse.java | 17 +++++++++++------ .../actuate/health/HealthStatusHttpMapper.java | 8 ++++---- .../actuate/management/HeapDumpWebEndpoint.java | 6 +++--- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEventsWebEndpointExtension.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEventsWebEndpointExtension.java index 75f1869a5df..0489c2f1b48 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEventsWebEndpointExtension.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEventsWebEndpointExtension.java @@ -42,7 +42,7 @@ public class AuditEventsWebEndpointExtension { public WebEndpointResponse eventsWithPrincipalDateAfterAndType( String principal, Date after, String type) { if (after == null) { - return new WebEndpointResponse<>(WebEndpointResponse.BAD_REQUEST_STATUS); + return new WebEndpointResponse<>(WebEndpointResponse.STATUS_BAD_REQUEST); } AuditEventsDescriptor auditEvents = this.delegate .eventsWithPrincipalDateAfterAndType(principal, after, type); diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/WebEndpointResponse.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/WebEndpointResponse.java index cfd6482dc47..6834bd9eb12 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/WebEndpointResponse.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/WebEndpointResponse.java @@ -34,27 +34,32 @@ public final class WebEndpointResponse { /** * {@code 200 OK}. */ - public static final int OK_STATUS = 200; + public static final int STATUS_OK = 200; /** * {@code 400 Bad Request}. */ - public static final int BAD_REQUEST_STATUS = 400; + public static final int STATUS_BAD_REQUEST = 400; + + /** + * {@code 404 Not Found}. + */ + public static final int STATUS_NOT_FOUND = 404; /** * {@code 429 Too Many Requests}. */ - public static final int TOO_MANY_REQUESTS_STATUS = 429; + public static final int STATUS_TOO_MANY_REQUESTS = 429; /** * {@code 500 Internal Server Error}. */ - public static final int INTERNAL_SERVER_ERROR_STATUS = 500; + public static final int STATUS_INTERNAL_SERVER_ERROR = 500; /** * {@code 503 Service Unavailable}. */ - public static final int SERVICE_UNAVAILABLE_STATUS = 503; + public static final int STATUS_SERVICE_UNAVAILABLE = 503; private final T body; @@ -82,7 +87,7 @@ public final class WebEndpointResponse { * @param body the body */ public WebEndpointResponse(T body) { - this(body, OK_STATUS); + this(body, STATUS_OK); } /** diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthStatusHttpMapper.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthStatusHttpMapper.java index d7e41f5264c..9e3f3a1194a 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthStatusHttpMapper.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthStatusHttpMapper.java @@ -41,9 +41,9 @@ public class HealthStatusHttpMapper { } private void setupDefaultStatusMapping() { - addStatusMapping(Status.DOWN, WebEndpointResponse.SERVICE_UNAVAILABLE_STATUS); + addStatusMapping(Status.DOWN, WebEndpointResponse.STATUS_SERVICE_UNAVAILABLE); addStatusMapping(Status.OUT_OF_SERVICE, - WebEndpointResponse.SERVICE_UNAVAILABLE_STATUS); + WebEndpointResponse.STATUS_SERVICE_UNAVAILABLE); } /** @@ -105,9 +105,9 @@ public class HealthStatusHttpMapper { return this.statusMapping.keySet().stream() .filter((key) -> code.equals(getUniformValue(key))) .map(this.statusMapping::get).findFirst() - .orElse(WebEndpointResponse.OK_STATUS); + .orElse(WebEndpointResponse.STATUS_OK); } - return WebEndpointResponse.OK_STATUS; + return WebEndpointResponse.STATUS_OK; } private String getUniformValue(String code) { diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/management/HeapDumpWebEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/management/HeapDumpWebEndpoint.java index 2dfb081f997..0991472745e 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/management/HeapDumpWebEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/management/HeapDumpWebEndpoint.java @@ -89,13 +89,13 @@ public class HeapDumpWebEndpoint { } catch (IOException ex) { return new WebEndpointResponse<>( - WebEndpointResponse.INTERNAL_SERVER_ERROR_STATUS); + WebEndpointResponse.STATUS_INTERNAL_SERVER_ERROR); } catch (HeapDumperUnavailableException ex) { return new WebEndpointResponse<>( - WebEndpointResponse.SERVICE_UNAVAILABLE_STATUS); + WebEndpointResponse.STATUS_SERVICE_UNAVAILABLE); } - return new WebEndpointResponse<>(WebEndpointResponse.TOO_MANY_REQUESTS_STATUS); + return new WebEndpointResponse<>(WebEndpointResponse.STATUS_TOO_MANY_REQUESTS); } private Resource dumpHeap(boolean live) throws IOException, InterruptedException {