From 5beae639150054a0875dcd6d5e1478fb384458df Mon Sep 17 00:00:00 2001 From: rishabh singh Date: Fri, 6 Sep 2024 12:54:15 +0530 Subject: [PATCH 1/3] Add produces annotation to ParallelIndexSupervisorTask#report --- .../common/task/batch/parallel/ParallelIndexSupervisorTask.java | 1 + 1 file changed, 1 insertion(+) diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTask.java index 6039a62bc984..fa2745944a6f 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTask.java @@ -1400,6 +1400,7 @@ static InputFormat getInputFormat(ParallelIndexIngestionSpec ingestionSchema) @POST @Path("/report") @Consumes(SmileMediaTypes.APPLICATION_JACKSON_SMILE) + @Produces(SmileMediaTypes.APPLICATION_JACKSON_SMILE) public Response report( SubTaskReport report, @Context final HttpServletRequest req From c13ed5a75d81a973f1e96fff61423527a9014987 Mon Sep 17 00:00:00 2001 From: rishabh singh Date: Fri, 6 Sep 2024 13:04:59 +0530 Subject: [PATCH 2/3] change to application/json --- .../common/task/batch/parallel/ParallelIndexSupervisorTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTask.java index fa2745944a6f..9cb2a456a784 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTask.java @@ -1400,7 +1400,7 @@ static InputFormat getInputFormat(ParallelIndexIngestionSpec ingestionSchema) @POST @Path("/report") @Consumes(SmileMediaTypes.APPLICATION_JACKSON_SMILE) - @Produces(SmileMediaTypes.APPLICATION_JACKSON_SMILE) + @Produces(MediaType.APPLICATION_JSON) public Response report( SubTaskReport report, @Context final HttpServletRequest req From 61475a2460fce4a8ba7eae1ec6f29106cc2b8d7d Mon Sep 17 00:00:00 2001 From: rishabh singh Date: Fri, 6 Sep 2024 14:26:41 +0530 Subject: [PATCH 3/3] Set response type in CustomExceptionMapper instead --- .../common/task/batch/parallel/ParallelIndexSupervisorTask.java | 1 - .../server/initialization/jetty/CustomExceptionMapper.java | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTask.java b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTask.java index 9cb2a456a784..6039a62bc984 100644 --- a/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTask.java +++ b/indexing-service/src/main/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTask.java @@ -1400,7 +1400,6 @@ static InputFormat getInputFormat(ParallelIndexIngestionSpec ingestionSchema) @POST @Path("/report") @Consumes(SmileMediaTypes.APPLICATION_JACKSON_SMILE) - @Produces(MediaType.APPLICATION_JSON) public Response report( SubTaskReport report, @Context final HttpServletRequest req diff --git a/server/src/main/java/org/apache/druid/server/initialization/jetty/CustomExceptionMapper.java b/server/src/main/java/org/apache/druid/server/initialization/jetty/CustomExceptionMapper.java index 2b1b8351aed4..18148b0c348e 100644 --- a/server/src/main/java/org/apache/druid/server/initialization/jetty/CustomExceptionMapper.java +++ b/server/src/main/java/org/apache/druid/server/initialization/jetty/CustomExceptionMapper.java @@ -23,6 +23,7 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.google.common.collect.ImmutableMap; +import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; @@ -38,6 +39,7 @@ public Response toResponse(JsonMappingException exception) "error", exception.getMessage() == null ? "unknown json mapping exception" : exception.getMessage() )) + .type(MediaType.APPLICATION_JSON) .build(); } }