svn commit: r1899805 - /jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JcrRemotingServlet.java

[re...@apache.org]

Author: reschke
Date: Wed Apr 13 11:13:20 2022
New Revision: 1899805

URL: http://svn.apache.org/viewvc?rev=1899805&view=rev
Log:
JCR-4766: JcrRemotingServlet should use 'application/json' media type for JSON response

Modified:
    jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JcrRemotingServlet.java

Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JcrRemotingServlet.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JcrRemotingServlet.java?rev=1899805&r1=1899804&r2=1899805&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JcrRemotingServlet.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/remoting/davex/JcrRemotingServlet.java Wed Apr 13 11:13:20 2022
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.server.rem
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -246,6 +247,8 @@ public abstract class JcrRemotingServlet
     private static final String PARAM_CLONE = ":clone";
     private static final String PARAM_INCLUDE = ":include";
 
+    private static final String CONTENT_TYPE_APPLICATION_JSON = "application/json";
+
     private BatchReadConfig brConfig;
     private ProtectedRemoveManager protectedRemoveManager;
 
@@ -352,7 +355,8 @@ public abstract class JcrRemotingServlet
                 Node node = session.getNode(path);
                 int depth = ((WrappingLocator) locator).getDepth();
 
-                webdavResponse.setContentType("text/plain;charset=utf-8");
+                webdavResponse.setContentType(CONTENT_TYPE_APPLICATION_JSON);
+                webdavResponse.setCharacterEncoding(StandardCharsets.UTF_8.name());
                 webdavResponse.setStatus(DavServletResponse.SC_OK);
                 JsonWriter writer = new JsonWriter(webdavResponse.getWriter());
 
@@ -437,7 +441,8 @@ public abstract class JcrRemotingServlet
                 if (loc == null) {
                     webdavResponse.setStatus(HttpServletResponse.SC_OK);
                     if (includes != null) {
-                        webdavResponse.setContentType("text/plain;charset=utf-8");
+                        webdavResponse.setContentType(CONTENT_TYPE_APPLICATION_JSON);
+                        webdavResponse.setCharacterEncoding(StandardCharsets.UTF_8.name());
                         JsonWriter writer = new JsonWriter(webdavResponse.getWriter());
 
                         DavResourceLocator locator = davResource.getLocator();