Remove tailing slash from mappings (Mapping\(".+)/"

src/main/java/com/jayfella/website/controller/api/ApiApprovalController.java

@@ -36,7 +36,7 @@ import java.util.List;
 import static com.jayfella.website.core.ServerAdvice.KEY_USER;
 
 @RestController
-@RequestMapping("/api/page/approve/")
+@RequestMapping("/api/page/approve")
 public class ApiApprovalController {
 
     @Autowired private PageDraftRepository draftRepository;
@@ -52,7 +52,7 @@ public class ApiApprovalController {
 
     @Autowired private CategoryRepository categoryRepository;
 
-    @PostMapping("/draft/")
+    @PostMapping("/draft")
     public ResponseEntity<?> userRequestDraftReview(ModelMap model, @ModelAttribute @Valid SimplePageRequest approveRequest, BindingResult bindingResult) throws IOException {
 
         User user = (User) model.get(KEY_USER);
@@ -105,7 +105,7 @@ public class ApiApprovalController {
 
     }
 
-    @PostMapping("/draft/accept/")
+    @PostMapping("/draft/accept")
     public ResponseEntity staffApproveDraft(ModelMap model,
                                                 @ModelAttribute @Valid SimplePageRequest approveRequest, BindingResult bindingResult) throws IOException {
 
@@ -179,7 +179,7 @@ public class ApiApprovalController {
         return livePage;
     }
 
-    @PostMapping("/amendment/")
+    @PostMapping("/amendment")
     public ResponseEntity userRequestAmendmentReview(ModelMap model,
                                                      @ModelAttribute @Valid SimplePageRequest approveRequest,
                                                      BindingResult bindingResult) throws IOException {
@@ -233,7 +233,7 @@ public class ApiApprovalController {
         }
     }
 
-    @PostMapping("/amendment/accept/")
+    @PostMapping("/amendment/accept")
     public ResponseEntity staffApproveAmendment(ModelMap model,
                                                 @ModelAttribute @Valid SimplePageRequest approveRequest,
                                                 BindingResult bindingResult) throws IOException {

src/main/java/com/jayfella/website/controller/api/ApiAvatarController.java

@@ -20,7 +20,7 @@ import java.io.IOException;
 import static com.jayfella.website.core.ServerAdvice.KEY_USER;
 
 @RestController
-@RequestMapping("/api/avatar/")
+@RequestMapping("/api/avatar")
 public class ApiAvatarController {
 
     @Autowired

src/main/java/com/jayfella/website/controller/api/ApiBadgeController.java

@@ -26,7 +26,7 @@ import static com.jayfella.website.core.ServerAdvice.KEY_USER;
  * CRUD Repository for Badges
  */
 @RestController
-@RequestMapping("/api/badges/")
+@RequestMapping("/api/badges")
 public class ApiBadgeController {
 
     @Autowired private BadgeRepository badgeRepository;
@@ -131,7 +131,7 @@ public class ApiBadgeController {
                 .body(new SimpleApiResponse("Badge deleted."));
     }
 
-    @PostMapping("/grant/")
+    @PostMapping("/grant")
     public ResponseEntity grantBadge(ModelMap model,
                                      @ModelAttribute @Valid UserBadgeRequest grantRequest,
                                      BindingResult bindingResult) {
@@ -173,7 +173,7 @@ public class ApiBadgeController {
                 .body(badge);
     }
 
-    @PostMapping("/revoke/")
+    @PostMapping("/revoke")
     public ResponseEntity revokeBadge(ModelMap model,
                                       @ModelAttribute @Valid UserBadgeRequest revokeRequest,
                                       BindingResult bindingResult) {

src/main/java/com/jayfella/website/controller/api/ApiBlobController.java

@@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
 @RestController
-@RequestMapping("/api/blob/")
+@RequestMapping("/api/blob")
 public class ApiBlobController {
 
     @Autowired private CategoryRepository categoryRepository;

src/main/java/com/jayfella/website/controller/api/ApiCategoryController.java

@@ -18,7 +18,7 @@ import javax.validation.Valid;
 import static com.jayfella.website.core.ServerAdvice.KEY_USER;
 
 @RestController
-@RequestMapping("/api/category/")
+@RequestMapping("/api/category")
 public class ApiCategoryController {
 
     @Autowired private CategoryRepository categoryRepository;

src/main/java/com/jayfella/website/controller/api/ApiMessagesController.java

@@ -110,7 +110,7 @@ public class ApiMessagesController {
     }
 
     // USER create new reply
-    @PostMapping("/reply/")
+    @PostMapping("/reply")
     public ResponseEntity createReply(ModelMap model,
                                       @ModelAttribute @Valid NewReplyRequest newReplyRequest,
                                       BindingResult bindingResult) {

src/main/java/com/jayfella/website/controller/api/ApiRejectionController.java

@@ -31,7 +31,7 @@ import java.io.UnsupportedEncodingException;
 import static com.jayfella.website.core.ServerAdvice.KEY_USER;
 
 @RestController
-@RequestMapping("/api/reject/")
+@RequestMapping("/api/reject")
 public class ApiRejectionController {
 
     private static final Logger log = LoggerFactory.getLogger(ApiRejectionController.class);
@@ -45,7 +45,7 @@ public class ApiRejectionController {
     @Autowired private EmailService emailService;
 
     // STAFF reject draft submission
-    @PostMapping("/draft/")
+    @PostMapping("/draft")
     public ResponseEntity rejectDraft(ModelMap model, @ModelAttribute @Valid StaffRejectionRequest rejectRequest, BindingResult bindingResult) {
 
         User user = (User) model.get(KEY_USER);
@@ -84,7 +84,7 @@ public class ApiRejectionController {
         return ApiResponses.pageRejected(draft);
     }
 
-    @PostMapping("/amendment/")
+    @PostMapping("/amendment")
     public ResponseEntity rejectAmendment(ModelMap model, @ModelAttribute @Valid StaffRejectionRequest rejectRequest, BindingResult bindingResult) {
 
         User user = (User) model.get(KEY_USER);

src/main/java/com/jayfella/website/controller/api/ApiReviewController.java

@@ -32,7 +32,7 @@ import static com.jayfella.website.core.ServerAdvice.KEY_USER;
  */
 
 @RestController()
-@RequestMapping("/api/review/")
+@RequestMapping("/api/review")
 public class ApiReviewController {
 
     // @Autowired private OpenSourceAssetRepository openSourceAssetRepository;
@@ -72,7 +72,7 @@ public class ApiReviewController {
                 .body(pageReviews);
     }
 
-    @GetMapping("/user/")
+    @GetMapping("/user")
     public ResponseEntity getUserReviews(ModelMap model) {
 
         User user = (User) model.get(KEY_USER);

src/main/java/com/jayfella/website/controller/api/ApiReviewJobController.java

@@ -28,7 +28,7 @@ import java.io.UnsupportedEncodingException;
 import static com.jayfella.website.core.ServerAdvice.KEY_USER;
 
 @RestController
-@RequestMapping("/api/approve/job/")
+@RequestMapping("/api/approve/job")
 public class ApiReviewJobController {
 
     @Autowired private PageDraftRepository draftRepository;
@@ -36,7 +36,7 @@ public class ApiReviewJobController {
 
     @Autowired private EmailService emailService;
 
-    @PostMapping("/{pageState}/")
+    @PostMapping("/{pageState}")
     public ResponseEntity<?> takeJob(ModelMap model,
                                      @PathVariable("pageState") String pageState,
                                      @ModelAttribute @Valid SimplePageRequest jobRequest,

src/main/java/com/jayfella/website/controller/api/ApiSearchController.java

@@ -19,7 +19,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @RestController
-@RequestMapping("/api/search/")
+@RequestMapping("/api/search")
 public class ApiSearchController {
 
     @Autowired private CategoryRepository categoryRepository;

src/main/java/com/jayfella/website/controller/api/ApiUserController.java

@@ -90,7 +90,7 @@ public class ApiUserController {
     }
 
     // allow the user to view their email address.
-    @GetMapping("/email/")
+    @GetMapping("/email")
     public ResponseEntity getMyEmailAddress(ModelMap model) {
 
         User user = (User) model.get(KEY_USER);
@@ -127,7 +127,7 @@ public class ApiUserController {
                 .body(new SimpleApiResponse(searchedUser.getEmail()));
     }
 
-    @PostMapping("/create/")
+    @PostMapping("/create")
     public ResponseEntity createUser(ModelMap model,
                                      @ModelAttribute @Valid AdminCreateUserRequest createUserRequest,
                                      BindingResult bindingResult) throws IOException {
@@ -176,7 +176,7 @@ public class ApiUserController {
                 .body(newUser);
     }
 
-    @PutMapping("/username/")
+    @PutMapping("/username")
     public ResponseEntity updateUsername(ModelMap model, @ModelAttribute @Valid UsernameUpdateRequest updateRequest) {
 
         User user = (User) model.get(KEY_USER);
@@ -195,7 +195,7 @@ public class ApiUserController {
         return new ResponseEntity<>(new SimpleApiResponse("Username updated successfully."), HttpStatus.OK);
     }
 
-    @PutMapping("/name/")
+    @PutMapping("/name")
     public ResponseEntity updateName(ModelMap model, @ModelAttribute @Valid NameUpdateRequest updateRequest) {
 
         User user = (User) model.get(KEY_USER);

src/main/java/com/jayfella/website/controller/api/ApiUserPreferencesController.java

@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController()
-@RequestMapping("/api/user/preferences/")
+@RequestMapping("/api/user/preferences")
 public class ApiUserPreferencesController {
 
     @Autowired private UserRepository userRepository;

src/main/java/com/jayfella/website/controller/api/ApiValidationController.java

@@ -33,7 +33,7 @@ import static com.jayfella.website.core.ServerAdvice.KEY_USER;
  */
 
 @RestController
-@RequestMapping("/api/validate/")
+@RequestMapping("/api/validate")
 public class ApiValidationController {
 
     @Autowired private UserValidationRepository userValidationRepository;
@@ -100,7 +100,7 @@ public class ApiValidationController {
     }
 
     // sends a new email validation email to the user.
-    @PostMapping("/resend/")
+    @PostMapping("/resend")
     public ResponseEntity sendNewEmailValidation(ModelMap model) {
 
         User user = (User) model.get(KEY_USER);
@@ -141,7 +141,7 @@ public class ApiValidationController {
     }
 
     // USER requests a change in their details (email, password).
-    @PostMapping("/details/")
+    @PostMapping("/details")
     public ResponseEntity changeDetails(ModelMap model, @ModelAttribute @Valid ChangeDetailsRequest changeDetailsRequest, BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
@@ -237,7 +237,7 @@ public class ApiValidationController {
                 .body(new SimpleApiResponse("Please check your email for a validation code."));
     }
 
-    @PostMapping("/cancel/")
+    @PostMapping("/cancel")
     public ResponseEntity cancelValidationRequest(ModelMap model) {
 
         User user = (User) model.get(KEY_USER);

src/main/java/com/jayfella/website/controller/api/page/ApiAmendmentController.java

@@ -37,7 +37,7 @@ import static com.jayfella.website.core.ServerAdvice.KEY_USER;
  */
 
 @RestController
-@RequestMapping("/api/page/amendment/")
+@RequestMapping("/api/page/amendment")
 public class ApiAmendmentController {
 
     @Autowired private LivePageRepository livePageRepository;
@@ -169,7 +169,7 @@ public class ApiAmendmentController {
         return ApiResponses.pageDeleted(amendment);
     }
 
-    @GetMapping("/all/")
+    @GetMapping("/all")
     public ResponseEntity getAllAmendments(ModelMap model){
 
         User user = (User) model.get(KEY_USER);
@@ -188,7 +188,7 @@ public class ApiAmendmentController {
                 .body(amendments);
     }
 
-    @GetMapping("/pending/")
+    @GetMapping("/pending")
     public ResponseEntity<?> getPendingDrafts(ModelMap model) {
 
         User user = (User) model.get(KEY_USER);

src/main/java/com/jayfella/website/controller/api/page/ApiDraftController.java

@@ -41,7 +41,7 @@ import static com.jayfella.website.core.ServerAdvice.KEY_USER;
  */
 
 @RestController
-@RequestMapping("/api/page/draft/")
+@RequestMapping("/api/page/draft")
 public class ApiDraftController {
 
     @Autowired private PageDraftRepository draftRepository;
@@ -250,7 +250,7 @@ public class ApiDraftController {
         return ApiResponses.pageDeleted(draft);
     }
 
-    @GetMapping("/all/")
+    @GetMapping("/all")
     public ResponseEntity getAllDrafts(ModelMap model){
 
         User user = (User) model.get(KEY_USER);
@@ -267,7 +267,7 @@ public class ApiDraftController {
                 .body(draftRepository.findAll());
     }
 
-    @GetMapping("/pending/")
+    @GetMapping("/pending")
     public ResponseEntity<?> getPendingDrafts(ModelMap model) {
 
         User user = (User) model.get(KEY_USER);

src/main/java/com/jayfella/website/controller/api/page/ApiLivePageController.java

@@ -37,7 +37,7 @@ import static com.jayfella.website.core.ServerAdvice.KEY_USER;
  * An endpoint that returns LIVE asset collections based on various filters.
  */
 @RestController
-@RequestMapping("/api/page/")
+@RequestMapping("/api/page")
 public class ApiLivePageController {
 
     @Autowired private PageDraftRepository draftRepository;
@@ -64,7 +64,7 @@ public class ApiLivePageController {
     }
 
     // ALL returns the top ten highest rated assets.
-    @GetMapping("/highest-rated/")
+    @GetMapping("/highest-rated")
     public Iterable<LivePage> getHighestRated() {
 
         Pageable sortByRating = PageRequest.of(
@@ -149,7 +149,7 @@ public class ApiLivePageController {
 
      */
 
-    @GetMapping("/top/")
+    @GetMapping("/top")
     public ResponseEntity getTopAssets() {
 
         // I'm not sure how to optimize this. I want to choose a random

src/main/java/com/jayfella/website/controller/api/page/ApiPageController.java

@@ -21,7 +21,7 @@ import java.util.Map;
 import static com.jayfella.website.core.ServerAdvice.KEY_USER;
 
 @RestController
-@RequestMapping("/api/page/")
+@RequestMapping("/api/page")
 public class ApiPageController {
 
     @Autowired private PageDraftRepository draftRepository;
@@ -30,7 +30,7 @@ public class ApiPageController {
 
     @Autowired private UserRepository userRepository;
 
-    @GetMapping("/user/all/")
+    @GetMapping("/user/all")
     public ResponseEntity getAllUserPages(ModelMap model) {
 
         User user = (User) model.get(KEY_USER);

src/main/java/com/jayfella/website/controller/http/AdminController.java

@@ -50,7 +50,7 @@ public class AdminController {
         return StoreHtmlFilePaths.Admin.INDEX.getHtmlFilePath();
     }
 
-    @GetMapping("/badges/")
+    @GetMapping("/badges")
     public String getBadgesPage(HttpServletResponse response, ModelMap model) throws IOException {
         User user = (User) model.get(ServerAdvice.KEY_USER);
 
@@ -76,7 +76,7 @@ public class AdminController {
         return StoreHtmlFilePaths.Admin.USER.getHtmlFilePath();
     }
 
-    @GetMapping("/users/")
+    @GetMapping("/users")
     public String getUsersPage(HttpServletResponse response, ModelMap model) throws IOException {
         User user = (User) model.get(ServerAdvice.KEY_USER);
 
@@ -88,7 +88,7 @@ public class AdminController {
         return StoreHtmlFilePaths.Admin.USERS.getHtmlFilePath();
     }
 
-    @GetMapping("/pages/")
+    @GetMapping("/pages")
     public String getAssetsPage(ModelMap model, HttpServletResponse response) throws IOException {
 
         User user = (User) model.get(ServerAdvice.KEY_USER);

src/main/java/com/jayfella/website/controller/http/CategoryController.java

@@ -16,7 +16,7 @@ public class CategoryController {
 
     @Autowired private CategoryRepository categoryRepository;
 
-    @RequestMapping("/{categoryName}/")
+    @RequestMapping("/{categoryName}")
     public String listCategory(ModelMap model, @PathVariable("categoryName") String categoryName) throws IOException {
         model.put("category", categoryName);
         return "/category/index.html";

src/main/java/com/jayfella/website/controller/http/CreatePageController.java

@@ -26,7 +26,7 @@ public class CreatePageController {
      * AUTH: USER
      * Displays the "create potential asset" web page.
      */
-    @GetMapping("/create/")
+    @GetMapping("/create")
     public String createPotentialAsset(HttpServletResponse response, ModelMap model) throws IOException {
 
         User user = (User) model.get(ServerAdvice.KEY_USER);

src/main/java/com/jayfella/website/controller/http/LegalController.java

@@ -10,20 +10,20 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 @Controller
-@RequestMapping("/legal/")
+@RequestMapping("/legal")
 public class LegalController {
 
-    @GetMapping("/cookies/")
+    @GetMapping("/cookies")
     public String getCookiesPage() {
         return "/legal/cookies.html";
     }
 
-    @GetMapping("/terms/")
+    @GetMapping("/terms")
     public String getTermsOfService() {
         return "/legal/tos.html";
     }
 
-    @GetMapping("/license/opensource/")
+    @GetMapping("/license/opensource")
     public String getOpenSourcLicenseChooser(Model model) {
 
         model.addAttribute("licenses", OpenSourceLicense.values());

src/main/java/com/jayfella/website/controller/http/MessageController.java

@@ -15,7 +15,7 @@ import java.io.IOException;
 import static com.jayfella.website.core.ServerAdvice.KEY_USER;
 
 @Controller
-@RequestMapping("/messages/")
+@RequestMapping("/messages")
 public class MessageController {
 
     @Autowired private MessagesRepository messagesRepository;

src/main/java/com/jayfella/website/controller/http/OAuthCallbackController.java

@@ -5,10 +5,10 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 @Controller
-@RequestMapping("/callback/")
+@RequestMapping("/callback")
 public class OAuthCallbackController {
 
-    @GetMapping("/github/")
+    @GetMapping("/github")
     public void auth() {
 
     }

src/main/java/com/jayfella/website/controller/http/RejectionController.java

@@ -24,7 +24,7 @@ import java.io.IOException;
 import static com.jayfella.website.core.ServerAdvice.KEY_USER;
 
 @Controller
-@RequestMapping("/rejections/")
+@RequestMapping("/rejections")
 public class RejectionController {
 
     @Autowired private PageDraftRepository draftRepository;

src/main/java/com/jayfella/website/controller/http/StoreSearchController.java

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 @Controller
-@RequestMapping("/search/")
+@RequestMapping("/search")
 public class StoreSearchController {
 
     @GetMapping
@@ -22,7 +22,7 @@ public class StoreSearchController {
         return "/search/index.html";
     }
 
-    @GetMapping("/{categoryId}/")
+    @GetMapping("/{categoryId}")
     public String getWithCategory(Model model,
                                               @PathVariable("categoryId") int categoryId) {
 

src/main/java/com/jayfella/website/controller/http/TestController.java

@@ -5,7 +5,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 @Controller
-@RequestMapping("/test/")
+@RequestMapping("/test")
 public class TestController {
 
     @GetMapping

src/main/java/com/jayfella/website/controller/http/UserController.java

@@ -64,12 +64,12 @@ public class UserController {
         return StoreHtmlFilePaths.User.INDEX.getHtmlFilePath();
     }
 
-    @GetMapping("/login/")
+    @GetMapping("/login")
     public String getLoginPage() {
         return StoreHtmlFilePaths.User.LOGIN.getHtmlFilePath();
     }
 
-    @PostMapping("/login/")
+    @PostMapping("/login")
     public String postLogin(HttpServletResponse response, Model model,
                             @ModelAttribute @Valid LoginRequest loginRequest,
                             BindingResult result) throws IOException {
@@ -101,7 +101,7 @@ public class UserController {
         return null;
     }
 
-    @PostMapping("/logout/")
+    @PostMapping("/logout")
     public String postLogout(ModelMap model,
                              HttpServletResponse response,
                              @CookieValue(value = KEY_SESSION) String session) throws IOException {
@@ -116,7 +116,7 @@ public class UserController {
         return null;
     }
 
-    @GetMapping("/register/")
+    @GetMapping("/register")
     public String getRegisterPage(HttpServletResponse response) throws IOException {
 
         if (ServerConfig.getInstance().getWebsiteConfig().isRegistrationDisabled()) {
@@ -127,12 +127,12 @@ public class UserController {
         return StoreHtmlFilePaths.User.REGISTER.getHtmlFilePath();
     }
 
-    @GetMapping("/registered/")
+    @GetMapping("/registered")
     public String getRegisteredPage() {
         return StoreHtmlFilePaths.User.REGISTERED.getHtmlFilePath();
     }
 
-    @PostMapping("/register/")
+    @PostMapping("/register")
     public String postRegisterPage(HttpServletResponse response, Model model,
                                    @ModelAttribute @Valid RegisterRequest registerRequest,
                                    BindingResult result) throws IOException {
@@ -180,7 +180,7 @@ public class UserController {
         return null;
     }
 
-    @GetMapping("/my-pages/")
+    @GetMapping("/my-pages")
     public String displayUserAssets(HttpServletResponse response, ModelMap model) throws IOException {
 
         User user = (User) model.get(ServerAdvice.KEY_USER);
@@ -200,7 +200,7 @@ public class UserController {
         return StoreHtmlFilePaths.User.PROFILE.getHtmlFilePath();
     }
 
-    @GetMapping("/reset-password/")
+    @GetMapping("/reset-password")
     public String getResetPassword() {
         return "/user/reset-password.html";
     }

src/main/java/com/jayfella/website/core/controller/http/user/MessagesController.java

@@ -5,7 +5,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 @Controller
-@RequestMapping("/user/messages/")
+@RequestMapping("/user/messages")
 public class MessagesController {
 
     @GetMapping()