diff --git a/spring-boot-samples/spring-boot-sample-web-secure/pom.xml b/spring-boot-samples/spring-boot-sample-web-secure/pom.xml
index 5bbf8da399d..dd78096ff5c 100644
--- a/spring-boot-samples/spring-boot-sample-web-secure/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-web-secure/pom.xml
@@ -23,18 +23,10 @@
org.springframework.boot
spring-boot-starter-security
-
- org.springframework.boot
- spring-boot-starter-jdbc
-
org.springframework.boot
spring-boot-starter-thymeleaf
-
- com.h2database
- h2
-
org.apache.httpcomponents
httpclient
diff --git a/spring-boot-samples/spring-boot-sample-web-secure/src/main/java/sample/ui/secure/SampleWebSecureApplication.java b/spring-boot-samples/spring-boot-sample-web-secure/src/main/java/sample/ui/secure/SampleWebSecureApplication.java
index 65174bceb04..186d3ef5c72 100644
--- a/spring-boot-samples/spring-boot-sample-web-secure/src/main/java/sample/ui/secure/SampleWebSecureApplication.java
+++ b/spring-boot-samples/spring-boot-sample-web-secure/src/main/java/sample/ui/secure/SampleWebSecureApplication.java
@@ -19,18 +19,14 @@ package sample.ui.secure;
import java.util.Date;
import java.util.Map;
-import javax.sql.DataSource;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.security.SecurityProperties;
import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
-import org.springframework.core.Ordered;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.authentication.configurers.GlobalAuthenticationConfigurerAdapter;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.stereotype.Controller;
@@ -65,16 +61,7 @@ public class SampleWebSecureApplication extends WebMvcConfigurerAdapter {
registry.addViewController("/login").setViewName("login");
}
- @Bean
- public ApplicationSecurity applicationSecurity() {
- return new ApplicationSecurity();
- }
-
- @Bean
- public AuthenticationSecurity authenticationSecurity() {
- return new AuthenticationSecurity();
- }
-
+ @Configuration
@Order(SecurityProperties.ACCESS_OVERRIDE_ORDER)
protected static class ApplicationSecurity extends WebSecurityConfigurerAdapter {
@@ -86,20 +73,12 @@ public class SampleWebSecureApplication extends WebMvcConfigurerAdapter {
http.authorizeRequests().anyRequest().fullyAuthenticated().and().formLogin()
.loginPage("/login").failureUrl("/login?error").permitAll();
}
- }
-
- @Order(Ordered.HIGHEST_PRECEDENCE + 10)
- protected static class AuthenticationSecurity extends
- GlobalAuthenticationConfigurerAdapter {
-
- @Autowired
- private DataSource dataSource;
@Override
- public void init(AuthenticationManagerBuilder auth) throws Exception {
- auth.jdbcAuthentication().dataSource(this.dataSource).withUser("admin")
- .password("admin").roles("ADMIN", "USER").and().withUser("user")
- .password("user").roles("USER");
+ public void configure(AuthenticationManagerBuilder auth) throws Exception {
+ auth.inMemoryAuthentication().withUser("admin").password("admin")
+ .roles("ADMIN", "USER").and().withUser("user").password("user")
+ .roles("USER");
}
}