Merge branch 'more-security-boot14' into email-verification-boot14

Author: naturalprogrammer

pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.2.RELEASE</version>
+		<version>1.4.0.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

src/main/java/com/naturalprogrammer/spring/tutorial/config/SecurityConfig.java

@@ -5,7 +5,6 @@
 import org.springframework.context.annotation.Bean;
 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.WebSecurityConfigurerAdapter;
@@ -29,24 +28,18 @@ public PasswordEncoder passwordEncoder() {
 	  return new BCryptPasswordEncoder();
 	}
 
-	@Override
-	protected void configure(AuthenticationManagerBuilder builder) throws Exception {
-
-		builder.userDetailsService(userDetailsService).passwordEncoder(passwordEncoder());
-	}
-
 	@Override
     protected void configure(HttpSecurity http) throws Exception {
 
         http
         	.authorizeRequests()
-		    	.antMatchers(HttpMethod.GET,
+		    	.mvcMatchers(HttpMethod.GET,
 		    			"/").permitAll()
-		    	.antMatchers(
+		    	.mvcMatchers(
 		    			"/signup",
 		    			"/forgot-password",
 	            		"/reset-password/*").permitAll()
-		    	.antMatchers(HttpMethod.GET, "/admin/**").hasRole("ADMIN")
+		    	.mvcMatchers(HttpMethod.GET, "/admin/**").hasRole("ADMIN")
             	.anyRequest().authenticated()
 	        .and()
 	            .formLogin()

src/main/java/com/naturalprogrammer/spring/tutorial/controllers/MailController.java

@@ -2,7 +2,6 @@
 
 import javax.mail.MessagingException;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -13,7 +12,6 @@ public class MailController {
 
 	private MailSender mailSender;
 
-	@Autowired
 	public MailController(MailSender mailSender) {
 		this.mailSender = mailSender;
 	}

src/main/java/com/naturalprogrammer/spring/tutorial/controllers/SignupController.java

@@ -5,8 +5,9 @@
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.naturalprogrammer.spring.tutorial.domain.User;
@@ -20,14 +21,14 @@ public class SignupController {
 	@Autowired
 	private UserService userService;
 
-	@RequestMapping(method=RequestMethod.GET)
+    @GetMapping
 	public String signup(Model model) {
 
 		model.addAttribute(new User());
 		return "signup";
 	}
 
-	@RequestMapping(method=RequestMethod.POST)
+    @PostMapping
 	public String doSignup(@Validated User user,
 			BindingResult result,
 			RedirectAttributes redirectAttributes) {

src/main/java/com/naturalprogrammer/spring/tutorial/domain/User.java

@@ -39,6 +39,7 @@ public static enum Role {
 	private long id;
 
 	@UniqueEmail
+	@Column(nullable = false, length = 250)
 	private String email;
 
 	@NotBlank

src/test/java/com/naturalprogrammer/spring/tutorial/NpSpringTutorialApplicationTests.java

@@ -2,13 +2,11 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = NpSpringTutorialApplication.class)
-@WebAppConfiguration
+@RunWith(SpringRunner.class)
+@SpringBootTest
 public class NpSpringTutorialApplicationTests {
 
 	@Test