#190 - More simplifications for Spring Boot 1.4 M3.

Replaced all occurrences of @SpringApplicationConfiguration with @SpringBootTest. Using SpringRunner instead of @SpringJUnit4ClassRunner now.

rest/security/src/main/java/example/springdata/rest/security/Application.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,14 @@ import javax.annotation.PostConstruct;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
+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.core.context.SecurityContextHolder;
 
 /**
@@ -28,8 +34,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
  *
  * @author Greg Turnquist
  */
-@ComponentScan
-@EnableAutoConfiguration
+@SpringBootApplication
 public class Application {
 
 	@Autowired ItemRepository itemRepository;
@@ -42,8 +47,7 @@ public class Application {
 	/**
 	 * Pre-load the system with employees and items.
 	 */
-	@PostConstruct
-	public void init() {
+	public @PostConstruct void init() {
 
 		employeeRepository.save(new Employee("Bilbo", "Baggins", "thief"));
 		employeeRepository.save(new Employee("Frodo", "Baggins", "ring bearer"));
@@ -60,4 +64,55 @@ public class Application {
 
 		SecurityContextHolder.clearContext();
 	}
+
+	/**
+	 * This application is secured at both the URL level for some parts, and the method level for other parts. The URL
+	 * security is shown inside this code, while method-level annotations are enabled at by
+	 * {@link EnableGlobalMethodSecurity}.
+	 *
+	 * @author Greg Turnquist
+	 * @author Oliver Gierke
+	 */
+	@Configuration
+	@EnableGlobalMethodSecurity(prePostEnabled = true)
+	@EnableWebSecurity
+	static class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+
+		/**
+		 * This section defines the user accounts which can be used for authentication as well as the roles each user has.
+		 * 
+		 * @see org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter#configure(org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder)
+		 */
+		@Override
+		protected void configure(AuthenticationManagerBuilder auth) throws Exception {
+
+			auth.inMemoryAuthentication().//
+					withUser("greg").password("turnquist").roles("USER").and().//
+					withUser("ollie").password("gierke").roles("USER", "ADMIN");
+		}
+
+		/**
+		 * This section defines the security policy for the app.
+		 * <p>
+		 * <ul>
+		 * <li>BASIC authentication is supported (enough for this REST-based demo).</li>
+		 * <li>/employees is secured using URL security shown below.</li>
+		 * <li>CSRF headers are disabled since we are only testing the REST interface, not a web one.</li>
+		 * </ul>
+		 * NOTE: GET is not shown which defaults to permitted.
+		 *
+		 * @param http
+		 * @throws Exception
+		 * @see org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter#configure(org.springframework.security.config.annotation.web.builders.HttpSecurity)
+		 */
+		@Override
+		protected void configure(HttpSecurity http) throws Exception {
+
+			http.httpBasic().and().authorizeRequests().//
+					antMatchers(HttpMethod.POST, "/employees").hasRole("ADMIN").//
+					antMatchers(HttpMethod.PUT, "/employees/**").hasRole("ADMIN").//
+					antMatchers(HttpMethod.PATCH, "/employees/**").hasRole("ADMIN").and().//
+					csrf().disable();
+		}
+	}
 }

rest/security/src/main/java/example/springdata/rest/security/SecurityConfiguration.java

@@ -1,75 +0,0 @@
-/*
- * Copyright 2014-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package example.springdata.rest.security;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.HttpMethod;
-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;
-
-/**
- * This application is secured at both the URL level for some parts, and the method level for other parts. The URL
- * security is shown inside this code, while method-level annotations are enabled at by
- * {@link EnableGlobalMethodSecurity}.
- *
- * @author Greg Turnquist
- * @author Oliver Gierke
- */
-@Configuration
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-@EnableWebSecurity
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
-
-	/**
-	 * This section defines the user accounts which can be used for authentication as well as the roles each user has.
-	 * 
-	 * @see org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter#configure(org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder)
-	 */
-	@Override
-	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-
-		auth.inMemoryAuthentication().//
-				withUser("greg").password("turnquist").roles("USER").and().//
-				withUser("ollie").password("gierke").roles("USER", "ADMIN");
-	}
-
-	/**
-	 * This section defines the security policy for the app.
-	 * <p>
-	 * <ul>
-	 * <li>BASIC authentication is supported (enough for this REST-based demo).</li>
-	 * <li>/employees is secured using URL security shown below.</li>
-	 * <li>CSRF headers are disabled since we are only testing the REST interface, not a web one.</li>
-	 * </ul>
-	 * NOTE: GET is not shown which defaults to permitted.
-	 *
-	 * @param http
-	 * @throws Exception
-	 * @see org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter#configure(org.springframework.security.config.annotation.web.builders.HttpSecurity)
-	 */
-	@Override
-	protected void configure(HttpSecurity http) throws Exception {
-
-		http.httpBasic().and().authorizeRequests().//
-				antMatchers(HttpMethod.POST, "/employees").hasRole("ADMIN").//
-				antMatchers(HttpMethod.PUT, "/employees/**").hasRole("ADMIN").//
-				antMatchers(HttpMethod.PATCH, "/employees/**").hasRole("ADMIN").and().//
-				csrf().disable();
-	}
-}

rest/security/src/test/java/example/springdata/rest/security/MethodLevelSecurityTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,21 +17,15 @@ package example.springdata.rest.security;
 
 import static org.junit.Assert.*;
 
-import example.springdata.rest.security.Application;
-import example.springdata.rest.security.Item;
-import example.springdata.rest.security.ItemRepository;
-import example.springdata.rest.security.SecurityConfiguration;
-import example.springdata.rest.security.SecurityUtils;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.authentication.AuthenticationCredentialsNotFoundException;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * Collection of test cases used to verify method-level security.
@@ -39,8 +33,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Greg Turnquist
  * @author Oliver Gierke
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = { Application.class, SecurityConfiguration.class })
+@RunWith(SpringRunner.class)
+@SpringBootTest
 public class MethodLevelSecurityTests {
 
 	@Autowired ItemRepository itemRepository;

rest/security/src/test/java/example/springdata/rest/security/UrlLevelSecurityTests.java

@@ -26,15 +26,14 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.hateoas.MediaTypes;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.crypto.codec.Base64;
 import org.springframework.security.web.FilterChainProxy;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.context.WebApplicationContext;
 
@@ -46,9 +45,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
  * @author Greg Turnquist
  * @author Oliver Gierke
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@WebAppConfiguration
-@SpringApplicationConfiguration(classes = { Application.class, SecurityConfiguration.class })
+@RunWith(SpringRunner.class)
+@SpringBootTest
 public class UrlLevelSecurityTests {
 
 	static final String PAYLOAD = "{\"firstName\": \"Saruman\", \"lastName\": \"the White\", " + "\"title\": \"Wizard\"}";