Merge pull request #376 from OneBusAway/utf8

Use UTF-8 as character encoding for XML responses

onebusaway-api-webapp/src/main/java/org/onebusaway/api/impl/CustomJsonLibHandler.java

@@ -32,7 +32,6 @@
 
 public class CustomJsonLibHandler extends AbstractContentTypeHandler {
 
-        private String defaultEncoding = "ISO-8859-1";
         private ObjectMapper mapper = new ObjectMapper();
 
         public void toObject(ActionInvocation invocation, Reader in, Object target) throws IOException {
@@ -90,9 +89,6 @@ public String getContentType() {
                 if(callback != null){
                         return "application/javascript";
                 }
-                // we used to set charset for callbacks
-                // after Jackson upgrade to 2.12.0 this no longer works
-                //return "application/json;charset=" + this.defaultEncoding;
                 return "application/json";
         }
 
@@ -102,6 +98,6 @@ public String getExtension() {
 
         @Inject("struts.i18n.encoding")
         public void setDefaultEncoding(String val) {
-                this.defaultEncoding = val;
+                /* nop - TODO: can this just be removed? */
         }
 }

onebusaway-api-webapp/src/main/java/org/onebusaway/api/impl/XmlResult.java

@@ -36,6 +36,7 @@ protected void doExecute(String finalLocation, ActionInvocation invocation)
     HttpServletResponse response = ServletActionContext.getResponse();
     RequestDispatcher dispatcher = request.getRequestDispatcher(finalLocation);
     response.setContentType("text/xml");
+    response.setCharacterEncoding("UTF-8");
     dispatcher.include(request, response);
   }