From 2d24ca920b0e39ba0a5819f614e53c3807ab226f Mon Sep 17 00:00:00 2001 From: Dragonfire Date: Mon, 6 Feb 2017 17:48:51 +0100 Subject: [PATCH] Remove @Basic Annotation --- src/main/java/com/faforever/api/data/domain/Login.java | 5 ----- .../com/faforever/api/data/domain/PlayerAchievement.java | 5 ----- src/main/java/com/faforever/api/data/domain/User.java | 4 +--- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/main/java/com/faforever/api/data/domain/Login.java b/src/main/java/com/faforever/api/data/domain/Login.java index 30c8612b6..43e134c94 100644 --- a/src/main/java/com/faforever/api/data/domain/Login.java +++ b/src/main/java/com/faforever/api/data/domain/Login.java @@ -5,7 +5,6 @@ import lombok.Setter; import org.hibernate.annotations.Formula; -import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.GeneratedValue; import javax.persistence.Id; @@ -33,7 +32,6 @@ public int getId() { return id; } - @Basic @Column(name = "login") public String getLogin() { return login; @@ -45,21 +43,18 @@ public String getLowerCaseLogin() { return lowerCaseLogin; } - @Basic @Column(name = "email") @ReadPermission(expression = IsOwner.EXPRESSION) public String getEMail() { return eMail; } - @Basic @Column(name = "steamid") @ReadPermission(expression = IsOwner.EXPRESSION) public String getSteamId() { return steamId; } - @Basic @Column(name = "user_agent") public String getUserAgent() { return userAgent; diff --git a/src/main/java/com/faforever/api/data/domain/PlayerAchievement.java b/src/main/java/com/faforever/api/data/domain/PlayerAchievement.java index ea727624e..78575d9c4 100644 --- a/src/main/java/com/faforever/api/data/domain/PlayerAchievement.java +++ b/src/main/java/com/faforever/api/data/domain/PlayerAchievement.java @@ -3,7 +3,6 @@ import com.yahoo.elide.annotation.Include; import lombok.Setter; -import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.EnumType; @@ -37,26 +36,22 @@ public int getId() { return id; } - @Basic @Column(name = "current_steps") public Integer getCurrentSteps() { return currentSteps; } - @Basic @Column(name = "state") @Enumerated(EnumType.STRING) public AchievementState getState() { return state; } - @Basic @Column(name = "create_time") public Timestamp getCreateTime() { return createTime; } - @Basic @Column(name = "update_time") public Timestamp getUpdateTime() { return updateTime; diff --git a/src/main/java/com/faforever/api/data/domain/User.java b/src/main/java/com/faforever/api/data/domain/User.java index 485843b63..c8f3ad4cb 100644 --- a/src/main/java/com/faforever/api/data/domain/User.java +++ b/src/main/java/com/faforever/api/data/domain/User.java @@ -2,7 +2,6 @@ import lombok.Setter; -import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; @@ -13,8 +12,7 @@ public class User extends Login { private String password; - - @Basic + @Column(name = "password") public String getPassword() { return password;