Merge pull request #62 from Shredder121/organization-property

Add Organization property to the payloads
Shredder121 · Feb 22, 2016 · ac936b0 · ac936b0
2 parents 38612c8 + c24cf0a
commit ac936b0
Show file tree

Hide file tree

Showing 42 changed files with 379 additions and 40 deletions.
diff --git a/src/main/java/com/github/shredder121/gh_event_api/handler/Public/PublicPayload.java b/src/main/java/com/github/shredder121/gh_event_api/handler/Public/PublicPayload.java
@@ -19,6 +19,7 @@
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import com.github.shredder121.gh_event_api.model.Organization;
 import com.github.shredder121.gh_event_api.model.Repository;
 import com.github.shredder121.gh_event_api.model.User;
 import com.github.shredder121.gh_event_api.model.json.PropertyBasedJsonCreator;
@@ -42,6 +43,12 @@ public class PublicPayload {
      */
     @NotNull Repository repository;
 
+    /**
+     * The organization the repository belongs to.
+     * Only non-null with organization webhooks.
+     */
+    Organization organization;
+
     /**
      * The user who triggered the event.
      */

diff --git a/...java/com/github/shredder121/gh_event_api/handler/commit_comment/CommitCommentPayload.java b/...java/com/github/shredder121/gh_event_api/handler/commit_comment/CommitCommentPayload.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.databind.PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.github.shredder121.gh_event_api.model.Comment;
+import com.github.shredder121.gh_event_api.model.Organization;
 import com.github.shredder121.gh_event_api.model.Repository;
 import com.github.shredder121.gh_event_api.model.User;
 import com.github.shredder121.gh_event_api.model.json.PropertyBasedJsonCreator;
@@ -53,6 +54,12 @@ public class CommitCommentPayload {
      */
     @NotNull Repository repository;
 
+    /**
+     * The organization the repository belongs to.
+     * Only non-null with organization webhooks.
+     */
+    Organization organization;
+
     /**
      * The actor commenting on the commit.
      */

diff --git a/src/main/java/com/github/shredder121/gh_event_api/handler/create/CreatePayload.java b/src/main/java/com/github/shredder121/gh_event_api/handler/create/CreatePayload.java
@@ -19,6 +19,7 @@
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import com.github.shredder121.gh_event_api.model.Organization;
 import com.github.shredder121.gh_event_api.model.Repository;
 import com.github.shredder121.gh_event_api.model.User;
 import com.github.shredder121.gh_event_api.model.json.PropertyBasedJsonCreator;
@@ -68,6 +69,12 @@ public class CreatePayload {
      */
     @NotNull Repository repository;
 
+    /**
+     * The organization the repository belongs to.
+     * Only non-null with organization webhooks.
+     */
+    Organization organization;
+
     /**
      * The user that created the object.
      */

diff --git a/src/main/java/com/github/shredder121/gh_event_api/handler/delete/DeletePayload.java b/src/main/java/com/github/shredder121/gh_event_api/handler/delete/DeletePayload.java
@@ -19,6 +19,7 @@
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import com.github.shredder121.gh_event_api.model.Organization;
 import com.github.shredder121.gh_event_api.model.Repository;
 import com.github.shredder121.gh_event_api.model.User;
 import com.github.shredder121.gh_event_api.model.json.PropertyBasedJsonCreator;
@@ -58,6 +59,12 @@ public class DeletePayload {
      */
     @NotNull Repository repository;
 
+    /**
+     * The organization the repository belongs to.
+     * Only non-null with organization webhooks.
+     */
+    Organization organization;
+
     /**
      * The user that deleted the object.
      */

diff --git a/src/main/java/com/github/shredder121/gh_event_api/handler/deployment/DeploymentPayload.java b/src/main/java/com/github/shredder121/gh_event_api/handler/deployment/DeploymentPayload.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.databind.PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.github.shredder121.gh_event_api.model.Deployment;
+import com.github.shredder121.gh_event_api.model.Organization;
 import com.github.shredder121.gh_event_api.model.Repository;
 import com.github.shredder121.gh_event_api.model.User;
 import com.github.shredder121.gh_event_api.model.json.PropertyBasedJsonCreator;
@@ -48,6 +49,12 @@ public class DeploymentPayload {
      */
     @NotNull Repository repository;
 
+    /**
+     * The organization the repository belongs to.
+     * Only non-null with organization webhooks.
+     */
+    Organization organization;
+
     /**
      * The user that requested the deployment.
      */

diff --git a/...om/github/shredder121/gh_event_api/handler/deployment_status/DeploymentStatusPayload.java b/...om/github/shredder121/gh_event_api/handler/deployment_status/DeploymentStatusPayload.java
@@ -19,10 +19,7 @@
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
-import com.github.shredder121.gh_event_api.model.Deployment;
-import com.github.shredder121.gh_event_api.model.DeploymentStatus;
-import com.github.shredder121.gh_event_api.model.Repository;
-import com.github.shredder121.gh_event_api.model.User;
+import com.github.shredder121.gh_event_api.model.*;
 import com.github.shredder121.gh_event_api.model.json.PropertyBasedJsonCreator;
 
 /**
@@ -54,6 +51,12 @@ public class DeploymentStatusPayload {
      */
     @NotNull Repository repository;
 
+    /**
+     * The organization the repository belongs to.
+     * Only non-null with organization webhooks.
+     */
+    Organization organization;
+
     /**
      * The user that triggered the event.
      */

diff --git a/src/main/java/com/github/shredder121/gh_event_api/handler/fork/ForkPayload.java b/src/main/java/com/github/shredder121/gh_event_api/handler/fork/ForkPayload.java
@@ -19,6 +19,7 @@
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import com.github.shredder121.gh_event_api.model.Organization;
 import com.github.shredder121.gh_event_api.model.Repository;
 import com.github.shredder121.gh_event_api.model.User;
 import com.github.shredder121.gh_event_api.model.json.PropertyBasedJsonCreator;
@@ -47,6 +48,12 @@ public class ForkPayload {
      */
     @NotNull Repository repository;
 
+    /**
+     * The organization the repository belongs to.
+     * Only non-null with organization webhooks.
+     */
+    Organization organization;
+
     /**
      * The actor forking the Repository.
      */

diff --git a/src/main/java/com/github/shredder121/gh_event_api/handler/gollum/GollumPayload.java b/src/main/java/com/github/shredder121/gh_event_api/handler/gollum/GollumPayload.java
@@ -19,6 +19,7 @@
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import com.github.shredder121.gh_event_api.model.Organization;
 import com.github.shredder121.gh_event_api.model.Repository;
 import com.github.shredder121.gh_event_api.model.User;
 import com.github.shredder121.gh_event_api.model.WikiPage;
@@ -49,6 +50,12 @@ public class GollumPayload {
      */
     @NotNull Repository repository;
 
+    /**
+     * The organization the repository belongs to.
+     * Only non-null with organization webhooks.
+     */
+    Organization organization;
+
     /**
      * The user that triggered the change.
      */

diff --git a/...n/java/com/github/shredder121/gh_event_api/handler/issue_comment/IssueCommentPayload.java b/...n/java/com/github/shredder121/gh_event_api/handler/issue_comment/IssueCommentPayload.java
@@ -19,10 +19,7 @@
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
-import com.github.shredder121.gh_event_api.model.Comment;
-import com.github.shredder121.gh_event_api.model.Issue;
-import com.github.shredder121.gh_event_api.model.Repository;
-import com.github.shredder121.gh_event_api.model.User;
+import com.github.shredder121.gh_event_api.model.*;
 import com.github.shredder121.gh_event_api.model.json.PropertyBasedJsonCreator;
 
 /**
@@ -60,6 +57,12 @@ public class IssueCommentPayload {
      */
     @NotNull Repository repository;
 
+    /**
+     * The organization the repository belongs to.
+     * Only non-null with organization webhooks.
+     */
+    Organization organization;
+
     /**
      * The user commenting on the issue.
      */

diff --git a/src/main/java/com/github/shredder121/gh_event_api/handler/issues/IssuesPayload.java b/src/main/java/com/github/shredder121/gh_event_api/handler/issues/IssuesPayload.java
@@ -19,10 +19,7 @@
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
-import com.github.shredder121.gh_event_api.model.Issue;
-import com.github.shredder121.gh_event_api.model.Label;
-import com.github.shredder121.gh_event_api.model.Repository;
-import com.github.shredder121.gh_event_api.model.User;
+import com.github.shredder121.gh_event_api.model.*;
 import com.github.shredder121.gh_event_api.model.json.PropertyBasedJsonCreator;
 
 /**
@@ -54,6 +51,12 @@ public class IssuesPayload {
      */
     @NotNull Repository repository;
 
+    /**
+     * The organization the repository belongs to.
+     * Only non-null with organization webhooks.
+     */
+    Organization organization;
+
     /**
      * The user that created the issue.
      */

diff --git a/src/main/java/com/github/shredder121/gh_event_api/handler/membership/MembershipPayload.java b/src/main/java/com/github/shredder121/gh_event_api/handler/membership/MembershipPayload.java
@@ -19,6 +19,7 @@
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import com.github.shredder121.gh_event_api.model.Organization;
 import com.github.shredder121.gh_event_api.model.Team;
 import com.github.shredder121.gh_event_api.model.User;
 import com.github.shredder121.gh_event_api.model.json.PropertyBasedJsonCreator;
@@ -59,6 +60,11 @@ public class MembershipPayload {
      */
     @NotNull Team team;
 
+    /**
+     * The organization the team belongs to.
+     */
+    @NotNull Organization organization;
+
     /**
      * The person that triggered the event.
      */

diff --git a/src/main/java/com/github/shredder121/gh_event_api/handler/page_build/PageBuildPayload.java b/src/main/java/com/github/shredder121/gh_event_api/handler/page_build/PageBuildPayload.java
@@ -19,6 +19,7 @@
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import com.github.shredder121.gh_event_api.model.Organization;
 import com.github.shredder121.gh_event_api.model.PageBuild;
 import com.github.shredder121.gh_event_api.model.Repository;
 import com.github.shredder121.gh_event_api.model.User;
@@ -53,6 +54,12 @@ public class PageBuildPayload {
      */
     @NotNull Repository repository;
 
+    /**
+     * The organization the repository belongs to.
+     * Only non-null with organization webhooks.
+     */
+    Organization organization;
+
     /**
      * The user that triggered the build.
      */

diff --git a/...ain/java/com/github/shredder121/gh_event_api/handler/pull_request/PullRequestPayload.java b/...ain/java/com/github/shredder121/gh_event_api/handler/pull_request/PullRequestPayload.java
@@ -19,10 +19,7 @@
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
-import com.github.shredder121.gh_event_api.model.Label;
-import com.github.shredder121.gh_event_api.model.PullRequest;
-import com.github.shredder121.gh_event_api.model.Repository;
-import com.github.shredder121.gh_event_api.model.User;
+import com.github.shredder121.gh_event_api.model.*;
 import com.github.shredder121.gh_event_api.model.json.PropertyBasedJsonCreator;
 
 /**
@@ -59,6 +56,12 @@ public class PullRequestPayload {
      */
     @NotNull Repository repository;
 
+    /**
+     * The organization the repository belongs to.
+     * Only non-null with organization webhooks.
+     */
+    Organization organization;
+
     /**
      * The User that invoked the action.
      */

diff --git a/...121/gh_event_api/handler/pull_request_review_comment/PullRequestReviewCommentPayload.java b/...121/gh_event_api/handler/pull_request_review_comment/PullRequestReviewCommentPayload.java
@@ -19,10 +19,7 @@
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
-import com.github.shredder121.gh_event_api.model.Comment;
-import com.github.shredder121.gh_event_api.model.PullRequest;
-import com.github.shredder121.gh_event_api.model.Repository;
-import com.github.shredder121.gh_event_api.model.User;
+import com.github.shredder121.gh_event_api.model.*;
 import com.github.shredder121.gh_event_api.model.json.PropertyBasedJsonCreator;
 
 /**
@@ -60,6 +57,12 @@ public class PullRequestReviewCommentPayload {
      */
     @NotNull Repository repository;
 
+    /**
+     * The organization the repository belongs to.
+     * Only non-null with organization webhooks.
+     */
+    Organization organization;
+
     /**
      * The user that invoked the action.
      */

diff --git a/src/main/java/com/github/shredder121/gh_event_api/handler/push/PushPayload.java b/src/main/java/com/github/shredder121/gh_event_api/handler/push/PushPayload.java
@@ -19,7 +19,10 @@
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import com.github.shredder121.gh_event_api.model.Organization;
 import com.github.shredder121.gh_event_api.model.PushCommit;
+import com.github.shredder121.gh_event_api.model.Repository;
+import com.github.shredder121.gh_event_api.model.User;
 import com.github.shredder121.gh_event_api.model.json.PropertyBasedJsonCreator;
 import com.google.common.collect.ImmutableList;
 
@@ -76,4 +79,20 @@ public class PushPayload {
      * The first commit in this push.
      */
     PushCommit headCommit;
+
+    /**
+     * The repository that was pushed to.
+     */
+    @NotNull Repository repository;
+
+    /**
+     * The organization the repository belongs to.
+     * Only non-null with organization webhooks.
+     */
+    Organization organization;
+
+    /**
+     * The user who triggered the event.
+     */
+    @NotNull User sender;
 }
diff --git a/src/main/java/com/github/shredder121/gh_event_api/handler/release/ReleasePayload.java b/src/main/java/com/github/shredder121/gh_event_api/handler/release/ReleasePayload.java
@@ -19,6 +19,7 @@
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import com.github.shredder121.gh_event_api.model.Organization;
 import com.github.shredder121.gh_event_api.model.Release;
 import com.github.shredder121.gh_event_api.model.Repository;
 import com.github.shredder121.gh_event_api.model.User;
@@ -54,6 +55,12 @@ public class ReleasePayload {
      */
     @NotNull Repository repository;
 
+    /**
+     * The organization the repository belongs to.
+     * Only non-null with organization webhooks.
+     */
+    Organization organization;
+
     /**
      * The user that triggered the release.
      */

diff --git a/src/main/java/com/github/shredder121/gh_event_api/handler/repository/RepositoryPayload.java b/src/main/java/com/github/shredder121/gh_event_api/handler/repository/RepositoryPayload.java
@@ -19,6 +19,7 @@
 
 import com.fasterxml.jackson.databind.PropertyNamingStrategy.LowerCaseWithUnderscoresStrategy;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import com.github.shredder121.gh_event_api.model.Organization;
 import com.github.shredder121.gh_event_api.model.Repository;
 import com.github.shredder121.gh_event_api.model.User;
 import com.github.shredder121.gh_event_api.model.json.PropertyBasedJsonCreator;
@@ -48,6 +49,11 @@ public class RepositoryPayload {
      */
     @NotNull Repository repository;
 
+    /**
+     * The organization the repository belongs to.
+     */
+    @NotNull Organization organization;
+
     /**
      * The user who triggered the request.
      */