Strong mode and some fixes

Pacane · Pacane · commit ffd3bd603fdf · 2016-10-06T11:54:53.000-04:00
diff --git a/lib/src/common/model/issues.dart b/lib/src/common/model/issues.dart
@@ -58,10 +58,10 @@ class Issue {
   @ApiName("closed_by")
   User closedBy;
 
-  static Issue fromJSON(input) {
+  static Issue fromJSON(Map<String, dynamic> input) {
     if (input == null) return null;
 
-    var labels = input['labels'];
+    var labels = input['labels'] as List<Map<String, dynamic>>;
     if (labels == null) labels = [];
 
     return new Issue()
@@ -74,9 +74,11 @@ class Issue {
       ..user = User.fromJSON(input['user'])
       ..labels = labels.map(IssueLabel.fromJSON).toList(growable: false)
       ..assignee = User.fromJSON(input['assignee'])
-      ..milestone = Milestone.fromJSON(input['milestone'])
+      ..milestone =
+          Milestone.fromJSON(input['milestone'] as Map<String, dynamic>)
       ..commentsCount = input['comments']
-      ..pullRequest = IssuePullRequest.fromJSON(input['pull_request'])
+      ..pullRequest = IssuePullRequest
+          .fromJSON(input['pull_request'] as Map<String, dynamic>)
       ..createdAt = parseDateTime(input['created_at'])
       ..updatedAt = parseDateTime(input['updated_at'])
       ..closedAt = parseDateTime(input['closed_at'])
@@ -100,7 +102,7 @@ class IssueRequest {
   IssueRequest();
 
   String toJSON() {
-    var map = {};
+    var map = <String, dynamic>{};
     putValue("title", title, map);
     putValue("body", body, map);
     putValue("labels", labels, map);
@@ -125,7 +127,7 @@ class IssuePullRequest {
   @ApiName("patch_url")
   String patchUrl;
 
-  static IssuePullRequest fromJSON(input) {
+  static IssuePullRequest fromJSON(Map<String, dynamic> input) {
     if (input == null) return null;
 
     return new IssuePullRequest()
@@ -155,7 +157,7 @@ class IssueComment {
   @ApiName("issue_url")
   String issueUrl;
 
-  static IssueComment fromJSON(input) {
+  static IssueComment fromJSON(Map<String, dynamic> input) {
     if (input == null) return null;
 
     return new IssueComment()
@@ -178,7 +180,7 @@ class IssueLabel {
   /// Label Color
   String color;
 
-  static IssueLabel fromJSON(input) {
+  static IssueLabel fromJSON(Map<String, dynamic> input) {
     if (input == null) return null;
 
     assert(input['name'] != null);
@@ -189,6 +191,7 @@ class IssueLabel {
       ..color = input['color'];
   }
 
+  @override
   String toString() => 'IssueLabel: $name';
 }
 
@@ -232,7 +235,7 @@ class Milestone {
   @ApiName("due_on")
   DateTime dueOn;
 
-  static Milestone fromJSON(input) {
+  static Milestone fromJSON(Map<String, dynamic> input) {
     if (input == null) return null;
 
     return new Milestone()
@@ -261,7 +264,7 @@ class CreateMilestone {
   CreateMilestone(this.title);
 
   String toJSON() {
-    var map = {};
+    var map = <String, dynamic>{};
     putValue("title", title, map);
     putValue("state", state, map);
     putValue(description, description, map);
diff --git a/test/helper/mock.dart b/test/helper/mock.dart
@@ -18,7 +18,8 @@ class MockWithNamedArgs extends Mock {
     log = new LogEntryListNamedArgs(() => _lastNamedArgs);
   }
 
-  noSuchMethod(Invocation invocation) {
+  @override
+  dynamic noSuchMethod(Invocation invocation) {
     _lastNamedArgs = invocation.namedArguments;
     return super.noSuchMethod(invocation);
   }
@@ -41,6 +42,7 @@ class LogEntryListNamedArgs extends LogEntryList {
 
   LogEntryListNamedArgs(this.getLastNamedArgs);
 
+  @override
   add(LogEntry entry) {
     logs.add(new LogEntryNamedArgs(entry, getLastNamedArgs()));
   }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,8 @@ class MockWithNamedArgs extends Mock {`
`18`	`18`	`log = new LogEntryListNamedArgs(() => _lastNamedArgs);`
`19`	`19`	`}`
`20`	`20`
`21`		`- noSuchMethod(Invocation invocation) {`
	`21`	`+ @override`
	`22`	`+ dynamic noSuchMethod(Invocation invocation) {`
`22`	`23`	`_lastNamedArgs = invocation.namedArguments;`
`23`	`24`	`return super.noSuchMethod(invocation);`
`24`	`25`	`}`
`@@ -41,6 +42,7 @@ class LogEntryListNamedArgs extends LogEntryList {`
`41`	`42`
`42`	`43`	`LogEntryListNamedArgs(this.getLastNamedArgs);`
`43`	`44`
	`45`	`+ @override`
`44`	`46`	`add(LogEntry entry) {`
`45`	`47`	`logs.add(new LogEntryNamedArgs(entry, getLastNamedArgs()));`
`46`	`48`	`}`