Cleanup of some dead or unnecessary code

Author: aashishpatil-g

packages/firebase_data_connect/firebase_data_connect/lib/src/cache/cache_data_types.dart

@@ -81,9 +81,6 @@ class ResultTree {
   /// The timestamp when the result was last accessed.
   DateTime lastAccessed;
 
-  /// A reference to the root `EntityNode` of the dehydrated tree.
-  //final EntityNode rootObject;
-
   /// Checks if cached data is stale
   bool isStale() {
     return DateTime.now().difference(cachedAt) > ttl;

packages/firebase_data_connect/firebase_data_connect/lib/src/cache/cache_manager.dart

@@ -99,12 +99,12 @@ class Cache {
     Map<String, dynamic> dehydratedMap =
         rootNode.toJson(mode: EncodingMode.dehydrated);
 
-    Duration ttl = serverResponse.ttl != null
-        ? serverResponse.ttl!
-        : Duration(seconds: 10);
+    // if we have server ttl, that overrides maxAge from cacheSettings
+    Duration ttl =
+        serverResponse.ttl != null ? serverResponse.ttl! : _settings.maxAge;
     final resultTree = ResultTree(
         data: dehydratedMap,
-        ttl: ttl, // Default TTL
+        ttl: ttl,
         cachedAt: DateTime.now(),
         lastAccessed: DateTime.now());
 
@@ -122,8 +122,7 @@ class Cache {
     }
 
     // we have a provider lets ensure its initialized
-    bool? initialized = await providerInitialization;
-    if (initialized == null || initialized == false) {
+    if (await providerInitialization != true) {
       developer.log('CacheProvider not initialized. Cache not functional');
       return null;
     }

packages/firebase_data_connect/firebase_data_connect/lib/src/cache/result_tree_processor.dart

@@ -44,72 +44,60 @@ class ResultTreeProcessor {
   EntityNode _dehydrateNode(String queryId, dynamic data,
       CacheProvider cacheProvider, Set<String> impactedQueryIds) {
     if (data is Map<String, dynamic>) {
-      if (data.containsKey(kGlobalIDKey)) {
-        // data contains a unique entity id. we can normalize
-        final guid = data[kGlobalIDKey] as String;
-
-        final serverValues = <String, dynamic>{};
-        final nestedObjects = <String, EntityNode>{};
-        final nestedObjectLists = <String, List<EntityNode>>{};
-
-        for (final entry in data.entries) {
-          final key = entry.key;
-          final value = entry.value;
-
-          if (value is Map<String, dynamic>) {
-            EntityNode en =
-                _dehydrateNode(queryId, value, cacheProvider, impactedQueryIds);
-            nestedObjects[key] = en;
-          } else if (value is List) {
-            final nodeList = <EntityNode>[];
-            for (final item in value) {
+      // data contains a unique entity id. we can normalize
+      final guid = data[kGlobalIDKey] as String?;
+
+      final serverValues = <String, dynamic>{};
+      final nestedObjects = <String, EntityNode>{};
+      final nestedObjectLists = <String, List<EntityNode>>{};
+
+      for (final entry in data.entries) {
+        final key = entry.key;
+        final value = entry.value;
+
+        if (value is Map<String, dynamic>) {
+          EntityNode en =
+              _dehydrateNode(queryId, value, cacheProvider, impactedQueryIds);
+          nestedObjects[key] = en;
+        } else if (value is List) {
+          final nodeList = <EntityNode>[];
+          final scalarValueList = <dynamic>[];
+          for (final item in value) {
+            if (item is Map<String, dynamic>) {
               nodeList.add(_dehydrateNode(
                   queryId, item, cacheProvider, impactedQueryIds));
+            } else {
+              // assuming scalar - we don't handle array of arrays
+              scalarValueList.add(item);
             }
+          }
+
+          // we either do object lists or scalar lists stored with scalars
+          // we don't handle mixed lists.
+          if (nodeList.isNotEmpty) {
             nestedObjectLists[key] = nodeList;
           } else {
-            serverValues[key] = value;
+            serverValues[key] = scalarValueList;
           }
+        } else {
+          serverValues[key] = value;
         }
+      }
 
+      if (guid != null) {
         final existingEdo = cacheProvider.getEntityDataObject(guid);
-        existingEdo.referencedFrom.add(queryId);
-        impactedQueryIds.addAll(existingEdo.referencedFrom);
+        //existingEdo.referencedFrom.add(queryId);
         existingEdo.setServerValues(serverValues, queryId);
         cacheProvider.saveEntityDataObject(existingEdo);
+        impactedQueryIds.addAll(existingEdo.referencedFrom);
 
         return EntityNode(
             entity: existingEdo,
             nestedObjects: nestedObjects,
             nestedObjectLists: nestedObjectLists);
       } else {
-        // GlobalID check
-        // no entity id. scalar data must be stored inline.
-        final scalarValues = <String, dynamic>{};
-        final nestedObjects = <String, EntityNode>{};
-        final nestedObjectLists = <String, List<EntityNode>>{};
-
-        for (final entry in data.entries) {
-          final key = entry.key;
-          final value = entry.value;
-
-          if (value is Map<String, dynamic>) {
-            nestedObjects[key] =
-                _dehydrateNode(queryId, value, cacheProvider, impactedQueryIds);
-          } else if (value is List) {
-            final nodeList = <EntityNode>[];
-            for (final item in value) {
-              nodeList.add(_dehydrateNode(
-                  queryId, item, cacheProvider, impactedQueryIds));
-            }
-            nestedObjectLists[key] = nodeList;
-          } else {
-            scalarValues[key] = value;
-          }
-        }
-
         return EntityNode(
-            scalarValues: scalarValues,
+            scalarValues: serverValues,
             nestedObjects: nestedObjects,
             nestedObjectLists: nestedObjectLists);
       }
@@ -129,47 +117,34 @@ class ResultTreeProcessor {
 
   Future<dynamic> _hydrateNode(
       EntityNode node, CacheProvider cacheProvider) async {
+    final Map<String, dynamic> data = {};
     if (node.entity != null) {
       final edo = cacheProvider.getEntityDataObject(node.entity!.guid);
-      final data = Map<String, dynamic>.from(edo.fields());
-
-      if (node.nestedObjects != null) {
-        for (final entry in node.nestedObjects!.entries) {
-          data[entry.key] = await _hydrateNode(entry.value, cacheProvider);
-        }
-      }
-
-      if (node.nestedObjectLists != null) {
-        for (final entry in node.nestedObjectLists!.entries) {
-          final list = <dynamic>[];
-          for (final item in entry.value) {
-            list.add(await _hydrateNode(item, cacheProvider));
-          }
-          data[entry.key] = list;
-        }
-      }
+      data.addAll(edo.fields());
+    }
 
-      return data;
-    } else if (node.scalarValues != null) {
+    if (node.scalarValues != null) {
       if (node.scalarValues!.containsKey('value')) {
         return node.scalarValues!['value'];
       }
       return node.scalarValues;
-    } else if (node.nestedObjects != null) {
-      final data = <String, dynamic>{};
+    }
+    if (node.nestedObjects != null) {
       for (final entry in node.nestedObjects!.entries) {
         data[entry.key] = await _hydrateNode(entry.value, cacheProvider);
       }
-      return data;
-    } else if (node.nestedObjectLists != null &&
-        node.nestedObjectLists!.containsKey('list')) {
-      final list = <dynamic>[];
-      for (final item in node.nestedObjectLists!['list']!) {
-        list.add(await _hydrateNode(item, cacheProvider));
+    }
+
+    if (node.nestedObjectLists != null) {
+      for (final entry in node.nestedObjectLists!.entries) {
+        final list = <dynamic>[];
+        for (final item in entry.value) {
+          list.add(await _hydrateNode(item, cacheProvider));
+        }
+        data[entry.key] = list;
       }
-      return list;
-    } else {
-      return {};
     }
+
+    return data;
   }
 }

packages/firebase_data_connect/firebase_data_connect/lib/src/core/ref.dart

@@ -235,7 +235,6 @@ class QueryRef<Data, Variables> extends OperationRef<Data, Variables> {
     }
   }
 
-  //String get _queryId => '$operationName::${serializer(variables as Variables)}';
   String get _queryId =>
       QueryManager.createQueryId(operationName, variables, serializer);