Merge remote-tracking branch 'upstream/master'

Author: Doha2012

spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/PrivilegeRepository.java

@@ -5,5 +5,6 @@
 
 public interface PrivilegeRepository extends JpaRepository<Privilege, Long> {
     public Privilege findByName(String name);
+
     public void delete(Privilege privilege);
 }

spring-security-login-and-registration/src/main/java/org/baeldung/persistence/dao/RoleRepository.java

@@ -5,5 +5,6 @@
 
 public interface RoleRepository extends JpaRepository<Role, Long> {
     public Role findByName(String name);
+
     public void delete(Role role);
 }

spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/User.java

@@ -1,6 +1,5 @@
 package org.baeldung.persistence.model;
 
-
 import java.util.Collection;
 
 import javax.persistence.Entity;
@@ -31,10 +30,7 @@ public class User {
     private boolean tokenExpired;
 
     @ManyToMany
-    @JoinTable(
-            name = "users_roles", 
-            joinColumns = @JoinColumn(name = "user_id", referencedColumnName = "id"), 
-            inverseJoinColumns = @JoinColumn(name = "role_id", referencedColumnName = "id"))
+    @JoinTable(name = "users_roles", joinColumns = @JoinColumn(name = "user_id", referencedColumnName = "id"), inverseJoinColumns = @JoinColumn(name = "role_id", referencedColumnName = "id"))
     private Collection<Role> roles;
 
     public User() {

spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserService.java

@@ -28,7 +28,7 @@ public class UserService implements IUserService {
 
     @Autowired
     private RoleRepository roleRepository;
-    
+
     // API
 
     @Override

spring-security-login-and-registration/src/main/java/org/baeldung/spring/PersistenceJPAConfig.java

@@ -1,7 +1,9 @@
 package org.baeldung.spring;
 
 import java.util.Properties;
+
 import javax.sql.DataSource;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -53,7 +55,7 @@ public DataSource dataSource() {
 
     @Bean
     public JpaTransactionManager transactionManager() {
-        JpaTransactionManager transactionManager = new JpaTransactionManager();
+        final JpaTransactionManager transactionManager = new JpaTransactionManager();
         transactionManager.setEntityManagerFactory(entityManagerFactory().getObject());
         return transactionManager;
     }

spring-security-login-and-registration/src/main/java/org/baeldung/test/SpringSecurityRolesTest.java

@@ -15,13 +15,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
 import org.springframework.test.context.transaction.TransactionConfiguration;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { TestConfig.class }, loader = AnnotationConfigContextLoader.class)
@@ -38,10 +37,15 @@ public class SpringSecurityRolesTest {
     @Autowired
     private PrivilegeRepository privilegeRepository;
 
+    @Autowired
+    private PasswordEncoder passwordEncoder;
+
     private User user;
     private Role role;
     private Privilege privilege;
 
+    // tests
+
     @Test
     public void testDeleteUser() {
         role = new Role("TEST_ROLE");
@@ -50,8 +54,7 @@ public void testDeleteUser() {
         user = new User();
         user.setFirstName("John");
         user.setLastName("Doe");
-        PasswordEncoder encoder = new BCryptPasswordEncoder();
-        user.setPassword(encoder.encode("123"));
+        user.setPassword(passwordEncoder.encode("123"));
         user.setEmail("john@doe.com");
         user.setRoles(Arrays.asList(role));
         user.setEnabled(true);
@@ -78,8 +81,7 @@ public void testDeleteRole() {
         user = new User();
         user.setFirstName("John");
         user.setLastName("Doe");
-        PasswordEncoder encoder = new BCryptPasswordEncoder();
-        user.setPassword(encoder.encode("123"));
+        user.setPassword(passwordEncoder.encode("123"));
         user.setEmail("john@doe.com");
         user.setRoles(Arrays.asList(role));
         user.setEnabled(true);
@@ -92,7 +94,7 @@ public void testDeleteRole() {
         user.setRoles(new ArrayList<Role>());
         role.setPrivileges(new ArrayList<Privilege>());
         roleRepository.delete(role);
-        
+
         assertNull(roleRepository.findByName(role.getName()));
         assertNotNull(privilegeRepository.findByName(privilege.getName()));
         assertNotNull(userRepository.findByEmail(user.getEmail()));
@@ -106,13 +108,13 @@ public void testDeletePrivilege() {
         role = new Role("TEST_ROLE");
         role.setPrivileges(Arrays.asList(privilege));
         roleRepository.save(role);
-        
+
         assertNotNull(roleRepository.findByName(role.getName()));
         assertNotNull(privilegeRepository.findByName(privilege.getName()));
 
         role.setPrivileges(new ArrayList<Privilege>());
         privilegeRepository.delete(privilege);
-        
+
         assertNull(privilegeRepository.findByName(privilege.getName()));
         assertNotNull(roleRepository.findByName(role.getName()));
     }

spring-security-login-and-registration/src/main/java/org/baeldung/test/TestConfig.java

@@ -1,73 +1,17 @@
 package org.baeldung.test;
 
-import java.util.Properties;
-
-import javax.sql.DataSource;
-
-import org.springframework.beans.factory.annotation.Autowired;
+import org.baeldung.spring.PersistenceJPAConfig;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.core.env.Environment;
-import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import org.springframework.orm.jpa.JpaTransactionManager;
-import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-@Configuration
-@EnableTransactionManagement
-@PropertySource({ "classpath:persistence.properties" })
-@ComponentScan({ "org.baeldung.persistence.model","org.baeldung.persistence.dao" })
-@EnableJpaRepositories(basePackages = "org.baeldung.persistence.dao")
-public class TestConfig {
-    @Autowired
-    private Environment env;
-
-    public TestConfig() {
-        super();
-    }
-
-    @Bean
-    public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
-        final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
-        em.setDataSource(dataSource());
-        em.setPackagesToScan(new String[] { "org.baeldung.persistence.model" });
-        final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
-        em.setJpaVendorAdapter(vendorAdapter);
-        em.setJpaProperties(additionalProperties());
-        return em;
-    }
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 
-    @Bean
-    public DataSource dataSource() {
-        final DriverManagerDataSource dataSource = new DriverManagerDataSource();
-        dataSource.setDriverClassName(env.getProperty("jdbc.driverClassName"));
-        dataSource.setUrl(env.getProperty("jdbc.url"));
-        dataSource.setUsername(env.getProperty("jdbc.user"));
-        dataSource.setPassword(env.getProperty("jdbc.pass"));
-        return dataSource;
-    }
+@ComponentScan({ "org.baeldung.persistence.dao" })
+public class TestConfig extends PersistenceJPAConfig {
 
     @Bean
-    public JpaTransactionManager transactionManager() {
-        JpaTransactionManager transactionManager = new JpaTransactionManager();
-        transactionManager.setEntityManagerFactory(entityManagerFactory().getObject());
-        return transactionManager;
+    public PasswordEncoder encoder() {
+        return new BCryptPasswordEncoder(11);
     }
 
-    @Bean
-    public PersistenceExceptionTranslationPostProcessor exceptionTranslation() {
-        return new PersistenceExceptionTranslationPostProcessor();
-    }
-
-    final Properties additionalProperties() {
-        final Properties hibernateProperties = new Properties();
-        hibernateProperties.setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
-        hibernateProperties.setProperty("hibernate.dialect", env.getProperty("hibernate.dialect"));
-        return hibernateProperties;
-    }
 }