fix: ensure gql builder event manager has default handler (#519)

twitch4j · Jan 29, 2022 · 69e667d · 69e667d
1 parent 7500fe6
commit 69e667d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 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
@@ -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
@@ -27,7 +27,7 @@ public class TwitchGraphQLBuilder {
      * Event Manager
      */
     @With
-    private EventManager eventManager = new EventManager();
+    private EventManager eventManager = null;
 
     /**
      * EventManager