moving more classes to JsonSerializable

Author: robbecker-wf

lib/src/common/activity_service.dart

@@ -18,7 +18,7 @@ class ActivityService extends Service {
   /// API docs: https://developer.github.com/v3/activity/events/#list-public-events
   Stream<Event> listPublicEvents({int pages = 2}) {
     return PaginationHelper(github)
-        .objects('GET', '/events', Event.fromJSON, pages: pages);
+        .objects('GET', '/events', (i) => Event.fromJson(i), pages: pages);
   }
 
   /// Lists public events for a network of repositories.
@@ -27,7 +27,7 @@ class ActivityService extends Service {
   Stream<Event> listRepositoryNetworkEvents(RepositorySlug slug,
       {int pages = 2}) {
     return PaginationHelper(github).objects(
-        'GET', '/networks/${slug.fullName}/events', Event.fromJSON,
+        'GET', '/networks/${slug.fullName}/events', (i) => Event.fromJson(i),
         pages: pages);
   }
 
@@ -47,8 +47,8 @@ class ActivityService extends Service {
   ///
   /// API docs: https://developer.github.com/v3/activity/events/#list-repository-events
   Stream<Event> listRepositoryIssueEvents(RepositorySlug slug, {int pages}) {
-    return PaginationHelper(github).objects(
-        'GET', '/repos/${slug.fullName}/issues/events', Event.fromJSON,
+    return PaginationHelper(github).objects('GET',
+        '/repos/${slug.fullName}/issues/events', (i) => Event.fromJson(i),
         pages: pages);
   }
 
@@ -62,7 +62,7 @@ class ActivityService extends Service {
   /// API docs: https://developer.github.com/v3/activity/events/#list-repository-events
   Stream<Event> listRepositoryEvents(RepositorySlug slug, {int pages}) {
     return PaginationHelper(github).objects(
-        'GET', '/repos/${slug.fullName}/events', Event.fromJSON,
+        'GET', '/repos/${slug.fullName}/events', (i) => Event.fromJson(i),
         pages: pages);
   }
 
@@ -76,8 +76,9 @@ class ActivityService extends Service {
   ///
   /// API docs: https://developer.github.com/v3/activity/events/#list-public-events-for-an-organization
   Stream<Event> listEventsForOrganization(String name, {int pages}) {
-    return PaginationHelper(github)
-        .objects('GET', '/orgs/$name/events', Event.fromJSON, pages: pages);
+    return PaginationHelper(github).objects(
+        'GET', '/orgs/$name/events', (i) => Event.fromJson(i),
+        pages: pages);
   }
 
   /// Returns an [EventPoller] for public events for an organization.
@@ -103,7 +104,7 @@ class ActivityService extends Service {
   /// API docs: https://developer.github.com/v3/activity/events/#list-events-performed-by-a-user
   Stream<Event> listEventsPerformedByUser(String username, {int pages}) {
     return PaginationHelper(github).objects(
-        'GET', '/users/$username/events', Event.fromJSON,
+        'GET', '/users/$username/events', (i) => Event.fromJson(i),
         pages: pages);
   }
 
@@ -112,7 +113,7 @@ class ActivityService extends Service {
   /// API docs: https://developer.github.com/v3/activity/events/#list-public-events-performed-by-a-user
   Stream<Event> listPublicEventsPerformedByUser(String username, {int pages}) {
     return PaginationHelper(github).objects(
-        'GET', '/users/$username/events/public', Event.fromJSON,
+        'GET', '/users/$username/events/public', (i) => Event.fromJson(i),
         pages: pages);
   }
 
@@ -214,15 +215,15 @@ class ActivityService extends Service {
   /// API docs: https://developer.github.com/v3/activity/starring/#list-repositories-being-starred
   Stream<Repository> listStarredByUser(String user) {
     return PaginationHelper(github)
-        .objects('GET', '/users/$user/starred', Repository.fromJSON);
+        .objects('GET', '/users/$user/starred', (i) => Repository.fromJson(i));
   }
 
   /// Lists all the repos by the current user.
   ///
   /// API docs: https://developer.github.com/v3/activity/starring/#list-repositories-being-starred
   Stream<Repository> listStarred() {
     return PaginationHelper(github)
-        .objects('GET', '/user/starred', Repository.fromJSON);
+        .objects('GET', '/user/starred', (i) => Repository.fromJson(i));
   }
 
   /// Checks if the currently authenticated user has starred the specified repository.
@@ -268,16 +269,16 @@ class ActivityService extends Service {
   ///
   /// API docs: https://developer.github.com/v3/activity/watching/#list-repositories-being-watched
   Stream<Repository> listWatchedByUser(String user) {
-    return PaginationHelper(github)
-        .objects('GET', '/users/$user/subscriptions', Repository.fromJSON);
+    return PaginationHelper(github).objects(
+        'GET', '/users/$user/subscriptions', (i) => Repository.fromJson(i));
   }
 
   /// Lists the repositories the current user is watching.
   ///
   /// API docs: https://developer.github.com/v3/activity/watching/#list-repositories-being-watched
   Stream<Repository> listWatched() {
     return PaginationHelper(github)
-        .objects('GET', '/user/subscriptions', Repository.fromJSON);
+        .objects('GET', '/user/subscriptions', (i) => Repository.fromJson(i));
   }
 
   /// Fetches repository subscription information.
@@ -286,7 +287,8 @@ class ActivityService extends Service {
   Future<RepositorySubscription> getRepositorySubscription(
           RepositorySlug slug) =>
       github.getJSON('/repos/${slug.fullName}/subscription',
-          statusCode: StatusCodes.OK, convert: RepositorySubscription.fromJSON);
+          statusCode: StatusCodes.OK,
+          convert: (i) => RepositorySubscription.fromJson(i));
 
   /// Sets the Repository Subscription Status
   ///
@@ -302,7 +304,7 @@ class ActivityService extends Service {
     return github.postJSON(
       '/repos/${slug.fullName}/subscription',
       statusCode: StatusCodes.OK,
-      convert: RepositorySubscription.fromJSON,
+      convert: (i) => RepositorySubscription.fromJson(i),
       body: jsonEncode(map),
     );
   }
@@ -354,7 +356,7 @@ class EventPoller {
 
       if (!(onlyNew && _timer == null)) {
         for (final item in json) {
-          final event = Event.fromJSON(item);
+          final event = Event.fromJson(item);
 
           if (after == null ? false : event.createdAt.toUtc().isBefore(after)) {
             continue;

lib/src/common/model/activity.dart

@@ -1,66 +1,40 @@
 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';
 
+part 'activity.g.dart';
+
 /// Model class for an event.
+@JsonSerializable(createToJson: false)
 class Event {
+  Event();
+  String id;
+  String type;
   Repository repo;
-
   User actor;
-
   Organization org;
+  Map<String, dynamic> payload;
 
   @JsonKey(name: 'created_at')
   DateTime createdAt;
 
-  String id;
-
-  String type;
-
-  Map<String, dynamic> json;
-
-  Map<String, dynamic> payload;
-
-  static Event fromJSON(Map<String, dynamic> input) {
-    if (input == null) return null;
-
-    final event = Event();
-
-    event.json = input;
-
-    event.type = input['type'];
-
-    event
-      ..repo = Repository.fromJSON(input['repo'] as Map<String, dynamic>)
-      ..org = Organization.fromJSON(input['org'] as Map<String, dynamic>)
-      ..createdAt = parseDateTime(input['created_at'])
-      ..id = input['id']
-      ..actor = User.fromJson(input['actor'] as Map<String, dynamic>)
-      ..payload = input['payload'] as Map<String, dynamic>;
-
-    return event;
+  factory Event.fromJson(Map<String, dynamic> input) {
+    return _$EventFromJson(input);
   }
 }
 
 /// Model class for a repository subscription.
+@JsonSerializable(createToJson: false)
 class RepositorySubscription {
+  RepositorySubscription();
   bool subscribed;
   bool ignored;
   String reason;
 
   @JsonKey(name: 'created_at')
   DateTime createdAt;
 
-  RepositorySubscription();
-
-  static RepositorySubscription fromJSON(Map<String, dynamic> input) {
-    if (input == null) return null;
-
-    return RepositorySubscription()
-      ..subscribed = input['subscribed']
-      ..ignored = input['ignored']
-      ..reason = input['reason']
-      ..createdAt = parseDateTime(input['created_at']);
+  factory RepositorySubscription.fromJson(Map<String, dynamic> input) {
+    return _$RepositorySubscriptionFromJson(input);
   }
 }

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

@@ -22,7 +22,7 @@ class Notification {
     return Notification()
       ..id = input['id']
       ..repository =
-          Repository.fromJSON(input['repository'] as Map<String, dynamic>)
+          Repository.fromJson(input['repository'] as Map<String, dynamic>)
       ..subject =
           NotificationSubject.fromJSON(input['subject'] as Map<String, dynamic>)
       ..reason = input['reason']

lib/src/common/model/notifications.dart

@@ -5,7 +5,10 @@ import 'package:json_annotation/json_annotation.dart';
 part 'orgs.g.dart';
 
 /// Model class for a GitHub organization.
+@JsonSerializable(createToJson: false)
 class Organization {
+  Organization();
+
   /// Organization Login
   String login;
 
@@ -59,25 +62,8 @@ class Organization {
   @JsonKey(name: 'updated_at')
   DateTime updatedAt;
 
-  static Organization fromJSON(Map<String, dynamic> input) {
-    if (input == null) return null;
-
-    return Organization()
-      ..login = input['login']
-      ..id = input['id']
-      ..htmlUrl = input['html_url']
-      ..avatarUrl = input['avatar_url']
-      ..name = input['name']
-      ..company = input['company']
-      ..createdAt = parseDateTime(input['created_at'])
-      ..updatedAt = parseDateTime(input['updated_at'])
-      ..publicGistsCount = input['public_gists']
-      ..publicReposCount = input['public_repos']
-      ..followersCount = input['followers']
-      ..followingCount = input['following']
-      ..email = input['email']
-      ..blog = input['blog']
-      ..location = input['location'];
+  factory Organization.fromJson(Map<String, dynamic> input) {
+    return _$OrganizationFromJson(input);
   }
 }
 
@@ -91,7 +77,7 @@ class OrganizationMembership {
 
     return OrganizationMembership()
       ..organization =
-          Organization.fromJSON(input['organization'] as Map<String, dynamic>)
+          Organization.fromJson(input['organization'] as Map<String, dynamic>)
       ..state = input['state'];
   }
 }
@@ -127,7 +113,7 @@ class Team {
       ..membersCount = input['members_count']
       ..reposCount = input['repos_count']
       ..organization =
-          Organization.fromJSON(input['organization'] as Map<String, dynamic>);
+          Organization.fromJson(input['organization'] as Map<String, dynamic>);
   }
 }
 

lib/src/common/model/orgs.dart

@@ -191,7 +191,7 @@ class PullRequestHead {
     head.ref = input['ref'];
     head.sha = input['sha'];
     head.user = User.fromJson(input['user'] as Map<String, dynamic>);
-    head.repo = Repository.fromJSON(input['repo'] as Map<String, dynamic>);
+    head.repo = Repository.fromJson(input['repo'] as Map<String, dynamic>);
     return head;
   }
 }

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

@@ -38,6 +38,8 @@ class GitHubComparison {
 /// Model class for a repository.
 @JsonSerializable(createToJson: false)
 class Repository {
+  Repository();
+
   /// Repository Name
   String name;
 
@@ -132,8 +134,7 @@ class Repository {
 
   LicenseKind license;
 
-  static Repository fromJSON(Map<String, dynamic> input) {
-    if (input == null) return null;
+  factory Repository.fromJson(Map<String, dynamic> input) {
     return _$RepositoryFromJson(input);
   }
 

lib/src/common/model/pulls.dart

@@ -24,7 +24,7 @@ class CombinedRepositoryStatus {
           .map((it) => RepositoryStatus.fromJSON(it))
           .toList()
       ..repository =
-          Repository.fromJSON(input['repository'] as Map<String, dynamic>);
+          Repository.fromJson(input['repository'] as Map<String, dynamic>);
   }
 }
 

lib/src/common/model/repos.dart

@@ -47,7 +47,6 @@ class CodeSearchItem {
   @JsonKey(name: 'html_url', fromJson: Uri.parse)
   Uri htmlUrl;
 
-  @JsonKey(fromJson: Repository.fromJSON)
   Repository repository;
 
   static CodeSearchItem fromJson(Map<String, dynamic> input) {