[sling-org-apache-sling-servlets-resolver] branch master updated: SLING-10021 cleanup

[enorman]

This is an automated email from the ASF dual-hosted git repository.

enorman pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-resolver.git


The following commit(s) were added to refs/heads/master by this push:
     new 312c7e6  SLING-10021 cleanup
312c7e6 is described below

commit 312c7e64735102c789d12ffa386e3da2851e25f1
Author: Eric Norman <enor...@apache.org>
AuthorDate: Tue Dec 29 19:18:24 2020 -0800

    SLING-10021 cleanup
---
 .../resolver/internal/defaults/DefaultErrorHandlerServlet.java | 10 +++++-----
 .../internal/defaults/DefaultErrorHandlerServletTest.java      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServlet.java
 
b/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServlet.java
index d85b636..fa32047 100644
--- 
a/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServlet.java
+++ 
b/src/main/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServlet.java
@@ -80,8 +80,8 @@ public class DefaultErrorHandlerServlet extends 
GenericServlet {
             statusMessage = statusToString(statusCode);
         }
 
-        //properly consider the 'Accept' header conditions to decide whether 
to send json or html back 
-        if (req instanceof HttpServletRequest && 
+        //properly consider the 'Accept' header conditions to decide whether 
to send json or html back
+        if (req instanceof HttpServletRequest &&
                 JSON_CONTENT_TYPE.equals(new 
MediaRangeList((HttpServletRequest)req).prefer(HTML_CONTENT_TYPE, 
JSON_CONTENT_TYPE))) {
             renderJson(req, res, statusMessage, requestUri, servletName, 
statusCode);
         } else {
@@ -145,12 +145,12 @@ public class DefaultErrorHandlerServlet extends 
GenericServlet {
             // the error inline and warn about that
             log.warn("Response already committed, unable to change status, 
output might not be well formed");
         }
-        
+
         // send the error as JSON
         try (JsonGenerator jsonGenerator = 
Json.createGenerator(res.getWriter())) {
             jsonGenerator.writeStartObject();
             jsonGenerator.write("status", statusCode);
-            
+
             String msg = 
(String)req.getAttribute(SlingConstants.ERROR_MESSAGE);
             if (msg != null && !msg.isEmpty()) {
                 jsonGenerator.write("message", statusMessage);
@@ -159,7 +159,7 @@ public class DefaultErrorHandlerServlet extends 
GenericServlet {
             if (requestUri != null && !requestUri.isEmpty()) {
                 jsonGenerator.write("requestUri", requestUri);
             }
-            
+
             if (servletName != null && !servletName.isEmpty()) {
                 jsonGenerator.write("servletName", servletName);
             }
diff --git 
a/src/test/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServletTest.java
 
b/src/test/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServletTest.java
index ba54f8f..1ec9f7c 100644
--- 
a/src/test/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServletTest.java
+++ 
b/src/test/java/org/apache/sling/servlets/resolver/internal/defaults/DefaultErrorHandlerServletTest.java
@@ -82,7 +82,7 @@ public class DefaultErrorHandlerServletTest {
         errorServlet.init(new MockServletConfig());
         errorServlet.service(req, res);
 
-        // verify we got json back
+        // verify we got html back
         assertEquals("text/html", res.getContentType());
         String responseOutput = res.getOutput().toString();