Revert "Migrate all entities to field level annotations"

This reverts commit 3d2480c

Author: Brutus5000

src/inttest/java/com/faforever/api/data/ClanElideTest.java

@@ -47,9 +47,12 @@ public class ClanElideTest extends AbstractIntegrationTest {
   @Test
   @WithUserDetails(AUTH_CLAN_LEADER)
   public void canDeleteMemberOfOwnClan() throws Exception {
+    assertNotNull(playerRepository.getOne(12).getClan());
+
     mockMvc.perform(
       delete("/data/clanMembership/2")) // magic value from prepClanData.sql
       .andExpect(status().isNoContent());
+    assertNull(playerRepository.getOne(12).getClan());
   }
 
   @Test
@@ -73,9 +76,13 @@ public void cannotDeleteLeaderFromClan() throws Exception {
   @Test
   @WithUserDetails(AUTH_CLAN_MEMBER)
   public void canLeaveClan() throws Exception {
+    assertNotNull(playerRepository.getOne(12).getClan());
+
     mockMvc.perform(
       delete("/data/clanMembership/2")) // magic value from prepClanData.sql
       .andExpect(status().isNoContent());
+
+    assertNull(playerRepository.getOne(12).getClan());
   }
 
   @Test
@@ -99,22 +106,30 @@ public void getFilteredPlayerForClanInvite() throws Exception {
   @Test
   @WithUserDetails(AUTH_CLAN_LEADER)
   public void canTransferLeadershipAsLeader() throws Exception {
+    assertThat(clanRepository.getOne(1).getLeader().getLogin(), is(AUTH_CLAN_LEADER));
+
     mockMvc.perform(
       patch("/data/clan/1")
         .header(HttpHeaders.CONTENT_TYPE, JsonApiMediaType.JSON_API_MEDIA_TYPE)
         .content(generateTransferLeadershipContent(1, 12))) // magic value from prepClanData.sql
       .andExpect(status().isNoContent());
+
+    assertThat(clanRepository.getOne(1).getLeader().getLogin(), is(AUTH_CLAN_MEMBER));
   }
 
   @Test
   @WithUserDetails(AUTH_CLAN_MEMBER)
   public void cannotTransferLeadershipAsMember() throws Exception {
+    assertThat(clanRepository.getOne(1).getLeader().getLogin(), is(AUTH_CLAN_LEADER));
+
     mockMvc.perform(
       patch("/data/clan/1")
         .header(HttpHeaders.CONTENT_TYPE, JsonApiMediaType.JSON_API_MEDIA_TYPE)
         .content(generateTransferLeadershipContent(1, 12))) // magic value from prepClanData.sql
       .andExpect(status().isForbidden())
       .andExpect(jsonPath("$.errors[0].detail", is("UpdatePermission Denied")));
+
+    assertThat(clanRepository.getOne(1).getLeader().getLogin(), is(AUTH_CLAN_LEADER));
   }
 
   @Test

src/inttest/java/com/faforever/api/data/MapElideTest.java

@@ -68,7 +68,7 @@ public void canUpdateMapRecommendationToTrueWithScopeAndRole() throws Exception
         .content(MAP_RECOMMENDED_TRUE_ID_1))
       .andExpect(status().isNoContent());
 
-    assertThat(mapRepository.getOne(1).isRecommended(), is(true));
+    assertThat(mapRepository.getOne(1).getRecommended(), is(true));
   }
 
   @Test
@@ -81,7 +81,7 @@ public void cannotUpdateMapRecommendationToTrueWithoutScope() throws Exception {
         .content(MAP_RECOMMENDED_TRUE_ID_1))
       .andExpect(status().isForbidden());
 
-    assertThat(mapRepository.getOne(1).isRecommended(), is(false));
+    assertThat(mapRepository.getOne(1).getRecommended(), is(false));
   }
 
   @Test
@@ -94,7 +94,7 @@ public void cannotUpdateMapRecommendationToTrueWithoutRole() throws Exception {
         .content(MAP_RECOMMENDED_TRUE_ID_1))
       .andExpect(status().isForbidden());
 
-    assertThat(mapRepository.getOne(1).isRecommended(), is(false));
+    assertThat(mapRepository.getOne(1).getRecommended(), is(false));
   }
 
   @Test
@@ -107,7 +107,7 @@ public void canUpdateMapRecommendationToFalseWithScopeAndRole() throws Exception
         .content(MAP_RECOMMENDED_FALSE_ID_1))
       .andExpect(status().isNoContent());
 
-    assertThat(mapRepository.getOne(1).isRecommended(), is(false));
+    assertThat(mapRepository.getOne(1).getRecommended(), is(false));
   }
 
   @Test

src/inttest/java/com/faforever/api/data/ModElideTest.java

@@ -68,7 +68,7 @@ public void canUpdateModRecommendationToTrueWithScopeAndRole() throws Exception
         .content(MOD_RECOMMENDED_TRUE_ID_1))
       .andExpect(status().isNoContent());
 
-    assertThat(modRepository.getOne(1).isRecommended(), is(true));
+    assertThat(modRepository.getOne(1).getRecommended(), is(true));
   }
 
   @Test
@@ -81,7 +81,7 @@ public void cannotUpdateModRecommendationToTrueWithoutScope() throws Exception {
         .content(MOD_RECOMMENDED_TRUE_ID_1))
       .andExpect(status().isForbidden());
 
-    assertThat(modRepository.getOne(1).isRecommended(), is(false));
+    assertThat(modRepository.getOne(1).getRecommended(), is(false));
   }
 
   @Test
