refactor(Bugsnag*): rename Event, Error, and Thread to Bugsnag{name} so that the public API doesn't pollute common java.lang classes (and Event)

Author: lemnik

bugsnag-spring/src/main/java/com/bugsnag/BugsnagSpringConfiguration.java

@@ -28,7 +28,7 @@ public class BugsnagSpringConfiguration implements InitializingBean {
     Callback springVersionErrorCallback() {
         Callback callback = new Callback() {
             @Override
-            public boolean onError(Event report) {
+            public boolean onError(BugsnagEvent report) {
                 addSpringRuntimeVersion(report.getDevice());
                 return true;
             }

bugsnag-spring/src/main/java/com/bugsnag/ExceptionClassCallback.java

@@ -111,7 +111,7 @@ class ExceptionClassCallback implements Callback {
     }
 
     @Override
-    public boolean onError(Event event) {
+    public boolean onError(BugsnagEvent event) {
 
         HandledState handledState = event.getHandledState();
 

bugsnag-spring/src/main/java/com/bugsnag/SpringBootConfiguration.java

@@ -19,7 +19,7 @@ public class SpringBootConfiguration {
     Callback springBootVersionErrorCallback() {
         Callback callback = new Callback() {
             @Override
-            public boolean onError(Event report) {
+            public boolean onError(BugsnagEvent report) {
                 addSpringRuntimeVersion(report.getDevice());
                 return true;
             }

bugsnag-spring/src/test/java/com/bugsnag/NotifierTest.java

@@ -11,7 +11,7 @@
 
 public class NotifierTest {
 
-    private Event event;
+    private BugsnagEvent event;
     private Configuration config;
     private SessionPayload sessionPayload;
 
@@ -23,7 +23,7 @@ public class NotifierTest {
     @Before
     public void setUp() throws Throwable {
         config = new Configuration("api-key");
-        event = new Event(config, new RuntimeException());
+        event = new BugsnagEvent(config, new RuntimeException());
         sessionPayload = new SessionPayload(Collections.<SessionCount>emptyList(), config);
     }
 

bugsnag-spring/src/test/java/com/bugsnag/SpringAsyncTest.java

@@ -50,7 +50,7 @@ public void setUp() {
     public void bugsnagNotifyWhenAsyncVoidReturnTypeException() {
         asyncService.throwExceptionVoid();
 
-        Event event = verifyAndGetReport(delivery);
+        BugsnagEvent event = verifyAndGetReport(delivery);
 
         // Assert that the exception was detected correctly
         assertEquals("Async void test", event.getExceptionMessage());
@@ -71,7 +71,7 @@ public void bugsnagNotifyWhenAsyncVoidReturnTypeException() {
     public void bugsnagNotifyWhenAsyncFutureReturnTypeException() {
         asyncService.throwExceptionFuture();
 
-        Event event = verifyAndGetReport(delivery);
+        BugsnagEvent event = verifyAndGetReport(delivery);
 
         // Assert that the exception was detected correctly
         assertEquals("Async future test", event.getExceptionMessage());

bugsnag-spring/src/test/java/com/bugsnag/SpringMvcTest.java

@@ -83,7 +83,7 @@ public void setUp() {
     public void bugsnagNotifyWhenUncaughtControllerException() {
         callRuntimeExceptionEndpoint();
 
-        Event event = verifyAndGetReport(delivery);
+        BugsnagEvent event = verifyAndGetReport(delivery);
 
         // Assert that the exception was detected correctly
         assertEquals("Test", event.getExceptionMessage());
@@ -129,7 +129,7 @@ public void noBugsnagSessionStartedWhenAutoCaptureSessionsFalse() {
     public void requestMetadataSetCorrectly() {
         callRuntimeExceptionEndpoint();
 
-        Event event = verifyAndGetReport(delivery);
+        BugsnagEvent event = verifyAndGetReport(delivery);
 
         // Check that the context is set to the HTTP method and URI of the endpoint
         assertEquals("GET /throw-runtime-exception", event.getContext());
@@ -161,7 +161,7 @@ public void requestMetadataSetCorrectly() {
     public void springVersionSetCorrectly() {
         callRuntimeExceptionEndpoint();
 
-        Event event = verifyAndGetReport(delivery);
+        BugsnagEvent event = verifyAndGetReport(delivery);
 
         // Check that the Spring version is set as expected
         Map<String, Object> deviceMetadata = event.getDevice();
@@ -175,7 +175,7 @@ public void springVersionSetCorrectly() {
     public void unhandledTypeMismatchExceptionSeverityInfo() {
         callUnhandledTypeMismatchExceptionEndpoint();
 
-        Event event = verifyAndGetReport(delivery);
+        BugsnagEvent event = verifyAndGetReport(delivery);
 
         assertTrue(event.getUnhandled());
         assertEquals("info", event.getSeverity());
@@ -187,10 +187,10 @@ public void unhandledTypeMismatchExceptionSeverityInfo() {
     @Test
     public void unhandledTypeMismatchExceptionCallbackSeverity()
             throws IllegalAccessException, NoSuchFieldException {
-        Event event;
+        BugsnagEvent event;
         Callback callback = new Callback() {
             @Override
-            public boolean onError(Event report) {
+            public boolean onError(BugsnagEvent report) {
                 report.setSeverity(Severity.WARNING);
                 return true;
             }
@@ -219,7 +219,7 @@ public boolean onError(Event report) {
     public void handledTypeMismatchExceptionUserSeverity() {
         callHandledTypeMismatchExceptionUserSeverityEndpoint();
 
-        Event event = verifyAndGetReport(delivery);
+        BugsnagEvent event = verifyAndGetReport(delivery);
 
         assertFalse(event.getUnhandled());
         assertEquals("warning", event.getSeverity());
@@ -231,7 +231,7 @@ public void handledTypeMismatchExceptionUserSeverity() {
     public void handledTypeMismatchExceptionCallbackSeverity() {
         callHandledTypeMismatchExceptionCallbackSeverityEndpoint();
 
-        Event event = verifyAndGetReport(delivery);
+        BugsnagEvent event = verifyAndGetReport(delivery);
 
         assertFalse(event.getUnhandled());
         assertEquals("warning", event.getSeverity());

bugsnag-spring/src/test/java/com/bugsnag/SpringScheduledTaskTest.java

@@ -70,7 +70,7 @@ public void run() {
         // Run the task now and wait for it to finish
         scheduler.submit(exampleRunnable).get();
 
-        Event event = verifyAndGetReport(delivery);
+        BugsnagEvent event = verifyAndGetReport(delivery);
 
         // Assert that the exception was detected correctly
         assertEquals("Scheduled test", event.getExceptionMessage());

bugsnag-spring/src/test/java/com/bugsnag/TestUtils.java

@@ -16,7 +16,7 @@ class TestUtils {
     /**
      * Verify that a report was received, then capture and return that report
      */
-    static Event verifyAndGetReport(Delivery delivery) {
+    static BugsnagEvent verifyAndGetReport(Delivery delivery) {
         ArgumentCaptor<Notification> notificationCaptor =
                 ArgumentCaptor.forClass(Notification.class);
         verify(delivery, timeout(100).times(1)).deliver(

bugsnag-spring/src/test/java/com/bugsnag/testapp/springboot/TestController.java

@@ -2,7 +2,7 @@
 
 import com.bugsnag.Bugsnag;
 
-import com.bugsnag.Event;
+import com.bugsnag.BugsnagEvent;
 import com.bugsnag.Severity;
 import com.bugsnag.callbacks.Callback;
 
@@ -67,7 +67,7 @@ public void handledTypeMismatchExceptionCallbackSeverity() {
         } catch (TypeMismatchException ex) {
             bugsnag.notify(ex, new Callback() {
                 @Override
-                public boolean onError(Event event) {
+                public boolean onError(BugsnagEvent event) {
                     event.setSeverity(Severity.WARNING);
                     return true;
                 }

bugsnag/src/main/java/com/bugsnag/Bugsnag.java

@@ -122,7 +122,7 @@ public void run() {
     }
 
     private void addSessionTrackingShutdownHook() {
-        Runtime.getRuntime().addShutdownHook(new Thread() {
+        Runtime.getRuntime().addShutdownHook(new java.lang.Thread() {
             @Override
             public void run() {
                 close();
@@ -349,13 +349,13 @@ public void setTimeout(int timeout) {
      *
      * @param throwable the exception to send to Bugsnag
      * @return the report object
-     * @see Event
-     * @see #notify(Event)
+     * @see BugsnagEvent
+     * @see #notify(BugsnagEvent)
      */
-    public Event buildReport(Throwable throwable) {
+    public BugsnagEvent buildReport(Throwable throwable) {
         HandledState handledState = HandledState.newInstance(
                 HandledState.SeverityReasonType.REASON_HANDLED_EXCEPTION);
-        return new Event(config, throwable, handledState, Thread.currentThread(), featureFlagStore);
+        return new BugsnagEvent(config, throwable, handledState, java.lang.Thread.currentThread(), featureFlagStore);
     }
 
     /**
@@ -411,39 +411,39 @@ public boolean notify(Throwable throwable, Severity severity, Callback callback)
 
         HandledState handledState = HandledState.newInstance(
                 HandledState.SeverityReasonType.REASON_USER_SPECIFIED, severity);
-        Event event = new Event(config, throwable, handledState, Thread.currentThread(), featureFlagStore);
+        BugsnagEvent event = new BugsnagEvent(config, throwable, handledState, java.lang.Thread.currentThread(), featureFlagStore);
         return notify(event, callback);
     }
 
     /**
      * Notify Bugsnag of an exception and provide custom diagnostic data
      * for this particular error report.
      *
-     * @param event the {@link Event} object to send to Bugsnag
+     * @param event the {@link BugsnagEvent} object to send to Bugsnag
      * @return true unless the error report was ignored
-     * @see Event
+     * @see BugsnagEvent
      * @see #buildReport
      */
-    public boolean notify(Event event) {
+    public boolean notify(BugsnagEvent event) {
         return notify(event, null);
     }
 
-    boolean notify(Throwable throwable, HandledState handledState, Thread currentThread) {
-        Event event = new Event(config, throwable, handledState, currentThread, featureFlagStore);
+    boolean notify(Throwable throwable, HandledState handledState, java.lang.Thread currentThread) {
+        BugsnagEvent event = new BugsnagEvent(config, throwable, handledState, currentThread, featureFlagStore);
         return notify(event, null);
     }
 
     /**
      * Notify Bugsnag of an exception and provide custom diagnostic data
      * for this particular error report.
      *
-     * @param event         the {@link Event} object to send to Bugsnag
+     * @param event         the {@link BugsnagEvent} object to send to Bugsnag
      * @param reportCallback the {@link Callback} object to run for this Report
      * @return false if the error report was ignored
-     * @see Event
+     * @see BugsnagEvent
      * @see #buildReport
      */
-    public boolean notify(Event event, Callback reportCallback) {
+    public boolean notify(BugsnagEvent event, Callback reportCallback) {
         if (event == null) {
             LOGGER.warn("Tried to call notify with a null Report");
             return false;
@@ -675,7 +675,7 @@ SessionTracker getSessionTracker() {
      * @return clients which catch uncaught exceptions
      */
     public static Set<Bugsnag> uncaughtExceptionClients() {
-        UncaughtExceptionHandler handler = Thread.getDefaultUncaughtExceptionHandler();
+        UncaughtExceptionHandler handler = java.lang.Thread.getDefaultUncaughtExceptionHandler();
         if (handler instanceof ExceptionHandler) {
             ExceptionHandler bugsnagHandler = (ExceptionHandler) handler;
             return Collections.unmodifiableSet(bugsnagHandler.uncaughtExceptionClients());