merlimat closed pull request #1612: Fix pulsar broker handling
WebApplicationException
URL: https://github.com/apache/incubator-pulsar/pull/1612
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 968ab6125..06b1e97b9 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.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 RestException(PulsarAdminException cae) {
}
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 000000000..cf9e95268
--- /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());
+ }
+
+}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
