Use AbstractEntity in all possible entities

FAForever · May 8, 2017 · 103d90c · 103d90c
1 parent 1124dd5
commit 103d90c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 109 deletions.
diff --git a/src/main/java/com/faforever/api/data/domain/Avatar.java b/src/main/java/com/faforever/api/data/domain/Avatar.java
@@ -5,28 +5,17 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import javax.persistence.Table;
 
 @Entity
 @Table(name = "avatars_list")
 @Include(rootLevel = true, type = "avatar")
 @Setter
-public class Avatar {
+public class Avatar extends AbstractEntity {
 
-  private int id;
   private String url;
   private String tooltip;
 
-  @Id
-  @GeneratedValue(strategy = GenerationType.IDENTITY)
-  @Column(name = "id")
-  public int getId() {
-    return id;
-  }
-
   @Column(name = "url")
   public String getUrl() {
     return url;

diff --git a/src/main/java/com/faforever/api/data/domain/ClanMembership.java b/src/main/java/com/faforever/api/data/domain/ClanMembership.java
@@ -5,37 +5,22 @@
 import com.yahoo.elide.annotation.Include;
 import lombok.Setter;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
-import java.time.OffsetDateTime;
 
 @Entity
 @Table(name = "clan_membership")
 @Include(rootLevel = true, type = "clanMembership")
 @DeletePermission(expression = IsClanMembershipDeletable.EXPRESSION)
 @Setter
-public class ClanMembership {
+public class ClanMembership extends AbstractEntity {
 
-  private int id;
-  private OffsetDateTime createTime;
-  private OffsetDateTime updateTime;
   private Clan clan;
   private Player player;
 
-  @Id
-  @GeneratedValue(strategy = GenerationType.IDENTITY)
-  @Column(name = "id")
-  public int getId() {
-    return id;
-  }
-
   @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "clan_id")
   public Clan getClan() {
@@ -47,14 +32,4 @@ public Clan getClan() {
   public Player getPlayer() {
     return player;
   }
-
-  @Column(name = "create_time")
-  public OffsetDateTime getCreateTime() {
-    return createTime;
-  }
-
-  @Column(name = "update_time")
-  public OffsetDateTime getUpdateTime() {
-    return updateTime;
-  }
 }
diff --git a/src/main/java/com/faforever/api/data/domain/MapVersion.java b/src/main/java/com/faforever/api/data/domain/MapVersion.java
@@ -10,27 +10,22 @@
 import javax.persistence.Entity;
 import javax.persistence.EntityListeners;
 import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.validation.constraints.NotNull;
-import java.time.OffsetDateTime;
 import java.util.List;
 
 @Entity
 @Setter
 @EntityListeners(MapVersionEnricher.class)
 @Table(name = "map_version")
 @Include(rootLevel = true, type = "mapVersion")
-public class MapVersion {
+public class MapVersion extends AbstractEntity {
 
-  private int id;
   private String description;
   private int maxPlayers;
   private int width;
@@ -40,22 +35,13 @@ public class MapVersion {
   private String folderName;
   private boolean ranked;
   private boolean hidden;
-  private OffsetDateTime createTime;
-  private OffsetDateTime updateTime;
   private Map map;
   private MapVersionStatistics statistics;
   private String thumbnailUrlSmall;
   private String thumbnailUrlLarge;
   private String downloadUrl;
   private List<MapVersionReview> reviews;
 
-  @Id
-  @GeneratedValue(strategy = GenerationType.IDENTITY)
-  @Column(name = "id")
-  public int getId() {
-    return id;
-  }
-
   @Column(name = "description")
   public String getDescription() {
     return description;
@@ -101,16 +87,6 @@ public boolean isHidden() {
     return hidden;
   }
 
-  @Column(name = "create_time")
-  public OffsetDateTime getCreateTime() {
-    return createTime;
-  }
-
-  @Column(name = "update_time")
-  public OffsetDateTime getUpdateTime() {
-    return updateTime;
-  }
-
   @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "map_id")
   @NotNull

diff --git a/src/main/java/com/faforever/api/data/domain/PlayerAchievement.java b/src/main/java/com/faforever/api/data/domain/PlayerAchievement.java
@@ -9,36 +9,23 @@
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
-import java.time.OffsetDateTime;
 
 @Entity
 @Table(name = "player_achievements")
 @Include(rootLevel = true, type = "playerAchievement")
 @Setter
-public class PlayerAchievement {
+public class PlayerAchievement extends AbstractEntity {
 
-  private int id;
   private Integer currentSteps;
   private AchievementState state;
-  private OffsetDateTime createTime;
-  private OffsetDateTime updateTime;
   private Player player;
   private int playerId;
   private Achievement achievement;
 
-  @Id
-  @Column(name = "id")
-  @GeneratedValue
-  public int getId() {
-    return id;
-  }
-
   @Column(name = "current_steps")
   public Integer getCurrentSteps() {
     return currentSteps;
@@ -50,16 +37,6 @@ public AchievementState getState() {
     return state;
   }
 
-  @Column(name = "create_time")
-  public OffsetDateTime getCreateTime() {
-    return createTime;
-  }
-
-  @Column(name = "update_time")
-  public OffsetDateTime getUpdateTime() {
-    return updateTime;
-  }
-
   @Exclude
   @Column(name = "player_id")
   public int getPlayerId() {

diff --git a/src/main/java/com/faforever/api/data/domain/PlayerEvent.java b/src/main/java/com/faforever/api/data/domain/PlayerEvent.java
@@ -6,31 +6,20 @@
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
-import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
-import java.time.OffsetDateTime;
 
 @Entity
 @Table(name = "player_events")
 @Include(rootLevel = true, type = "playerEvent")
 @Setter
-public class PlayerEvent {
+public class PlayerEvent extends AbstractEntity {
 
-  private int id;
   private Player player;
   private Event event;
   private int count;
-  private OffsetDateTime createTime;
-  private OffsetDateTime updateTime;
-
-  @Id
-  @Column(name = "id")
-  public int getId() {
-    return id;
-  }
 
   @OneToOne
   @JoinColumn(name = "player_id")
@@ -48,14 +37,4 @@ public Event getEvent() {
   public int getCount() {
     return count;
   }
-
-  @Column(name = "create_time")
-  public OffsetDateTime getCreateTime() {
-    return createTime;
-  }
-
-  @Column(name = "update_time")
-  public OffsetDateTime getUpdateTime() {
-    return updateTime;
-  }
 }