From 2a4affefac130082d6bf5df4b5b70577788d53ee Mon Sep 17 00:00:00 2001
From: Greg Messner <greg@messners.com>
Date: Thu, 11 Jan 2018 08:05:18 -0800
Subject: [PATCH] Simplified exception handling and logging of same.

---
 .../api/systemhooks/SystemHookManager.java    | 22 +++----------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/gitlab4j/api/systemhooks/SystemHookManager.java b/src/main/java/org/gitlab4j/api/systemhooks/SystemHookManager.java
index 5a6f3e31..70c9dab5 100644
--- a/src/main/java/org/gitlab4j/api/systemhooks/SystemHookManager.java
+++ b/src/main/java/org/gitlab4j/api/systemhooks/SystemHookManager.java
@@ -1,7 +1,6 @@
 
 package org.gitlab4j.api.systemhooks;
 
-import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -15,9 +14,6 @@ import org.gitlab4j.api.HookManager;
 import org.gitlab4j.api.utils.HttpRequestUtils;
 import org.gitlab4j.api.utils.JacksonJson;
 
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-
 /**
  * This class provides a handler for processing GitLab System Hook callouts.
  */
@@ -71,7 +67,6 @@ public class SystemHookManager extends HookManager {
             throw new GitLabApiException(message);
         }
 
-        String errorMessage = null;
         try {
 
             SystemHookEvent event;
@@ -88,22 +83,11 @@ public class SystemHookManager extends HookManager {
 
             fireEvent(event);
 
-        } catch (JsonParseException jpe) {
-            errorMessage = jpe.getMessage();
-            LOG.warning("Error parsing JSON data, error=" + errorMessage);
-        } catch (JsonMappingException jme) {
-            errorMessage = jme.getMessage();
-            LOG.warning("Error mapping JSON data, error=" + errorMessage);
-        } catch (IOException ioe) {
-            errorMessage = ioe.getMessage();
-            LOG.warning("Error reading JSON data, error=" + errorMessage);
         } catch (Exception e) {
-            errorMessage = e.getMessage();
-            LOG.warning("Unexpected error reading JSON data, error=" + errorMessage);
+            LOG.warning("Error processing JSON data, exception=" +
+                    e.getClass().getSimpleName() + ", error=" + e.getMessage());
+            throw new GitLabApiException(e);
         }
-
-        if (errorMessage != null)
-            throw new GitLabApiException(errorMessage);
     }
 
     /**
-- 
GitLab