First version, include basic tests.

jcartign
Showing 19 changed files with 543 additions and 0 deletions Show diff stats
.gitignore
pom.xml
src/main/java/fr/plil/sio/persistence/api/Group.java
src/main/java/fr/plil/sio/persistence/api/GroupService.java
src/main/java/fr/plil/sio/persistence/api/Right.java
src/main/java/fr/plil/sio/persistence/api/RightService.java
src/main/java/fr/plil/sio/persistence/api/User.java
src/main/java/fr/plil/sio/persistence/api/UserService.java
src/main/java/fr/plil/sio/persistence/jdbc/GroupServiceJdbc.java
src/main/java/fr/plil/sio/persistence/jdbc/JdbcApplication.java
src/main/java/fr/plil/sio/persistence/jdbc/RightServiceJdbc.java
src/main/java/fr/plil/sio/persistence/jdbc/UserRepository.java
src/main/java/fr/plil/sio/persistence/jdbc/UserRepositoryJdbc.java
src/main/java/fr/plil/sio/persistence/jdbc/UserServiceJdbc.java
src/main/resources/schema.sql
src/test/java/fr/plil/sio/persistence/jdbc/GroupServiceTest.java
src/test/java/fr/plil/sio/persistence/jdbc/RightServiceTest.java
src/test/java/fr/plil/sio/persistence/jdbc/UserServiceTest.java
src/test/resources/application.properties
+++ a/.gitignore
@@ -0,0 +1,4 @@
+*.iml
+*/target/
+.idea/
+*/.idea/
+++ a/pom.xml
@@ -0,0 +1,38 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+                             http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>fr.plil.sio.persistence</groupId>
+    <artifactId>spring-jdbc</artifactId>
+    <version>0.1</version>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.3.6.RELEASE</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>1.8</java.version>
+    </properties>
+
+</project>
+++ a/src/main/java/fr/plil/sio/persistence/api/Group.java
@@ -0,0 +1,37 @@
+package fr.plil.sio.persistence.api;
+
+import java.util.Set;
+import java.util.TreeSet;
+
+public class Group {
+
+    private Long id;
+
+    private String name;
+
+    private Set<User> users = new TreeSet<>();
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Set<User> getUsers() {
+        return users;
+    }
+
+    public void setUsers(Set<User> users) {
+        this.users = users;
+    }
+}
+++ a/src/main/java/fr/plil/sio/persistence/api/GroupService.java
@@ -0,0 +1,18 @@
+package fr.plil.sio.persistence.api;
+
+public interface GroupService {
+
+    Group create(String name);
+
+    boolean delete(Group group);
+
+    Group findByName(String name);
+
+    boolean addUser(Group group, User user);
+
+    boolean removeUser(Group group, User user);
+
+    boolean addRight(Group group, Right right);
+
+    boolean removeRight(Group group, Right right);
+}
+++ a/src/main/java/fr/plil/sio/persistence/api/Right.java
@@ -0,0 +1,46 @@
+package fr.plil.sio.persistence.api;
+
+import java.util.Set;
+
+public class Right {
+
+    private Long id;
+
+    private String name;
+
+    private Right parent;
+
+    private Set<Right> siblings;
+
+    public Set<Right> getSiblings() {
+        return siblings;
+    }
+
+    public void setSiblings(Set<Right> siblings) {
+        this.siblings = siblings;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Right getParent() {
+        return parent;
+    }
+
+    public void setParent(Right parent) {
+        this.parent = parent;
+    }
+}
+++ a/src/main/java/fr/plil/sio/persistence/api/RightService.java
@@ -0,0 +1,12 @@
+package fr.plil.sio.persistence.api;
+
+public interface RightService {
+
+    Right create(String name);
+
+    Right create(String name, Right parent);
+
+    boolean delete(Right group);
+
+    Right findByName(String name);
+}
+++ a/src/main/java/fr/plil/sio/persistence/api/User.java
@@ -0,0 +1,43 @@
+package fr.plil.sio.persistence.api;
+
+import javax.annotation.Generated;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class User {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    private String name;
+
+    private Group group;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Group getGroup() {
+        return group;
+    }
+
+    public void setGroup(Group group) {
+        this.group = group;
+    }
+}
+++ a/src/main/java/fr/plil/sio/persistence/api/UserService.java
@@ -0,0 +1,12 @@
+package fr.plil.sio.persistence.api;
+
+public interface UserService {
+
+    User create(String name);
+
+    boolean delete(User user);
+
+    User findByName(String name);
+
+    boolean isUserHasRight(User user, Right right);
+}
+++ a/src/main/java/fr/plil/sio/persistence/jdbc/GroupServiceJdbc.java
@@ -0,0 +1,46 @@
+package fr.plil.sio.persistence.jdbc;
+
+import fr.plil.sio.persistence.api.Group;
+import fr.plil.sio.persistence.api.GroupService;
+import fr.plil.sio.persistence.api.Right;
+import fr.plil.sio.persistence.api.User;
+import org.springframework.stereotype.Service;
+
+@Service
+public class GroupServiceJdbc implements GroupService {
+    @Override
+    public Group create(String name) {
+        return null;
+    }
+
+    @Override
+    public boolean delete(Group group) {
+        return false;
+    }
+
+    @Override
+    public Group findByName(String name) {
+        return null;
+    }
+
+    @Override
+    public boolean addUser(Group group, User user) {
+        return false;
+    }
+
+    @Override
+    public boolean removeUser(Group group, User user) {
+        return false;
+    }
+
+    @Override
+    public boolean addRight(Group group, Right right) {
+        return false;
+
+    }
+
+    @Override
+    public boolean removeRight(Group group, Right right) {
+        return false;
+    }
+}
+++ a/src/main/java/fr/plil/sio/persistence/jdbc/JdbcApplication.java
@@ -0,0 +1,7 @@
+package fr.plil.sio.persistence.jdbc;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class JdbcApplication {
+}
+++ a/src/main/java/fr/plil/sio/persistence/jdbc/RightServiceJdbc.java
@@ -0,0 +1,28 @@
+package fr.plil.sio.persistence.jdbc;
+
+import fr.plil.sio.persistence.api.Right;
+import fr.plil.sio.persistence.api.RightService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class RightServiceJdbc implements RightService{
+    @Override
+    public Right create(String name) {
+        return null;
+    }
+
+    @Override
+    public Right create(String name, Right parent) {
+        return null;
+    }
+
+    @Override
+    public boolean delete(Right group) {
+        return false;
+    }
+
+    @Override
+    public Right findByName(String name) {
+        return null;
+    }
+}
+++ a/src/main/java/fr/plil/sio/persistence/jdbc/UserRepository.java
@@ -0,0 +1,12 @@
+package fr.plil.sio.persistence.jdbc;
+
+import fr.plil.sio.persistence.api.User;
+
+public interface UserRepository {
+
+    User findByName(String name);
+
+    void delete(Long id);
+
+    void save(User user);
+}
+++ a/src/main/java/fr/plil/sio/persistence/jdbc/UserRepositoryJdbc.java
@@ -0,0 +1,91 @@
+package fr.plil.sio.persistence.jdbc;
+
+import fr.plil.sio.persistence.api.User;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+import javax.sql.DataSource;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+@Repository
+public class UserRepositoryJdbc implements UserRepository {
+
+    private static final Logger logger = LoggerFactory.getLogger(UserRepositoryJdbc.class);
+
+    @Autowired
+    private DataSource dataSource;
+
+    @Override
+    public User findByName(String name) {
+        Statement stmt = null;
+        ResultSet rs = null;
+        try {
+            stmt = dataSource.getConnection().createStatement();
+            rs = stmt.executeQuery("SELECT * FROM GROUP_T WHERE NAME_C = \'" + name + "\'");
+            if (rs.next()) {
+                logger.debug("found user " + name);
+                User user = new User();
+                user.setId(rs.getLong("GROUP_ID"));
+                user.setName(rs.getString("NAME_C"));
+                return user;
+            } else {
+                logger.debug("not found " + name);
+                return null;
+            }
+        } catch (SQLException e) {
+            throw new UnsupportedOperationException("sql exception", e);
+        } finally {
+            try {
+                if (rs != null) {
+                    rs.close();
+                }
+                if (stmt != null) {
+                    stmt.close();
+                }
+            } catch (SQLException e) {
+                throw new UnsupportedOperationException("sql exception during close", e);
+
+            }
+        }
+    }
+
+    @Override
+    public void delete(Long id) {
+        throw new IllegalStateException("not implemented !");
+    }
+
+    @Override
+    public void save(User user) {
+        Statement stmt = null;
+        ResultSet rs = null;
+        try {
+            stmt = dataSource.getConnection().createStatement();
+            stmt.executeUpdate("INSERT INTO USER_T (NAME_C) VALUES (\'" + user.getName() + "\')",
+                    Statement.RETURN_GENERATED_KEYS);
+            rs = stmt.getGeneratedKeys();
+            if (rs.next()) {
+                user.setId(rs.getLong(1));
+            } else {
+                throw new UnsupportedOperationException("default in key access");
+            }
+        } catch (SQLException e) {
+            throw new UnsupportedOperationException("sql exception", e);
+        } finally {
+            try {
+                if (rs != null) {
+                    rs.close();
+                }
+                if (stmt != null) {
+                    stmt.close();
+                }
+            } catch (SQLException e) {
+                throw new UnsupportedOperationException("sql exception during close", e);
+            }
+        }
+
+    }
+}
+++ a/src/main/java/fr/plil/sio/persistence/jdbc/UserServiceJdbc.java
@@ -0,0 +1,38 @@
+package fr.plil.sio.persistence.jdbc;
+
+import fr.plil.sio.persistence.api.Right;
+import fr.plil.sio.persistence.api.User;
+import fr.plil.sio.persistence.api.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserServiceJdbc implements UserService {
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Override
+    public User create(String name) {
+        return null;
+    }
+
+    @Override
+    public boolean delete(User user) {
+        return false;
+    }
+
+    @Override
+    public boolean isUserHasRight(User user, Right right) {
+        return false;
+    }
+
+    @Override
+    public User findByName(String name) {
+        return null;
+    }
+
+    public void setUserRepository(UserRepository userRepository) {
+        this.userRepository = userRepository;
+    }
+}
+++ a/src/main/resources/schema.sql
@@ -0,0 +1,2 @@
+CREATE TABLE USER_T (USER_ID INT NOT NULL AUTO_INCREMENT, NAME_C VARCHAR(50) UNIQUE NOT NULL, PRIMARY KEY(USER_ID));
+CREATE TABLE GROUP_T (GROUP_ID INT NOT NULL AUTO_INCREMENT, NAME_C VARCHAR(50) UNIQUE NOT NULL, PRIMARY KEY(GROUP_ID));
+++ a/src/test/java/fr/plil/sio/persistence/jdbc/GroupServiceTest.java
@@ -0,0 +1,61 @@
+package fr.plil.sio.persistence.jdbc;
+
+import fr.plil.sio.persistence.api.Group;
+import fr.plil.sio.persistence.api.GroupService;
+import fr.plil.sio.persistence.api.User;
+import fr.plil.sio.persistence.api.UserService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(classes = JdbcApplication.class)
+public class GroupServiceTest {
+
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private GroupService groupService;
+
+    @Test
+    public void testCreateAndFindByName() {
+        groupService.create("group1");
+        Group group2 = groupService.findByName("group1");
+        assertNotNull(group2);
+        assertNotNull(group2.getName());
+        assertEquals("group1", group2.getName());
+    }
+
+    @Test
+    public void addUsersAndCheckIfPresent() {
+        Group group1 = groupService.create("group1");
+        User user1 = userService.create("user1");
+        User user2 = userService.create("user2");
+        groupService.addUser(group1, user1);
+        groupService.addUser(group1, user2);
+        Group group2 = groupService.findByName("group1");
+        assertNotNull(group2);
+        assertNotNull(group2.getName());
+        assertEquals("group1", group2.getName());
+        assertEquals(2, group2.getUsers().size());
+    }
+
+    @Test
+    public void deleteGroupDoesNotDeleteUsers() {
+        Group group1 = groupService.create("group1");
+        User user1 = userService.create("user1");
+        User user2 = userService.create("user2");
+        groupService.addUser(group1, user1);
+        groupService.addUser(group1, user2);
+        groupService.delete(group1);
+        assertNotNull(userService.findByName("user1"));
+        assertNotNull(userService.findByName("user2"));
+    }
+
+}
+++ a/src/test/java/fr/plil/sio/persistence/jdbc/RightServiceTest.java
@@ -0,0 +1,10 @@
+package fr.plil.sio.persistence.jdbc;
+
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(classes = JdbcApplication.class)
+public class RightServiceTest {
+}
+++ a/src/test/java/fr/plil/sio/persistence/jdbc/UserServiceTest.java
@@ -0,0 +1,35 @@
+package fr.plil.sio.persistence.jdbc;
+
+import fr.plil.sio.persistence.api.User;
+import fr.plil.sio.persistence.api.UserService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(classes = JdbcApplication.class)
+public class UserServiceTest {
+
+    @Autowired
+    private UserService userService;
+
+    @Test
+    public void testCreateAndFindByName() {
+        final String name = "blabla";
+        User user1 = userService.create(name);
+        User user2 = userService.findByName(name);
+        assertNotNull(user1);
+        assertNotNull(user2);
+        assertNotNull(user1.getName());
+        assertNotNull(user2.getName());
+        assertNotNull(user1.getGroup());
+        assertNotNull(user2.getGroup());
+        assertEquals(user1.getName(), user2.getName());
+        assertEquals(user1.getGroup(), user2.getGroup());
+    }
+}
+++ a/src/test/resources/application.properties
@@ -0,0 +1,3 @@
+logging.level.org.springframework=INFO
+logging.level.org.hibernate.SQL=DEBUG
+logging.level.org.hibernate=INFO
 \ No newline at end of file