refactor Reqest.fromJson for use by performance measurement tests

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';
 
 part 'generated_protocol.dart';
@@ skipping 516 matching lines @@
    *   }
    *
    * where both the parameters and clientRequestTime are optional.
    * The parameters can contain any number of name/value pairs.
    * The clientRequestTime must be an int representing the time at which
    * the client issued the request (milliseconds since epoch).
    */
   factory Request.fromString(String data) {
     try {
       var result = JSON.decode(data);
-      if (result is! Map) {
-        return null;
-      }
-      var id = result[Request.ID];
-      var method = result[Request.METHOD];
-      if (id is! String || method is! String) {
-        return null;
-      }
-      var time = result[Request.CLIENT_REQUEST_TIME];
-      if (time != null && time is! int) {
-        return null;
-      }
-      var params = result[Request.PARAMS];
-      if (params is Map || params == null) {
-        return new Request(id, method, params, time);
-      } else {
-        return null;
-      }
+      return new Request.fromJson(result);
     } catch (exception) {
       return null;
     }
   }
 
   /**
+   * Return a request parsed from the given json, or `null` if the [data] is
+   * not a valid json representation of a request. The [data] is expected to
+   * have the following format:
+   *
+   *   {
+   *     'id': String,
+   *     'method': methodName,
+   *     'params': {
+   *       paramter_name: value
+   *     }
+   *     'clientRequestTime': millisecondsSinceEpoch

[Brian Wilkerson, 2015/06/15 15:41:40]

nit: It would look nicer if this line were moved before 'id' and it would keep
the keys alphabetized.

[danrubel, 2015/06/15 16:25:17]

Done.

+   *   }
+   *
+   * where both the parameters and clientRequestTime are optional.
+   * The parameters can contain any number of name/value pairs.
+   * The clientRequestTime must be an int representing the time at which
+   * the client issued the request (milliseconds since epoch).
+   */
+  factory Request.fromJson(result) {

[Brian Wilkerson, 2015/06/15 15:41:40]

Parameters should have type annotations. Can we move the test for whether
'result' is a map into fromString?

[danrubel, 2015/06/15 16:25:18]

Done.

+    if (result is! Map) {
+      return null;
+    }
+    var id = result[Request.ID];
+    var method = result[Request.METHOD];
+    if (id is! String || method is! String) {
+      return null;
+    }
+    var time = result[Request.CLIENT_REQUEST_TIME];
+    if (time != null && time is! int) {
+      return null;
+    }
+    var params = result[Request.PARAMS];
+    if (params is Map || params == null) {
+      return new Request(id, method, params, time);
+    } else {
+      return null;
+    }
+  }
+
+  /**
    * Return a table representing the structure of the Json object that will be
    * sent to the client to represent this response.
    */
   Map<String, Object> toJson() {
     Map<String, Object> jsonObject = new HashMap<String, Object>();
     jsonObject[ID] = id;
     jsonObject[METHOD] = method;
     if (_params.isNotEmpty) {
       jsonObject[PARAMS] = _params;
     }
@@ skipping 340 matching lines @@
     hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
     hash = hash ^ (hash >> 11);
     return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
   }
 
   static int hash2(a, b) => finish(combine(combine(0, a), b));
 
   static int hash4(a, b, c, d) =>
       finish(combine(combine(combine(combine(0, a), b), c), d));
 }