Switching to spring-data-jpa

Julien Iguchi-Cartigny · Julien Iguchi-Cartigny
1 parent 8efec875
Showing 15 changed files with 101 additions and 137 deletions Show diff stats
pom.xml
src/main/java/fr/plil/sio/web/mvc/Application.java
src/main/java/fr/plil/sio/web/mvc/CheckUserInterceptor.java
src/main/java/fr/plil/sio/web/mvc/LoginController.java
src/main/java/fr/plil/sio/web/mvc/NewUserController.java
src/main/java/fr/plil/sio/web/mvc/User.java
src/main/java/fr/plil/sio/web/mvc/UserRepository.java
src/main/java/fr/plil/sio/web/mvc/UserRepositoryImpl.java
src/main/java/fr/plil/sio/web/mvc/ViewUsersController.java
src/main/resources/application.properties
src/main/resources/data.sql
src/test/java/fr/plil/sio/web/mvc/LoginControllerTest.java
src/test/java/fr/plil/sio/web/mvc/NewUserControllerTest.java
src/test/java/fr/plil/sio/web/mvc/UserRepositoryTest.java
src/test/java/fr/plil/sio/web/mvc/ViewUsersControllerTest.java
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
@@ -27,6 +27,10 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-rest</artifactId>
 		</dependency>
 		<dependency>
@@ -34,11 +38,6 @@
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-tomcat</artifactId>
 			<scope>provided</scope>
@@ -57,6 +56,11 @@
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
 	</dependencies>
 	<build>
@@ -6,10 +6,12 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.context.web.SpringBootServletInitializer;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 @EnableAutoConfiguration
 @Configuration
 @ComponentScan
