Support Java 7

Author: schmidt-sebastian

firebase-firestore/src/main/java/com/google/firebase/firestore/bundle/BundleElement.java

@@ -19,19 +19,4 @@
 
 public interface BundleElement {
 
-  static BundleElement fromJson(BundleSerializer serializer, String json) throws JSONException {
-    JSONObject object = new JSONObject(json);
-
-    if (object.has("metadata")) {
-      return serializer.decodeBundleMetadata(object.getJSONObject("metadata"));
-    } else if (object.has("namedQuery")) {
-      return serializer.decodeNamedQuery(object.getJSONObject("namedQuery"));
-    } else if (object.has("documentMetadata")) {
-      return serializer.decodeBundledDocumentMetadata(object.getJSONObject("documentMetadata"));
-    } else if (object.has("document")) {
-      return serializer.decodeDocument(object.getJSONObject("document"));
-    } else {
-      throw new IllegalArgumentException("Cannot decode unknown Bundle element: " + json);
-    }
-  }
 }

firebase-firestore/src/main/java/com/google/firebase/firestore/bundle/BundleReader.java

@@ -21,6 +21,7 @@
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import org.json.JSONException;
+import org.json.JSONObject;
 
 /**
  * Reads the length-prefixed JSON stream for Bundles.
@@ -101,7 +102,7 @@ private BundleElement readNextElement() throws IOException, JSONException {
 
     String json = readJsonString(Integer.parseInt(lengthPrefix));
     bytesRead += lengthPrefix.length() + json.length();
-    return BundleElement.fromJson(serializer, json);
+    return decodeBundleElement(json);
   }
 
   /**
@@ -190,6 +191,23 @@ private boolean pullMoreData() throws IOException {
     return buffer.remaining() > 0;
   }
 
+  /** Converts a JSON-encoded bundle element into its model class. */
+  private BundleElement decodeBundleElement(String json) throws JSONException {
+    JSONObject object = new JSONObject(json);
+
+    if (object.has("metadata")) {
+      return serializer.decodeBundleMetadata(object.getJSONObject("metadata"));
+    } else if (object.has("namedQuery")) {
+      return serializer.decodeNamedQuery(object.getJSONObject("namedQuery"));
+    } else if (object.has("documentMetadata")) {
+      return serializer.decodeBundledDocumentMetadata(object.getJSONObject("documentMetadata"));
+    } else if (object.has("document")) {
+      return serializer.decodeDocument(object.getJSONObject("document"));
+    } else {
+      throw new IllegalArgumentException("Cannot decode unknown Bundle element: " + json);
+    }
+  }
+
   /** Closes the underlying stream and raises an IllegalArgumentException. */
   private void raiseError(String message) throws IOException {
     close();