updates to immutable, more json_serializable

Author: robbecker-wf

lib/src/common/authorizations_service.dart

@@ -17,15 +17,15 @@ class AuthorizationsService extends Service {
   /// API docs: https://developer.github.com/v3/oauth_authorizations/#list-your-authorizations
   Stream<Authorization> listAuthorizations() {
     return PaginationHelper(github)
-        .objects('GET', '/authorizations', Authorization.fromJSON);
+        .objects('GET', '/authorizations', (i) => Authorization.fromJson(i));
   }
 
   /// Fetches an authorization specified by [id].
   ///
   /// API docs: https://developer.github.com/v3/oauth_authorizations/#get-a-single-authorization
   Future<Authorization> getAuthorization(int id) =>
       github.getJSON('/authorizations/$id',
-          statusCode: 200, convert: Authorization.fromJSON);
+          statusCode: 200, convert: (i) => Authorization.fromJson(i));
 
   // TODO: Implement remaining API methods of authorizations:
   // See https://developer.github.com/v3/oauth_authorizations/

lib/src/common/gists_service.dart

@@ -15,38 +15,39 @@ class GistsService extends Service {
   /// API docs: https://developer.github.com/v3/gists/#list-gists
   Stream<Gist> listUserGists(String username) {
     return PaginationHelper(github)
-        .objects('GET', '/users/$username/gists', Gist.fromJSON);
+        .objects('GET', '/users/$username/gists', (i) => Gist.fromJson(i));
   }
 
   /// Fetches the gists for the currently authenticated user.
   /// If the user is not authenticated, this returns all public gists.
   ///
   /// API docs: https://developer.github.com/v3/gists/#list-gists
   Stream<Gist> listCurrentUserGists() {
-    return PaginationHelper(github).objects('GET', '/gists', Gist.fromJSON);
+    return PaginationHelper(github)
+        .objects('GET', '/gists', (i) => Gist.fromJson(i));
   }
 
   /// Fetches the currently authenticated user's public gists.
   ///
   /// API docs: https://developer.github.com/v3/gists/#list-gists
   Stream<Gist> listCurrentUserPublicGists() {
     return PaginationHelper(github)
-        .objects('GET', '/gists/public', Gist.fromJSON);
+        .objects('GET', '/gists/public', (i) => Gist.fromJson(i));
   }
 
   /// Fetches the currently authenticated user's starred gists.
   ///
   /// API docs: https://developer.github.com/v3/gists/#list-gists
   Stream<Gist> listCurrentUserStarredGists() {
     return PaginationHelper(github)
-        .objects('GET', '/gists/starred', Gist.fromJSON);
+        .objects('GET', '/gists/starred', (i) => Gist.fromJson(i));
   }
 
   /// Fetches a Gist by the specified [id].
   ///
   /// API docs: https://developer.github.com/v3/gists/#get-a-single-gist
   Future<Gist> getGist(String id) => github.getJSON('/gists/$id',
-      statusCode: StatusCodes.OK, convert: Gist.fromJSON);
+      statusCode: StatusCodes.OK, convert: (i) => Gist.fromJson(i));
 
   /// Creates a Gist
   ///
@@ -76,7 +77,7 @@ class GistsService extends Service {
       '/gists',
       statusCode: 201,
       body: jsonEncode(map),
-      convert: Gist.fromJSON,
+      convert: (i) => Gist.fromJson(i),
     );
   }
 
@@ -115,7 +116,7 @@ class GistsService extends Service {
       '/gists/$id',
       statusCode: 200,
       body: jsonEncode(map),
-      convert: Gist.fromJSON,
+      convert: (i) => Gist.fromJson(i),
     );
   }
 
@@ -155,7 +156,7 @@ class GistsService extends Service {
     return github
         .request('POST', '/gists/$id/forks', statusCode: 201)
         .then((response) {
-      return Gist.fromJSON(jsonDecode(response.body) as Map<String, dynamic>);
+      return Gist.fromJson(jsonDecode(response.body) as Map<String, dynamic>);
     });
   }
 

lib/src/common/model/activity.dart

@@ -1,40 +1,53 @@
 import 'package:github/src/common.dart';
 import 'package:github/src/common/model/users.dart';
 import 'package:json_annotation/json_annotation.dart';
+import 'package:meta/meta.dart';
 
 part 'activity.g.dart';
 
 /// Model class for an event.
+@immutable
 @JsonSerializable(createToJson: false)
 class Event {
-  Event();
-  String id;
-  String type;
-  Repository repo;
-  User actor;
-  Organization org;
-  Map<String, dynamic> payload;
+  const Event({
+    @required this.id,
+    @required this.type,
+    @required this.repo,
+    @required this.actor,
+    @required this.org,
+    @required this.payload,
+    @required this.createdAt,
+  });
+  final String id;
+  final String type;
+  final Repository repo;
+  final User actor;
+  final Organization org;
+  final Map<String, dynamic> payload;
 
   @JsonKey(name: 'created_at')
-  DateTime createdAt;
+  final DateTime createdAt;
 
-  factory Event.fromJson(Map<String, dynamic> input) {
-    return _$EventFromJson(input);
-  }
+  factory Event.fromJson(Map<String, dynamic> input) => _$EventFromJson(input);
 }
 
 /// Model class for a repository subscription.
