commit 58edb51cc839a16120f8a1f9f879a0bc2fd08494 Author: Eric Yang Date: Thu Feb 8 20:45:40 2018 -0500 YARN-7909. Add charset to YARN Service REST API. (Contributed by Eric Yang) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java index 16f8513..e58938e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java @@ -94,7 +94,7 @@ private static void init() { @GET @Path(VERSION) @Consumes({ MediaType.APPLICATION_JSON }) - @Produces({ MediaType.APPLICATION_JSON }) + @Produces({ MediaType.APPLICATION_JSON + ";charset=utf-8" }) public Response getVersion() { String version = VersionInfo.getBuildVersion(); LOG.info(version); @@ -104,7 +104,7 @@ public Response getVersion() { @POST @Path(SERVICE_ROOT_PATH) @Consumes({ MediaType.APPLICATION_JSON }) - @Produces({ MediaType.APPLICATION_JSON }) + @Produces({ MediaType.APPLICATION_JSON + ";charset=utf-8" }) public Response createService(@Context HttpServletRequest request, Service service) { ServiceStatus serviceStatus = new ServiceStatus(); @@ -167,7 +167,7 @@ public ApplicationId run() throws IOException, YarnException { @GET @Path(SERVICE_PATH) @Consumes({ MediaType.APPLICATION_JSON }) - @Produces({ MediaType.APPLICATION_JSON }) + @Produces({ MediaType.APPLICATION_JSON + ";charset=utf-8" }) public Response getService(@Context HttpServletRequest request, @PathParam(SERVICE_NAME) String appName) { ServiceStatus serviceStatus = new ServiceStatus(); @@ -210,7 +210,7 @@ public Service run() throws IOException, YarnException { @DELETE @Path(SERVICE_PATH) @Consumes({ MediaType.APPLICATION_JSON }) - @Produces({ MediaType.APPLICATION_JSON }) + @Produces({ MediaType.APPLICATION_JSON + ";charset=utf-8" }) public Response deleteService(@Context HttpServletRequest request, @PathParam(SERVICE_NAME) String appName) { try { @@ -273,7 +273,8 @@ public Integer run() throws IOException, YarnException, @PUT @Path(COMPONENT_PATH) @Consumes({ MediaType.APPLICATION_JSON }) - @Produces({ MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN }) + @Produces({ MediaType.APPLICATION_JSON + ";charset=utf-8", + MediaType.TEXT_PLAIN }) public Response updateComponent(@Context HttpServletRequest request, @PathParam(SERVICE_NAME) String appName, @PathParam(COMPONENT_NAME) String componentName, Component component) { @@ -322,7 +323,7 @@ public Response updateComponent(@Context HttpServletRequest request, @PUT @Path(SERVICE_PATH) @Consumes({ MediaType.APPLICATION_JSON }) - @Produces({ MediaType.APPLICATION_JSON }) + @Produces({ MediaType.APPLICATION_JSON + ";charset=utf-8" }) public Response updateService(@Context HttpServletRequest request, @PathParam(SERVICE_NAME) String appName, Service updateServiceData) {