From 7c7a548003f535dbe6be1ea512d30b01cba306cc Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Wed, 15 May 2024 11:57:07 +0200 Subject: [PATCH] use PrintWriter in JSONReconcile servlet --- .../webapp/controller/grefine/JSONReconcileServlet.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java index 8469d377e9..707e70e145 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java @@ -3,6 +3,7 @@ package edu.cornell.mannlib.vitro.webapp.controller.grefine; import java.io.IOException; +import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -70,6 +71,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { super.doGet(req, resp); resp.setContentType("application/json"); + resp.setCharacterEncoding("UTF-8"); VitroRequest vreq = new VitroRequest(req); try { @@ -81,7 +83,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) .toString() : vreq.getParameter("callback") + "(" + qJson.toString() + ")"; // System.out.println("JSONReconcileServlet result: " + responseStr); - ServletOutputStream out = resp.getOutputStream(); + PrintWriter out = resp.getWriter(); out.print(responseStr); } else { // metadata String defaultNamespace = null; @@ -97,7 +99,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) ObjectNode metaJson = getMetadata(req, resp, defaultNamespace, defaultTypeList, serverName, serverPort); String callbackStr = (vreq.getParameter("callback") == null) ? "" : vreq.getParameter("callback"); - ServletOutputStream out = resp.getOutputStream(); + PrintWriter out = resp.getWriter(); out.print(callbackStr + "(" + metaJson.toString() + ")"); } } catch (Exception ex) {