This is an automated email from the ASF dual-hosted git repository.
frankchen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 36bc418 Set Content-Type for String based response (#12295)
36bc418 is described below
commit 36bc41855d4d368ab6fbe0d5019bb27ba9c48440
Author: Frank Chen <frank.chen...@outlook.com>
AuthorDate: Fri Mar 4 15:17:03 2022 +0800
Set Content-Type for String based response (#12295)
---
.../org/apache/druid/security/basic/BasicSecurityResourceFilter.java | 2 ++
.../java/org/apache/druid/indexing/overlord/http/OverlordResource.java | 2 ++
.../druid/indexing/overlord/http/security/SupervisorResourceFilter.java | 2 ++
.../druid/indexing/overlord/http/security/TaskResourceFilter.java | 2 ++
.../druid/indexing/seekablestream/SeekableStreamIndexTaskRunner.java | 2 ++
.../main/java/org/apache/druid/indexing/worker/http/WorkerResource.java | 1 +
6 files changed, 11 insertions(+)
diff --git
a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicSecurityResourceFilter.java
b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicSecurityResourceFilter.java
index 8294ec1..bcb4ec0 100644
---
a/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicSecurityResourceFilter.java
+++
b/extensions-core/druid-basic-security/src/main/java/org/apache/druid/security/basic/BasicSecurityResourceFilter.java
@@ -31,6 +31,7 @@ import org.apache.druid.server.security.ResourceAction;
import org.apache.druid.server.security.ResourceType;
import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
public class BasicSecurityResourceFilter extends AbstractResourceFilter
@@ -62,6 +63,7 @@ public class BasicSecurityResourceFilter extends
AbstractResourceFilter
if (!authResult.isAllowed()) {
throw new WebApplicationException(
Response.status(Response.Status.FORBIDDEN)
+ .type(MediaType.TEXT_PLAIN)
.entity(StringUtils.format("Access-Check-Result: %s",
authResult.toString()))
.build()
);
diff --git
a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordResource.java
b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordResource.java
index 85bb3db..32024fd 100644
---
a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordResource.java
+++
b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/OverlordResource.java
@@ -639,6 +639,7 @@ public class OverlordResource
if (state != null) {
if (!API_TASK_STATES.contains(StringUtils.toLowerCase(state))) {
return Response.status(Status.BAD_REQUEST)
+ .type(MediaType.TEXT_PLAIN)
.entity(StringUtils.format("Invalid state : %s, valid
values are: %s", state, API_TASK_STATES))
.build();
}
@@ -658,6 +659,7 @@ public class OverlordResource
if (!authResult.isAllowed()) {
throw new WebApplicationException(
Response.status(Response.Status.FORBIDDEN)
+ .type(MediaType.TEXT_PLAIN)
.entity(StringUtils.format("Access-Check-Result: %s",
authResult.toString()))
.build()
);
diff --git
a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/security/SupervisorResourceFilter.java
b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/security/SupervisorResourceFilter.java
index f498788..7e9aaa9 100644
---
a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/security/SupervisorResourceFilter.java
+++
b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/security/SupervisorResourceFilter.java
@@ -38,6 +38,7 @@ import org.apache.druid.server.security.ForbiddenException;
import org.apache.druid.server.security.ResourceAction;
import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.PathSegment;
import javax.ws.rs.core.Response;
@@ -79,6 +80,7 @@ public class SupervisorResourceFilter extends
AbstractResourceFilter
if (!supervisorSpecOptional.isPresent()) {
throw new WebApplicationException(
Response.status(Response.Status.NOT_FOUND)
+ .type(MediaType.TEXT_PLAIN)
.entity(StringUtils.format("Cannot find any supervisor with
id: [%s]", supervisorId))
.build()
);
diff --git
a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/security/TaskResourceFilter.java
b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/security/TaskResourceFilter.java
index 72ad3be..ad1f526 100644
---
a/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/security/TaskResourceFilter.java
+++
b/indexing-service/src/main/java/org/apache/druid/indexing/overlord/http/security/TaskResourceFilter.java
@@ -38,6 +38,7 @@ import org.apache.druid.server.security.ResourceAction;
import org.apache.druid.server.security.ResourceType;
import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
/**
@@ -79,6 +80,7 @@ public class TaskResourceFilter extends AbstractResourceFilter
if (!taskOptional.isPresent()) {
throw new WebApplicationException(
Response.status(Response.Status.NOT_FOUND)
+ .type(MediaType.TEXT_PLAIN)
.entity(StringUtils.format("Cannot find any task with id:
[%s]", taskId))
.build()
);
diff --git
a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunner.java
b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunner.java
index 9b2eff3..dce3b09 100644
---
a/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunner.java
+++
b/indexing-service/src/main/java/org/apache/druid/indexing/seekablestream/SeekableStreamIndexTaskRunner.java
@@ -1639,6 +1639,7 @@ public abstract class
SeekableStreamIndexTaskRunner<PartitionIdType, SequenceOff
return Response.ok(sequenceNumbers).build();
} else if (latestSequence.isCheckpointed()) {
return Response.status(Response.Status.BAD_REQUEST)
+ .type(MediaType.TEXT_PLAIN)
.entity(StringUtils.format(
"Sequence [%s] has already endOffsets set, cannot
set to [%s]",
latestSequence,
@@ -1771,6 +1772,7 @@ public abstract class
SeekableStreamIndexTaskRunner<PartitionIdType, SequenceOff
{
if (!(status == Status.PAUSED || status == Status.READING)) {
return Response.status(Response.Status.BAD_REQUEST)
+ .type(MediaType.TEXT_PLAIN)
.entity(StringUtils.format("Can't pause, task is not in a
pausable state (state: [%s])", status))
.build();
}
diff --git
a/indexing-service/src/main/java/org/apache/druid/indexing/worker/http/WorkerResource.java
b/indexing-service/src/main/java/org/apache/druid/indexing/worker/http/WorkerResource.java
index 06c414b..935514f 100644
---
a/indexing-service/src/main/java/org/apache/druid/indexing/worker/http/WorkerResource.java
+++
b/indexing-service/src/main/java/org/apache/druid/indexing/worker/http/WorkerResource.java
@@ -206,6 +206,7 @@ public class WorkerResource
IdUtils.validateId("taskId", taskId);
if (!(taskRunner instanceof TaskLogStreamer)) {
return Response.status(501)
+ .type(MediaType.TEXT_PLAIN)
.entity(StringUtils.format(
"Log streaming not supported by [%s]",
taskRunner.getClass().getName()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org
For additional commands, e-mail: commits-h...@druid.apache.org