+@EnableJpaRepositories
 public class Application extends SpringBootServletInitializer {
     public static void main(String[] args) {
 package fr.plil.sio.web.mvc;
-import java.io.IOException;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
 public class CheckUserInterceptor extends HandlerInterceptorAdapter {
     private static final Logger logger = LoggerFactory.getLogger(CheckUserInterceptor.class);
-    @Autowired
+    @Resource
     private UserSession userSession;
     @Override
 package fr.plil.sio.web.mvc;
-import javax.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
+import javax.annotation.Resource;
+
 @Controller
 @RequestMapping(value = "/login")
 public class LoginController {
@@ -25,7 +26,7 @@ public class LoginController {
     @RequestMapping(method = RequestMethod.POST)
     public String postLoginCheck(User user, BindingResult result) {
-        User userFromDao = userRepository.getFromUsername(user.getUsername());
+        User userFromDao = userRepository.findByUsername(user.getUsername());
         if (userFromDao == null) {
             result.rejectValue("username","login.form.invalid");
 package fr.plil.sio.web.mvc;
-import javax.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
+import javax.annotation.Resource;
+
 @Controller
 public class NewUserController {
@@ -33,7 +34,7 @@ public class NewUserController {
         userValidator.validate(user, result);
-        boolean present = (userRepository.getFromUsername(user.getUsername()) != null);
+        boolean present = (userRepository.findByUsername(user.getUsername()) != null);
         if (present) {
             result.rejectValue("username", "new.user.form.present");
 package fr.plil.sio.web.mvc;
-public class User {
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+public class User implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    @Column
     private String username;
+
+    @Column
     private String password;
+    public User() {
+    }
+
+    public User(String username, String password) {
+        this.username = username;
+        this.password = password;
+    }
+
     public String getUsername() {
         return username;
     }
 package fr.plil.sio.web.mvc;
-import java.util.Set;
+import org.springframework.data.jpa.repository.JpaRepository;
-public interface UserRepository {
+public interface UserRepository extends JpaRepository<User, Long> {
-    boolean save(User user);
-
-    User getFromUsername(String username);
-
-    Set<User> getAllUsers();
-
-    boolean update(User user);
-
-    boolean delete(User user);
+    User findByUsername(String username);
 }
@@ -1,48 +0,0 @@
-package fr.plil.sio.web.mvc;
-
-import java.util.HashSet;
-import java.util.Set;
-import org.springframework.stereotype.Repository;
-
-@Repository(value = "userDao")
-public class UserRepositoryImpl implements UserRepository {
-
-    private Set<User> users = new HashSet<User>();
-
-    public UserRepositoryImpl() {
-        User user = new User();
-        user.setUsername("admin");
-        user.setPassword("admin");
-        users.add(user);
-    }
-
-    @Override
-    public boolean save(User user) {        
-        return users.add(user);
-    }
-
-    @Override
-    public User getFromUsername(String username) {
-        for (User user : users) {
-            if (user.getUsername().equals(username)) {
-                return user;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public Set<User> getAllUsers() {
-        return users;
-    }
-
-    @Override
-    public boolean update(User user) {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-
-    @Override
-    public boolean delete(User user) {
-        throw new UnsupportedOperationException("Not supported.");
-    }
-}
 package fr.plil.sio.web.mvc;
-import java.util.Set;
-import javax.annotation.Resource;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import javax.annotation.Resource;
+import java.util.List;
+
 @Controller
 public class ViewUsersController {
@@ -17,8 +18,8 @@ public class ViewUsersController {
     private UserSession userSession;
     @ModelAttribute("users")
-    public Set<User> populateUsers() {
-        return userRepository.getAllUsers();
+    public List<User> populateUsers() {
+        return userRepository.findAll();
     }
     @ModelAttribute("userSession")
 logging.level.fr.plil.sio.web.mvc=DEBUG
+logging.level.org.hibernate=DEBUG
+
+spring.jpa.hibernate.ddl-auto=create-drop
 spring.view.prefix=/WEB-INF/views/
 spring.view.suffix=.jsp
@@ -0,0 +1 @@
+INSERT INTO USER (username,password) VALUES ('admin','admin')
 \ No newline at end of file
 package fr.plil.sio.web.mvc;
-import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.servlet.ModelAndView;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 public class LoginControllerTest {
     private LoginController loginController;
@@ -20,7 +23,8 @@ public class LoginControllerTest {
         loginController = new LoginController();
         user = new User();
         results = new BeanPropertyBindingResult(user, "user");
-        userRepository = new UserRepositoryImpl();
+        userRepository = mock(UserRepository.class);
+        when(userRepository.findByUsername("admin")).thenReturn(new User("admin", "admin"));
         loginController.setUserRepository(userRepository);
         userSession = new UserSession();
         loginController.setUserSession(userSession);
 package fr.plil.sio.web.mvc;
-import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.servlet.ModelAndView;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 public class NewUserControllerTest {
     private NewUserController newUserController;
@@ -21,7 +24,11 @@ public class NewUserControllerTest {
         newUserController = new NewUserController();
         user = new User();
         results = new BeanPropertyBindingResult(user, "user");
-        userRepository = new UserRepositoryImpl();
+        userRepository = mock(UserRepository.class);
+
+        User user = new User("admin", "password");
+        when(userRepository.findByUsername("admin")).thenReturn(user);
+
         newUserController.setUserRepository(userRepository);
         userSession = new UserSession();
         userSession.setUsername("admin");
 package fr.plil.sio.web.mvc;
-import static org.junit.Assert.*;
-import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.transaction.TransactionConfiguration;
+import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(classes = Application.class)
+@Transactional
+@TransactionConfiguration
 public class UserRepositoryTest {
+    @Resource
     private UserRepository userRepository;
-    @Before
-    public void createInstances() {
-        userRepository = new UserRepositoryImpl();
-    }
-
     @Test
     public void testAdminPresent() {
-        assertEquals(1, userRepository.getAllUsers().size());
-        assertNotNull(userRepository.getFromUsername("admin"));
-        assertEquals("admin", userRepository.getFromUsername("admin").getUsername());
-    }
-
-    @Test
-    public void testSaveSucceed() {
-        User user = new User();
-        user.setUsername("abc");
-        user.setPassword("abc");
-        assertTrue(userRepository.save(user));
-    }
-
-    @Test
-    public void testSaveFailed() {
-        User user = new User();
-        user.setUsername("admin");
-        user.setPassword("abc");
-        assertFalse(userRepository.save(user));
-    }
-
-    @Test
-    public void testGetFromUsernameFound() {
-        User user = new User();
-        user.setUsername("abc");
-        user.setPassword("abc");
-        userRepository.save(user);
-        assertNotNull(userRepository.getFromUsername("admin"));
-        assertEquals("admin", userRepository.getFromUsername("admin").getUsername());
-    }
-
-    @Test
-    public void testGetFromUsernameNotFound() {
-        assertNull(userRepository.getFromUsername("abc"));
-    }
-
-    @Test
-    public void testGetAllUsers() {
-        assertEquals(1, userRepository.getAllUsers().size());
-        User user = new User();
-        user.setUsername("abc");
-        user.setPassword("abc");
-        assertTrue(userRepository.save(user));
-        assertEquals(2, userRepository.getAllUsers().size());
+        assertEquals(1, userRepository.findAll().size());
+        assertNotNull(userRepository.findByUsername("admin"));
+        assertEquals("admin", userRepository.findByUsername("admin").getUsername());
     }
 }
 \ No newline at end of file
 package fr.plil.sio.web.mvc;
-import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 public class ViewUsersControllerTest {
     private ViewUsersController viewUsersController;
@@ -13,7 +19,10 @@ public class ViewUsersControllerTest {
     @Before
     public void createInstances() {
         viewUsersController = new ViewUsersController();
-        userRepository = new UserRepositoryImpl();
+        userRepository = mock(UserRepository.class);
+        List<User> users = new LinkedList<>();
+        users.add(new User("admin", "password"));
+        when(userRepository.findAll()).thenReturn(users);
         viewUsersController.setUserRepository(userRepository);
         userSession = new UserSession();
         userSession.setUsername("admin");