[sling-org-apache-sling-clam] 01/02: style

[ol...@apache.org]

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

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

commit b755e55deb979727e3c53afa3a45abce64e2653a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Feb 3 17:32:31 2019 +0100

    style
---
 .../org/apache/sling/clam/http/internal/ClamScanServlet.java  | 11 ++++++-----
 .../org/apache/sling/clam/http/internal/ResponseUtil.java     |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/apache/sling/clam/http/internal/ClamScanServlet.java b/src/main/java/org/apache/sling/clam/http/internal/ClamScanServlet.java
index cb3067e..837acff 100644
--- a/src/main/java/org/apache/sling/clam/http/internal/ClamScanServlet.java
+++ b/src/main/java/org/apache/sling/clam/http/internal/ClamScanServlet.java
@@ -26,6 +26,7 @@ import java.util.regex.Pattern;
 import javax.jcr.Node;
 import javax.servlet.Servlet;
 import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
 
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.SlingHttpServletResponse;
@@ -120,7 +121,7 @@ public class ClamScanServlet extends SlingAllMethodsServlet {
             logger.error(e.getMessage(), e);
         }
         if (!isAuthorized) {
-            handleError(response, 403, null);
+            handleError(response, HttpServletResponse.SC_FORBIDDEN, null);
             return;
         }
 
@@ -136,26 +137,26 @@ public class ClamScanServlet extends SlingAllMethodsServlet {
             maxLength = maxLength(request, configuration.digger_default_property_length_max());
             maxDepth = RequestUtil.maxDepth(request, configuration.digger_default_node_depth_max());
         } catch (Exception e) {
-            response.sendError(400, e.getMessage());
+            handleError(response, HttpServletResponse.SC_BAD_REQUEST, e.getMessage());
             return;
         }
 
         final Resource resource = request.getResourceResolver().getResource(path);
         if (resource == null) {
-            response.sendError(400, "No resource at given path found: " + path);
+            handleError(response, HttpServletResponse.SC_BAD_REQUEST, "No resource at given path found: " + path);
             return;
         }
 
         final Node node = resource.adaptTo(Node.class);
         if (node == null) {
-            response.sendError(400, "Resource at given path is not a Node: " + path);
+            handleError(response, HttpServletResponse.SC_BAD_REQUEST, "Resource at given path is not a Node: " + path);
             return;
         }
 
         try {
             digger.dig(node, pattern, propertyTypes, maxLength, maxDepth);
         } catch (Exception e) {
-            response.sendError(500, e.getMessage());
+            handleError(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.getMessage());
         }
     }
 
diff --git a/src/main/java/org/apache/sling/clam/http/internal/ResponseUtil.java b/src/main/java/org/apache/sling/clam/http/internal/ResponseUtil.java
index 606e458..c0d8723 100644
--- a/src/main/java/org/apache/sling/clam/http/internal/ResponseUtil.java
+++ b/src/main/java/org/apache/sling/clam/http/internal/ResponseUtil.java
@@ -19,6 +19,7 @@
 package org.apache.sling.clam.http.internal;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 
 import javax.json.Json;
 import javax.json.JsonException;
@@ -36,7 +37,7 @@ public class ResponseUtil {
 
     static void handleError(@NotNull final SlingHttpServletResponse response, final int status, @Nullable final String message) throws ServletException, IOException {
         try {
-            response.setCharacterEncoding("UTF-8");
+            response.setCharacterEncoding(StandardCharsets.UTF_8.name());
             response.setContentType("application/json");
             response.setStatus(status);
             if (message != null) {