Merge pull request #249 from SpinlockLabs/nullsafe_2

Nullsafe 2

Author: robrbecker

CHANGELOG.md

@@ -72,7 +72,7 @@
 - For web: browser specific helper methods have moved. use import `package:github/browser_helper.dart` (renderMarkdown, and createAvatorImage)
 - `createGithubClient(...)` has been removed. Just create a GitHub object directly now.
 - `findAuthenticationFromEnvironment` now works in both server/flutter and web environments
-  - On the web, it will check the query string first, then localstorage
+  - On the web, it will check the query string first, then session storage
 - all static methods are now factory constructors
 - fromJSON is now fromJson everywhere
 - toJSON is now toJson everywhere

build.yaml

@@ -0,0 +1,8 @@
+targets:
+  $default:
+    builders:
+      json_serializable:
+        options:
+          # Options configure how source code is generated for every
+          # `@JsonSerializable`-annotated class in the package.
+          field_rename: snake

example/languages.dart

@@ -14,18 +14,9 @@ Future<void> main() async {
 }
 
 Future<void> loadRepository() async {
-  String? user = 'dart-lang';
-  String? reponame = 'sdk';
-
   final params = queryString;
-
-  if (params.containsKey('user')) {
-    user = params['user'];
-  }
-
-  if (params.containsKey('repo')) {
-    reponame = params['repo'];
-  }
+  var user = params['user'] ?? 'dart-lang';
+  var reponame = params['repo'] ?? 'sdk';
 
   document.getElementById('name')!.setInnerHtml('$user/$reponame');
 

example/repos.dart

@@ -10,13 +10,13 @@ List<Repository>? repos;
 
 Map<String, Comparator<Repository>> sorts = {
   'stars': (Repository a, Repository b) =>
-      b.stargazersCount!.compareTo(a.stargazersCount!),
+      b.stargazersCount.compareTo(a.stargazersCount),
   'forks': (Repository a, Repository b) =>
-      b.forksCount!.compareTo(a.forksCount!),
+      b.forksCount.compareTo(a.forksCount),
   'created': (Repository a, Repository b) =>
       b.createdAt!.compareTo(a.createdAt!),
   'pushed': (Repository a, Repository b) => b.pushedAt!.compareTo(a.pushedAt!),
-  'size': (Repository a, Repository b) => b.size!.compareTo(a.size!)
+  'size': (Repository a, Repository b) => b.size.compareTo(a.size)
 };
 
 Future<void> main() async {
@@ -53,8 +53,8 @@ void updateRepos(
         <div class="repo" id="repo_${repo.name}">
           <div class="line"></div>
           <h2><a href="${repo.htmlUrl}">${repo.name}</a></h2>
-          ${repo.description != "" && repo.description != null ? "<b>Description</b>: ${repo.description}<br/>" : ""}
-          <b>Language</b>: ${repo.language ?? "Unknown"}
+          ${repo.description != "" ? "<b>Description</b>: ${repo.description}<br/>" : ""}
+          <b>Language</b>: ${repo.language}
           <br/>
           <b>Default Branch</b>: ${repo.defaultBranch}
           <br/>
@@ -92,7 +92,7 @@ void loadRepos([int Function(Repository a, Repository b)? compare]) {
     }
   }
 
-  compare ??= (a, b) => a.name!.compareTo(b.name!);
+  compare ??= (a, b) => a.name.compareTo(b.name);
 
   github.repositories.listUserRepositories(user!).toList().then((repos) {
     _reposCache = repos;

example/stars.dart

@@ -12,16 +12,8 @@ Future<void> main() async {
 }
 
 void loadStars() {
-  String? user = 'SpinlockLabs';
-  String? repo = 'github.dart';
-
-  if (queryString.containsKey('user')) {
-    user = queryString['user'];
-  }
-
-  if (queryString.containsKey('repo')) {
-    repo = queryString['repo'];
-  }
+  var user = queryString['user'] ?? 'SpinlockLabs';
+  var repo = queryString['repo'] ?? 'github.dart';
 
   querySelector('#title')!.appendText(' for $user/$repo');
 

example/status.dart

@@ -5,7 +5,7 @@ import 'package:json_annotation/json_annotation.dart';
 part 'authorizations.g.dart';
 
 /// Model class for an authorization.
-@JsonSerializable(fieldRename: FieldRename.snake)
+@JsonSerializable()
 class Authorization {
   Authorization(
       {this.id,
@@ -34,7 +34,7 @@ class Authorization {
 }
 
 /// Model class for an application of an [Authorization].
-@JsonSerializable(fieldRename: FieldRename.snake)
+@JsonSerializable()
 class AuthorizationApplication {
   AuthorizationApplication({this.url, this.name, this.clientId});
 
@@ -47,7 +47,7 @@ class AuthorizationApplication {
   Map<String, dynamic> toJson() => _$AuthorizationApplicationToJson(this);
 }
 
-@JsonSerializable(fieldRename: FieldRename.snake)
+@JsonSerializable()
 class CreateAuthorization {
   CreateAuthorization(this.note,
       {this.scopes, this.noteUrl, this.clientId, this.clientSecret});

example/status.html

@@ -124,7 +124,7 @@ class GistHistoryEntry {
 }
 
 /// Model class for gist comments.
-@JsonSerializable(fieldRename: FieldRename.snake)
+@JsonSerializable()
 class GistComment {
   GistComment({
     this.id,
@@ -146,7 +146,7 @@ class GistComment {
 }
 
 /// Model class for a new gist comment to be created.
-@JsonSerializable(fieldRename: FieldRename.snake)
+@JsonSerializable()
 class CreateGistComment {
   CreateGistComment(this.body);
   String? body;

lib/src/common/model/authorizations.dart

@@ -5,7 +5,7 @@ import 'package:json_annotation/json_annotation.dart';
 part 'git.g.dart';
 
 /// Model class for a blob.
-@JsonSerializable(fieldRename: FieldRename.snake)
+@JsonSerializable()
 class GitBlob {
   GitBlob({
     this.content,
@@ -28,7 +28,7 @@ class GitBlob {
 /// Model class for a new blob to be created.
 ///
 /// The [encoding] can be either 'utf-8' or 'base64'.
-@JsonSerializable(fieldRename: FieldRename.snake)
+@JsonSerializable()
 class CreateGitBlob {
   CreateGitBlob(this.content, this.encoding);
 
@@ -44,7 +44,7 @@ class CreateGitBlob {
 ///
 /// Note: This is the raw [GitCommit]. The [RepositoryCommit] is a repository
 /// commit containing GitHub-specific information.
-@JsonSerializable(fieldRename: FieldRename.snake)
+@JsonSerializable()
 class GitCommit {
   GitCommit({
     this.sha,
@@ -73,7 +73,7 @@ class GitCommit {
 }
 
 /// Model class for a new commit to be created.
-@JsonSerializable(fieldRename: FieldRename.snake)
+@JsonSerializable()
 class CreateGitCommit {
   CreateGitCommit(this.message, this.tree,
       {this.parents, this.committer, this.author});
@@ -117,7 +117,7 @@ class GitCommitUser {
 }
 
 /// Model class for a GitHub tree.
-@JsonSerializable(fieldRename: FieldRename.snake)
+@JsonSerializable()
 class GitTree {
   String? sha;
   String? url;
@@ -139,7 +139,7 @@ class GitTree {
 /// Model class for the contents of a tree structure. [GitTreeEntry] can
 /// represent either a blog, a commit (in the case of a submodule), or another
 /// tree.
-@JsonSerializable(fieldRename: FieldRename.snake)
+@JsonSerializable()
 class GitTreeEntry {
   String? path;
   String? mode;
@@ -156,7 +156,7 @@ class GitTreeEntry {
 }
 
 /// Model class for a new tree to be created.
-@JsonSerializable(fieldRename: FieldRename.snake)
+@JsonSerializable()
 class CreateGitTree {
   CreateGitTree(this.entries, {this.baseTree});
 
@@ -176,7 +176,7 @@ class CreateGitTree {
 }
 
 /// Model class for a new tree entry to be created.
-@JsonSerializable(fieldRename: FieldRename.snake)
+@JsonSerializable()
 class CreateGitTreeEntry {
   /// Constructor.
   /// Either [sha] or [content] must be defined.
@@ -199,7 +199,7 @@ class CreateGitTreeEntry {
 }
 
 /// Model class for a reference.
-@JsonSerializable(fieldRename: FieldRename.snake)
+@JsonSerializable()
 class GitReference {
   GitReference({
     this.ref,
@@ -216,7 +216,7 @@ class GitReference {
 }
 
 /// Model class for a tag.
-@JsonSerializable(fieldRename: FieldRename.snake)
+@JsonSerializable()
 class GitTag {
   GitTag({
     this.tag,
@@ -239,7 +239,7 @@ class GitTag {
 }
 
 /// Model class for a new tag to be created.
-@JsonSerializable(fieldRename: FieldRename.snake)
+@JsonSerializable()
 class CreateGitTag {
   CreateGitTag(this.tag, this.message, this.object, this.type, this.tagger);
 
@@ -255,7 +255,7 @@ class CreateGitTag {
 }
 
 /// Model class for an object referenced by [GitReference] and [GitTag].
-@JsonSerializable(fieldRename: FieldRename.snake)
+@JsonSerializable()
 class GitObject {
   GitObject(this.type, this.sha, this.url);
   String? type;