added GithubEvent to use some inheritance for common properties among…

… events
Zomis · Jan 21, 2015 · f9d4cf3 · f9d4cf3
1 parent e7a995f
commit f9d4cf3
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 217 deletions.
diff --git a/src/main/java/com/skiwi/githubhooksechatservice/events/github/CommitCommentEvent.java b/src/main/java/com/skiwi/githubhooksechatservice/events/github/CommitCommentEvent.java
@@ -4,41 +4,24 @@
 import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.skiwi.githubhooksechatservice.events.AnySetterJSONObject;
 import com.skiwi.githubhooksechatservice.events.github.classes.CommitComment;
-import com.skiwi.githubhooksechatservice.events.github.classes.Organization;
-import com.skiwi.githubhooksechatservice.events.github.classes.Repository;
 import com.skiwi.githubhooksechatservice.events.github.classes.User;
 
 /**
  *
  * @author Frank van Heeswijk
  */
-public final class CommitCommentEvent extends AnySetterJSONObject {
+public final class CommitCommentEvent extends GithubEvent {
 	@JsonProperty
 	private CommitComment comment;
 
-	@JsonProperty
-	private Repository repository;
-
-	@JsonProperty(required = false)
-	private Organization organization;
-
 	@JsonProperty
 	private User sender;
 
 	public CommitComment getComment() {
 		return comment;
 	}
 
-	public Repository getRepository() {
-		return repository;
-	}
-
-	public Organization getOrganization() {
-		return organization;
-	}
-
 	public User getSender() {
 		return sender;
 	}

diff --git a/src/main/java/com/skiwi/githubhooksechatservice/events/github/CreateEvent.java b/src/main/java/com/skiwi/githubhooksechatservice/events/github/CreateEvent.java
@@ -4,16 +4,13 @@
 import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.skiwi.githubhooksechatservice.events.AnySetterJSONObject;
-import com.skiwi.githubhooksechatservice.events.github.classes.Organization;
-import com.skiwi.githubhooksechatservice.events.github.classes.Repository;
 import com.skiwi.githubhooksechatservice.events.github.classes.User;
 
 /**
  *
  * @author Frank van Heeswijk
  */
-public final class CreateEvent extends AnySetterJSONObject {
+public final class CreateEvent extends GithubEvent {
     @JsonProperty
     private String ref;
 
@@ -29,12 +26,6 @@ public final class CreateEvent extends AnySetterJSONObject {
     @JsonProperty("pusher_type")
     private String pusherType;
 
-    @JsonProperty
-    private Repository repository;
-
-	@JsonProperty(required = false)
-	private Organization organization;
-
     @JsonProperty
     private User sender;
 
@@ -58,14 +49,6 @@ public String getPusherType() {
         return pusherType;
     }
 
-    public Repository getRepository() {
-        return repository;
-    }
-
-	public Organization getOrganization() {
-		return organization;
-	}
-
     public User getSender() {
         return sender;
     }

diff --git a/src/main/java/com/skiwi/githubhooksechatservice/events/github/DeleteEvent.java b/src/main/java/com/skiwi/githubhooksechatservice/events/github/DeleteEvent.java
@@ -4,16 +4,13 @@
 import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.skiwi.githubhooksechatservice.events.AnySetterJSONObject;
-import com.skiwi.githubhooksechatservice.events.github.classes.Organization;
-import com.skiwi.githubhooksechatservice.events.github.classes.Repository;
 import com.skiwi.githubhooksechatservice.events.github.classes.User;
 
 /**
  *
  * @author Frank van Heeswijk
  */
-public final class DeleteEvent extends AnySetterJSONObject {
+public final class DeleteEvent extends GithubEvent {
     @JsonProperty
     private String ref;
 
@@ -23,12 +20,6 @@ public final class DeleteEvent extends AnySetterJSONObject {
     @JsonProperty("pusher_type")
     private String pusherType;
 
-    @JsonProperty
-    private Repository repository;
-
-	@JsonProperty(required = false)
-	private Organization organization;
-
     @JsonProperty
     private User sender;
 
@@ -44,14 +35,6 @@ public String getPusherType() {
         return pusherType;
     }
 
-    public Repository getRepository() {
-        return repository;
-    }
-
-	public Organization getOrganization() {
-		return organization;
-	}
-
     public User getSender() {
         return sender;
     }

diff --git a/src/main/java/com/skiwi/githubhooksechatservice/events/github/ForkEvent.java b/src/main/java/com/skiwi/githubhooksechatservice/events/github/ForkEvent.java
@@ -4,40 +4,24 @@
 import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.skiwi.githubhooksechatservice.events.AnySetterJSONObject;
-import com.skiwi.githubhooksechatservice.events.github.classes.Organization;
 import com.skiwi.githubhooksechatservice.events.github.classes.Repository;
 import com.skiwi.githubhooksechatservice.events.github.classes.User;
 
 /**
  *
  * @author Frank van Heeswijk
  */
-public final class ForkEvent extends AnySetterJSONObject {
+public final class ForkEvent extends GithubEvent {
 	@JsonProperty
 	private Repository forkee;
 
-	@JsonProperty
-	private Repository repository;
-
-	@JsonProperty(required = false)
-	private Organization organization;
-
 	@JsonProperty
 	private User sender;
 
 	public Repository getForkee() {
 		return forkee;
 	}
 
-	public Repository getRepository() {
-		return repository;
-	}
-
-	public Organization getOrganization() {
-		return organization;
-	}
-
 	public User getSender() {
 		return sender;
 	}

diff --git a/src/main/java/com/skiwi/githubhooksechatservice/events/github/GithubEvent.java b/src/main/java/com/skiwi/githubhooksechatservice/events/github/GithubEvent.java
@@ -0,0 +1,25 @@
+package com.skiwi.githubhooksechatservice.events.github;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.skiwi.githubhooksechatservice.events.AnySetterJSONObject;
+import com.skiwi.githubhooksechatservice.events.github.classes.Organization;
+import com.skiwi.githubhooksechatservice.events.github.classes.Repository;
+
+public abstract class GithubEvent extends AnySetterJSONObject {
+
+	@JsonProperty
+	protected Repository repository;
+
+	@JsonProperty(required = false)
+	protected Organization organization;
+
+	public final Repository getRepository() {
+		return repository;
+	}
+
+	public final Organization getOrganization() {
+		return organization;
+	}
+
+
+}
diff --git a/src/main/java/com/skiwi/githubhooksechatservice/events/github/GollumEvent.java b/src/main/java/com/skiwi/githubhooksechatservice/events/github/GollumEvent.java
@@ -6,41 +6,24 @@
 import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.skiwi.githubhooksechatservice.events.AnySetterJSONObject;
-import com.skiwi.githubhooksechatservice.events.github.classes.Organization;
-import com.skiwi.githubhooksechatservice.events.github.classes.Repository;
 import com.skiwi.githubhooksechatservice.events.github.classes.User;
 import com.skiwi.githubhooksechatservice.events.github.classes.WikiPage;
 
 /**
  *
  * @author Frank van Heeswijk
  */
-public final class GollumEvent extends AnySetterJSONObject {
+public final class GollumEvent extends GithubEvent {
 	@JsonProperty
 	private WikiPage[] pages;
 
-	@JsonProperty
-	private Repository repository;
-
-	@JsonProperty(required = false)
-	private Organization organization;
-
 	@JsonProperty
 	private User sender;
 
 	public List<WikiPage> getPages() {
 		return Arrays.asList(pages);
 	}
 
-	public Repository getRepository() {
-		return repository;
-	}
-
-	public Organization getOrganization() {
-		return organization;
-	}
-
 	public User getSender() {
 		return sender;
 	}

diff --git a/src/main/java/com/skiwi/githubhooksechatservice/events/github/IssueCommentEvent.java b/src/main/java/com/skiwi/githubhooksechatservice/events/github/IssueCommentEvent.java
@@ -4,18 +4,15 @@
 import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.skiwi.githubhooksechatservice.events.AnySetterJSONObject;
 import com.skiwi.githubhooksechatservice.events.github.classes.Issue;
 import com.skiwi.githubhooksechatservice.events.github.classes.IssueComment;
-import com.skiwi.githubhooksechatservice.events.github.classes.Organization;
-import com.skiwi.githubhooksechatservice.events.github.classes.Repository;
 import com.skiwi.githubhooksechatservice.events.github.classes.User;
 
 /**
  *
  * @author Frank van Heeswijk
  */
-public final class IssueCommentEvent extends AnySetterJSONObject {
+public final class IssueCommentEvent extends GithubEvent {
 	@JsonProperty
 	private String action;
 
@@ -25,12 +22,6 @@ public final class IssueCommentEvent extends AnySetterJSONObject {
 	@JsonProperty
 	private IssueComment comment;
 
-	@JsonProperty
-	private Repository repository;
-
-	@JsonProperty(required = false)
-	private Organization organization;
-
 	@JsonProperty
 	private User sender;
 
@@ -46,14 +37,6 @@ public IssueComment getComment() {
 		return comment;
 	}
 
-	public Repository getRepository() {
-		return repository;
-	}
-
-	public Organization getOrganization() {
-		return organization;
-	}
-
 	public User getSender() {
 		return sender;
 	}

diff --git a/src/main/java/com/skiwi/githubhooksechatservice/events/github/IssuesEvent.java b/src/main/java/com/skiwi/githubhooksechatservice/events/github/IssuesEvent.java
@@ -4,18 +4,15 @@
 import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.skiwi.githubhooksechatservice.events.AnySetterJSONObject;
 import com.skiwi.githubhooksechatservice.events.github.classes.Issue;
 import com.skiwi.githubhooksechatservice.events.github.classes.Label;
-import com.skiwi.githubhooksechatservice.events.github.classes.Organization;
-import com.skiwi.githubhooksechatservice.events.github.classes.Repository;
 import com.skiwi.githubhooksechatservice.events.github.classes.User;
 
 /**
  *
  * @author Frank van Heeswijk
  */
-public final class IssuesEvent extends AnySetterJSONObject {
+public final class IssuesEvent extends GithubEvent {
 	@JsonProperty
 	private String action;
 
@@ -28,12 +25,6 @@ public final class IssuesEvent extends AnySetterJSONObject {
 	@JsonProperty(required = false)
 	private Label label;
 
-	@JsonProperty
-	private Repository repository;
-
-	@JsonProperty(required = false)
-	private Organization organization;
-
 	@JsonProperty
 	private User sender;
 
@@ -53,14 +44,6 @@ public Label getLabel() {
 		return label;
 	}
 
-	public Repository getRepository() {
-		return repository;
-	}
-
-	public Organization getOrganization() {
-		return organization;
-	}
-
 	public User getSender() {
 		return sender;
 	}

diff --git a/src/main/java/com/skiwi/githubhooksechatservice/events/github/MemberEvent.java b/src/main/java/com/skiwi/githubhooksechatservice/events/github/MemberEvent.java
@@ -4,28 +4,19 @@
 import java.util.Objects;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.skiwi.githubhooksechatservice.events.AnySetterJSONObject;
-import com.skiwi.githubhooksechatservice.events.github.classes.Organization;
-import com.skiwi.githubhooksechatservice.events.github.classes.Repository;
 import com.skiwi.githubhooksechatservice.events.github.classes.User;
 
 /**
  *
  * @author Frank van Heeswijk
  */
-public final class MemberEvent extends AnySetterJSONObject {
+public final class MemberEvent extends GithubEvent {
 	@JsonProperty
 	private User member;
 
 	@JsonProperty
 	private String action;
 
-	@JsonProperty
-	private Repository repository;
-
-	@JsonProperty(required = false)
-	private Organization organization;
-
 	@JsonProperty
 	private User sender;
 
@@ -37,14 +28,6 @@ public String getAction() {
 		return action;
 	}
 
-	public Repository getRepository() {
-		return repository;
-	}
-
-	public Organization getOrganization() {
-		return organization;
-	}
-
 	public User getSender() {
 		return sender;
 	}