Add trailing slashes to requests with ...Mapping(value= ..)

WISVCH · May 20, 2024 · 14bd310 · 14bd310
1 parent 49dca5f
commit 14bd310
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 20 deletions.
diff --git a/docs/tutorial.md b/docs/tutorial.md
@@ -31,13 +31,13 @@ Lets say you want to create two pages on paths `/events/example/page-1` and on `
 
 ```java
 @Controller
-@RequestMapping(value = "/events/example")
+@RequestMapping({"/events/example","/events/example/"})
 public class MyController { 
 
-    @RequestMapping(value= "/page-1")
+    @RequestMapping({"/page-1","/page-1/"})
     public String handlePageOne() { return "page 1"; }
 
-    @RequestMapping(value= "/page-2")
+    @RequestMapping({"/page-2","/page-2/"})
     public String handlePageTwo() { return "page 2"; }
 }
 ```
@@ -46,10 +46,10 @@ Or you could uses a `@PathVariable` which makes a part of the Path variable whic
 
 ```java
 @Controller
-@RequestMapping(value = "/events/example")
+@RequestMapping({"/events/example","/events/example/"})
 public class MyController { 
 
-    @RequestMapping(value= "/{page}")
+    @RequestMapping({"/{page}","/{page}/"})
     public String handleBothPages(@PathVariable String page) { return page; }
 }
 ```

diff --git a/src/main/java/ch/wisv/events/admin/controller/DashboardCustomerController.java b/src/main/java/ch/wisv/events/admin/controller/DashboardCustomerController.java
@@ -20,7 +20,7 @@
  * DashboardCustomerController class.
  */
 @Controller
-@RequestMapping(value = "/administrator/customers")
+@RequestMapping({"/administrator/customers","/administrator/customers/"})
 @PreAuthorize("hasRole('ADMIN')")
 public class DashboardCustomerController extends DashboardController {
 

diff --git a/src/main/java/ch/wisv/events/admin/controller/DashboardEventController.java b/src/main/java/ch/wisv/events/admin/controller/DashboardEventController.java
@@ -37,7 +37,7 @@
  * DashboardEventController class.
  */
 @Controller
-@RequestMapping(value = "/administrator/events")
+@RequestMapping({"/administrator/events","/administrator/events/"})
 @PreAuthorize("hasRole('ADMIN')")
 public class DashboardEventController extends DashboardController {
 

diff --git a/src/main/java/ch/wisv/events/admin/controller/DashboardIndexController.java b/src/main/java/ch/wisv/events/admin/controller/DashboardIndexController.java
@@ -21,7 +21,7 @@
  * DashboardController.
  */
 @Controller
-@RequestMapping(value = "/administrator")
+@RequestMapping({"/administrator","/administrator/"})
 @PreAuthorize("hasRole('ADMIN')")
 public class DashboardIndexController extends DashboardController {
 

diff --git a/src/main/java/ch/wisv/events/admin/controller/DashboardOrderController.java b/src/main/java/ch/wisv/events/admin/controller/DashboardOrderController.java
@@ -20,7 +20,7 @@
  * DashboardOrderController class.
  */
 @Controller
-@RequestMapping(value = "/administrator/orders")
+@RequestMapping({"/administrator/orders","/administrator/orders/"})
 @PreAuthorize("hasRole('ADMIN')")
 public class DashboardOrderController extends DashboardController {
 

diff --git a/src/main/java/ch/wisv/events/api/controller/ProductRestController.java b/src/main/java/ch/wisv/events/api/controller/ProductRestController.java
@@ -79,7 +79,7 @@ public ResponseEntity createProduct(@Validated @RequestBody ProductDto product)
      *
      * @return Search Object
      */
-    @GetMapping(value = "/search/unused")
+    @GetMapping({"/search/unused","/search/unused/"})
     @PreAuthorize("hasRole('ADMIN')")
     public Search getSearchProducts(@RequestParam(value = "query", required = false) String query) {
         List<Product> productList = productService.getAllProducts();

diff --git a/src/main/java/ch/wisv/events/sales/controller/SalesController.java b/src/main/java/ch/wisv/events/sales/controller/SalesController.java
@@ -7,7 +7,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 
 @Controller
-@RequestMapping(value = "/sales")
+@RequestMapping({"/sales","/sales/"})
 @PreAuthorize("hasRole('USER')")
 public class SalesController {
 

diff --git a/src/main/java/ch/wisv/events/sales/controller/scan/SalesScanBarcodeController.java b/src/main/java/ch/wisv/events/sales/controller/scan/SalesScanBarcodeController.java
@@ -13,7 +13,7 @@
  * SalesScanEventController.
  */
 @Controller
-@RequestMapping(value = "/sales/scan/barcode/{uniqueCode}")
+@RequestMapping({"/sales/scan/barcode/{uniqueCode}","/sales/scan/barcode/{uniqueCode}/"})
 @PreAuthorize("hasRole('USER')")
 public class SalesScanBarcodeController {
 

diff --git a/src/main/java/ch/wisv/events/sales/controller/scan/SalesScanEventController.java b/src/main/java/ch/wisv/events/sales/controller/scan/SalesScanEventController.java
@@ -15,7 +15,7 @@
  * SalesScanEventController.
  */
 @Controller
-@RequestMapping(value = "/sales/scan/event/{key}")
+@RequestMapping({"/sales/scan/event/{key}","/sales/scan/event/{key}/"})
 @PreAuthorize("hasRole('USER')")
 public class SalesScanEventController {
 

diff --git a/src/main/java/ch/wisv/events/sales/controller/scan/SalesScanMainController.java b/src/main/java/ch/wisv/events/sales/controller/scan/SalesScanMainController.java
@@ -13,7 +13,7 @@
  * SalesScanMainController class.
  */
 @Controller
-@RequestMapping(value = "/sales/scan")
+@RequestMapping({"/sales/scan","/sales/scan/"})
 @PreAuthorize("hasRole('USER')")
 public class SalesScanMainController {
 

diff --git a/src/main/java/ch/wisv/events/sales/controller/scan/SalesScanRestController.java b/src/main/java/ch/wisv/events/sales/controller/scan/SalesScanRestController.java
@@ -25,7 +25,7 @@
  * SalesScanRestController.
  */
 @RestController
-@RequestMapping(value = "/api/v1/sales/scan/event/{key}")
+@RequestMapping({"/api/v1/sales/scan/event/{key}","/api/v1/sales/scan/event/{key}/"})
 @PreAuthorize("hasRole('USER')")
 public class SalesScanRestController {
 

diff --git a/src/main/java/ch/wisv/events/sales/controller/scan/SalesScanTicketController.java b/src/main/java/ch/wisv/events/sales/controller/scan/SalesScanTicketController.java
@@ -12,7 +12,7 @@
  * SalesScanEventController.
  */
 @Controller
-@RequestMapping(value = "/sales/scan/ticket")
+@RequestMapping({"/sales/scan/ticket","/sales/scan/ticket/"})
 @PreAuthorize("hasRole('USER')")
 public class SalesScanTicketController {
 

diff --git a/src/main/java/ch/wisv/events/sales/controller/sell/SalesSellMainController.java b/src/main/java/ch/wisv/events/sales/controller/sell/SalesSellMainController.java
@@ -22,7 +22,7 @@
  * SalesSellMainController class.
  */
 @Controller
-@RequestMapping(value = "/sales/sell")
+@RequestMapping({"/sales/sell","/sales/sell/"})
 @PreAuthorize("hasRole('USER')")
 public class SalesSellMainController {
 

diff --git a/src/main/java/ch/wisv/events/sales/controller/sell/SalesSellOrderController.java b/src/main/java/ch/wisv/events/sales/controller/sell/SalesSellOrderController.java
@@ -16,7 +16,7 @@
  */
 @Controller
 @PreAuthorize("hasRole('USER')")
-@RequestMapping(value = "/sales/sell/order/{publicReference}")
+@RequestMapping({"/sales/sell/order/{publicReference}","/sales/sell/order/{publicReference}/"})
 public class SalesSellOrderController {
 
     /** OrderService. */

diff --git a/src/main/java/ch/wisv/events/sales/controller/sell/SalesSellPaymentController.java b/src/main/java/ch/wisv/events/sales/controller/sell/SalesSellPaymentController.java
@@ -15,7 +15,7 @@
 
 @Controller
 @PreAuthorize("hasRole('USER')")
-@RequestMapping(value = "/sales/sell/payment/{publicReference}")
+@RequestMapping({"/sales/sell/payment/{publicReference}","/sales/sell/payment/{publicReference}/"})
 public class SalesSellPaymentController {
 
     /** OrderService. */

diff --git a/src/main/java/ch/wisv/events/sales/controller/stats/SalesStatsController.java b/src/main/java/ch/wisv/events/sales/controller/stats/SalesStatsController.java
@@ -24,7 +24,7 @@
  * SalesScanEventController.
  */
 @Controller
-@RequestMapping(value = "/sales/stats")
+@RequestMapping({"/sales/stats","/sales/stats/"})
 @PreAuthorize("hasRole('USER')")
 public class SalesStatsController {
     /**