Update FirebaseJson, add FirebaseJson to FirebaseData and StreamData

mobizt · Aug 19, 2019 · 469daf9 · 469daf9
1 parent 3e895ef
commit 469daf9
Show file tree

Hide file tree

Showing 19 changed files with 450 additions and 38 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Firebase Realtime Database Arduino Library for ESP8266
 
 
-Google's Firebase Realtime Database Arduino Library for ESP8266 v 2.4.0
+Google's Firebase Realtime Database Arduino Library for ESP8266 v 2.4.1
 
 
 This library supports ESP8266 MCU from Espressif. The following are platforms which library are also available.

diff --git a/examples/Basic/Basic.ino b/examples/Basic/Basic.ino
@@ -23,6 +23,8 @@
 //Define FirebaseESP8266 data object
 FirebaseData firebaseData;
 
+void printJsonObjectContent(FirebaseData &data);
+
 void setup()
 {
 
@@ -84,7 +86,7 @@ void setup()
       else if (firebaseData.dataType() == "string")
         Serial.println(firebaseData.stringData());
       else if (firebaseData.dataType() == "json")
-        Serial.println(firebaseData.jsonData());
+        printJsonObjectContent(firebaseData);
       Serial.println("------------------------------------");
       Serial.println();
     }
@@ -121,7 +123,7 @@ void setup()
       else if (firebaseData.dataType() == "string")
         Serial.println(firebaseData.stringData());
       else if (firebaseData.dataType() == "json")
-        Serial.println(firebaseData.jsonData());
+        printJsonObjectContent(firebaseData);
       Serial.println("------------------------------------");
       Serial.println();
     }
@@ -214,7 +216,7 @@ void setup()
       else if (firebaseData.dataType() == "string")
         Serial.println(firebaseData.stringData());
       else if (firebaseData.dataType() == "json")
-        Serial.println(firebaseData.jsonData());
+        printJsonObjectContent(firebaseData);
       Serial.println("------------------------------------");
       Serial.println();
     }
@@ -231,3 +233,25 @@ void setup()
 void loop()
 {
 }
+
+void printJsonObjectContent(FirebaseData &data){
+  size_t tokenCount = data.jsonObject().parse(false).getJsonObjectIteratorCount();
+  String key;
+  String value;
+  FirebaseJsonObject jsonParseResult;
+  Serial.println();
+  for (size_t i = 0; i < tokenCount; i++)
+  {
+    data.jsonObject().jsonObjectiterator(i,key,value);
+    jsonParseResult = data.jsonObject().parseResult();
+    Serial.print("KEY: ");
+    Serial.print(key);
+    Serial.print(", ");
+    Serial.print("VALUE: ");
+    Serial.print(value); 
+    Serial.print(", ");
+    Serial.print("TYPE: ");
+    Serial.println(jsonParseResult.type);        
+
+  }
+}
diff --git a/examples/Basic_with_rootCA/Basic_with_rootCA.ino b/examples/Basic_with_rootCA/Basic_with_rootCA.ino
@@ -47,6 +47,8 @@ const char root_ca[] PROGMEM = "-----BEGIN CERTIFICATE-----\n"
 //Define FirebaseESP8266 data object
 FirebaseData firebaseData;
 
+void printJsonObjectContent(FirebaseData &data);
+
 void setup()
 {
 
@@ -120,7 +122,7 @@ void setup()
       else if (firebaseData.dataType() == "string")
         Serial.println(firebaseData.stringData());
       else if (firebaseData.dataType() == "json")
-        Serial.println(firebaseData.jsonData());
+        printJsonObjectContent(firebaseData);
       Serial.println("------------------------------------");
       Serial.println();
     }
@@ -157,7 +159,7 @@ void setup()
       else if (firebaseData.dataType() == "string")
         Serial.println(firebaseData.stringData());
       else if (firebaseData.dataType() == "json")
-        Serial.println(firebaseData.jsonData());
+        printJsonObjectContent(firebaseData);
       Serial.println("------------------------------------");
       Serial.println();
     }
@@ -248,7 +250,7 @@ void setup()
       else if (firebaseData.dataType() == "string")
         Serial.println(firebaseData.stringData());
       else if (firebaseData.dataType() == "json")
-        Serial.println(firebaseData.jsonData());
+        printJsonObjectContent(firebaseData);
       Serial.println("------------------------------------");
       Serial.println();
     }
@@ -265,3 +267,25 @@ void setup()
 void loop()
 {
 }
