From cde179a4bd99ffabc4068faa69698b23bbafe721 Mon Sep 17 00:00:00 2001
From: Sidd <iProdigy@users.noreply.github.com>
Date: Mon, 24 Jan 2022 17:26:06 -0800
Subject: [PATCH] fix: ensure gql builder event manager has default handler

---
 .../common/util/EventManagerUtils.java        | 19 +++++++------------
 .../graphql/TwitchGraphQLBuilder.java         |  2 +-
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/common/src/main/java/com/github/twitch4j/common/util/EventManagerUtils.java b/common/src/main/java/com/github/twitch4j/common/util/EventManagerUtils.java
index 8fc06b17f..6d8293384 100644
--- a/common/src/main/java/com/github/twitch4j/common/util/EventManagerUtils.java
+++ b/common/src/main/java/com/github/twitch4j/common/util/EventManagerUtils.java
@@ -7,28 +7,23 @@ public class EventManagerUtils {
     /**
      * Validates the provided EventManager or initializes a new one
      *
-     * @param eventManager EventManager
+     * @param eventManager        EventManager
      * @param defaultEventHandler The default eventHandler class
      * @return EventManager
      */
-    public static EventManager validateOrInitializeEventManager(EventManager eventManager, @SuppressWarnings("rawtypes") Class defaultEventHandler) {
-        if (eventManager == null) {
-            EventManager newEM = initializeEventManager(defaultEventHandler);
-            validateEventManager(newEM);
-            return newEM;
-        } else {
-            validateEventManager(eventManager);
-            return eventManager;
-        }
+    public static EventManager validateOrInitializeEventManager(EventManager eventManager, Class<?> defaultEventHandler) {
+        EventManager em = eventManager != null ? eventManager : initializeEventManager(defaultEventHandler);
+        validateEventManager(em);
+        return em;
     }
 
     /**
-     *  Initializes a new EventManager instance.
+     * Initializes a new EventManager instance.
      *
      * @param defaultEventHandler The default eventHandler class
      * @return EventManager
      */
-    public static EventManager initializeEventManager(@SuppressWarnings("rawtypes") Class defaultEventHandler) {
+    public static EventManager initializeEventManager(Class<?> defaultEventHandler) {
         EventManager eventManager = new EventManager();
 
         eventManager.autoDiscovery();
diff --git a/graphql/src/main/java/com/github/twitch4j/graphql/TwitchGraphQLBuilder.java b/graphql/src/main/java/com/github/twitch4j/graphql/TwitchGraphQLBuilder.java
index 1a4037c3c..fb628c4ee 100644
--- a/graphql/src/main/java/com/github/twitch4j/graphql/TwitchGraphQLBuilder.java
+++ b/graphql/src/main/java/com/github/twitch4j/graphql/TwitchGraphQLBuilder.java
@@ -27,7 +27,7 @@ public class TwitchGraphQLBuilder {
      * Event Manager
      */
     @With
-    private EventManager eventManager = new EventManager();
+    private EventManager eventManager = null;
 
     /**
      * EventManager