From 78294e2c4ab4f35bda1ced137fe8704da250a402 Mon Sep 17 00:00:00 2001
From: jcartign <julien.cartigny@polytech-lille.fr>
Date: Mon, 26 Sep 2016 16:55:30 +0200
Subject: [PATCH] Add clean domain objects

---
 src/main/java/fr/plil/sio/persistence/api/Group.java |  9 ---------
 src/main/java/fr/plil/sio/persistence/api/Right.java | 10 ----------
 src/main/java/fr/plil/sio/persistence/api/User.java  | 10 ----------
 3 files changed, 0 insertions(+), 29 deletions(-)

diff --git a/src/main/java/fr/plil/sio/persistence/api/Group.java b/src/main/java/fr/plil/sio/persistence/api/Group.java
index a6920a8..0cb77fa 100644
--- a/src/main/java/fr/plil/sio/persistence/api/Group.java
+++ b/src/main/java/fr/plil/sio/persistence/api/Group.java
@@ -1,6 +1,5 @@
 package fr.plil.sio.persistence.api;
 
-import javax.persistence.*;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -9,28 +8,20 @@ import java.util.List;
  * A group contains a list of rights unique by their ID (no two groups with the same ID can exist in the database).
  */
 
-@Entity
-@Table(name = "GROUP_T")
 public class Group {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "GROUP_ID")
     private Long id;
 
-    @Column(name = "NAME_C")
     private String name;
 
     /**
      * Users in the group.
      */
-    @OneToMany(mappedBy = "group")
     private List<User> users = new LinkedList<>();
 
     /**
      * List of rights. The list CANNOT contains duplicate rights.
      */
-    @OneToMany
     private List<Right> rights = new LinkedList<>();
 
     public List<Right> getRights() {
diff --git a/src/main/java/fr/plil/sio/persistence/api/Right.java b/src/main/java/fr/plil/sio/persistence/api/Right.java
index 2cdfa40..6929203 100644
--- a/src/main/java/fr/plil/sio/persistence/api/Right.java
+++ b/src/main/java/fr/plil/sio/persistence/api/Right.java
@@ -1,6 +1,5 @@
 package fr.plil.sio.persistence.api;
 
-import javax.persistence.*;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -10,25 +9,16 @@ import java.util.List;
  * A right can have zero, one or more siblings.
  */
 
-@Entity
-@Table(name = "RIGHT_T")
 public class Right {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "RIGHT_ID")
     private Long id;
 
-    @Column(name = "NAME_C")
     private String name;
 
     /// the parent right
-    @ManyToOne
-    @JoinColumn(name = "PARENT_C")
     private Right parent;
 
     /// the sibling right(s), eventually empty
-    @OneToMany(mappedBy = "parent")
     private List<Right> siblings = new LinkedList<>();
 
     public List<Right> getSiblings() {
diff --git a/src/main/java/fr/plil/sio/persistence/api/User.java b/src/main/java/fr/plil/sio/persistence/api/User.java
index 89b4114..7b075cc 100644
--- a/src/main/java/fr/plil/sio/persistence/api/User.java
+++ b/src/main/java/fr/plil/sio/persistence/api/User.java
@@ -1,26 +1,16 @@
 package fr.plil.sio.persistence.api;
 
-import javax.persistence.*;
-
 /**
  * An user MUST have a group in the database.
  * An user is unique by it name, i.e. database cannot contain two user with the same name or the same ID.
  */
 
-@Entity
-@Table(name = "USER_T")
 public class User {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    @Column(name = "USER_ID")
     private Long id;
 
-    @Column(name = "NAME_C")
     private String name;
 
-    @ManyToOne
-    @JoinColumn(name = "GROUP_C")
     private Group group;
 
     public Long getId() {
--
libgit2 0.21.2