+
+void printJsonObjectContent(FirebaseData &data){
+  size_t tokenCount = data.jsonObject().parse(false).getJsonObjectIteratorCount();
+  String key;
+  String value;
+  FirebaseJsonObject jsonParseResult;
+  Serial.println();
+  for (size_t i = 0; i < tokenCount; i++)
+  {
+    data.jsonObject().jsonObjectiterator(i,key,value);
+    jsonParseResult = data.jsonObject().parseResult();
+    Serial.print("KEY: ");
+    Serial.print(key);
+    Serial.print(", ");
+    Serial.print("VALUE: ");
+    Serial.print(value); 
+    Serial.print(", ");
+    Serial.print("TYPE: ");
+    Serial.println(jsonParseResult.type);        
+
+  }
+}
diff --git a/examples/Blob/Blob.ino b/examples/Blob/Blob.ino
@@ -27,6 +27,8 @@
 //Define Firebase Data object
 FirebaseData firebaseData;
 
+void printJsonObjectContent(FirebaseData &data);
+
 String path = "/ESP8266_Test";
 
 void setup()
@@ -164,7 +166,7 @@ void setup()
       else if (firebaseData.dataType() == "string")
         Serial.println(firebaseData.stringData());
       else if (firebaseData.dataType() == "json")
-        Serial.println(firebaseData.jsonData());
+        printJsonObjectContent(firebaseData);
       else if (firebaseData.dataType() == "blob")
       {
 
@@ -204,3 +206,25 @@ void setup()
 void loop()
 {
 }
+
+void printJsonObjectContent(FirebaseData &data){
+  size_t tokenCount = data.jsonObject().parse(false).getJsonObjectIteratorCount();
+  String key;
+  String value;
+  FirebaseJsonObject jsonParseResult;
+  Serial.println();
+  for (size_t i = 0; i < tokenCount; i++)
+  {
+    data.jsonObject().jsonObjectiterator(i,key,value);
+    jsonParseResult = data.jsonObject().parseResult();
+    Serial.print("KEY: ");
+    Serial.print(key);
+    Serial.print(", ");
+    Serial.print("VALUE: ");
+    Serial.print(value); 
+    Serial.print(", ");
+    Serial.print("TYPE: ");
+    Serial.println(jsonParseResult.type);        
+
+  }
+}
diff --git a/examples/Blynk/Blynk.ino b/examples/Blynk/Blynk.ino
@@ -34,6 +34,8 @@
 FirebaseData firebaseData1;
 FirebaseData firebaseData2;
 
+void printJsonObjectContent(FirebaseData &data);
+
 String path = "/Blynk_Test/Int";
 
 //D4 or GPIO2 on Wemos D1 mini
@@ -138,7 +140,7 @@ void loop()
     else if (firebaseData1.dataType() == "string")
       Serial.println(firebaseData1.stringData());
     else if (firebaseData1.dataType() == "json")
-      Serial.println(firebaseData1.jsonData());
+      printJsonObjectContent(firebaseData1);
     Serial.println("------------------------------------");
     Serial.println();
   }
@@ -167,7 +169,7 @@ BLYNK_WRITE(V1)
     else if (firebaseData2.dataType() == "string")
       Serial.println(firebaseData2.stringData());
     else if (firebaseData2.dataType() == "json")
-      Serial.println(firebaseData2.jsonData());
+      printJsonObjectContent(firebaseData2);
     Serial.println("------------------------------------");
     Serial.println();
   }
@@ -178,4 +180,27 @@ BLYNK_WRITE(V1)
     Serial.println("------------------------------------");
     Serial.println();
   }
+}
+
+
+void printJsonObjectContent(FirebaseData &data){
+  size_t tokenCount = data.jsonObject().parse(false).getJsonObjectIteratorCount();
+  String key;
+  String value;
+  FirebaseJsonObject jsonParseResult;
+  Serial.println();
+  for (size_t i = 0; i < tokenCount; i++)
+  {
+    data.jsonObject().jsonObjectiterator(i,key,value);
+    jsonParseResult = data.jsonObject().parseResult();
+    Serial.print("KEY: ");
+    Serial.print(key);
+    Serial.print(", ");
+    Serial.print("VALUE: ");
+    Serial.print(value); 
+    Serial.print(", ");
+    Serial.print("TYPE: ");
+    Serial.println(jsonParseResult.type);        
+
+  }
 }
diff --git a/examples/Data_filter/Data_filter.ino b/examples/Data_filter/Data_filter.ino
@@ -25,6 +25,8 @@
 //Define Firebase Data object
 FirebaseData firebaseData;
 
+void printJsonObjectContent(FirebaseData &data);
+
 void setup()
 {
 
@@ -113,7 +115,7 @@ void setup()
 
     Serial.println("PASSED");
     Serial.println("JSON DATA: ");
-    Serial.println(firebaseData.jsonData());
+    printJsonObjectContent(firebaseData);
     Serial.println("------------------------------------");
     Serial.println();
   }
@@ -132,3 +134,25 @@ void setup()
 void loop()
 {
 }
