diff options
author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2016-11-29 14:00:18 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2016-11-29 16:53:59 +0100 |
commit | d89285bd7b540770d2fa5fe473234c134ed825a5 (patch) | |
tree | b70051bc498ddce69a66a721c73bedd391d2f4fa /jdisc_http_service/src | |
parent | 35490d3030e9d7377ebaedf4b4f0a3969635763f (diff) |
Move use of setStatus to separate method
Improve documentation on the deprecation of setStatus
Diffstat (limited to 'jdisc_http_service/src')
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java index dbefa4a597e..511451b3577 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java @@ -178,18 +178,20 @@ public class ServletResponseController { private static void setStatus_holdingLock(Response jdiscResponse, HttpServletResponse servletResponse) { if (jdiscResponse instanceof HttpResponse) { - // TODO: Figure out what this does to the response (with Jetty), and move to non-deprecated APIs. - // Deprecate our own code as necessary. - servletResponse.setStatus(jdiscResponse.getStatus(), ((HttpResponse) jdiscResponse).getMessage()); + setStatus(servletResponse, jdiscResponse.getStatus(), Optional.ofNullable(((HttpResponse) jdiscResponse).getMessage())); } else { - Optional<String> errorMessage = getErrorMessage(jdiscResponse); - if (errorMessage.isPresent()) { - // TODO: Figure out what this does to the response (with Jetty), and move to non-deprecated APIs. - // Deprecate our own code as necessary. - servletResponse.setStatus(jdiscResponse.getStatus(), errorMessage.get()); - } else { - servletResponse.setStatus(jdiscResponse.getStatus()); - } + setStatus(servletResponse, jdiscResponse.getStatus(), getErrorMessage(jdiscResponse)); + } + } + + @SuppressWarnings("deprecation") + private static void setStatus(HttpServletResponse response, int statusCode, Optional<String> reasonPhrase) { + if (reasonPhrase.isPresent()) { + // Sets the status line: a status code along with a custom message. + // Using a custom status message is deprecated in the Servlet API. No alternative exist. + response.setStatus(statusCode, reasonPhrase.get()); // DEPRECATED + } else { + response.setStatus(statusCode); } } |