Merge branch 'edit-profile-boot14' into aop-boot14

naturalprogrammer · naturalprogrammer · commit 630a53aa555f · 2016-07-31T13:38:12.000+05:30
diff --git a/pom.xml b/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>
 
diff --git a/src/main/java/com/naturalprogrammer/spring/tutorial/config/SecurityConfig.java b/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,25 +28,19 @@ 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,
 		    			"/users/*",
 		    			"/").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()
diff --git a/src/main/java/com/naturalprogrammer/spring/tutorial/controllers/ForgotPasswordController.java b/src/main/java/com/naturalprogrammer/spring/tutorial/controllers/ForgotPasswordController.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.dto.ForgotPasswordForm;
@@ -20,14 +21,14 @@ public class ForgotPasswordController {
 	@Autowired
 	private UserService userService;
 
-	@RequestMapping(method = RequestMethod.GET)
+	@GetMapping
 	public String forgotPassword(Model model) {
 		
 		model.addAttribute(new ForgotPasswordForm());		
 		return "forgot-password";		
 	}
 
-	@RequestMapping(method = RequestMethod.POST)
+	@PostMapping
 	public String forgotPassword(
 			@Validated ForgotPasswordForm forgotPasswordForm,
 			BindingResult result,
diff --git a/src/main/java/com/naturalprogrammer/spring/tutorial/controllers/MailController.java b/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;
 	}
diff --git a/src/main/java/com/naturalprogrammer/spring/tutorial/controllers/ResetPasswordController.java b/src/main/java/com/naturalprogrammer/spring/tutorial/controllers/ResetPasswordController.java
@@ -7,9 +7,10 @@
 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.PathVariable;
+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.dto.ResetPasswordForm;
@@ -23,14 +24,14 @@ public class ResetPasswordController {
 	@Autowired
 	private UserService userService;
 
-	@RequestMapping(method = RequestMethod.GET)
+	@GetMapping
 	public String forgotPassword(Model model) {
 		
 		model.addAttribute(new ResetPasswordForm());		
 		return "reset-password";		
 	}	
 
-	@RequestMapping(method = RequestMethod.POST)
+	@PostMapping
 	public String resetPassword(
 			@PathVariable String resetPasswordCode,
 			@Validated ResetPasswordForm resetPasswordForm,
diff --git a/src/main/java/com/naturalprogrammer/spring/tutorial/controllers/SignupController.java b/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.SignUpValidation.class) User user,
 			BindingResult result,
diff --git a/src/main/java/com/naturalprogrammer/spring/tutorial/controllers/UserController.java b/src/main/java/com/naturalprogrammer/spring/tutorial/controllers/UserController.java
@@ -5,9 +5,10 @@
 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.PathVariable;
+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;
@@ -21,7 +22,7 @@ public class UserController {
 	@Autowired
 	private UserService userService;
 
-    @RequestMapping(path="/{verificationCode}/verify", method=RequestMethod.GET)
+    @GetMapping("/{verificationCode}/verify")
     public String verify(@PathVariable String verificationCode,
     		RedirectAttributes redirectAttributes) {
     	
@@ -31,8 +32,7 @@ public String verify(@PathVariable String verificationCode,
 		return "redirect:/";
     }
     
-    @RequestMapping(value="/{id}/resend-verification-mail",
-            method=RequestMethod.GET)
+    @GetMapping("/{id}/resend-verification-mail")
     public String resendVerificationMail(@PathVariable("id") User user,
     		RedirectAttributes redirectAttributes) {
 
@@ -44,21 +44,21 @@ public String resendVerificationMail(@PathVariable("id") User user,
     	return "redirect:/";
     }
     
-    @RequestMapping(value = "/{userId}", method=RequestMethod.GET)
+    @GetMapping("/{userId}")
     public String getById(@PathVariable long userId, Model model) {
     	
     	model.addAttribute(userService.findById(userId));
 	  	return "user";
     }
     
-    @RequestMapping(value = "/{id}/edit", method=RequestMethod.GET)
+    @GetMapping("/{id}/edit")
     public String edit(@PathVariable("id") User user, Model model) {
     	
     	model.addAttribute(user);
 		return "user-edit";
     }
     
-	@RequestMapping(value = "/{id}/edit", method = RequestMethod.POST)
+	@PostMapping("/{id}/edit")
 	public String edit(@PathVariable("id") User user,
 			@Validated(User.UpdateValidation.class) User updatedData,
 			BindingResult result,
diff --git a/src/test/java/com/naturalprogrammer/spring/tutorial/NpSpringTutorialApplicationTests.java b/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
