Replaced usage of wrong jpa table model classes

Signed-off-by: JannikEmmerich <[email protected]>

Author: JannikEmmerich

java-base/src/main/java/net/cryptic_game/backend/base/jpa/model/TableModel.java

@@ -0,0 +1,24 @@
+package net.cryptic_game.backend.base.jpa.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import net.cryptic_game.backend.base.json.JsonTransient;
+
+import javax.persistence.Column;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Version;
+
+@Getter
+@Setter
+@MappedSuperclass
+@NoArgsConstructor
+@AllArgsConstructor
+public abstract class TableModel {
+
+    @JsonTransient
+    @Version
+    @Column(name = "version", nullable = false)
+    private Long version;
+}

java-base/src/main/java/net/cryptic_game/backend/base/jpa/model/TableModelAutoId.java

@@ -0,0 +1,24 @@
+package net.cryptic_game.backend.base.jpa.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import java.util.UUID;
+
+@Getter
+@MappedSuperclass
+@NoArgsConstructor
+@AllArgsConstructor
+public abstract class TableModelAutoId extends TableModel {
+
+    @Id
+    @GeneratedValue
+    @Column(name = "id", updatable = false, nullable = false, unique = true)
+    private UUID id;
+}
+

java-base/src/main/java/net/cryptic_game/backend/base/jpa/model/TableModelId.java

@@ -0,0 +1,21 @@
+package net.cryptic_game.backend.base.jpa.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import java.util.UUID;
+
+@Getter
+@MappedSuperclass
+@NoArgsConstructor
+@AllArgsConstructor
+public abstract class TableModelId extends TableModel {
+
+    @Id
+    @Column(name = "id", updatable = false, nullable = false)
+    private UUID id;
+}

java-data/src/main/java/net/cryptic_game/backend/data/sql/entities/Inventory.java

@@ -2,10 +2,10 @@
 
 import com.google.gson.JsonObject;
 import lombok.Data;
+import net.cryptic_game.backend.base.jpa.model.TableModelAutoId;
 import net.cryptic_game.backend.base.json.JsonBuilder;
 import net.cryptic_game.backend.base.json.JsonSerializable;
 import net.cryptic_game.backend.data.sql.entities.user.User;
-import net.getnova.framework.jpa.model.TableModelAutoId;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

java-data/src/main/java/net/cryptic_game/backend/data/sql/entities/chat/ChatChannel.java

@@ -4,7 +4,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import net.getnova.framework.jpa.model.TableModelAutoId;
+import net.cryptic_game.backend.base.jpa.model.TableModelAutoId;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

java-data/src/main/java/net/cryptic_game/backend/data/sql/entities/chat/ChatChannelAccess.java

@@ -6,10 +6,10 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
+import net.cryptic_game.backend.base.jpa.model.TableModelAutoId;
 import net.cryptic_game.backend.base.json.JsonBuilder;
 import net.cryptic_game.backend.base.json.JsonSerializable;
 import net.cryptic_game.backend.data.sql.entities.user.User;
-import net.getnova.framework.jpa.model.TableModelAutoId;
 
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;

java-data/src/main/java/net/cryptic_game/backend/data/sql/entities/chat/ChatMessage.java

@@ -5,10 +5,10 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import net.cryptic_game.backend.base.jpa.model.TableModelAutoId;
 import net.cryptic_game.backend.base.json.JsonBuilder;
 import net.cryptic_game.backend.base.json.JsonSerializable;
 import net.cryptic_game.backend.data.sql.entities.user.User;
-import net.getnova.framework.jpa.model.TableModelAutoId;
 import org.hibernate.Session;
 
 import javax.persistence.Column;

java-data/src/main/java/net/cryptic_game/backend/data/sql/entities/currency/CurrencyTransaction.java

@@ -6,9 +6,9 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import net.cryptic_game.backend.base.jpa.model.TableModelAutoId;
 import net.cryptic_game.backend.base.json.JsonBuilder;
 import net.cryptic_game.backend.base.json.JsonSerializable;
-import net.getnova.framework.jpa.model.TableModelAutoId;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

java-data/src/main/java/net/cryptic_game/backend/data/sql/entities/currency/CurrencyWallet.java

@@ -4,8 +4,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import net.cryptic_game.backend.base.jpa.model.TableModelAutoId;
 import net.cryptic_game.backend.base.json.JsonTransient;
-import net.getnova.framework.jpa.model.TableModelAutoId;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

java-data/src/main/java/net/cryptic_game/backend/data/sql/entities/device/Device.java

@@ -5,10 +5,10 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import net.cryptic_game.backend.base.jpa.model.TableModelAutoId;
 import net.cryptic_game.backend.base.json.JsonBuilder;
 import net.cryptic_game.backend.base.json.JsonSerializable;
 import net.cryptic_game.backend.data.sql.entities.user.User;
-import net.getnova.framework.jpa.model.TableModelAutoId;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;