Revert "Fixup several hashcode recursions"

Brutus5000 · Brutus5000 · commit 5ab2ff15fe75 · 2021-07-27T20:14:18.000+02:00
This reverts commit bae4478
diff --git a/src/inttest/resources/sql/prepGameData.sql b/src/inttest/resources/sql/prepGameData.sql
@@ -1,6 +1,2 @@
 INSERT INTO game_stats (id, startTime, gameName, gameType, gameMod, `host`, mapId, validity, replay_available)
 VALUES (1, NOW(), 'Test game', '0', 6, 1, 1, 0, false);
-
-INSERT INTO game_player_stats (id, gameId, playerId, AI, faction, color, team, place, mean, deviation, after_mean,
-                               after_deviation, score, scoreTime, result)
-VALUES (1, 1, 1, FALSE, 0, 0, 0, 0, 1000.0, 100.0, null, null, null, null, null);
diff --git a/src/main/java/com/faforever/api/data/domain/Achievement.java b/src/main/java/com/faforever/api/data/domain/Achievement.java
@@ -5,7 +5,6 @@
 import com.yahoo.elide.annotation.Exclude;
 import com.yahoo.elide.annotation.Include;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
@@ -28,14 +27,12 @@
 @EntityListeners(AchievementLocalizationListener.class)
 @Data
 @NoArgsConstructor
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 public class Achievement {
 
   public static final String TYPE_NAME = "achievement";
 
   @Id
   @Column(name = "id")
-  @EqualsAndHashCode.Include
   private String id;
 
   @Column(name = "\"order\"")
diff --git a/src/main/java/com/faforever/api/data/domain/Avatar.java b/src/main/java/com/faforever/api/data/domain/Avatar.java
@@ -8,7 +8,6 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.CascadeType;
@@ -63,6 +62,5 @@ public class Avatar implements DefaultEntity {
   @OneToMany(mappedBy = "avatar", cascade = CascadeType.ALL, orphanRemoval = true)
   // Permission is managed by AvatarAssignment class
   @UpdatePermission(expression = Prefab.ALL)
-  @EqualsAndHashCode.Exclude
   private List<AvatarAssignment> assignments;
 }
diff --git a/src/main/java/com/faforever/api/data/domain/AvatarAssignment.java b/src/main/java/com/faforever/api/data/domain/AvatarAssignment.java
@@ -11,7 +11,6 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
@@ -66,14 +65,12 @@ public class AvatarAssignment implements DefaultEntity, OwnableEntity {
   @JoinColumn(name = "idUser")
   @NotNull
   @Relationship(Player.TYPE_NAME)
-  @EqualsAndHashCode.Exclude
   private Player player;
 
   @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "idAvatar")
   @NotNull
   @Relationship(Avatar.TYPE_NAME)
-  @EqualsAndHashCode.Exclude
   private Avatar avatar;
 
   @Override
diff --git a/src/main/java/com/faforever/api/data/domain/BanInfo.java b/src/main/java/com/faforever/api/data/domain/BanInfo.java
@@ -13,7 +13,6 @@
 import com.yahoo.elide.annotation.ReadPermission;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
@@ -84,7 +83,6 @@ public class BanInfo implements DefaultEntity {
 
   @ManyToOne
   @JoinColumn(name = "report_id")
-  @EqualsAndHashCode.Exclude
   private ModerationReport moderationReport;
 
   @Column(name = "revoke_reason")
diff --git a/src/main/java/com/faforever/api/data/domain/Clan.java b/src/main/java/com/faforever/api/data/domain/Clan.java
@@ -40,7 +40,6 @@
 @CreatePermission(expression = Prefab.ALL)
 @Data
 @NoArgsConstructor
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @IsLeaderInClan
 @EntityListeners(ClanEnricherListener.class)
 public class Clan implements DefaultEntity, OwnableEntity {
@@ -62,7 +61,6 @@ public class Clan implements DefaultEntity, OwnableEntity {
   @Column(name = "name")
   @NotNull
   @UpdatePermission(expression = IsEntityOwner.EXPRESSION)
-  @EqualsAndHashCode.Include
   private String name;
 
   @Column(name = "tag")
diff --git a/src/main/java/com/faforever/api/data/domain/Game.java b/src/main/java/com/faforever/api/data/domain/Game.java
@@ -7,9 +7,7 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import lombok.ToString;
 import org.hibernate.annotations.BatchSize;
 import org.hibernate.annotations.Immutable;
 import org.jetbrains.annotations.Nullable;
@@ -40,17 +38,13 @@
 @Immutable
 @Data
 @NoArgsConstructor
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-@ToString(onlyExplicitlyIncluded = false)
 @EntityListeners(GameEnricher.class)
 public class Game {
 
   public static final String TYPE_NAME = "game";
 
   @Id
   @Column(name = "id")
-  @EqualsAndHashCode.Include
-  @ToString.Include
   private int id;
 
   @Column(name = "startTime")
diff --git a/src/main/java/com/faforever/api/data/domain/GamePlayerStats.java b/src/main/java/com/faforever/api/data/domain/GamePlayerStats.java
@@ -2,9 +2,7 @@
 
 import com.yahoo.elide.annotation.Include;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import lombok.ToString;
 import org.hibernate.annotations.BatchSize;
 import org.hibernate.annotations.Immutable;
 
@@ -29,21 +27,16 @@
 @Immutable
 @Data
 @NoArgsConstructor
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-@ToString(onlyExplicitlyIncluded = true)
 public class GamePlayerStats {
 
   public static final String TYPE_NAME = "gamePlayerStats";
 
   @Id
   @Column(name = "id")
-  @EqualsAndHashCode.Include
-  @ToString.Include
   private long id;
 
   @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "playerId")
-  @ToString.Include
   private Player player;
 
   @Column(name = "AI")
diff --git a/src/main/java/com/faforever/api/data/domain/LeaderboardRating.java b/src/main/java/com/faforever/api/data/domain/LeaderboardRating.java
@@ -2,7 +2,6 @@
 
 import com.yahoo.elide.annotation.Include;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
@@ -53,12 +52,10 @@ public class LeaderboardRating implements DefaultEntity, OwnableEntity {
 
   @ManyToOne
   @JoinColumn(name = "leaderboard_id")
-  @EqualsAndHashCode.Exclude
   private Leaderboard leaderboard;
 
   @ManyToOne
   @JoinColumn(name = "login_id")
-  @EqualsAndHashCode.Exclude
   private Player player;
 
   @Override
diff --git a/src/main/java/com/faforever/api/data/domain/LeaderboardRatingJournal.java b/src/main/java/com/faforever/api/data/domain/LeaderboardRatingJournal.java
@@ -2,7 +2,6 @@
 
 import com.yahoo.elide.annotation.Include;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
@@ -50,11 +49,9 @@ public class LeaderboardRatingJournal implements DefaultEntity {
 
   @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "leaderboard_id")
-  @EqualsAndHashCode.Exclude
   private Leaderboard leaderboard;
 
   @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "game_player_stats_id")
-  @EqualsAndHashCode.Exclude
   private GamePlayerStats gamePlayerStats;
 }
diff --git a/src/main/java/com/faforever/api/data/domain/Login.java b/src/main/java/com/faforever/api/data/domain/Login.java
@@ -36,14 +36,12 @@
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)
-@ToString(onlyExplicitlyIncluded = true)
 public abstract class Login implements DefaultEntity, OwnableEntity {
 
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)
   @Column(name = "id")
   @EqualsAndHashCode.Include
-  @ToString.Include
   private Integer id;
 
   @Column(name = "create_time")
@@ -54,7 +52,6 @@ public abstract class Login implements DefaultEntity, OwnableEntity {
 
   @Column(name = "login")
   @EqualsAndHashCode.Include
-  @ToString.Include
   protected String login;
 
   @Column(name = "email")
diff --git a/src/main/java/com/faforever/api/data/domain/Map.java b/src/main/java/com/faforever/api/data/domain/Map.java
@@ -7,7 +7,6 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.BatchSize;
 import org.hibernate.annotations.JoinColumnOrFormula;
@@ -40,7 +39,6 @@
 @Entity
 @Data
 @NoArgsConstructor
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @Table(name = "map")
 @Include(name = Map.TYPE_NAME)
 @EntityListeners(MapChangeListener.class)
@@ -51,7 +49,6 @@ public class Map implements DefaultEntity, OwnableEntity {
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)
   @Column(name = "id")
-  @EqualsAndHashCode.Include
   private Integer id;
 
   @Column(name = "create_time")
@@ -69,7 +66,6 @@ public class Map implements DefaultEntity, OwnableEntity {
   @Column(name = "display_name", unique = true)
   @Size(max = 100)
   @NotNull
-  @EqualsAndHashCode.Include
   private String displayName;
 
   @Column(name = "map_type")
diff --git a/src/main/java/com/faforever/api/data/domain/MapVersion.java b/src/main/java/com/faforever/api/data/domain/MapVersion.java
@@ -36,8 +36,6 @@
 @Entity
 @Data
 @NoArgsConstructor
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-@ToString(onlyExplicitlyIncluded = true)
 @EntityListeners(MapVersionEnricher.class)
 @Table(name = "map_version")
 @Include(name = MapVersion.TYPE_NAME)
@@ -48,8 +46,6 @@ public class MapVersion implements DefaultEntity, OwnableEntity {
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)
   @Column(name = "id")
-  @EqualsAndHashCode.Include
-  @ToString.Include
   private Integer id;
 
   @Column(name = "create_time")
@@ -75,15 +71,11 @@ public class MapVersion implements DefaultEntity, OwnableEntity {
   private int height;
 
   @Column(name = "version")
-  @EqualsAndHashCode.Include
-  @ToString.Include
   // FIXME: validation
   private int version;
 
   @Column(name = "filename")
   @NotNull
-  @EqualsAndHashCode.Include
-  @ToString.Include
   private String filename;
 
   @Transient
@@ -104,9 +96,13 @@ public class MapVersion implements DefaultEntity, OwnableEntity {
   @JoinColumn(name = "map_id")
   @NotNull
   @BatchSize(size = 1000)
+  @EqualsAndHashCode.Exclude
+  @ToString.Exclude
   private Map map;
 
   @OneToOne(mappedBy = "mapVersion", fetch = FetchType.EAGER)
+  @EqualsAndHashCode.Exclude
+  @ToString.Exclude
   private MapVersionStatistics statistics;
 
   @Transient
@@ -127,10 +123,12 @@ public class MapVersion implements DefaultEntity, OwnableEntity {
 
   @OneToMany(mappedBy = "mapVersion")
   @UpdatePermission(expression = Prefab.ALL)
+  @EqualsAndHashCode.Exclude
   private List<MapVersionReview> reviews;
 
   @OneToOne(mappedBy = "mapVersion")
   @UpdatePermission(expression = Prefab.ALL)
+  @EqualsAndHashCode.Exclude
   private MapVersionReviewsSummary reviewsSummary;
 
   @Transient
diff --git a/src/main/java/com/faforever/api/data/domain/Mod.java b/src/main/java/com/faforever/api/data/domain/Mod.java
@@ -6,7 +6,6 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.JoinColumnOrFormula;
 import org.hibernate.annotations.JoinColumnsOrFormulas;
@@ -37,7 +36,6 @@
 @Include(name = Mod.TYPE_NAME)
 @Data
 @NoArgsConstructor
-@EqualsAndHashCode(onlyExplicitlyIncluded = false)
 @EntityListeners(ModChangeListener.class)
 public class Mod implements DefaultEntity, OwnableEntity {
 
@@ -46,7 +44,6 @@ public class Mod implements DefaultEntity, OwnableEntity {
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)
   @Column(name = "id")
-  @EqualsAndHashCode.Include
   private Integer id;
 
   @Column(name = "create_time")
@@ -64,7 +61,6 @@ public class Mod implements DefaultEntity, OwnableEntity {
   @Column(name = "display_name")
   @Size(max = 100)
   @NotNull
-  @EqualsAndHashCode.Include
   private String displayName;
 
   @Column(name = "author")
diff --git a/src/main/java/com/faforever/api/data/domain/ModVersion.java b/src/main/java/com/faforever/api/data/domain/ModVersion.java
@@ -10,7 +10,6 @@
 import com.yahoo.elide.annotation.Include;
 import com.yahoo.elide.annotation.UpdatePermission;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
@@ -36,7 +35,6 @@
 @Include(name = ModVersion.TYPE_NAME)
 @Data
 @NoArgsConstructor
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @EntityListeners(ModVersionEnricher.class)
 public class ModVersion implements DefaultEntity, OwnableEntity {
 
@@ -45,7 +43,6 @@ public class ModVersion implements DefaultEntity, OwnableEntity {
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)
   @Column(name = "id")
-  @EqualsAndHashCode.Include
   private Integer id;
 
   @Column(name = "create_time")
@@ -56,7 +53,6 @@ public class ModVersion implements DefaultEntity, OwnableEntity {
 
 
   @Column(name = "uid")
-  @EqualsAndHashCode.Include
   private String uid;
 
   @Column(name = "type")
@@ -67,7 +63,6 @@ public class ModVersion implements DefaultEntity, OwnableEntity {
   private String description;
 
   @Column(name = "version")
-  @EqualsAndHashCode.Include
   private short version;
 
   @Column(name = "filename")
diff --git a/src/main/java/com/faforever/api/data/domain/ModerationReport.java b/src/main/java/com/faforever/api/data/domain/ModerationReport.java
diff --git a/src/main/java/com/faforever/api/data/domain/NameRecord.java b/src/main/java/com/faforever/api/data/domain/NameRecord.java
diff --git a/src/main/java/com/faforever/api/data/domain/PlayerDivisionInfo.java b/src/main/java/com/faforever/api/data/domain/PlayerDivisionInfo.java
diff --git a/src/main/java/com/faforever/api/data/domain/PlayerEvent.java b/src/main/java/com/faforever/api/data/domain/PlayerEvent.java
diff --git a/src/main/java/com/faforever/api/data/domain/Teamkill.java b/src/main/java/com/faforever/api/data/domain/Teamkill.java
diff --git a/src/main/java/com/faforever/api/data/domain/UserGroup.java b/src/main/java/com/faforever/api/data/domain/UserGroup.java
diff --git a/src/main/java/com/faforever/api/data/domain/Vote.java b/src/main/java/com/faforever/api/data/domain/Vote.java
