Merge migration from spring-jdbc

- add javadocs in Group, Right and User - fixing few mistakes in Group and Right service tests - update application properties to increase JDBC connection tomcat pool

Merge migration from spring-jdbc
- add javadocs in Group, Right and User - fixing few mistakes in Group and Right service tests - update application properties to increase JDBC connection tomcat pool
jcartign
2 parents fd5e74ca d41edfbc
Showing 6 changed files with 60 additions and 16 deletions Show diff stats
src/main/java/fr/plil/sio/persistence/api/Group.java
src/main/java/fr/plil/sio/persistence/api/Right.java
src/main/java/fr/plil/sio/persistence/api/User.java
src/test/java/fr/plil/sio/persistence/jpa/GroupServiceTest.java
src/test/java/fr/plil/sio/persistence/jpa/RightServiceTest.java
src/test/resources/application.properties
 package fr.plil.sio.persistence.api;
+import javax.persistence.*;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
+/**
+ * A group is unique by its name (no two groups with the same name or the same ID can exist in the database).
+ * 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.
      */
-    private Set<User> users = new TreeSet<>();
+    @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() {
@@ -45,11 +57,11 @@ public class Group {
         this.name = name;
     }
-    public Set<User> getUsers() {
+    public List<User> getUsers() {
         return users;
     }
-    public void setUsers(Set<User> users) {
+    public void setUsers(List<User> users) {
         this.users = users;
     }
 }
 package fr.plil.sio.persistence.api;
-import java.util.HashSet;
-import java.util.Set;
+import javax.persistence.*;
+import java.util.LinkedList;
+import java.util.List;
+/**
+ * A right is unique by itd ID, i.e. it can exist two rights with the same name in the database.
+ * A right may have a parent, null else.
+ * 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 group
+    /// the parent right
+    @ManyToOne
+    @JoinColumn(name = "PARENT_C")
     private Right parent;
-    /// the sibling group(s), eventually empty
-    private Set<Right> siblings = new HashSet<>();
+    /// the sibling right(s), eventually empty
+    @OneToMany(mappedBy = "parent")
+    private List<Right> siblings = new LinkedList<>();
-    public Set<Right> getSiblings() {
+    public List<Right> getSiblings() {
         return siblings;
     }
-    public void setSiblings(Set<Right> siblings) {
+    public void setSiblings(List<Right> siblings) {
         this.siblings = siblings;
     }
 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() {
@@ -69,7 +69,7 @@ public class GroupServiceTest {
     @Test
     public void deleteGroupDoesDeleteUsers() {
         userService.create("user1", "group");
-        userService.create("user1", "group");
+        userService.create("user2", "group");
         assertNotNull(userService.findByName("user1"));
         assertNotNull(userService.findByName("user2"));
         groupService.delete("group");
@@ -86,8 +86,8 @@ public class RightServiceTest {
         assertEquals(0, rightService.findByName("parent").size());
     }
-    @Test
-    public void testDeleteRightIfNotFound() {
+    @Test(expected = IllegalArgumentException.class)
+    public void testDeleteRightIfNotInDatabase() {
         Right right = new Right();
         right.setName("not-a-right");
         assertFalse(rightService.delete(right));
 logging.level.org.springframework=INFO
 logging.level.org.hibernate.SQL=DEBUG
 logging.level.org.hibernate=INFO
-spring.datasource.url=jdbc:h2:mem:persistence;TRACE_LEVEL_FILE=4
 \ No newline at end of file
+spring.datasource.url=jdbc:h2:mem:persistence;TRACE_LEVEL_FILE=4;
+spring.datasource.tomcat.max-active=300
 \ No newline at end of file