diff options
author | Shinsuke Nishio <nishio@densan-labs.net> | 2016-04-30 00:19:29 +0900 |
---|---|---|
committer | Shinsuke Nishio <nishio@densan-labs.net> | 2016-04-30 00:19:29 +0900 |
commit | 14e6ef1c752e1761cd4fcbe7401382f4b2d01ef9 (patch) | |
tree | 221c08bed352d89fa1a8881dcb167eeba0b016d4 /src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/Pullrequest.java | |
parent | 2d213eb8b0c2491e3e51844239911270041a5492 (diff) | |
parent | 8af88eec6b4e8deb09aa9efd47769749cdc0afbc (diff) | |
download | bbprb-14e6ef1c752e1761cd4fcbe7401382f4b2d01ef9.tar.gz |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/Pullrequest.java')
-rw-r--r-- | src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/Pullrequest.java | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/Pullrequest.java b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/Pullrequest.java index 1e8bf5c..140c213 100644 --- a/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/Pullrequest.java +++ b/src/main/java/bitbucketpullrequestbuilder/bitbucketpullrequestbuilder/bitbucket/Pullrequest.java @@ -28,6 +28,7 @@ public class Pullrequest { private String updatedOn; private String mergeCommit; private String id; + private Author author; @JsonIgnoreProperties(ignoreUnknown = true) public static class Response { @@ -233,6 +234,33 @@ public class Pullrequest { this.createdOn = createdOn; } } + + @JsonIgnoreProperties(ignoreUnknown = true) + public static class Author { + private String username; + private String display_name; + public static final String COMBINED_NAME = "%s <@%s>"; + + public String getUsername() { + return username; + } + public void setUsername(String username) { + this.username = username; + } + + @JsonProperty("display_name") + public String getDisplayName() { + return display_name; + } + + @JsonProperty("display_name") + public void setDisplayName(String display_name) { + this.display_name = display_name; + } + public String getCombinedUsername() { + return String.format(COMBINED_NAME, this.getDisplayName(), this.getUsername()); + } + } //-------------------- only getters and setters follow ----------------- @@ -341,5 +369,13 @@ public class Pullrequest { public void setId(String id) { this.id = id; } + + public Author getAuthor() { + return this.author; + } + + public void setAutohor(Author author) { + this.author = author; + } } |