JSON 404,405 messsages for the API part of the app (re: #3235)

IQSS · Oct 23, 2016 · dff1f32 · dff1f32
1 parent 66cdb19
commit dff1f32
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/ApiBlockingFilter.java b/src/main/java/edu/harvard/iq/dataverse/api/ApiBlockingFilter.java
@@ -158,7 +158,15 @@ public void doFilter(ServletRequest sr, ServletResponse sr1, FilterChain fc) thr
                 return;
             }
         }
-        fc.doFilter(sr, sr1);
+        try {
+            fc.doFilter(sr, sr1);
+        } catch ( ServletException se ) {
+            logger.log(Level.WARNING, "Error processing " + requestURI +": " + se.getMessage(), se);
+            HttpServletResponse resp = (HttpServletResponse) sr1;
+            resp.setStatus(500);
+            resp.setHeader("PROCUDER", "ApiBlockingFilter");
+            resp.getWriter().append("Error: " + se.getMessage());
+        }
     }
 
     @Override

diff --git a/src/main/java/edu/harvard/iq/dataverse/api/TestApi.java b/src/main/java/edu/harvard/iq/dataverse/api/TestApi.java
@@ -23,6 +23,7 @@
 import javax.ejb.EJB;
 import javax.json.Json;
 import javax.json.JsonObjectBuilder;
+import javax.ws.rs.NotFoundException;
 import javax.ws.rs.QueryParam;
 import org.mindrot.jbcrypt.BCrypt;
 
@@ -144,4 +145,10 @@ public Response getIpGroupsContaining( @PathParam("address") String addrStr ) {
         }
     }
 
+
+    @Path("/notFound/{thing}")
+    @GET
+    public Response throwNotFound( @PathParam("thing") String thing ) {
+        throw new NotFoundException("Can't find the " + thing);
+    }
 }