Integration interface better compatibility with Kotlin null-safety

CHANGELOG.md

@@ -8,6 +8,7 @@
 * Enchancement: Support @SentrySpan and @SentryTransaction on classes and interfaces. (#1243)
 * Enchancement: Do not serialize empty collections and maps (#1245)
 * Ref: Simplify RestTemplate instrumentation (#1246)
+* Enchancement: Integration interface better compatibility with Kotlin null-safety
 
 # 4.1.0
 

sentry-spring-boot-starter/src/test/kotlin/io/sentry/spring/boot/SentryAutoConfigurationTest.kt

@@ -565,7 +565,7 @@ class SentryAutoConfigurationTest {
     }
 
     class CustomIntegration : Integration {
-        override fun register(hub: IHub?, options: SentryOptions?) {}
+        override fun register(hub: IHub, options: SentryOptions) {}
     }
 
     @Configuration(proxyBeanMethods = false)

sentry/src/main/java/io/sentry/Integration.java

@@ -1,5 +1,7 @@
 package io.sentry;
 
+import org.jetbrains.annotations.NotNull;
+
 /**
  * Code that provides middlewares, bindings or hooks into certain frameworks or environments, along
  * with code that inserts those bindings and activates them.
@@ -11,5 +13,5 @@ public interface Integration {
    * @param hub the Hub
    * @param options the options
    */
-  void register(IHub hub, SentryOptions options);
+  void register(@NotNull IHub hub, @NotNull SentryOptions options);
 }

sentry/src/main/java/io/sentry/SendCachedEnvelopeFireAndForgetIntegration.java

@@ -8,7 +8,7 @@
 /** Sends cached events over when your App. is starting. */
 public final class SendCachedEnvelopeFireAndForgetIntegration implements Integration {
 
-  private final SendFireAndForgetFactory factory;
+  private final @NotNull SendFireAndForgetFactory factory;
 
   public interface SendFireAndForget {
     void send();
@@ -21,7 +21,7 @@ public interface SendFireAndForgetDirPath {
 
   public interface SendFireAndForgetFactory {
     @Nullable
-    SendFireAndForget create(IHub hub, SentryOptions options);
+    SendFireAndForget create(@NotNull IHub hub, @NotNull SentryOptions options);
 
     default boolean hasValidPath(final @Nullable String dirPath, final @NotNull ILogger logger) {
       if (dirPath == null || dirPath.isEmpty()) {

sentry/src/test/java/io/sentry/HubTest.kt

@@ -581,9 +581,9 @@ class HubTest {
         doAnswer {
             val hub = it.arguments[0] as IHub
             assertTrue(hub.isEnabled)
-        }.whenever(mock).register(any(), eq(options))
+        }.whenever(mock).register(any(), eq(options!!))
 
-        verify(mock).register(any(), eq(options))
+        verify(mock).register(any(), eq(options!!))
     }
 
     //region setLevel tests

sentry/src/test/java/io/sentry/SendCachedEnvelopeFireAndForgetIntegrationTest.kt

@@ -63,7 +63,7 @@ class SendCachedEnvelopeFireAndForgetIntegrationTest {
     }
 
     private class CustomFactory : SendCachedEnvelopeFireAndForgetIntegration.SendFireAndForgetFactory {
-        override fun create(hub: IHub?, options: SentryOptions?): SendCachedEnvelopeFireAndForgetIntegration.SendFireAndForget? {
+        override fun create(hub: IHub, options: SentryOptions): SendCachedEnvelopeFireAndForgetIntegration.SendFireAndForget? {
             return null
         }
     }