Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from Jan 29, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 7 additions & 12 deletions common/src/main/java/com/github/twitch4j/common/util/EventManagerUtils.java
View file
Open in desktop
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion graphql/src/main/java/com/github/twitch4j/graphql/TwitchGraphQLBuilder.java
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@ public class TwitchGraphQLBuilder {
* Event Manager
*/
@With
private EventManager eventManager = new EventManager();
private EventManager eventManager = null;

/**
* EventManager
Expand Down