From 006ce222d099b9f182e20d77bdfbd77c7702e2b0 Mon Sep 17 00:00:00 2001
From: florian <florian.thierry72@gmail.com>
Date: Sun, 1 Sep 2019 13:37:34 +0200
Subject: [PATCH] Remove abstract class of entities.

---
 .../entities/persistence/AbstractEntity.java  | 25 -------------------
 .../entities/persistence/Application.java     | 24 ++++++++++++++----
 .../persistence/ConfigurationFile.java        | 19 +++++++++++++-
 .../cerberus/entities/persistence/User.java   | 24 ++++++++++++++----
 4 files changed, 56 insertions(+), 36 deletions(-)
 delete mode 100644 src/main/java/org/cerberus/entities/persistence/AbstractEntity.java

diff --git a/src/main/java/org/cerberus/entities/persistence/AbstractEntity.java b/src/main/java/org/cerberus/entities/persistence/AbstractEntity.java
deleted file mode 100644
index 7323e66..0000000
--- a/src/main/java/org/cerberus/entities/persistence/AbstractEntity.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.cerberus.entities.persistence;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.PrePersist;
-import java.util.UUID;
-
-@Entity
-abstract class AbstractEntity {
-    @Id
-    protected UUID id;
-
-    @PrePersist
-    public void prePersist() {
-        id = UUID.randomUUID();
-    }
-
-    public UUID getId() {
-        return id;
-    }
-
-    public void setId(UUID id) {
-        this.id = id;
-    }
-}
diff --git a/src/main/java/org/cerberus/entities/persistence/Application.java b/src/main/java/org/cerberus/entities/persistence/Application.java
index 35eaad4..e6e40df 100644
--- a/src/main/java/org/cerberus/entities/persistence/Application.java
+++ b/src/main/java/org/cerberus/entities/persistence/Application.java
@@ -2,16 +2,17 @@ package org.cerberus.entities.persistence;
 
 import org.hibernate.annotations.Proxy;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.util.List;
+import java.util.UUID;
 
 @Entity
 @Table(name="application")
 @Proxy(lazy = false)
-public class Application extends AbstractEntity {
+public class Application {
+    @Id
+    private UUID id;
+
     @Column(nullable = false)
     private String name;
 
@@ -24,6 +25,19 @@ public class Application extends AbstractEntity {
     @OneToMany(mappedBy = "application")
     private List<ApplicationRole> administratorList;
 
+    @PrePersist
+    public void prePersist() {
+        id = UUID.randomUUID();
+    }
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
     public String getName() {
         return name;
     }
diff --git a/src/main/java/org/cerberus/entities/persistence/ConfigurationFile.java b/src/main/java/org/cerberus/entities/persistence/ConfigurationFile.java
index f4aeba3..da90f61 100644
--- a/src/main/java/org/cerberus/entities/persistence/ConfigurationFile.java
+++ b/src/main/java/org/cerberus/entities/persistence/ConfigurationFile.java
@@ -3,11 +3,15 @@ package org.cerberus.entities.persistence;
 import org.hibernate.annotations.Proxy;
 
 import javax.persistence.*;
+import java.util.UUID;
 
 @Entity
 @Table(name="configuration_file")
 @Proxy(lazy = false)
-public class ConfigurationFile extends AbstractEntity {
+public class ConfigurationFile {
+    @Id
+    private UUID id;
+
     @Column(nullable = false)
     private String path;
 
@@ -15,6 +19,19 @@ public class ConfigurationFile extends AbstractEntity {
     @JoinColumn(name = "application_id")
     private Application application;
 
+    @PrePersist
+    public void prePersist() {
+        id = UUID.randomUUID();
+    }
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
     public String getPath() {
         return path;
     }
diff --git a/src/main/java/org/cerberus/entities/persistence/User.java b/src/main/java/org/cerberus/entities/persistence/User.java
index 711e0e8..ae98ec9 100644
--- a/src/main/java/org/cerberus/entities/persistence/User.java
+++ b/src/main/java/org/cerberus/entities/persistence/User.java
@@ -4,17 +4,18 @@ import org.hibernate.annotations.Generated;
 import org.hibernate.annotations.GenerationTime;
 import org.hibernate.annotations.Proxy;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.time.LocalDate;
 import java.util.List;
+import java.util.UUID;
 
 @Entity
 @Table(name="`user`")
 @Proxy(lazy = false)
-public class User extends AbstractEntity {
+public class User {
+    @Id
+    private UUID id;
+
     @Column(nullable = false)
     private String name;
 
@@ -34,6 +35,19 @@ public class User extends AbstractEntity {
     @OneToMany(mappedBy = "user")
     private List<ApplicationRole> applicationRoleList;
 
+    @PrePersist
+    public void prePersist() {
+        id = UUID.randomUUID();
+    }
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
     public String getName() {
         return name;
     }