Change HashMap declarations back to Map.

pkg/analysis_server/lib/src/protocol.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library protocol;
 
 import 'dart:collection';
 import 'dart:convert' show JsonDecoder;
 
 /**
@@ skipping 60 matching lines @@
   final String id;
 
   /**
    * The method being requested.
    */
   final String method;
 
   /**
    * A table mapping the names of request parameters to their values.
    */
-  final HashMap<String, Object> params = new HashMap<String, Object>();
+  final Map<String, Object> params = new HashMap<String, Object>();
 
   /**
    * A decoder that can be used to decode strings into JSON objects.
    */
   static const JsonDecoder DECODER = const JsonDecoder(null);
 
   /**
    * Initialize a newly created [Request] to have the given [id] and [method]
    * name.
    */
@@ skipping 68 matching lines @@
    * Set the value of the parameter with the given [name] to the given [value].
    */
   void setParameter(String name, Object value) {
     params[name] = value;
   }
 
   /**
    * Return a table representing the structure of the Json object that will be
    * sent to the client to represent this response.
    */
-  HashMap<String, Object> toJson() {
-    HashMap<String, Object> jsonObject = new HashMap<String, Object>();
+  Map<String, Object> toJson() {
+    Map<String, Object> jsonObject = new HashMap<String, Object>();
     jsonObject[ID] = id;
     jsonObject[METHOD] = method;
     if (params.isNotEmpty) {
       jsonObject[PARAMS] = params;
     }
     return jsonObject;
   }
 }
 
 /**
@@ skipping 22 matching lines @@
    * Create a RequestDatum for decoding and validating [datum], which refers to
    * [request] in any errors it reports.
    */
   RequestDatum(this.request, this.path, this.datum);
 
   /**
    * Validate that the datum is a Map containing the given [key], and return
    * a [RequestDatum] containing the corresponding value.
    */
   RequestDatum operator [](String key) {
-    HashMap<String, Object> map = _asMap();
+    Map<String, Object> map = _asMap();
     if (!map.containsKey(key)) {
       throw new RequestFailure(new Response.invalidParameter(request, path,
           "contain key '$key'"));
     }
     return new RequestDatum(request, "$path.$key", map[key]);
   }
 
   /**
    * Return `true` if the datum is a Map containing the given [key].
    */
@@ skipping 142 matching lines @@
    * Determine if the datum is a map.  Note: null is considered a synonym for
    * the empty map.
    */
   bool get isMap {
     return datum == null || datum is Map;
   }
 
   /**
    * Validate that the datum is a map, and return it in raw form.
    */
-  HashMap<String, Object> _asMap() {
+  Map<String, Object> _asMap() {
     if (!isMap) {
       throw new RequestFailure(new Response.invalidParameter(request, path,
           "be a map"));
     }
     if (datum == null) {
       return {};
     } else {
       return datum;
     }
   }
@@ skipping 13 matching lines @@
       if (value is! String) {
         return false;
       }
     }
     return true;
   }
 
   /**
    * Validate that the datum is a map from strings to strings, and return it.
    */
