This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new f8c2d25 Fix pulsar broker handling WebApplicationException (#1612)
f8c2d25 is described below
commit f8c2d2580dab7a99fa508debc22b8fedf231f7ca
Author: Sijie Guo <guosi...@gmail.com>
AuthorDate: Wed Apr 18 15:32:37 2018 -0700
Fix pulsar broker handling WebApplicationException (#1612)
*Problem*
Currently all WebApplicationExeptions are converted to 500 /
InternalServerError by broker before responding to rest requests.
*Solution*
Make sure RestException handles WebApplicationExeption
---
.../apache/pulsar/broker/web/RestException.java | 14 +++--
.../pulsar/broker/web/RestExceptionTest.java | 59 ++++++++++++++++++++++
2 files changed, 69 insertions(+), 4 deletions(-)
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/RestException.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/RestException.java
index 968ab61..06b1e97 100644
---
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/RestException.java
+++
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/RestException.java
@@ -25,6 +25,7 @@ import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
import org.apache.pulsar.client.admin.PulsarAdminException;
import org.apache.pulsar.common.policies.data.ErrorData;
@@ -62,12 +63,17 @@ public class RestException extends WebApplicationException {
}
private static Response getResponse(Throwable t) {
- if (t instanceof RestException) {
- RestException e = (RestException) t;
+ if (t instanceof RestException
+ || t instanceof WebApplicationException) {
+ WebApplicationException e = (WebApplicationException) t;
return
Response.status(e.getResponse().getStatus()).entity(e.getResponse().getEntity())
- .type(e.getResponse().getMediaType()).build();
+ .type(e.getResponse().getMediaType()).build();
} else {
- return
Response.status(500).entity(getExceptionData(t)).type(MediaType.TEXT_PLAIN).build();
+ return Response
+ .status(Status.INTERNAL_SERVER_ERROR)
+ .entity(getExceptionData(t))
+ .type(MediaType.TEXT_PLAIN)
+ .build();
}
}
}
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/RestExceptionTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/RestExceptionTest.java
new file mode 100644
index 0000000..cf9e952
--- /dev/null
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/RestExceptionTest.java
@@ -0,0 +1,59 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.broker.web;
+
+import static org.testng.Assert.assertEquals;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response.Status;
+import org.testng.annotations.Test;
+
+/**
+ * Unit test for pulsar functions.
+ */
+public class RestExceptionTest {
+
+ @Test
+ public void testRestException() {
+ RestException re = new RestException(Status.TEMPORARY_REDIRECT, "test
rest exception");
+ RestException testException = new RestException(re);
+
+ assertEquals(Status.TEMPORARY_REDIRECT.getStatusCode(),
testException.getResponse().getStatus());
+ assertEquals(re.getResponse().getEntity(),
testException.getResponse().getEntity());
+ }
+
+ @Test
+ public void testWebApplicationException() {
+ WebApplicationException wae = new WebApplicationException("test web
application exception", Status.TEMPORARY_REDIRECT);
+ RestException testException = new RestException(wae);
+
+ assertEquals(Status.TEMPORARY_REDIRECT.getStatusCode(),
testException.getResponse().getStatus());
+ assertEquals(wae.getResponse().getEntity(),
testException.getResponse().getEntity());
+ }
+
+ @Test
+ public void testOtherException() {
+ Exception otherException = new Exception("test other exception");
+ RestException testException = new RestException(otherException);
+
+ assertEquals(Status.INTERNAL_SERVER_ERROR.getStatusCode(),
testException.getResponse().getStatus());
+ assertEquals(RestException.getExceptionData(otherException),
testException.getResponse().getEntity());
+ }
+
+}
--
To stop receiving notification emails like this one, please contact
mme...@apache.org.
