lib/github: better type safety on json accesses

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/lib/github/api.nit b/lib/github/api.nit
index fd6f30b..84badf7 100644 (file)
--- a/lib/github/api.nit
+++ b/lib/github/api.nit
@@ -616,7 +616,7 @@ class Commit
        # Parent commits of `self`.
        fun parents: Array[Commit] do
                var res = new Array[Commit]
        # Parent commits of `self`.
        fun parents: Array[Commit] do
                var res = new Array[Commit]

-               var parents = json["parents"]
+               var parents = json.get_or_null("parents")

                if not parents isa JsonArray then return res
                for obj in parents do
                        if not obj isa JsonObject then continue
                if not parents isa JsonArray then return res
                for obj in parents do
                        if not obj isa JsonObject then continue

@@ -627,18 +627,16 @@ class Commit
 
        # Author of the commit.
        fun author: nullable User do
 
        # Author of the commit.
        fun author: nullable User do

-               if not json.has_key("author") then return null
-               var user = json["author"]
-               if not user isa JsonObject then return null
-               return new User.from_json(api, user)
+               var user = json.get_or_null("author")
+               if user isa JsonObject then return new User.from_json(api, user)
+               return null

        end
 
        # Committer of the commit.
        fun committer: nullable User do
        end
 
        # Committer of the commit.
        fun committer: nullable User do

-               if not json.has_key("committer") then return null
-               var user = json["author"]
-               if not user isa JsonObject then return null
-               return new User.from_json(api, user)
+               var user = json.get_or_null("author")
+               if user isa JsonObject then return new User.from_json(api, user)
+               return null

        end
 
        # Authoring date as ISODate.
        end
 
        # Authoring date as ISODate.

@@ -658,7 +656,7 @@ class Commit
        # List files staged in this commit.
        fun files: Array[GithubFile] do
                var res = new Array[GithubFile]
        # List files staged in this commit.
        fun files: Array[GithubFile] do
                var res = new Array[GithubFile]

-               var files = json["files"]
+               var files = json.get_or_null("files")

                if not files isa JsonArray then return res
                for obj in files do
                        res.add(new GithubFile(obj.as(JsonObject)))
                if not files isa JsonArray then return res
                for obj in files do
                        res.add(new GithubFile(obj.as(JsonObject)))

@@ -699,8 +697,9 @@ class Issue
        # List of labels on this issue associated to their names.
        fun labels: Map[String, Label] do
                var res = new HashMap[String, Label]
        # List of labels on this issue associated to their names.
        fun labels: Map[String, Label] do
                var res = new HashMap[String, Label]

-               if not json.has_key("labels") then return res
-               for obj in json["labels"].as(JsonArray) do
+               var lbls = json.get_or_null("labels")
+               if not lbls isa JsonArray then return res
+               for obj in lbls do

                        if not obj isa JsonObject then continue
                        var name = obj["name"].as(String)
                        res[name] = new Label.from_json(api, repo, obj)
                        if not obj isa JsonObject then continue
                        var name = obj["name"].as(String)
                        res[name] = new Label.from_json(api, repo, obj)

@@ -716,16 +715,16 @@ class Issue
 
        # Assigned `User` (if any).
        fun assignee: nullable User do
 
        # Assigned `User` (if any).
        fun assignee: nullable User do

-               var assignee = json["assignee"]
-               if not assignee isa JsonObject then return null
-               return new User.from_json(api, assignee)
+               var assignee = json.get_or_null("assignee")
+               if assignee isa JsonObject then return new User.from_json(api, assignee)
+               return null

        end
 
        # `Milestone` (if any).
        fun milestone: nullable Milestone do
        end
 
        # `Milestone` (if any).
        fun milestone: nullable Milestone do

-               var milestone = json["milestone"]
-               if not milestone isa JsonObject then return null
-               return new Milestone.from_json(api, repo, milestone)
+               var milestone = json.get_or_null("milestone")
+               if milestone isa JsonObject then return new Milestone.from_json(api, repo, milestone)
+               return null

        end
 
        # List of comments made on this issue.
        end
 
        # List of comments made on this issue.

