Improved handling of exceptions.

Author: gmessner

src/main/java/org/gitlab4j/api/systemhooks/SystemHookManager.java

@@ -147,22 +147,32 @@ public SystemHookEvent handleRequest(HttpServletRequest request) throws GitLabAp
         }
 
         // Unmarshal the tree to a concrete instance of a SystemHookEvent and fire the event to any listeners
+        SystemHookEvent event;
         try {
 
-            SystemHookEvent event = jacksonJson.unmarshal(SystemHookEvent.class, tree);
+            event = jacksonJson.unmarshal(SystemHookEvent.class, tree);
             if (LOGGER.isLoggable(Level.FINE)) {
                 LOGGER.fine(event.getEventName() + "\n" + jacksonJson.marshal(event) + "\n");
             }
 
             StringBuffer requestUrl = request.getRequestURL();
             event.setRequestUrl(requestUrl != null ? requestUrl.toString() : null);
             event.setRequestQueryString(request.getQueryString());
+
+        } catch (Exception e) {
+            LOGGER.warning(String.format("Error processing JSON data, exception=%s, error=%s",
+                    e.getClass().getSimpleName(), e.getMessage()));
+            throw new GitLabApiException(e);
+        }
+
+        try {
+
             fireEvent(event);
             return (event);
 
         } catch (Exception e) {
-            LOGGER.warning("Error processing JSON data, exception=" +
-                    e.getClass().getSimpleName() + ", error=" + e.getMessage());
+            LOGGER.warning(String.format("Error processing event, exception=%s, error=%s",
+                    e.getClass().getSimpleName(), e.getMessage()));
             throw new GitLabApiException(e);
         }
     }

src/main/java/org/gitlab4j/api/webhook/WebHookManager.java

@@ -116,9 +116,9 @@ public Event handleRequest(HttpServletRequest request) throws GitLabApiException
             throw new GitLabApiException(message);
         }
 
+        Event event;
         try {
 
-            Event event;
             if (LOGGER.isLoggable(Level.FINE)) {
                 LOGGER.fine(HttpRequestUtils.getShortRequestDump(eventName + " webhook", true, request));
                 String postData = HttpRequestUtils.getPostDataAsString(request);
@@ -130,13 +130,22 @@ public Event handleRequest(HttpServletRequest request) throws GitLabApiException
                 event = jacksonJson.unmarshal(Event.class, reader);
             }
 
+        } catch (Exception e) {
+            LOGGER.warning(String.format("Error processing JSON data, exception=%s, error=%s",
+                    e.getClass().getSimpleName(), e.getMessage()));
+            throw new GitLabApiException(e);
+        }
+
+        try {
+
             event.setRequestUrl(request.getRequestURL().toString());
             event.setRequestQueryString(request.getQueryString());
             fireEvent(event);
             return (event);
 
         } catch (Exception e) {
-            LOGGER.warning("Error parsing JSON data, exception=" + e.getClass().getSimpleName() + ", error=" + e.getMessage());
+            LOGGER.warning(String.format("Error processing event, exception=%s, error=%s",
+                    e.getClass().getSimpleName(), e.getMessage()));
             throw new GitLabApiException(e);
         }
     }