+
+void printJsonObjectContent(FirebaseData &data){
+  size_t tokenCount = data.jsonObject().parse(false).getJsonObjectIteratorCount();
+  String key;
+  String value;
+  FirebaseJsonObject jsonParseResult;
+  Serial.println();
+  for (size_t i = 0; i < tokenCount; i++)
+  {
+    data.jsonObject().jsonObjectiterator(i,key,value);
+    jsonParseResult = data.jsonObject().parseResult();
+    Serial.print("KEY: ");
+    Serial.print(key);
+    Serial.print(", ");
+    Serial.print("VALUE: ");
+    Serial.print(value); 
+    Serial.print(", ");
+    Serial.print("TYPE: ");
+    Serial.println(jsonParseResult.type);        
+
+  }
+}
diff --git a/examples/Different_objects_stream/Different_objects_stream.ino b/examples/Different_objects_stream/Different_objects_stream.ino
@@ -29,6 +29,8 @@
 FirebaseData firebaseData1;
 FirebaseData firebaseData2;
 
+void printJsonObjectContent(FirebaseData &data);
+
 unsigned long sendDataPrevMillis1;
 
 uint16_t count1;
@@ -110,7 +112,7 @@ void loop()
     else if (firebaseData2.dataType() == "string")
       Serial.println(firebaseData2.stringData());
     else if (firebaseData2.dataType() == "json")
-      Serial.println(firebaseData2.jsonData());
+      printJsonObjectContent(firebaseData2);
     else if (firebaseData2.dataType() == "blob")
     {
       std::vector<uint8_t> blob = firebaseData2.blobData();
@@ -166,4 +168,27 @@ void loop()
     Serial.println(ESP.getFreeHeap());
     Serial.println();
   }
+}
+
+
+void printJsonObjectContent(FirebaseData &data){
+  size_t tokenCount = data.jsonObject().parse(false).getJsonObjectIteratorCount();
+  String key;
+  String value;
+  FirebaseJsonObject jsonParseResult;
+  Serial.println();
+  for (size_t i = 0; i < tokenCount; i++)
+  {
+    data.jsonObject().jsonObjectiterator(i,key,value);
+    jsonParseResult = data.jsonObject().parseResult();
+    Serial.print("KEY: ");
+    Serial.print(key);
+    Serial.print(", ");
+    Serial.print("VALUE: ");
+    Serial.print(value); 
+    Serial.print(", ");
+    Serial.print("TYPE: ");
+    Serial.println(jsonParseResult.type);        
+
+  }
 }
diff --git a/examples/ETag/ETag.ino b/examples/ETag/ETag.ino
@@ -25,6 +25,8 @@
 //Define Firebase Data object
 FirebaseData firebaseData;
 
+void printJsonObjectContent(FirebaseData &data);
+
 void setup()
 {
 
@@ -74,7 +76,7 @@ void setup()
         else if (firebaseData.dataType() == "string")
             Serial.println(firebaseData.stringData());
         else if (firebaseData.dataType() == "json")
-            Serial.println(firebaseData.jsonData());
+            printJsonObjectContent(firebaseData);
         Serial.println("------------------------------------");
         Serial.println();
     }
@@ -108,7 +110,7 @@ void setup()
         else if (firebaseData.dataType() == "string")
             Serial.println(firebaseData.stringData());
         else if (firebaseData.dataType() == "json")
-            Serial.println(firebaseData.jsonData());
+            printJsonObjectContent(firebaseData);
         Serial.println("------------------------------------");
         Serial.println();
     }
@@ -142,7 +144,7 @@ void setup()
         else if (firebaseData.dataType() == "string")
             Serial.println(firebaseData.stringData());
         else if (firebaseData.dataType() == "json")
-            Serial.println(firebaseData.jsonData());
+            printJsonObjectContent(firebaseData);
         Serial.println("------------------------------------");
         Serial.println();
     }
@@ -171,7 +173,7 @@ void setup()
             else if (firebaseData.dataType() == "string")
                 Serial.println(firebaseData.stringData());
             else if (firebaseData.dataType() == "json")
-                Serial.println(firebaseData.jsonData());
+                printJsonObjectContent(firebaseData);
         }
 
         Serial.println("------------------------------------");
@@ -201,3 +203,25 @@ void setup()
 void loop()
 {
 }
+
+void printJsonObjectContent(FirebaseData &data){
+  size_t tokenCount = data.jsonObject().parse(false).getJsonObjectIteratorCount();
+  String key;
+  String value;
+  FirebaseJsonObject jsonParseResult;
+  Serial.println();
+  for (size_t i = 0; i < tokenCount; i++)
+  {
+    data.jsonObject().jsonObjectiterator(i,key,value);
+    jsonParseResult = data.jsonObject().parseResult();
+    Serial.print("KEY: ");
+    Serial.print(key);
+    Serial.print(", ");
+    Serial.print("VALUE: ");
+    Serial.print(value); 
+    Serial.print(", ");
+    Serial.print("TYPE: ");
+    Serial.println(jsonParseResult.type);        
+
+  }
+}