+@immutable
 @JsonSerializable(createToJson: false)
 class RepositorySubscription {
-  RepositorySubscription();
-  bool subscribed;
-  bool ignored;
-  String reason;
+  const RepositorySubscription({
+    @required this.subscribed,
+    @required this.ignored,
+    @required this.reason,
+    @required this.createdAt,
+  });
+  final bool subscribed;
+  final bool ignored;
+  final String reason;
 
   @JsonKey(name: 'created_at')
-  DateTime createdAt;
+  final DateTime createdAt;
 
-  factory RepositorySubscription.fromJson(Map<String, dynamic> input) {
-    return _$RepositorySubscriptionFromJson(input);
-  }
+  factory RepositorySubscription.fromJson(Map<String, dynamic> input) =>
+      _$RepositorySubscriptionFromJson(input);
 }

lib/src/common/model/activity.g.dart

@@ -1,62 +1,60 @@
 import 'dart:convert';
 import 'package:github/src/common.dart';
 import 'package:github/src/common/model/users.dart';
-import 'package:github/src/util.dart';
 import 'package:json_annotation/json_annotation.dart';
+import 'package:meta/meta.dart';
+
+part 'authorizations.g.dart';
 
 /// Model class for an authorization.
+@immutable
+@JsonSerializable(createToJson: false)
 class Authorization {
-  int id;
-
-  List<String> scopes;
-  String token;
-  AuthorizationApplication app;
-  String note;
-  String noteUrl;
-  DateTime createdAt;
-  DateTime updatedAt;
-  User user;
+  const Authorization(
+      {@required this.id,
+      @required this.scopes,
+      @required this.token,
+      @required this.app,
+      @required this.note,
+      @required this.noteUrl,
+      @required this.createdAt,
+      @required this.updatedAt,
+      @required this.user});
 
-  Map<String, dynamic> json;
-
-  static Authorization fromJSON(Map<String, dynamic> input) {
-    if (input == null) return null;
+  final int id;
+  final List<String> scopes;
+  final String token;
+  final AuthorizationApplication app;
+  final String note;
+  @JsonKey(name: 'note_url')
+  final String noteUrl;
+  @JsonKey(name: 'created_at')
+  final DateTime createdAt;
+  @JsonKey(name: 'updated_at')
+  final DateTime updatedAt;
+  final User user;
 
-    return Authorization()
-      ..id = input['id']
-      ..scopes = input['scopes'] as List<String>
-      ..token = input['token']
-      ..app = AuthorizationApplication.fromJSON(
-          input['app'] as Map<String, dynamic>)
-      ..note = input['note']
-      ..noteUrl = input['note_url']
-      ..createdAt = parseDateTime(input['created_at'])
-      ..updatedAt = parseDateTime(input['updated_at'])
-      ..json = input
-      ..user = User.fromJson(input['user'] as Map<String, dynamic>);
-  }
+  factory Authorization.fromJson(Map<String, dynamic> input) =>
+      _$AuthorizationFromJson(input);
 }
 
 /// Model class for an application of an [Authorization].
+@immutable
+@JsonSerializable(createToJson: false)
 class AuthorizationApplication {
-  String url;
-  String name;
+  const AuthorizationApplication({this.url, this.name, this.clientID});
 
-  @JsonKey(name: 'client_id')
-  String clientID;
-
-  AuthorizationApplication();
+  final String url;
+  final String name;
 
-  static AuthorizationApplication fromJSON(Map<String, dynamic> input) {
-    if (input == null) return null;
+  @JsonKey(name: 'client_id')
+  final String clientID;
 
-    return AuthorizationApplication()
-      ..url = input['url']
-      ..name = input['name']
-      ..clientID = input['client_id'];
-  }
+  factory AuthorizationApplication.fromJson(Map<String, dynamic> input) =>
+      _$AuthorizationApplicationFromJson(input);
 }
 
+@JsonSerializable()
 class CreateAuthorization {
   final String note;
 
@@ -67,12 +65,11 @@ class CreateAuthorization {
 
   CreateAuthorization(this.note);
 
+  factory CreateAuthorization.fromJson(Map<String, dynamic> json) =>
+      _$CreateAuthorizationFromJson(json);
+  Map<String, dynamic> toJson() => _$CreateAuthorizationToJson(this);
+
   String toJSON() {
-    final map = <String, dynamic>{};
-    putValue('note', note, map);
-    putValue('note_url', noteUrl, map);
-    putValue('client_id', clientID, map);
-    putValue('client_secret', clientSecret, map);
-    return jsonEncode(map);
+    return jsonEncode(toJson());
   }
 }