@@ -94,7 +94,7 @@ public void cannotUpdateModRecommendationToTrueWithoutRole() throws Exception {
         .content(MOD_RECOMMENDED_TRUE_ID_1))
       .andExpect(status().isForbidden());
 
-    assertThat(modRepository.getOne(1).isRecommended(), is(false));
+    assertThat(modRepository.getOne(1).getRecommended(), is(false));
   }
 
   @Test
@@ -107,7 +107,7 @@ public void canUpdateModRecommendationToFalseWithScopeAndRole() throws Exception
         .content(MOD_RECOMMENDED_FALSE_ID_1))
       .andExpect(status().isNoContent());
 
-    assertThat(modRepository.getOne(1).isRecommended(), is(false));
+    assertThat(modRepository.getOne(1).getRecommended(), is(false));
   }
 
   @Test

src/inttest/java/com/faforever/api/data/UserNoteTest.java

@@ -117,10 +117,14 @@ public void cannotCreateUserNoteWithoutRole() throws Exception {
 
   @Test
   public void canCreateUserNoteWithScopeAndRole() throws Exception {
+    assertThat(playerRepository.getOne(3).getUserNotes().size(), is(0));
+
     mockMvc.perform(post("/data/userNote")
       .with(getOAuthTokenWithTestUser(OAuthScope._READ_SENSIBLE_USERDATA, GroupPermission.ROLE_ADMIN_ACCOUNT_NOTE))
       .header(HttpHeaders.CONTENT_TYPE, JSON_API_MEDIA_TYPE)
       .content(testPost))
       .andExpect(status().isCreated());
+
+    assertThat(playerRepository.getOne(3).getUserNotes().size(), is(1));
   }
 }

src/inttest/resources/config/application.yml

@@ -97,4 +97,3 @@ logging:
     org.springframework.security: DEBUG
     org.springframework.transaction.interceptor: trace
     org.springframework.orm.jpa.JpaTransactionManager: trace
-    com.yahoo: DEBUG

src/main/java/com/faforever/api/client/OAuthClient.java

@@ -1,6 +1,6 @@
 package com.faforever.api.client;
 
-import lombok.Data;
+import lombok.Setter;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.util.Assert;
 
@@ -15,43 +15,71 @@
 
 @Entity
 @Table(name = "oauth_clients")
-@Data
+@Setter
 public class OAuthClient {
 
+  private String id;
+  private String name;
+  private String clientSecret;
+  private ClientType clientType;
+  private String redirectUris;
+  private String defaultRedirectUri;
+  private String defaultScope;
+  private String iconUrl;
+  private Boolean autoApproveScopes;
+
   @Id
   @Column(name = "id")
-  private String id;
+  public String getId() {
+    return id;
+  }
 
   @NotNull
   @Column(name = "name")
-  private String name;
+  public String getName() {
+    return name;
+  }
 
   @NotNull
   @Column(name = "client_secret")
-  private String clientSecret;
+  public String getClientSecret() {
+    return clientSecret;
+  }
 
   @NotNull
   @Column(name = "client_type")
-  private ClientType clientType;
+  public ClientType getClientType() {
+    return clientType;
+  }
 
   @NotNull
   @Column(name = "redirect_uris")
-  private String redirectUris;
+  public String getRedirectUris() {
+    return redirectUris;
+  }
 
   @NotNull
   @Column(name = "default_redirect_uri")
-  private String defaultRedirectUri;
+  public String getDefaultRedirectUri() {
+    return defaultRedirectUri;
+  }
 
   @NotNull
   @Column(name = "default_scope")
-  private String defaultScope;
+  public String getDefaultScope() {
+    return defaultScope;
+  }
 
   @Column(name = "icon_url")
-  private String iconUrl;
+  public String getIconUrl() {
+    return iconUrl;
+  }
 
   @Column(name = "auto_approve_scopes")
   @Nullable
-  private Boolean autoApproveScopes;
+  public Boolean isAutoApproveScopes() {
+    return autoApproveScopes;
+  }
 
   @Converter(autoApply = true)
   public static class ClientTypeConverter implements AttributeConverter<ClientType, String> {

src/main/java/com/faforever/api/data/checks/UserGroupPublicCheck.java

@@ -17,6 +17,6 @@ public class UserGroupPublicCheck extends OperationCheck<UserGroup> {
 
   @Override
   public boolean ok(UserGroup object, RequestScope requestScope, Optional<ChangeSpec> changeSpec) {
-    return object.isPublic_();
+    return object.isPublic();
   }
 }

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

@@ -0,0 +1,44 @@
+package com.faforever.api.data.domain;
+
+import lombok.EqualsAndHashCode;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import java.time.OffsetDateTime;
+
+@MappedSuperclass
+@Setter
+@EqualsAndHashCode(of = "id")
+public abstract class AbstractEntity {
+  protected Integer id;
+  protected OffsetDateTime createTime;
+  protected OffsetDateTime updateTime;
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "id")
+  public Integer getId() {
+    return id;
+  }
+
+  @Column(name = "create_time")
+  public OffsetDateTime getCreateTime() {
+    return createTime;
+  }
+
+  @Column(name = "update_time")
+  public OffsetDateTime getUpdateTime() {
+    return updateTime;
+  }
+
+  /**
+   * Supplement method for @EqualsAndHashCode overriding the default lombok implementation
+   */
+  protected boolean canEqual(Object other) {
+    return other instanceof AbstractEntity && this.getClass() == other.getClass();
+  }
+}