Simplify UserDetailsService creation in samples

Closes spring-projectsgh-10385
mcenci · Sep 26, 2017 · 7093602 · 7093602
1 parent 61bbaf1
commit 7093602
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 49 deletions.
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
@@ -176,7 +176,7 @@
 		<spring-plugin.version>1.2.0.RELEASE</spring-plugin.version>
 		<spring-restdocs.version>1.2.1.RELEASE</spring-restdocs.version>
 		<spring-retry.version>1.2.1.RELEASE</spring-retry.version>
-		<spring-security.version>5.0.0.M4</spring-security.version>
+		<spring-security.version>5.0.0.BUILD-SNAPSHOT</spring-security.version>
 		<spring-session.version>2.0.0.M4</spring-session.version>
 		<spring-session-data-mongodb.version>2.0.0.M3</spring-session-data-mongodb.version>
 		<spring-social.version>2.0.0.M4</spring-social.version>

diff --git a/...g-boot-security-test-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java b/...g-boot-security-test-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java
@@ -20,18 +20,14 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 
 @SpringBootApplication
 public class HelloWebSecurityApplication {
 
 	@Bean
-	public UserDetailsService userDetailsService() throws Exception {
-		InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
-		manager.createUser(
-				User.withUsername("user").password("password").roles("USER").build());
-		return manager;
+	public InMemoryUserDetailsManager inMemoryUserDetailsManager() throws Exception {
+		return new InMemoryUserDetailsManager(User.withUsername("user").password("password").roles("USER").build());
 	}
 
 	public static void main(String[] args) {

diff --git a/...actuator-log4j2/src/main/java/sample/actuator/log4j2/SampleActuatorLog4J2Application.java b/...actuator-log4j2/src/main/java/sample/actuator/log4j2/SampleActuatorLog4J2Application.java
@@ -20,18 +20,14 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 
 @SpringBootApplication
 public class SampleActuatorLog4J2Application {
 
 	@Bean
-	public UserDetailsService userDetailsService() throws Exception {
-		InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
-		manager.createUser(
-				User.withUsername("user").password("password").roles("USER").build());
-		return manager;
+	public InMemoryUserDetailsManager inMemoryUserDetailsManager() throws Exception {
+		return new InMemoryUserDetailsManager(User.withUsername("user").password("password").roles("USER").build());
 	}
 
 	public static void main(String[] args) throws Exception {

diff --git a/...boot-sample-actuator-ui/src/main/java/sample/actuator/ui/SampleActuatorUiApplication.java b/...boot-sample-actuator-ui/src/main/java/sample/actuator/ui/SampleActuatorUiApplication.java
@@ -23,7 +23,6 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,11 +33,8 @@
 public class SampleActuatorUiApplication {
 
 	@Bean
-	public UserDetailsService userDetailsService() throws Exception {
-		InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
-		manager.createUser(
-				User.withUsername("user").password("password").roles("USER").build());
-		return manager;
+	public InMemoryUserDetailsManager inMemoryUserDetailsManager() throws Exception {
+		return new InMemoryUserDetailsManager(User.withUsername("user").password("password").roles("USER").build());
 	}
 
 	@GetMapping("/")

diff --git a/.../spring-boot-sample-actuator/src/main/java/sample/actuator/SampleActuatorApplication.java b/.../spring-boot-sample-actuator/src/main/java/sample/actuator/SampleActuatorApplication.java
@@ -23,7 +23,6 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 
 @SpringBootApplication
@@ -35,11 +34,8 @@ public static void main(String[] args) throws Exception {
 	}
 
 	@Bean
-	public UserDetailsService userDetailsService() throws Exception {
-		InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
-		manager.createUser(
-				User.withUsername("user").password("password").roles("USER").build());
-		return manager;
+	public InMemoryUserDetailsManager inMemoryUserDetailsManager() throws Exception {
+		return new InMemoryUserDetailsManager(User.withUsername("user").password("password").roles("USER").build());
 	}
 
 	@Bean

diff --git a/...amples/spring-boot-sample-secure/src/main/java/sample/secure/SampleSecureApplication.java b/...amples/spring-boot-sample-secure/src/main/java/sample/secure/SampleSecureApplication.java
@@ -27,7 +27,6 @@
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 
 @EnableAutoConfiguration
@@ -39,11 +38,8 @@ public class SampleSecureApplication implements CommandLineRunner {
 	private SampleService service;
 
 	@Bean
-	public UserDetailsService userDetailsService() throws Exception {
-		InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
-		manager.createUser(
-				User.withUsername("user").password("password").roles("USER").build());
-		return manager;
+	public InMemoryUserDetailsManager inMemoryUserDetailsManager() throws Exception {
+		return new InMemoryUserDetailsManager(User.withUsername("user").password("password").roles("USER").build());
 	}
 
 	@Override

diff --git a/...les/spring-boot-sample-servlet/src/main/java/sample/servlet/SampleServletApplication.java b/...les/spring-boot-sample-servlet/src/main/java/sample/servlet/SampleServletApplication.java
@@ -31,19 +31,15 @@
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 
 @SpringBootConfiguration
 @EnableAutoConfiguration
 public class SampleServletApplication extends SpringBootServletInitializer {
 
 	@Bean
-	public UserDetailsService userDetailsService() throws Exception {
-		InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
-		manager.createUser(
-				User.withUsername("user").password("password").roles("USER").build());
-		return manager;
+	public InMemoryUserDetailsManager inMemoryUserDetailsManager() throws Exception {
+		return new InMemoryUserDetailsManager(User.withUsername("user").password("password").roles("USER").build());
 	}
 
 	@SuppressWarnings("serial")

diff --git a/...les/spring-boot-sample-session/src/main/java/sample/session/SampleSessionApplication.java b/...les/spring-boot-sample-session/src/main/java/sample/session/SampleSessionApplication.java
@@ -20,7 +20,6 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 
 @SpringBootApplication
@@ -31,11 +30,8 @@ public static void main(String[] args) throws Exception {
 	}
 
 	@Bean
-	public UserDetailsService userDetailsService() {
-		InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
-		manager.createUser(
-				User.withUsername("user").password("password").roles("USER").build());
-		return manager;
+	public InMemoryUserDetailsManager inMemoryUserDetailsManager() throws Exception {
+		return new InMemoryUserDetailsManager(User.withUsername("user").password("password").roles("USER").build());
 	}
 
 }
diff --git a/...st/java/org/springframework/boot/test/autoconfigure/security/SecurityTestApplication.java b/...st/java/org/springframework/boot/test/autoconfigure/security/SecurityTestApplication.java
@@ -21,7 +21,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -35,11 +34,8 @@
 public class SecurityTestApplication {
 
 	@Bean
-	public UserDetailsService userDetailsService() throws Exception {
-		InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
-		manager.createUser(
-				User.withUsername("user").password("secret").roles("USER").build());
-		return manager;
+	public InMemoryUserDetailsManager inMemoryUserDetailsManager() throws Exception {
+		return new InMemoryUserDetailsManager(User.withUsername("user").password("password").roles("USER").build());
 	}
 
 	@RestController