diff --git a/UserFront/src/main/java/com/userFront/controller/AccountController.java b/UserFront/src/main/java/com/userFront/controller/AccountController.java index 249e52ca..8e04f489 100644 --- a/UserFront/src/main/java/com/userFront/controller/AccountController.java +++ b/UserFront/src/main/java/com/userFront/controller/AccountController.java @@ -6,9 +6,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import com.userFront.domain.PrimaryAccount; import com.userFront.domain.PrimaryTransaction; @@ -32,7 +33,7 @@ public class AccountController { @Autowired private TransactionService transactionService; - @RequestMapping("/primaryAccount") + @GetMapping("/primaryAccount") public String primaryAccount(Model model, Principal principal) { List primaryTransactionList = transactionService .findPrimaryTransactionList(principal.getName()); @@ -46,7 +47,7 @@ public String primaryAccount(Model model, Principal principal) { return "primaryAccount"; } - @RequestMapping("/savingsAccount") + @GetMapping("/savingsAccount") public String savingsAccount(Model model, Principal principal) { List savingsTransactionList = transactionService .findSavingsTransactionList(principal.getName()); @@ -59,7 +60,7 @@ public String savingsAccount(Model model, Principal principal) { return "savingsAccount"; } - @RequestMapping(value = "/deposit", method = RequestMethod.GET) + @GetMapping("/deposit") public String deposit(Model model) { model.addAttribute("accountType", ""); model.addAttribute("amount", ""); @@ -67,7 +68,7 @@ public String deposit(Model model) { return "deposit"; } - @RequestMapping(value = "/deposit", method = RequestMethod.POST) + @PostMapping("/deposit") public String depositPOST(@ModelAttribute("amount") String amount, @ModelAttribute("accountType") String accountType, Principal principal) { accountService.deposit(accountType, Double.parseDouble(amount), principal); @@ -75,7 +76,7 @@ public String depositPOST(@ModelAttribute("amount") String amount, return "redirect:/userFront"; } - @RequestMapping(value = "/withdraw", method = RequestMethod.GET) + @GetMapping("/withdraw") public String withdraw(Model model) { model.addAttribute("accountType", ""); model.addAttribute("amount", ""); @@ -83,7 +84,7 @@ public String withdraw(Model model) { return "withdraw"; } - @RequestMapping(value = "/withdraw", method = RequestMethod.POST) + @PostMapping("/withdraw") public String withdrawPOST(@ModelAttribute("amount") String amount, @ModelAttribute("accountType") String accountType, Principal principal) { accountService.withdraw(accountType, Double.parseDouble(amount), principal); diff --git a/UserFront/src/main/java/com/userFront/controller/HomeController.java b/UserFront/src/main/java/com/userFront/controller/HomeController.java index 9ecd1cae..df85bf73 100644 --- a/UserFront/src/main/java/com/userFront/controller/HomeController.java +++ b/UserFront/src/main/java/com/userFront/controller/HomeController.java @@ -7,9 +7,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.PostMapping; import com.userFront.dao.RoleDao; import com.userFront.domain.PrimaryAccount; @@ -27,17 +27,17 @@ public class HomeController { @Autowired private RoleDao roleDao; - @RequestMapping("/") + @GetMapping("/") public String home() { return "redirect:/index"; } - @RequestMapping("/index") + @GetMapping("/index") public String index() { return "index"; } - @RequestMapping(value = "/signup", method = RequestMethod.GET) + @GetMapping("/signup") public String signup(Model model) { User user = new User(); @@ -46,7 +46,7 @@ public String signup(Model model) { return "signup"; } - @RequestMapping(value = "/signup", method = RequestMethod.POST) + @PostMapping("/signup") public String signupPost(@ModelAttribute("user") User user, Model model) { if (userService.checkUserExists(user.getUsername(), user.getEmail())) { @@ -70,7 +70,7 @@ public String signupPost(@ModelAttribute("user") User user, Model model) { } } - @RequestMapping("/userFront") + @GetMapping("/userFront") public String userFront(Principal principal, Model model) { User user = userService.findByUsername(principal.getName()); PrimaryAccount primaryAccount = user.getPrimaryAccount();