@@ -759,16 +758,16 @@ class Issue
 
        # Last update time in ISODate format (if any).
        fun updated_at: nullable ISODate do
 
        # Last update time in ISODate format (if any).
        fun updated_at: nullable ISODate do

-               var res = json["updated_at"]
-               if res == null then return null
-               return new ISODate.from_string(res.as(String))
+               var res = json.get_or_null("updated_at")
+               if res isa String then return new ISODate.from_string(res)
+               return null

        end
 
        # Close time in ISODate format (if any).
        fun closed_at: nullable ISODate do
        end
 
        # Close time in ISODate format (if any).
        fun closed_at: nullable ISODate do

-               var res = json["closed_at"]
-               if res == null then return null
-               return new ISODate.from_string(res.as(String))
+               var res = json.get_or_null("closed_at")
+               if res isa String then return new ISODate.from_string(res)
+               return null

        end
 
        # TODO link to pull request
        end
 
        # TODO link to pull request

@@ -780,7 +779,8 @@ class Issue
        fun events: Array[IssueEvent] do
                var res = new Array[IssueEvent]
                var page = 1
        fun events: Array[IssueEvent] do
                var res = new Array[IssueEvent]
                var page = 1

-               var array = api.get("{key}/events?page={page}").as(JsonArray)
+               var array = api.get("{key}/events?page={page}")
+               if not array isa JsonArray then return res

                while not array.is_empty do
                        for obj in array do
                                if not obj isa JsonObject then continue
                while not array.is_empty do
                        for obj in array do
                                if not obj isa JsonObject then continue

@@ -794,9 +794,9 @@ class Issue
 
        # User that closed this issue (if any).
        fun closed_by: nullable User do
 
        # User that closed this issue (if any).
        fun closed_by: nullable User do

-               var closer = json["closed_by"]
-               if not closer isa JsonObject then return null
-               return new User.from_json(api, closer)
+               var closer = json.get_or_null("closed_by")
+               if closer isa JsonObject then return new User.from_json(api, closer)
+               return null

        end
 end
 
        end
 end
 

@@ -813,9 +813,9 @@ class PullRequest
 
        # Merge time in ISODate format (if any).
        fun merged_at: nullable ISODate do
 
        # Merge time in ISODate format (if any).
        fun merged_at: nullable ISODate do

-               var res = json["merged_at"]
-               if res == null then return null
-               return new ISODate.from_string(res.to_s)
+               var res = json.get_or_null("merged_at")
+               if res isa String then return new ISODate.from_string(res)
+               return null

        end
 
        # Merge commit SHA.
        end
 
        # Merge commit SHA.

@@ -849,9 +849,9 @@ class PullRequest
 
        # User that merged this pull request (if any).
        fun merged_by: nullable User do
 
        # User that merged this pull request (if any).
        fun merged_by: nullable User do

-               var merger = json["merged_by"]
-               if not merger isa JsonObject then return null
-               return new User.from_json(api, merger)
+               var merger = json.get_or_null("merged_by")
+               if merger isa JsonObject then return new User.from_json(api, merger)
+               return null

        end
 
        # Count of commits in this pull request.
        end
 
        # Count of commits in this pull request.

@@ -963,23 +963,23 @@ class Milestone
 
        # Due time in ISODate format (if any).
        fun due_on: nullable ISODate do
 
        # Due time in ISODate format (if any).
        fun due_on: nullable ISODate do

-               var res = json["updated_at"]
-               if res == null then return null
-               return new ISODate.from_string(res.to_s)
+               var res = json.get_or_null("updated_at")
+               if res isa String then return new ISODate.from_string(res)
+               return null

        end
 
        # Update time in ISODate format (if any).
        fun updated_at: nullable ISODate do
        end
 
        # Update time in ISODate format (if any).
        fun updated_at: nullable ISODate do

