Revert "Revert EqualsAndHashcode behavior similar to AbstractEntity behavior"

This reverts commit 96f8726

Author: Brutus5000

src/main/java/com/faforever/api/data/domain/Avatar.java

@@ -29,7 +29,6 @@
 @Table(name = "avatars_list")
 @Include(name = Avatar.TYPE_NAME)
 @Data
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @NoArgsConstructor
 @Type(Avatar.TYPE_NAME)
 @EntityListeners(AvatarEnricherListener.class)
@@ -40,7 +39,6 @@ public class Avatar implements DefaultEntity {
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)
   @Column(name = "id")
-  @EqualsAndHashCode.Include
   private Integer id;
 
   @Column(name = "create_time")
@@ -65,5 +63,6 @@ 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;
 }

src/main/java/com/faforever/api/data/domain/AvatarAssignment.java

@@ -35,7 +35,6 @@
 @Audit(action = Action.CREATE, logStatement = "Avatar ''{0}'' has been assigned to player ''{1}''", logExpressions = {"${avatarAssignment.avatar.id}", "${avatarAssignment.player.id}"})
 @Audit(action = Action.DELETE, logStatement = "Avatar ''{0}'' has been revoked from player ''{1}''", logExpressions = {"${avatarAssignment.avatar.id}", "${avatarAssignment.player.id}"})
 @Data
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @NoArgsConstructor
 @Type(AvatarAssignment.TYPE_NAME)
 public class AvatarAssignment implements DefaultEntity, OwnableEntity {
@@ -45,7 +44,6 @@ public class AvatarAssignment implements DefaultEntity, OwnableEntity {
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)
   @Column(name = "id")
-
   private Integer id;
 
   @Column(name = "create_time")
@@ -68,12 +66,14 @@ 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

src/main/java/com/faforever/api/data/domain/BanInfo.java

@@ -46,14 +46,12 @@
 @Audit(action = Action.UPDATE, logStatement = "Updated ban with id `{0}` for player `{1}`", logExpressions = {"${banInfo.id}", "${banInfo.player}"})
 @LifeCycleHookBinding(operation = CREATE, phase = PRESECURITY, hook = BanInfoCreateHook.class)
 @Data
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @NoArgsConstructor
 public class BanInfo implements DefaultEntity {
 
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)
   @Column(name = "id")
-  @EqualsAndHashCode.Include
   private Integer id;
 
   @Column(name = "create_time")
@@ -75,7 +73,6 @@ public class BanInfo implements DefaultEntity {
 
   @Column(name = "reason")
   @NotNull
-  @EqualsAndHashCode.Include
   private String reason;
 
   @Column(name = "expires_at")
@@ -87,6 +84,7 @@ public class BanInfo implements DefaultEntity {
 
   @ManyToOne
   @JoinColumn(name = "report_id")
+  @EqualsAndHashCode.Exclude
   private ModerationReport moderationReport;
 
   @Column(name = "revoke_reason")

src/main/java/com/faforever/api/data/domain/ClanMembership.java

@@ -30,7 +30,6 @@
 @DeletePermission(expression = IsClanMembershipDeletable.EXPRESSION)
 @UpdatePermission(expression = IsClanMembershipDeletable.EXPRESSION)
 @Data
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @NoArgsConstructor
 @Access(AccessType.FIELD)
 public class ClanMembership implements DefaultEntity {
@@ -40,7 +39,6 @@ public class ClanMembership implements DefaultEntity {
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)
   @Column(name = "id")
-  @EqualsAndHashCode.Include
   private Integer id;
 
   @Column(name = "create_time")
@@ -51,9 +49,11 @@ public class ClanMembership implements DefaultEntity {
 
   @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "clan_id")
+  @EqualsAndHashCode.Exclude
   private Clan clan;
 
   @OneToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "player_id")
+  @EqualsAndHashCode.Exclude
   private Player player;
 }

src/main/java/com/faforever/api/data/domain/Division.java

@@ -27,7 +27,6 @@ public class Division {
   private int id;
 
   @Column(name = "name", nullable = false)
-  @EqualsAndHashCode.Include
   private String name;
 
   @Column(name = "league")

src/main/java/com/faforever/api/data/domain/Event.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;
@@ -21,7 +20,6 @@
 @Table(name = "event_definitions")
 @Include(name = Event.TYPE_NAME)
 @Data
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @NoArgsConstructor
 @EntityListeners(EventLocalizationListener.class)
 public class Event {
@@ -30,12 +28,10 @@ public class Event {
 
   @Id
   @Column(name = "id")
-  @EqualsAndHashCode.Include
   private String id;
 
   @Column(name = "name_key")
   @Exclude
-  @EqualsAndHashCode.Include
   private String nameKey;
 
   @Column(name = "image_url")

src/main/java/com/faforever/api/data/domain/FeaturedMod.java

@@ -2,7 +2,6 @@
 
 import com.yahoo.elide.annotation.Include;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
@@ -14,18 +13,15 @@
 @Table(name = "game_featuredMods")
 @Include(name = FeaturedMod.TYPE_NAME)
 @Data
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @NoArgsConstructor
 public class FeaturedMod {
   public static final String TYPE_NAME = "featuredMod";
 
   @Id
   @Column(name = "id")
-  @EqualsAndHashCode.Include
   private int id;
 
   @Column(name = "gamemod")
-  @EqualsAndHashCode.Include
   private String technicalName;
 
   @Column(name = "description")

src/main/java/com/faforever/api/data/domain/Game.java

@@ -41,7 +41,7 @@
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)
-@ToString(onlyExplicitlyIncluded = true)
+@ToString(onlyExplicitlyIncluded = false)
 @EntityListeners(GameEnricher.class)
 public class Game {
 

src/main/java/com/faforever/api/data/domain/GameReviewsSummary.java

@@ -2,7 +2,6 @@
 
 import com.yahoo.elide.annotation.Include;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.BatchSize;
 import org.hibernate.annotations.Immutable;
@@ -17,7 +16,6 @@
 
 @Entity
 @Data
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @NoArgsConstructor
 @Table(name = "game_reviews_summary")
 @Include(name = TYPE_NAME)
@@ -28,7 +26,6 @@ public class GameReviewsSummary {
 
   @Id
   @Column(name = "game_id")
-  @EqualsAndHashCode.Include
   private int id;
 
   @Column(name = "positive")

src/main/java/com/faforever/api/data/domain/GroupPermission.java

@@ -38,7 +38,6 @@
 @Table(name = "group_permission")
 @Include(name = "groupPermission")
 @Data
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @NoArgsConstructor
 @ReadPermission(expression = ReadUserGroupCheck.EXPRESSION)
 public class GroupPermission implements DefaultEntity, GrantedAuthority {
@@ -69,7 +68,6 @@ public class GroupPermission implements DefaultEntity, GrantedAuthority {
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)
   @Column(name = "id")
-  @EqualsAndHashCode.Include
   private Integer id;
 
   @Column(name = "create_time")
@@ -79,13 +77,13 @@ public class GroupPermission implements DefaultEntity, GrantedAuthority {
   private OffsetDateTime updateTime;
 
   @Column(name = "technical_name")
-  @EqualsAndHashCode.Include
   private String technicalName;
 
   @Column(name = "name_key")
   private String nameKey;
 
   @ManyToMany(mappedBy = "permissions")
+  @EqualsAndHashCode.Exclude
   @ToString.Exclude
   private Set<UserGroup> userGroups;