Merge pull request #259 from bugsnag/address-compiler-warnings

Address javac compiler warnings and intellij inspections

Author: fractalwrench

CHANGELOG.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+## 2.X.X (TBD)
+
+### Bug fixes
+
+* (android) Address javac compiler warnings and intellij inspections
+  [#250](https://github.com/bugsnag/bugsnag-react-native/issues/250)
+
 ## 2.10.0 (2018-07-03)
 
 This release alters the behaviour of the notifier to track sessions automatically.

android/src/main/java/com/bugsnag/BugsnagReactNative.java

@@ -1,17 +1,19 @@
 package com.bugsnag;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
-import java.util.logging.Logger;
-import java.util.Map;
-import java.lang.String;
-import java.lang.NumberFormatException;
-import java.io.IOException;
-
+import android.app.Activity;
+import android.content.Context;
+import android.support.annotation.NonNull;
+
+import com.bugsnag.android.BreadcrumbType;
+import com.bugsnag.android.Bugsnag;
+import com.bugsnag.android.Callback;
+import com.bugsnag.android.Client;
+import com.bugsnag.android.Configuration;
+import com.bugsnag.android.JsonStream;
+import com.bugsnag.android.MetaData;
+import com.bugsnag.android.Report;
+import com.bugsnag.android.Severity;
+import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -21,13 +23,15 @@
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
-import com.facebook.react.ReactPackage;
 import com.facebook.react.uimanager.ViewManager;
 
-import android.content.Context;
-import android.app.Activity;
-
-import com.bugsnag.android.*;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
 
 
 public class BugsnagReactNative extends ReactContextBaseJavaModule {
@@ -113,7 +117,7 @@ public void notifyBlocking(ReadableMap payload, boolean blocking, com.facebook.r
       final String errorMessage = payload.getString("errorMessage");
       final String rawStacktrace = payload.getString("stacktrace");
 
-      logger.info(String.format("Sending exception: %s - %s\n",
+      logger.info(String.format("Sending exception: %s - %s %s\n",
                                 errorClass, errorMessage, rawStacktrace));
       JavaScriptException exc = new JavaScriptException(errorClass,
                                                         errorMessage,
@@ -152,7 +156,7 @@ public void clearUser() {
    * Convert a typed map into a string Map
    */
   private Map<String, String> readStringMap(ReadableMap map) {
-    Map output = new HashMap<String,String>();
+    Map<String,String> output = new HashMap<>();
     ReadableMapKeySetIterator iterator = map.keySetIterator();
     while (iterator.hasNextKey()) {
         String key = iterator.nextKey();
@@ -176,7 +180,7 @@ private Map<String, String> readStringMap(ReadableMap map) {
   }
 
   private Client getClient(String apiKey) {
-      Client client = null;
+      Client client;
       try {
           client = Bugsnag.getClient();
       } catch (IllegalStateException exception) {
@@ -199,7 +203,7 @@ private BreadcrumbType parseBreadcrumbType(String value) {
   }
 
   private void configureRuntimeOptions(Client client, ReadableMap options) {
-      client.setIgnoreClasses(new String[] {"com.facebook.react.common.JavascriptException"});
+      client.setIgnoreClasses("com.facebook.react.common.JavascriptException");
       Configuration config = client.getConfig();
       if (options.hasKey("appVersion")) {
           String version = options.getString("appVersion");
@@ -278,6 +282,7 @@ public List<Class<? extends JavaScriptModule>> createJSModules() {
     return Collections.emptyList();
   }
 
+  @SuppressWarnings("rawtypes") // the ReactPackage interface uses a raw type, ignore it
   @Override
   public List<ViewManager> createViewManagers(
           ReactApplicationContext reactContext) {
@@ -339,7 +344,7 @@ Severity parseSeverity(String value) {
      * Convert a typed map from JS into a Map
      */
     Map<String, Object> readObjectMap(ReadableMap map) {
-        Map output = new HashMap<String, Object>();
+        Map<String, Object> output = new HashMap<>();
         ReadableMapKeySetIterator iterator = map.keySetIterator();
 
         while (iterator.hasNextKey()) {
@@ -380,8 +385,11 @@ public void beforeNotify(Report report) {
             MetaData reportMetadata = report.getError().getMetaData();
             for (String tab : metadata.keySet()) {
                 Object value = metadata.get(tab);
+
                 if (value instanceof Map) {
-                    Map<String, Object> values = (Map<String, Object>)value;
+                    @SuppressWarnings("unchecked") // ignore type erasure when casting Map
+                    Map<String, Object> values = (Map<String, Object>) value;
+
                     for (String key : values.keySet()) {
                         reportMetadata.addToTab(tab, key, values.get(key));
                     }
@@ -395,7 +403,10 @@ public void beforeNotify(Report report) {
  * Creates a streamable exception with a JavaScript stacktrace
  */
 class JavaScriptException extends Exception implements JsonStream.Streamable {
+
     private static final String EXCEPTION_TYPE = "browserjs";
+    private static final long serialVersionUID = 1175784680140218622L;
+
     private final String name;
     private final String rawStacktrace;
 
@@ -405,7 +416,7 @@ class JavaScriptException extends Exception implements JsonStream.Streamable {
         this.rawStacktrace = rawStacktrace;
     }
 
-    public void toStream(JsonStream writer) throws IOException {
+    public void toStream(@NonNull JsonStream writer) throws IOException {
         writer.beginObject();
         writer.name("errorClass").value(name);
         writer.name("message").value(getLocalizedMessage());

examples/plain/android/app/src/main/java/com/bugsnagreactnativeexample/CrashyPackage.java

@@ -16,6 +16,7 @@ public List<Class<? extends JavaScriptModule>> createJSModules() {
     return Collections.emptyList();
   }
 
+  @SuppressWarnings("rawtypes") // the ReactPackage interface uses a raw type, ignore it
   @Override
   public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
     return Collections.emptyList();