added requireNonNull utils

sentry/src/main/java/io/sentry/SentryClientFactory.java

@@ -1,16 +1,16 @@
 package io.sentry;
 
-import static java.util.Objects.requireNonNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
 import io.sentry.config.Lookup;
 import io.sentry.dsn.Dsn;
 import io.sentry.util.Nullable;
+import io.sentry.util.Objects;
 import io.sentry.util.Util;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Factory in charge of creating {@link SentryClient} instances. The implementations should have a constructor with a
@@ -32,7 +32,7 @@ public abstract class SentryClientFactory {
      * @param lookup the lookup to use
      */
     protected SentryClientFactory(Lookup lookup) {
-        this.lookup = requireNonNull(lookup);
+        this.lookup = Objects.requireNonNull(lookup);
     }
 
     /**

sentry/src/main/java/io/sentry/SentryOptions.java

@@ -1,11 +1,10 @@
 package io.sentry;
 
-import static java.util.Objects.requireNonNull;
-
 import io.sentry.config.Lookup;
 import io.sentry.config.ResourceLoader;
 import io.sentry.dsn.Dsn;
 import io.sentry.util.Nullable;
+import io.sentry.util.Objects;
 import io.sentry.util.Util;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,7 +38,7 @@ public final class SentryOptions {
      * @throws NullPointerException if lookup is null
      */
     public SentryOptions(Lookup lookup, @Nullable String dsn, @Nullable SentryClientFactory sentryClientFactory) {
-        this.lookup = requireNonNull(lookup, "lookup");
+        this.lookup = Objects.requireNonNull(lookup, "lookup");
         this.dsn = resolveDsn(lookup, dsn);
         this.sentryClientFactory = sentryClientFactory == null
                 ? SentryClientFactory.instantiateFrom(this.lookup, this.dsn)
@@ -164,7 +163,7 @@ public Lookup getLookup() {
      * @param lookup the lookup to use
      */
     public void setLookup(Lookup lookup) {
-        this.lookup = requireNonNull(lookup);
+        this.lookup = Objects.requireNonNull(lookup);
     }
 
     /**

sentry/src/main/java/io/sentry/util/Objects.java

@@ -0,0 +1,37 @@
+package io.sentry.util;
+
+/**
+ * backport of Objects Utils which is not available on Android yet.
+ */
+public final class Objects {
+    private Objects() {
+
+    }
+
+    /**
+     * backport of Objects.requireNonNull which is not available on Android yet.
+     * @param obj object to NPE check
+     * @param message custom message for NullPointerException
+     * @param <T> obj type
+     * @return returns obj itself if it's not null
+     */
+    public static <T> T requireNonNull(T obj, String message) {
+        if (obj == null) {
+            throw new NullPointerException(message);
+        }
+        return obj;
+    }
+
+    /**
+     * backport of Objects.requireNonNull which is not available on Android yet.
+     * @param obj object to NPE check
+     * @param <T> obj type
+     * @return returns obj itself if it's not null
+     */
+    public static <T> T requireNonNull(T obj) {
+        if (obj == null) {
+            throw new NullPointerException();
+        }
+        return obj;
+    }
+}