-               var res = json["updated_at"]
-               if res == null then return null
-               return new ISODate.from_string(res.to_s)
+               var res = json.get_or_null("updated_at")
+               if res isa String then return new ISODate.from_string(res)
+               return null

        end
 
        # Close time in ISODate format (if any).
        fun closed_at: nullable ISODate do
        end
 
        # Close time in ISODate format (if any).
        fun closed_at: nullable ISODate do

-               var res = json["closed_at"]
-               if res == null then return null
-               return new ISODate.from_string(res.to_s)
+               var res = json.get_or_null("closed_at")
+               if res isa String then return new ISODate.from_string(res)
+               return null

        end
 end
 
        end
 end
 

@@ -1013,8 +1013,9 @@ abstract class Comment
 
        # Last update time in ISODate format (if any).
        fun updated_at: nullable ISODate do
 
        # Last update time in ISODate format (if any).
        fun updated_at: nullable ISODate do

-               if not json.has_key("updated_at") then return null
-               return new ISODate.from_string(json["updated_at"].as(String))
+               var res = json.get_or_null("updated_at")
+               if res isa String then return new ISODate.from_string(res)
+               return null

        end
 
        # Comment body text.
        end
 
        # Comment body text.

@@ -1040,18 +1041,16 @@ class CommitComment
 
        # Position of the comment on the line.
        fun position: nullable String do
 
        # Position of the comment on the line.
        fun position: nullable String do

-               if not json.has_key("position") then return null
-               var res = json["position"]
-               if res == null then return null
-               return res.to_s
+               var res = json.get_or_null("position")
+               if res isa String then return res
+               return null

        end
 
        # Line of the comment.
        fun line: nullable String do
        end
 
        # Line of the comment.
        fun line: nullable String do

-               if not json.has_key("line") then return null
-               var res = json["line"]
-               if res == null then return null
-               return res.to_s
+               var res = json.get_or_null("line")
+               if res isa String then return res
+               return null

        end
 
        # Path of the commented file.
        end
 
        # Path of the commented file.

@@ -1154,37 +1153,37 @@ class IssueEvent
 
        # Commit linked to this event (if any).
        fun commit_id: nullable String do
 
        # Commit linked to this event (if any).
        fun commit_id: nullable String do

-               var res = json["commit_id"]
-               if res == null then return null
-               return res.to_s
+               var res = json.get_or_null("commit_id")
+               if res isa String then return res
+               return null

        end
 
        # Label linked to this event (if any).
        fun labl: nullable Label do
        end
 
        # Label linked to this event (if any).
        fun labl: nullable Label do

-               var res = json["label"]
-               if not res isa JsonObject then return null
-               return new Label.from_json(api, repo, res)
+               var res = json.get_or_null("label")
+               if res isa JsonObject then return new Label.from_json(api, repo, res)
+               return null

        end
 
        # User linked to this event (if any).
        fun assignee: nullable User do
        end
 
        # User linked to this event (if any).
        fun assignee: nullable User do

-               var res = json["assignee"]
-               if not res isa JsonObject then return null
-               return new User.from_json(api, res)
+               var res = json.get_or_null("assignee")
+               if res isa JsonObject then return new User.from_json(api, res)
+               return null

        end
 
        # Milestone linked to this event (if any).
        fun milestone: nullable Milestone do
        end
 
        # Milestone linked to this event (if any).
        fun milestone: nullable Milestone do

-               var res = json["milestone"]
-               if not res isa JsonObject then return null
-               return new Milestone.from_json(api, repo, res)
+               var res = json.get_or_null("milestone")
+               if res isa JsonObject then return new Milestone.from_json(api, repo, res)
+               return null

        end
 
        # Rename linked to this event (if any).
        fun rename: nullable RenameAction do
        end
 
        # Rename linked to this event (if any).
        fun rename: nullable RenameAction do

-               var res = json["rename"]
-               if res == null then return null
-               return new RenameAction(res.as(JsonObject))
+               var res = json.get_or_null("rename")
+               if res isa JsonObject then return new RenameAction(res)
+               return null

        end
 end
 
        end
 end
 

