martinvanzijl
diff --git a/‎src/main/java/org/kohsuke/github/GHEvent.java
Copy file name to clipboardExpand all lines: src/main/java/org/kohsuke/github/GHEvent.java
+48Lines changed: 48 additions & 0 deletions b/‎src/main/java/org/kohsuke/github/GHEvent.java
Copy file name to clipboardExpand all lines: src/main/java/org/kohsuke/github/GHEvent.java
+48Lines changed: 48 additions & 0 deletions
diff --git a/‎src/main/java/org/kohsuke/github/GHEventInfo.java
Copy file name to clipboardExpand all lines: src/main/java/org/kohsuke/github/GHEventInfo.java
+2-8Lines changed: 2 additions & 8 deletions b/‎src/main/java/org/kohsuke/github/GHEventInfo.java
Copy file name to clipboardExpand all lines: src/main/java/org/kohsuke/github/GHEventInfo.java
+2-8Lines changed: 2 additions & 8 deletions
diff --git a/‎src/test/java/org/kohsuke/github/GHEventTest.java
Copy file name to clipboard
+34Lines changed: 34 additions & 0 deletions b/‎src/test/java/org/kohsuke/github/GHEventTest.java
Copy file name to clipboard
+34Lines changed: 34 additions & 0 deletions
@@ -2,6 +2,8 @@
 
 import java.util.Locale;
 
+import javax.annotation.Nonnull;
+
 /**
  * Hook event type.
  *
@@ -85,4 +87,50 @@ String symbol() {
             return "*";
         return name().toLowerCase(Locale.ENGLISH);
     }
+
+    /**
+     * Representation of GitHub Event Type
+     *
+     * @see <a href="https://docs.github.com/en/developers/webhooks-and-events/github-event-types">GitHub event
+     *      types</a>
+     */
+    public enum GitHubEventType {
+        CommitCommentEvent(COMMIT_COMMENT),
+        CreateEvent(CREATE),
+        DeleteEvent(DELETE),
+        ForkEvent(FORK),
+        GollumEvent(GOLLUM),
+        IssueCommentEvent(ISSUE_COMMENT),
+        IssuesEvent(ISSUES),
+        MemberEvent(MEMBER),
+        PublicEvent(PUBLIC),
+        PullRequestEvent(PULL_REQUEST),
+        PullRequestReviewEvent(PULL_REQUEST_REVIEW),
+        PullRequestReviewCommentEvent(PULL_REQUEST_REVIEW_COMMENT),
+        PushEvent(PUSH),
+        ReleaseEvent(RELEASE),
+        WatchEvent(WATCH);
+
+        private final GHEvent event;
+        GitHubEventType(GHEvent event) {
+            this.event = event;
+        }
+
+        /**
+         * Required due to different naming conventions between different GitHub event names for Webhook events and
+         * GitHub events
+         *
+         * @param event
+         *            the github event as a string to convert to Event enum
+         * @return GHEvent
+         */
+        public static GHEvent transformToGHEvent(@Nonnull String event) {
+            try {
+                GitHubEventType gitHubEventType = GitHubEventType.valueOf(event);
+                return gitHubEventType.event;
+            } catch (IllegalArgumentException ignored) {
+                return UNKNOWN;
+            }
+        }
+    }
 }
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.kohsuke.github.GHEvent.GitHubEventType;
 
 import java.io.IOException;
 import java.util.Date;
@@ -46,14 +47,7 @@ public static class GHEventRepository {
      * @return the type
      */
     public GHEvent getType() {
-        String t = type;
-        if (t.endsWith("Event"))
-            t = t.substring(0, t.length() - 5);
-        for (GHEvent e : GHEvent.values()) {
-            if (e.name().replace("_", "").equalsIgnoreCase(t))
-                return e;
-        }
-        return GHEvent.UNKNOWN;
+        return GitHubEventType.transformToGHEvent(type);
     }
 
     GHEventInfo wrapUp(GitHub root) {
 
@@ -0,0 +1,34 @@
+package org.kohsuke.github;
+
+import org.junit.Test;
+import org.kohsuke.github.GHEvent.GitHubEventType;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+public class GHEventTest {
+
+    /**
+     * Function from GHEventInfo to transform string event to GHEvent which has been replaced by static mapping due to
+     * complex parsing logic below
+     */
+    private static GHEvent oldTransformationFunction(String t) {
+        if (t.endsWith("Event")) {
+            t = t.substring(0, t.length() - 5);
+        }
+        for (GHEvent e : GHEvent.values()) {
+            if (e.name().replace("_", "").equalsIgnoreCase(t)) {
+                return e;
+            }
+        }
+        return GHEvent.UNKNOWN;
+    }
+
+    @Test
+    public void regressionTest() {
+        for (GitHubEventType gitHubEventType : GitHubEventType.values()) {
+            assertThat(GitHubEventType.transformToGHEvent(gitHubEventType.name()),
+                    is(oldTransformationFunction(gitHubEventType.name())));
+        }
+    }
+}