refactor: extract separate method for deserialising individual Threads

bugsnag · Jan 18, 2019 · bdc8386 · bdc8386
1 parent 31bdd2d
commit bdc8386
Showing 1 changed file with 42 additions and 31 deletions.
diff --git a/sdk/src/main/java/com/bugsnag/android/ErrorReader.java b/sdk/src/main/java/com/bugsnag/android/ErrorReader.java
@@ -389,43 +389,54 @@ private static ThreadState readThreadState(Configuration config, JsonReader read
         List<CachedThread> threads = new ArrayList<>();
         reader.beginArray();
         while (reader.hasNext()) {
-            long id = 0;
-            String name = null;
-            String type = null;
-            boolean errorReportingThread = false;
-            StackTraceElement[] frames = null;
-            reader.beginObject();
-            while (reader.hasNext()) {
-                switch (reader.nextName()) {
-                    case "id":
-                        id = reader.nextLong();
-                        break;
-                    case "name":
-                        name = reader.nextString();
-                        break;
-                    case "type":
-                        type = reader.nextString();
-                        break;
-                    case "stacktrace":
-                        frames = readStackFrames(reader);
-                        break;
-                    case "errorReportingThread":
-                        errorReportingThread = reader.nextBoolean();
-                        break;
-                    default:
-                        reader.skipValue();
-                        break;
-                }
-            }
-            reader.endObject();
-            if (type != null && frames != null) {
-                threads.add(new CachedThread(config, id, name, type, errorReportingThread, frames));
+            CachedThread cachedThread = readThread(config, reader);
+
+            if (cachedThread != null) {
+                threads.add(cachedThread);
             }
         }
         reader.endArray();
         return new ThreadState(threads.toArray(new CachedThread[threads.size()]));
     }
 
+    private static CachedThread readThread(Configuration config,
+                                           JsonReader reader) throws IOException {
+        long id = 0;
+        String name = null;
+        String type = null;
+        boolean errorReportingThread = false;
+        StackTraceElement[] frames = null;
+        reader.beginObject();
+        while (reader.hasNext()) {
+            switch (reader.nextName()) {
+                case "id":
+                    id = reader.nextLong();
+                    break;
+                case "name":
+                    name = reader.nextString();
+                    break;
+                case "type":
+                    type = reader.nextString();
+                    break;
+                case "stacktrace":
+                    frames = readStackFrames(reader);
+                    break;
+                case "errorReportingThread":
+                    errorReportingThread = reader.nextBoolean();
+                    break;
+                default:
+                    reader.skipValue();
+                    break;
+            }
+        }
+        reader.endObject();
+        if (type != null && frames != null) {
+            return new CachedThread(config, id, name, type, errorReportingThread, frames);
+        } else {
+            return null;
+        }
+    }
+
     private static Map<String, Object> jsonObjectToMap(JsonReader reader) throws IOException {
         Map<String, Object> data = new HashMap<>();
         reader.beginObject();