ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Nag user (and sentry) if event handlers declare to throw an exception

Browse Source
This commit is contained in:
Lucwousin
2020-05-14 20:35:27 +02:00
parent 59d34418b4
commit f231af9a4f
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
runelite-client/src/main/java/net/runelite/client/plugins/Plugin.java
View File

@@ -29,17 +29,20 @@ import com.google.inject.Binder;
import com.google.inject.Injector; import com.google.inject.Injector;
import com.google.inject.Module; import com.google.inject.Module;
import io.reactivex.rxjava3.functions.Consumer; import io.reactivex.rxjava3.functions.Consumer;
import io.sentry.Sentry;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Set; import java.util.Set;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.Getter; import lombok.Getter;
import lombok.Value; import lombok.Value;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.events.Event; import net.runelite.api.events.Event;
import net.runelite.client.eventbus.EventBus; import net.runelite.client.eventbus.EventBus;
import net.runelite.client.eventbus.EventScheduler; import net.runelite.client.eventbus.EventScheduler;
import net.runelite.client.eventbus.Subscribe; import net.runelite.client.eventbus.Subscribe;
import org.pf4j.ExtensionPoint; import org.pf4j.ExtensionPoint;
@Slf4j
public abstract class Plugin implements Module, ExtensionPoint public abstract class Plugin implements Module, ExtensionPoint
{ {
private final Set<Subscription> annotatedSubscriptions = findSubscriptions(); private final Set<Subscription> annotatedSubscriptions = findSubscriptions();
@@ -90,6 +93,11 @@ public abstract class Plugin implements Module, ExtensionPoint
assert Event.class.isAssignableFrom(type) : "Parameters of methods annotated with @Subscribe should implement net.runelite.api.events.Event"; assert Event.class.isAssignableFrom(type) : "Parameters of methods annotated with @Subscribe should implement net.runelite.api.events.Event";
assert method.getReturnType() == void.class : "Methods annotated with @Subscribe should have a void return type"; assert method.getReturnType() == void.class : "Methods annotated with @Subscribe should have a void return type";
if (method.getExceptionTypes().length != 0)
{
log.warn("Event handlers should handle all checked exceptions themselves " + method.toString());
Sentry.capture("EventHandler " + method.toString()); // Spam Owain's inbox with this :)
}
method.setAccessible(true); method.setAccessible(true);
@@ -102,13 +110,14 @@ public abstract class Plugin implements Module, ExtensionPoint
} }
@Value @Value
@SuppressWarnings("rawtypes")
private static class Subscription private static class Subscription
{ {
private final Class type; Class type;
private final Consumer method; Consumer method;
private final int takeUntil; int takeUntil;
private final EventScheduler subscribe; EventScheduler subscribe;
private final EventScheduler observe; EventScheduler observe;
} }
public void resetConfiguration() public void resetConfiguration()