Unify the server and plugin versions of the generators

pkg/analysis_server/lib/protocol/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.
 
 /**
  * Support for client code that needs to interact with the requests, responses
  * and notifications that are part of the analysis server's wire protocol.
  */
 library analysis_server.plugin.protocol.protocol;
 
 import 'dart:collection';
 import 'dart:convert' hide JsonDecoder;
 
+import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/protocol/protocol_internal.dart';
 
-part 'generated_protocol.dart';
-
 /**
  * A [RequestHandler] that supports [startup] and [shutdown] methods.
  *
  * Clients may not extend, implement or mix-in this class.
  */
 abstract class DomainHandler implements RequestHandler {
   /**
    * Perform any operations associated with the shutdown of the domain. It is
    * not guaranteed that this method will be called. If it is, it will be
    * called after the last [Request] has been made.
@@ skipping 39 matching lines @@
 
   /**
    * The name of the event that triggered the notification.
    */
   final String event;
 
   /**
    * A table mapping the names of notification parameters to their values, or
    * `null` if there are no notification parameters.
    */
-  Map<String, Object> _params;
+  final Map<String, Object> params;
 
   /**
    * Initialize a newly created [Notification] to have the given [event] name.
    * If [_params] is provided, it will be used as the params; otherwise no
    * params will be used.
    */
-  Notification(this.event, [this._params]);
+  Notification(this.event, [this.params]);
 
   /**
    * Initialize a newly created instance based on the given JSON data.
    */
   factory Notification.fromJson(Map json) {
     return new Notification(json[Notification.EVENT],
         json[Notification.PARAMS] as Map<String, Object>);
   }
 
   /**
    * 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 = {};
     jsonObject[EVENT] = event;
-    if (_params != null) {
-      jsonObject[PARAMS] = _params;
+    if (params != null) {
+      jsonObject[PARAMS] = params;
     }
     return jsonObject;
   }
 }
 
 /**
  * A request that was received from the client.
  *
  * Clients may not extend, implement or mix-in this class.
  */
@@ skipping 25 matching lines @@
   final String id;
 
   /**
    * The method being requested.
    */
   final String method;
 
   /**
    * A table mapping the names of request parameters to their values.
    */
-  final Map<String, Object> _params;
+  final Map<String, Object> params;
 
   /**
    * The time (milliseconds since epoch) at which the client made the request
    * or `null` if this information is not provided by the client.
    */
   final int clientRequestTime;
 
   /**
    * Initialize a newly created [Request] to have the given [id] and [method]
    * name.  If [params] is supplied, it is used as the "params" map for the
    * request.  Otherwise an empty "params" map is allocated.
    */
   Request(this.id, this.method,
       [Map<String, Object> params, this.clientRequestTime])
-      : _params = params ?? new HashMap<String, Object>();
+      : params = params ?? new HashMap<String, Object>();
 
   /**
    * 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:
    *
    *   {
    *     'clientRequestTime': millisecondsSinceEpoch
    *     'id': String,
    *     'method': methodName,
@@ skipping 59 matching lines @@
   }
 
   /**
    * 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;
+    if (params.isNotEmpty) {
+      jsonObject[PARAMS] = params;
     }
     if (clientRequestTime != null) {
       jsonObject[CLIENT_REQUEST_TIME] = clientRequestTime;
     }
     return jsonObject;
   }
 }
 
 /**
  * An exception that occurred during the handling of a request that requires
@@ skipping 334 matching lines @@
     jsonObject[ID] = id;
     if (error != null) {
       jsonObject[ERROR] = error.toJson();
     }
     if (_result != null) {
       jsonObject[RESULT] = _result;
     }
     return jsonObject;
   }
 }