-  HashMap<String, String> asStringMap() {
+  Map<String, String> asStringMap() {
     if (!isStringMap) {
       throw new RequestFailure(new Response.invalidParameter(request, path,
           "be a string map"));
     }
     return _asMap();
   }
 
   /**
    * Determine if the datum is a map whose values are all string lists.  Note:
    * null is considered a synonym for the empty map.
@@ skipping 15 matching lines @@
         }
       }
     }
     return true;
   }
 
   /**
    * Validate that the datum is a map from strings to string lists, and return
    * it.
    */
-  HashMap<String, List<String>> asStringListMap() {
+  Map<String, List<String>> asStringListMap() {
     if (!isStringListMap) {
       throw new RequestFailure(new Response.invalidParameter(request, path,
           "be a string list map"));
     }
     return _asMap();
   }
 
   bool get isNull => datum == null;
 }
 
@@ skipping 26 matching lines @@
   /**
    * The error that was caused by attempting to handle the request, or `null` if
    * there was no error.
    */
   final RequestError error;
 
   /**
    * A table mapping the names of result fields to their values. The table
    * should be empty if there was an error.
    */
-  final HashMap<String, Object> result = new HashMap<String, Object>();
+  final Map<String, Object> result = new HashMap<String, Object>();
 
   /**
    * Initialize a newly created instance to represent a response to a request
    * with the given [id]. If an [error] is provided then the response will
    * represent an error condition.
    */
   Response(this.id, [this.error]);
 
   /**
    * Initialize a newly created instance to represent an error condition caused
@@ skipping 68 matching lines @@
    * Initialize a newly created instance to represent an error condition caused
    * by a `analysis.updateOptions` [request] that includes an unknown analysis
    * option.
    */
   Response.unknownOptionName(Request request, String optionName)
     : this(request.id, new RequestError(-12, 'Unknown analysis option: "$optionName"'));
 
   /**
    * Initialize a newly created instance based upon the given JSON data
    */
-  factory Response.fromJson(HashMap<String, Object> json) {
+  factory Response.fromJson(Map<String, Object> json) {
     try {
       Object id = json[Response.ID];
       if (id is! String) {
         return null;
       }
       Object error = json[Response.ERROR];
       Object result = json[Response.RESULT];
       Response response;
       if (error is Map) {
         response = new Response(id, new RequestError.fromJson(error));
@@ skipping 22 matching lines @@
    * Set the value of the result field with the given [name] to the given [value].
    */
   void setResult(String name, Object value) {
     result[name] = value;
   }
 
   /**
    * Return a table representing the structure of the Json object that will be
    * sent to the client to represent this response.
    */
-  HashMap<String, Object> toJson() {
-    HashMap<String, Object> jsonObject = new HashMap<String, Object>();
+  Map<String, Object> toJson() {
+    Map<String, Object> jsonObject = new HashMap<String, Object>();
     jsonObject[ID] = id;
     if (error != null) {
       jsonObject[ERROR] = error.toJson();
     }
     if (!result.isEmpty) {
       jsonObject[RESULT] = result;
     }
     return jsonObject;
   }
 }
@@ skipping 70 matching lines @@
   final int code;
 
   /**
    * A short description of the error.
    */
   final String message;
 
   /**
    * A table mapping the names of notification parameters to their values.
    */
-  final HashMap<String, Object> data = new HashMap<String, Object>();
+  final Map<String, Object> data = new HashMap<String, Object>();
 
   /**
    * Initialize a newly created [Error] to have the given [code] and [message].
    */
   RequestError(this.code, this.message);
 
   /**
    * Initialize a newly created [Error] to indicate a parse error. Invalid JSON
    * was received by the server. An error occurred on the server while parsing
    * the JSON text.
@@ skipping 26 matching lines @@
   RequestError.invalidParameters() : this(CODE_INVALID_PARAMS, "Invalid parameters");
 
   /**
    * Initialize a newly created [Error] to indicate an internal error.
    */
   RequestError.internalError() : this(CODE_INTERNAL_ERROR, "Internal error");
 
   /**
    * Initialize a newly created [Error] from the given JSON.
    */
-  factory RequestError.fromJson(HashMap<String, Object> json) {
+  factory RequestError.fromJson(Map<String, Object> json) {
     try {
       int code = json[RequestError.CODE];
       String message = json[RequestError.MESSAGE];
-      HashMap<String, Object> data = json[RequestError.DATA];
+      Map<String, Object> data = json[RequestError.DATA];
       RequestError requestError = new RequestError(code, message);
       if (data != null) {
         data.forEach((String key, Object value) {
           requestError.setData(key, value);
         });
       }
       return requestError;
     } catch (exception) {
       return null;
     }
   }
 
   /**
    * Return the value of the data with the given [name], or `null` if there is
    * no such data associated with this error.
    */
   Object getData(String name) => data[name];
 
   /**
    * Set the value of the data with the given [name] to the given [value].
    */
   void setData(String name, Object value) {
     data[name] = value;
   }
 
   /**
    * Return a table representing the structure of the Json object that will be
    * sent to the client to represent this response.
    */
-  HashMap<String, Object> toJson() {
-    HashMap<String, Object> jsonObject = new HashMap<String, Object>();
+  Map<String, Object> toJson() {
+    Map<String, Object> jsonObject = new HashMap<String, Object>();
     jsonObject[CODE] = code;
     jsonObject[MESSAGE] = message;
     if (!data.isEmpty) {
       jsonObject[DATA] = data;
     }
     return jsonObject;
   }
 
   @override
   String toString() => toJson().toString();
@@ skipping 16 matching lines @@
   static const String PARAMS = 'params';
 
   /**
    * The name of the event that triggered the notification.
    */
   final String event;
 
   /**
    * A table mapping the names of notification parameters to their values.
    */
-  final HashMap<String, Object> params = new HashMap<String, Object>();
+  final Map<String, Object> params = new HashMap<String, Object>();
 
   /**
    * Initialize a newly created [Notification] to have the given [event] name.
    */
   Notification(this.event);
 
   /**
    * Initialize a newly created instance based upon the given JSON data
    */
-  factory Notification.fromJson(HashMap<String, Object> json) {
+  factory Notification.fromJson(Map<String, Object> json) {
     try {
       String event = json[Notification.EVENT];
       Object params = json[Notification.PARAMS];
       Notification notification = new Notification(event);
       if (params is Map) {
         params.forEach((String key, Object value) {
           notification.setParameter(key, value);
         });
       }
       return notification;
@@ skipping 12 matching lines @@
    * Set the value of the parameter with the given [name] to the given [value].
    */
   void setParameter(String name, Object value) {
     params[name] = value;
   }
 
   /**
    * Return a table representing the structure of the Json object that will be
    * sent to the client to represent this response.
    */
-  HashMap<String, Object> toJson() {
-    HashMap<String, Object> jsonObject = new HashMap<String, Object>();
+  Map<String, Object> toJson() {
+    Map<String, Object> jsonObject = new HashMap<String, Object>();
     jsonObject[EVENT] = event;
     if (!params.isEmpty) {
       jsonObject[PARAMS] = params;
     }
     return jsonObject;
   }
 }
 
 /**
  * Instances of the class [RequestHandler] implement a handler that can handle
@@ skipping 18 matching lines @@
   /**
    * The response to be returned as a result of the failure.
    */
   final Response response;
 
   /**
    * Initialize a newly created exception to return the given reponse.
    */
   RequestFailure(this.response);
 }