Merge pull request #7547 from amit2103/BAEL-15958

[BAEL-15958] - Upgraded spring-security-core to Boot 2

spring-security-core/pom.xml

@@ -9,10 +9,10 @@
     <packaging>war</packaging>
 
     <parent>
-        <artifactId>parent-boot-1</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-1</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
@@ -36,6 +36,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>

spring-security-core/src/main/java/org/baeldung/app/App.java

@@ -5,7 +5,7 @@ import javax.servlet.Filter;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.web.filter.DelegatingFilterProxy;

spring-security-core/src/main/java/org/baeldung/config/WebSecurityConfig.java

@@ -1,12 +1,15 @@
 package org.baeldung.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 
 @Configuration
 @EnableWebSecurity
@@ -21,8 +24,13 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     @Autowired
     public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
         auth.inMemoryAuthentication()
-            .withUser("jim").password("jim").roles("USER", "ACTUATOR")
-            .and().withUser("pam").password("pam").roles("USER")
-            .and().withUser("michael").password("michael").roles("MANAGER");
+            .withUser("jim").password(passwordEncoder().encode("jim")).roles("USER", "ACTUATOR")
+            .and().withUser("pam").password(passwordEncoder().encode("pam")).roles("USER")
+            .and().withUser("michael").password(passwordEncoder().encode("michael")).roles("MANAGER");
+    }
+    
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
     }
 }

spring-security-core/src/main/java/org/baeldung/service/TaskService.java

@@ -20,7 +20,7 @@ public class TaskService {
 
     @PreFilter("hasRole('MANAGER') or filterObject.assignee == authentication.name")
     public Iterable<Task> save(Iterable<Task> entities) {
-        return taskRepository.save(entities);
+        return taskRepository.saveAll(entities);
     }
 
 }

spring-security-core/src/main/resources/application.properties

@@ -0,0 +1 @@
+spring.main.allow-bean-definition-overriding=true