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

refactor: avoid autoDiscovery in initializeEventManager #640

Merged
merged 1 commit into from Sep 4, 2022
Merged

refactor: avoid autoDiscovery in initializeEventManager #640

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
30 changes: 25 additions & 5 deletions common/src/main/java/com/github/twitch4j/common/util/EventManagerUtils.java
View file
Open in desktop
@@ -1,7 +1,12 @@
package com.github.twitch4j.common.util;

import com.github.philippheuer.events4j.api.service.IEventHandler;
import com.github.philippheuer.events4j.core.EventManager;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

@Slf4j
public class EventManagerUtils {

/**
Expand All @@ -11,7 +16,7 @@ public class EventManagerUtils {
* @param defaultEventHandler The default eventHandler class
* @return EventManager
*/
public static EventManager validateOrInitializeEventManager(EventManager eventManager, Class<?> defaultEventHandler) {
public static EventManager validateOrInitializeEventManager(@Nullable EventManager eventManager, @NotNull Class<?> defaultEventHandler) {
EventManager em = eventManager != null ? eventManager : initializeEventManager(defaultEventHandler);
validateEventManager(em);
return em;
Expand All @@ -23,11 +28,26 @@ public static EventManager validateOrInitializeEventManager(EventManager eventMa
* @param defaultEventHandler The default eventHandler class
* @return EventManager
*/
public static EventManager initializeEventManager(Class<?> defaultEventHandler) {
public static EventManager initializeEventManager(@NotNull Class<?> defaultEventHandler) {
EventManager eventManager = new EventManager();

eventManager.autoDiscovery();
eventManager.setDefaultEventHandler(defaultEventHandler);
// Try to register just defaultEventHandler
try {
eventManager.registerEventHandler((IEventHandler) defaultEventHandler.getDeclaredConstructor().newInstance());
eventManager.setDefaultEventHandler(defaultEventHandler);
} catch (Exception e) {
log.warn("Failed to register the requested default event handler: " + defaultEventHandler, e);
}

// Fallback
if (eventManager.getDefaultEventHandler() == null) {
eventManager.autoDiscovery();
if (!eventManager.getEventHandlers().isEmpty()) {
Class<? extends IEventHandler> clazz = eventManager.getEventHandlers().get(0).getClass();
eventManager.setDefaultEventHandler(clazz);
log.info("Registered fallback default event handler: {}", clazz.getTypeName());
}
}

return eventManager;
}
Expand All @@ -37,7 +57,7 @@ public static EventManager initializeEventManager(Class<?> defaultEventHandler)
*
* @param eventManager The eventManager instance
*/
public static void validateEventManager(EventManager eventManager) {
public static void validateEventManager(@NotNull EventManager eventManager) {
if (eventManager.getEventHandlers().size() == 0) {
throw new RuntimeException("Fatal: No EventHandlers have been registered in the EventManager, please run the autodiscovery to add EventHandlers that are present in your classpath. -> eventHandler.autoDiscovery();");
}
Expand Down