diff --git a/lib/github/events.nit b/lib/github/events.nit
index 8cacc35..296db34 100644 (file)
--- a/lib/github/events.nit
+++ b/lib/github/events.nit
@@ -103,21 +103,21 @@ class DeploymentEvent
 
        # Optional extra information for this deployment.
        fun payload: nullable String do
 
        # Optional extra information for this deployment.
        fun payload: nullable String do

-               if not json.has_key("payload") then return null
-               return json["payload"].as(String)
+               var res = json.get_or_null("payload")
+               if res isa String then return res else return null

        end
 
        # Optional environment to deploy to.
        # Default: "production"
        fun environment: nullable String do
        end
 
        # Optional environment to deploy to.
        # Default: "production"
        fun environment: nullable String do

-               if not json.has_key("environment") then return null
-               return json["environment"].as(String)
+               var res = json.get_or_null("environment")
+               if res isa String then return res else return null

        end
 
        # Optional human-readable description added to the deployment.
        fun description: nullable String do
        end
 
        # Optional human-readable description added to the deployment.
        fun description: nullable String do

-               if not json.has_key("description") then return null
-               return json["description"].as(String)
+               var res = json.get_or_null("description")
+               if res isa String then return res else return null

        end
 end
 
        end
 end
 

@@ -132,8 +132,8 @@ class DeploymentStatusEvent
 
        # Optional link added to the status.
        fun target_url: nullable String do
 
        # Optional link added to the status.
        fun target_url: nullable String do

-               if not json.has_key("target_url") then return null
-               return json["target_url"].as(String)
+               var res = json.get_or_null("target_url")
+               if res isa String then return res else return null

        end
 
        # Deployment hash that this status is associated with.
        end
 
        # Deployment hash that this status is associated with.

@@ -141,8 +141,8 @@ class DeploymentStatusEvent
 
        # Optional human-readable description added to the status.
        fun description: nullable String do
 
        # Optional human-readable description added to the status.
        fun description: nullable String do

-               if not json.has_key("description") then return null
-               return json["description"].as(String)
+               var res = json.get_or_null("description")
+               if res isa String then return res else return null

        end
 end
 
        end
 end
 

@@ -181,14 +181,14 @@ class IssuesEvent
 
        # Optional `Label` that was added or removed from the issue.
        fun lbl: nullable Label do
 
        # Optional `Label` that was added or removed from the issue.
        fun lbl: nullable Label do

-               if not json.has_key("label") then return null
-               return new Label.from_json(api, repo, json["label"].as(JsonObject))
+               var res = json.get_or_null("label")
+               if res isa JsonObject then return new Label.from_json(api, repo, res) else return null

        end
 
        # Optional `User` that was assigned or unassigned from the issue.
        fun assignee: nullable User do
        end
 
        # Optional `User` that was assigned or unassigned from the issue.
        fun assignee: nullable User do

-               if not json.has_key("assignee") then return null
-               return new User.from_json(api, json["assignee"].as(JsonObject))
+               var res = json.get_or_null("assignee")
+               if res isa JsonObject then return new User.from_json(api, res) else return null

        end
 end
 
        end
 end
 

@@ -274,14 +274,14 @@ class StatusEvent
 
        # Optional human-readable description added to the status.
        fun description: nullable String do
 
        # Optional human-readable description added to the status.
        fun description: nullable String do

-               if not json.has_key("description") then return null
-               return json["description"].as(String)
+               var res = json.get_or_null("description")
+               if res isa String then return res else return null

        end
 
        # Optional link added to the status.
        fun target_url: nullable String do
        end
 
        # Optional link added to the status.
        fun target_url: nullable String do

-               if not json.has_key("target_url") then return null
-               return json["target_url"].as(String)
+               var res = json.get_or_null("target_url")
+               if res isa String then return res else return null

        end
 
        # Array of branches containing the status' SHA.
        end
 
        # Array of branches containing the status' SHA.