Api-Roll 50: 2017-06-12

generated/googleapis/lib/datastore/v1.dart

 // This is a generated file (see the discoveryapis_generator project).
 
 library googleapis.datastore.v1;
 
 import 'dart:core' as core;
 import 'dart:async' as async;
 import 'dart:convert' as convert;
 
 import 'package:_discoveryapis_commons/_discoveryapis_commons.dart' as commons;
 import 'package:http/http.dart' as http;
@@ skipping 309 matching lines @@
   core.List<Key> keys;
 
   AllocateIdsRequest();
 
   AllocateIdsRequest.fromJson(core.Map _json) {
     if (_json.containsKey("keys")) {
       keys = _json["keys"].map((value) => new Key.fromJson(value)).toList();
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (keys != null) {
       _json["keys"] = keys.map((value) => (value).toJson()).toList();
     }
     return _json;
   }
 }
 
 /** The response for Datastore.AllocateIds. */
 class AllocateIdsResponse {
   /**
    * The keys specified in the request (in the same order), each with
    * its key path completed with a newly allocated ID.
    */
   core.List<Key> keys;
 
   AllocateIdsResponse();
 
   AllocateIdsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("keys")) {
       keys = _json["keys"].map((value) => new Key.fromJson(value)).toList();
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (keys != null) {
       _json["keys"] = keys.map((value) => (value).toJson()).toList();
     }
     return _json;
   }
 }
 
 /** An array value. */
 class ArrayValue {
   /**
    * Values in the array.
    * The order of this array may not be preserved if it contains a mix of
    * indexed and unindexed values.
    */
   core.List<Value> values;
 
   ArrayValue();
 
   ArrayValue.fromJson(core.Map _json) {
     if (_json.containsKey("values")) {
       values = _json["values"].map((value) => new Value.fromJson(value)).toList();
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (values != null) {
       _json["values"] = values.map((value) => (value).toJson()).toList();
     }
     return _json;
   }
 }
 
 /** The request for Datastore.BeginTransaction. */
 class BeginTransactionRequest {
 
   BeginTransactionRequest();
 
   BeginTransactionRequest.fromJson(core.Map _json) {
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     return _json;
   }
 }
 
 /** The response for Datastore.BeginTransaction. */
 class BeginTransactionResponse {
   /** The transaction identifier (always present). */
   core.String transaction;
   core.List<core.int> get transactionAsBytes {
     return convert.BASE64.decode(transaction);
   }
 
   void set transactionAsBytes(core.List<core.int> _bytes) {
     transaction = convert.BASE64.encode(_bytes).replaceAll("/", "_").replaceAll("+", "-");
   }
 
   BeginTransactionResponse();
 
   BeginTransactionResponse.fromJson(core.Map _json) {
     if (_json.containsKey("transaction")) {
       transaction = _json["transaction"];
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (transaction != null) {
       _json["transaction"] = transaction;
     }
     return _json;
   }
 }
 
 /** The request for Datastore.Commit. */
 class CommitRequest {
   /**
@@ skipping 45 matching lines @@
       mode = _json["mode"];
     }
     if (_json.containsKey("mutations")) {
       mutations = _json["mutations"].map((value) => new Mutation.fromJson(value)).toList();
     }
     if (_json.containsKey("transaction")) {
       transaction = _json["transaction"];
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (mode != null) {
       _json["mode"] = mode;
     }
     if (mutations != null) {
       _json["mutations"] = mutations.map((value) => (value).toJson()).toList();
     }
     if (transaction != null) {
       _json["transaction"] = transaction;
     }
     return _json;
@@ skipping 17 matching lines @@
 
   CommitResponse.fromJson(core.Map _json) {
     if (_json.containsKey("indexUpdates")) {
       indexUpdates = _json["indexUpdates"];
     }
     if (_json.containsKey("mutationResults")) {
       mutationResults = _json["mutationResults"].map((value) => new MutationResult.fromJson(value)).toList();
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (indexUpdates != null) {
       _json["indexUpdates"] = indexUpdates;
     }
     if (mutationResults != null) {
       _json["mutationResults"] = mutationResults.map((value) => (value).toJson()).toList();
     }
     return _json;
   }
 }
 
@@ skipping 16 matching lines @@
 
   CompositeFilter.fromJson(core.Map _json) {
     if (_json.containsKey("filters")) {
       filters = _json["filters"].map((value) => new Filter.fromJson(value)).toList();
     }
     if (_json.containsKey("op")) {
       op = _json["op"];
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (filters != null) {
       _json["filters"] = filters.map((value) => (value).toJson()).toList();
     }
     if (op != null) {
       _json["op"] = op;
     }
     return _json;
   }
 }
 
@@ skipping 24 matching lines @@
    */
   core.Map<core.String, Value> properties;
 
   Entity();
 
   Entity.fromJson(core.Map _json) {
     if (_json.containsKey("key")) {
       key = new Key.fromJson(_json["key"]);
     }
     if (_json.containsKey("properties")) {
-      properties = commons.mapMap(_json["properties"], (item) => new Value.fromJson(item));
+      properties = commons.mapMap<core.Map<core.String, core.Object>, Value>(_json["properties"], (core.Map<core.String, core.Object> item) => new Value.fromJson(item));
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (key != null) {
       _json["key"] = (key).toJson();
     }
     if (properties != null) {
-      _json["properties"] = commons.mapMap(properties, (item) => (item).toJson());
+      _json["properties"] = commons.mapMap<Value, core.Map<core.String, core.Object>>(properties, (Value item) => (item).toJson());
     }
     return _json;
   }
 }
 
 /** The result of fetching an entity from Datastore. */
 class EntityResult {
   /**
    * A cursor that points to the position after the result entity.
    * Set only when the `EntityResult` is part of a `QueryResultBatch` message.
@@ skipping 28 matching lines @@
       cursor = _json["cursor"];
     }
     if (_json.containsKey("entity")) {
       entity = new Entity.fromJson(_json["entity"]);
     }
     if (_json.containsKey("version")) {
       version = _json["version"];
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (cursor != null) {
       _json["cursor"] = cursor;
     }
     if (entity != null) {
       _json["entity"] = (entity).toJson();
     }
     if (version != null) {
       _json["version"] = version;
     }
     return _json;
@@ skipping 11 matching lines @@
 
   Filter.fromJson(core.Map _json) {
     if (_json.containsKey("compositeFilter")) {
       compositeFilter = new CompositeFilter.fromJson(_json["compositeFilter"]);
     }
     if (_json.containsKey("propertyFilter")) {
       propertyFilter = new PropertyFilter.fromJson(_json["propertyFilter"]);
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (compositeFilter != null) {
       _json["compositeFilter"] = (compositeFilter).toJson();
     }
     if (propertyFilter != null) {
       _json["propertyFilter"] = (propertyFilter).toJson();
     }
     return _json;
   }
 }
 
@@ skipping 31 matching lines @@
    */
   core.String queryString;
 
   GqlQuery();
 
   GqlQuery.fromJson(core.Map _json) {
     if (_json.containsKey("allowLiterals")) {
       allowLiterals = _json["allowLiterals"];
     }
     if (_json.containsKey("namedBindings")) {
-      namedBindings = commons.mapMap(_json["namedBindings"], (item) => new GqlQueryParameter.fromJson(item));
+      namedBindings = commons.mapMap<core.Map<core.String, core.Object>, GqlQueryParameter>(_json["namedBindings"], (core.Map<core.String, core.Object> item) => new GqlQueryParameter.fromJson(item));
     }
     if (_json.containsKey("positionalBindings")) {
       positionalBindings = _json["positionalBindings"].map((value) => new GqlQueryParameter.fromJson(value)).toList();
     }
     if (_json.containsKey("queryString")) {
       queryString = _json["queryString"];
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (allowLiterals != null) {
       _json["allowLiterals"] = allowLiterals;
     }
     if (namedBindings != null) {
-      _json["namedBindings"] = commons.mapMap(namedBindings, (item) => (item).toJson());
+      _json["namedBindings"] = commons.mapMap<GqlQueryParameter, core.Map<core.String, core.Object>>(namedBindings, (GqlQueryParameter item) => (item).toJson());
     }
     if (positionalBindings != null) {
       _json["positionalBindings"] = positionalBindings.map((value) => (value).toJson()).toList();
     }
     if (queryString != null) {
       _json["queryString"] = queryString;
     }
     return _json;
   }
 }
@@ skipping 19 matching lines @@
 
   GqlQueryParameter.fromJson(core.Map _json) {
     if (_json.containsKey("cursor")) {
       cursor = _json["cursor"];
     }
     if (_json.containsKey("value")) {
       value = new Value.fromJson(_json["value"]);
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (cursor != null) {
       _json["cursor"] = cursor;
     }
     if (value != null) {
       _json["value"] = (value).toJson();
     }
     return _json;
   }
 }
 
@@ skipping 34 matching lines @@
 
   Key.fromJson(core.Map _json) {
     if (_json.containsKey("partitionId")) {
       partitionId = new PartitionId.fromJson(_json["partitionId"]);
     }
     if (_json.containsKey("path")) {
       path = _json["path"].map((value) => new PathElement.fromJson(value)).toList();
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (partitionId != null) {
       _json["partitionId"] = (partitionId).toJson();
     }
     if (path != null) {
       _json["path"] = path.map((value) => (value).toJson()).toList();
     }
     return _json;
   }
 }
 
 /** A representation of a kind. */
 class KindExpression {
   /** The name of the kind. */
   core.String name;
 
   KindExpression();
 
   KindExpression.fromJson(core.Map _json) {
     if (_json.containsKey("name")) {
       name = _json["name"];
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (name != null) {
       _json["name"] = name;
     }
     return _json;
   }
 }
 
 /**
  * An object representing a latitude/longitude pair. This is expressed as a pair
  * of doubles representing degrees latitude and degrees longitude. Unless
@@ skipping 45 matching lines @@
 
   LatLng.fromJson(core.Map _json) {
     if (_json.containsKey("latitude")) {
       latitude = _json["latitude"];
     }
     if (_json.containsKey("longitude")) {
       longitude = _json["longitude"];
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (latitude != null) {
       _json["latitude"] = latitude;
     }
     if (longitude != null) {
       _json["longitude"] = longitude;
     }
     return _json;
   }
 }
 
 /** The request for Datastore.Lookup. */
 class LookupRequest {
   /** Keys of entities to look up. */
   core.List<Key> keys;
   /** The options for this lookup request. */
   ReadOptions readOptions;
 
   LookupRequest();
 
   LookupRequest.fromJson(core.Map _json) {
     if (_json.containsKey("keys")) {
       keys = _json["keys"].map((value) => new Key.fromJson(value)).toList();
     }
     if (_json.containsKey("readOptions")) {
       readOptions = new ReadOptions.fromJson(_json["readOptions"]);
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (keys != null) {
       _json["keys"] = keys.map((value) => (value).toJson()).toList();
     }
     if (readOptions != null) {
       _json["readOptions"] = (readOptions).toJson();
     }
     return _json;
   }
 }
 
@@ skipping 25 matching lines @@
       deferred = _json["deferred"].map((value) => new Key.fromJson(value)).toList();
     }
     if (_json.containsKey("found")) {
       found = _json["found"].map((value) => new EntityResult.fromJson(value)).toList();
     }
     if (_json.containsKey("missing")) {
       missing = _json["missing"].map((value) => new EntityResult.fromJson(value)).toList();
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (deferred != null) {
       _json["deferred"] = deferred.map((value) => (value).toJson()).toList();
     }
     if (found != null) {
       _json["found"] = found.map((value) => (value).toJson()).toList();
     }
     if (missing != null) {
       _json["missing"] = missing.map((value) => (value).toJson()).toList();
     }
     return _json;
@@ skipping 41 matching lines @@
       insert = new Entity.fromJson(_json["insert"]);
     }
     if (_json.containsKey("update")) {
       update = new Entity.fromJson(_json["update"]);
     }
     if (_json.containsKey("upsert")) {
       upsert = new Entity.fromJson(_json["upsert"]);
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (baseVersion != null) {
       _json["baseVersion"] = baseVersion;
     }
     if (delete != null) {
       _json["delete"] = (delete).toJson();
     }
     if (insert != null) {
       _json["insert"] = (insert).toJson();
     }
     if (update != null) {
@@ skipping 34 matching lines @@
       conflictDetected = _json["conflictDetected"];
     }
     if (_json.containsKey("key")) {
       key = new Key.fromJson(_json["key"]);
     }
     if (_json.containsKey("version")) {
       version = _json["version"];
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (conflictDetected != null) {
       _json["conflictDetected"] = conflictDetected;
     }
     if (key != null) {
       _json["key"] = (key).toJson();
     }
     if (version != null) {
       _json["version"] = version;
     }
     return _json;
@@ skipping 32 matching lines @@
 
   PartitionId.fromJson(core.Map _json) {
     if (_json.containsKey("namespaceId")) {
       namespaceId = _json["namespaceId"];
     }
     if (_json.containsKey("projectId")) {
       projectId = _json["projectId"];
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (namespaceId != null) {
       _json["namespaceId"] = namespaceId;
     }
     if (projectId != null) {
       _json["projectId"] = projectId;
     }
     return _json;
   }
 }
 
@@ skipping 32 matching lines @@
       id = _json["id"];
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
     }
     if (_json.containsKey("name")) {
       name = _json["name"];
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (id != null) {
       _json["id"] = id;
     }
     if (kind != null) {
       _json["kind"] = kind;
     }
     if (name != null) {
       _json["name"] = name;
     }
     return _json;
   }
 }
 
 /** A representation of a property in a projection. */
 class Projection {
   /** The property to project. */
   PropertyReference property;
 
   Projection();
 
   Projection.fromJson(core.Map _json) {
     if (_json.containsKey("property")) {
       property = new PropertyReference.fromJson(_json["property"]);
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (property != null) {
       _json["property"] = (property).toJson();
     }
     return _json;
   }
 }
 
 /** A filter on a specific property. */
 class PropertyFilter {
   /**
@@ skipping 20 matching lines @@
       op = _json["op"];
     }
     if (_json.containsKey("property")) {
       property = new PropertyReference.fromJson(_json["property"]);
     }
     if (_json.containsKey("value")) {
       value = new Value.fromJson(_json["value"]);
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (op != null) {
       _json["op"] = op;
     }
     if (property != null) {
       _json["property"] = (property).toJson();
     }
     if (value != null) {
       _json["value"] = (value).toJson();
     }
     return _json;
@@ skipping 17 matching lines @@
 
   PropertyOrder.fromJson(core.Map _json) {
     if (_json.containsKey("direction")) {
       direction = _json["direction"];
     }
     if (_json.containsKey("property")) {
       property = new PropertyReference.fromJson(_json["property"]);
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (direction != null) {
       _json["direction"] = direction;
     }
     if (property != null) {
       _json["property"] = (property).toJson();
     }
     return _json;
   }
 }
 
 /** A reference to a property relative to the kind expressions. */
 class PropertyReference {
   /**
    * The name of the property.
    * If name includes "."s, it may be interpreted as a property name path.
    */
   core.String name;
 
   PropertyReference();
 
   PropertyReference.fromJson(core.Map _json) {
     if (_json.containsKey("name")) {
       name = _json["name"];
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (name != null) {
       _json["name"] = name;
     }
     return _json;
   }
 }
 
 /** A query for entities. */
 class Query {
   /**
@@ skipping 81 matching lines @@
       order = _json["order"].map((value) => new PropertyOrder.fromJson(value)).toList();
     }
     if (_json.containsKey("projection")) {
       projection = _json["projection"].map((value) => new Projection.fromJson(value)).toList();
     }
     if (_json.containsKey("startCursor")) {
       startCursor = _json["startCursor"];
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (distinctOn != null) {
       _json["distinctOn"] = distinctOn.map((value) => (value).toJson()).toList();
     }
     if (endCursor != null) {
       _json["endCursor"] = endCursor;
     }
     if (filter != null) {
       _json["filter"] = (filter).toJson();
     }
     if (kind != null) {
@@ skipping 103 matching lines @@
       skippedCursor = _json["skippedCursor"];
     }
     if (_json.containsKey("skippedResults")) {
       skippedResults = _json["skippedResults"];
     }
     if (_json.containsKey("snapshotVersion")) {
       snapshotVersion = _json["snapshotVersion"];
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (endCursor != null) {
       _json["endCursor"] = endCursor;
     }
     if (entityResultType != null) {
       _json["entityResultType"] = entityResultType;
     }
     if (entityResults != null) {
       _json["entityResults"] = entityResults.map((value) => (value).toJson()).toList();
     }
     if (moreResults != null) {
@@ skipping 42 matching lines @@
 
   ReadOptions.fromJson(core.Map _json) {
     if (_json.containsKey("readConsistency")) {
       readConsistency = _json["readConsistency"];
     }
     if (_json.containsKey("transaction")) {
       transaction = _json["transaction"];
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (readConsistency != null) {
       _json["readConsistency"] = readConsistency;
     }
     if (transaction != null) {
       _json["transaction"] = transaction;
     }
     return _json;
   }
 }
 
@@ skipping 13 matching lines @@
   }
 
   RollbackRequest();
 
   RollbackRequest.fromJson(core.Map _json) {
     if (_json.containsKey("transaction")) {
       transaction = _json["transaction"];
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (transaction != null) {
       _json["transaction"] = transaction;
     }
     return _json;
   }
 }
 
 /**
  * The response for Datastore.Rollback.
  * (an empty message).
  */
 class RollbackResponse {
 
   RollbackResponse();
 
   RollbackResponse.fromJson(core.Map _json) {
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     return _json;
   }
 }
 
 /** The request for Datastore.RunQuery. */
 class RunQueryRequest {
   /** The GQL query to run. */
   GqlQuery gqlQuery;
   /**
    * Entities are partitioned into subsets, identified by a partition ID.
@@ skipping 17 matching lines @@
       partitionId = new PartitionId.fromJson(_json["partitionId"]);
     }
     if (_json.containsKey("query")) {
       query = new Query.fromJson(_json["query"]);
     }
     if (_json.containsKey("readOptions")) {
       readOptions = new ReadOptions.fromJson(_json["readOptions"]);
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (gqlQuery != null) {
       _json["gqlQuery"] = (gqlQuery).toJson();
     }
     if (partitionId != null) {
       _json["partitionId"] = (partitionId).toJson();
     }
     if (query != null) {
       _json["query"] = (query).toJson();
     }
     if (readOptions != null) {
@@ skipping 14 matching lines @@
 
   RunQueryResponse.fromJson(core.Map _json) {
     if (_json.containsKey("batch")) {
       batch = new QueryResultBatch.fromJson(_json["batch"]);
     }
     if (_json.containsKey("query")) {
       query = new Query.fromJson(_json["query"]);
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (batch != null) {
       _json["batch"] = (batch).toJson();
     }
     if (query != null) {
       _json["query"] = (query).toJson();
     }
     return _json;
   }
 }
 
@@ skipping 107 matching lines @@
       nullValue = _json["nullValue"];
     }
     if (_json.containsKey("stringValue")) {
       stringValue = _json["stringValue"];
     }
     if (_json.containsKey("timestampValue")) {
       timestampValue = _json["timestampValue"];
     }
   }
 
-  core.Map toJson() {
-    var _json = new core.Map();
+  core.Map<core.String, core.Object> toJson() {
+    final core.Map<core.String, core.Object> _json = new core.Map<core.String, core.Object>();
     if (arrayValue != null) {
       _json["arrayValue"] = (arrayValue).toJson();
     }
     if (blobValue != null) {
       _json["blobValue"] = blobValue;
     }
     if (booleanValue != null) {
       _json["booleanValue"] = booleanValue;
     }
     if (doubleValue != null) {
@@ skipping 22 matching lines @@
     }
     if (stringValue != null) {
       _json["stringValue"] = stringValue;
     }
     if (timestampValue != null) {
       _json["timestampValue"] = timestampValue;
     }
     return _json;
   }
 }