From c828c191aadc62c05566b259aca8c0047c6844bf Mon Sep 17 00:00:00 2001 From: Celestino Bellone <3385346+cbellone@users.noreply.github.com> Date: Thu, 25 Apr 2024 21:03:52 +0200 Subject: [PATCH] restore RequestParam value --- .../AdminConfigurationController.java | 8 ++++---- .../controller/AuthenticationController.java | 4 ++-- .../alfio/controller/IndexController.java | 2 +- .../admin/AdditionalFieldApiController.java | 2 +- .../api/admin/AdminPaymentsApiController.java | 6 +++--- .../admin/AdminReservationApiController.java | 16 +++++++-------- .../admin/AdminWaitingQueueApiController.java | 2 +- .../AttendeeBulkImportApiController.java | 2 +- .../api/admin/CheckInApiController.java | 20 +++++++++---------- .../api/admin/ConfigurationApiController.java | 4 ++-- .../admin/CustomMessagesApiController.java | 4 ++-- .../api/admin/EmailMessageApiController.java | 4 ++-- .../api/admin/EventApiController.java | 16 +++++++-------- .../api/admin/ExportApiController.java | 4 ++-- .../api/admin/ExtensionApiController.java | 8 ++++---- .../api/admin/GroupApiController.java | 4 ++-- .../api/admin/LocationApiController.java | 6 +++--- .../api/admin/PollAdminApiController.java | 2 +- .../admin/PromoCodeDiscountApiController.java | 2 +- .../api/admin/ResourceController.java | 6 +++--- .../api/admin/SubscriptionApiController.java | 2 +- .../api/admin/UsersApiController.java | 4 ++-- .../api/admin/UtilsApiController.java | 4 ++-- .../api/v1/AttendeeApiController.java | 2 +- .../api/v2/TranslationsApiController.java | 4 ++-- .../api/v2/user/EventApiV2Controller.java | 8 ++++---- .../api/v2/user/PollApiController.java | 4 ++-- .../v2/user/ReservationApiV2Controller.java | 10 +++++----- .../payment/PayPalCallbackController.java | 2 +- 29 files changed, 81 insertions(+), 81 deletions(-) diff --git a/src/main/java/alfio/controller/AdminConfigurationController.java b/src/main/java/alfio/controller/AdminConfigurationController.java index 09ba52a1e..b49d3674c 100644 --- a/src/main/java/alfio/controller/AdminConfigurationController.java +++ b/src/main/java/alfio/controller/AdminConfigurationController.java @@ -57,8 +57,8 @@ public class AdminConfigurationController { @GetMapping("/admin/configuration/payment/{provider}/connect/{orgId}") public String oAuthRedirectToAuthorizationURL(Principal principal, - @PathVariable Integer orgId, - @PathVariable String provider, + @PathVariable("orgId") Integer orgId, + @PathVariable("provider") String provider, HttpSession session) { if(CONNECT_PROVIDERS.contains(provider) && userManager.isOwnerOfOrganization(userManager.findUserByUsername(principal.getName()), orgId)) { var connectURL = getConnector(provider).getConnectURL(orgId); @@ -72,8 +72,8 @@ public String oAuthRedirectToAuthorizationURL(Principal principal, @GetMapping({ STRIPE_CONNECT_REDIRECT_PATH, MOLLIE_CONNECT_REDIRECT_PATH }) public String authorize(Principal principal, - @RequestParam String state, - @RequestParam(required = false) String code, + @RequestParam("state") String state, + @RequestParam(value = "code", required = false) String code, @RequestParam(value = "error", required = false) String errorCode, @RequestParam(value = "error_description", required = false) String errorDescription, HttpServletRequest request, diff --git a/src/main/java/alfio/controller/AuthenticationController.java b/src/main/java/alfio/controller/AuthenticationController.java index 741c716d5..ca387e4f4 100644 --- a/src/main/java/alfio/controller/AuthenticationController.java +++ b/src/main/java/alfio/controller/AuthenticationController.java @@ -77,8 +77,8 @@ public ResponseEntity authenticationStatus(Principal principal, } @GetMapping("/authentication") - public void getLoginPage(@RequestParam(required = false) String failed, - @RequestParam(required = false) String recaptchaFailed, + public void getLoginPage(@RequestParam(value="failed", required = false) String failed, + @RequestParam(value = "recaptchaFailed", required = false) String recaptchaFailed, Model model, Principal principal, HttpServletRequest request, diff --git a/src/main/java/alfio/controller/IndexController.java b/src/main/java/alfio/controller/IndexController.java index 3e00cfe88..87bb9a7f4 100644 --- a/src/main/java/alfio/controller/IndexController.java +++ b/src/main/java/alfio/controller/IndexController.java @@ -208,7 +208,7 @@ public ResponseEntity replyToK8s() { public void replyToIndex(@PathVariable(value = EVENT_SHORT_NAME, required = false) String eventShortName, @PathVariable(required = false) String subscriptionId, @RequestHeader(value = "User-Agent", required = false) String userAgent, - @RequestParam(required = false) String lang, + @RequestParam(value = "lang", required = false) String lang, ServletWebRequest request, HttpServletResponse response, HttpSession session) throws IOException { diff --git a/src/main/java/alfio/controller/api/admin/AdditionalFieldApiController.java b/src/main/java/alfio/controller/api/admin/AdditionalFieldApiController.java index e1ef9ba70..63c565a3b 100644 --- a/src/main/java/alfio/controller/api/admin/AdditionalFieldApiController.java +++ b/src/main/java/alfio/controller/api/admin/AdditionalFieldApiController.java @@ -141,7 +141,7 @@ public void swapAdditionalFieldPosition(@PathVariable PurchaseContext.PurchaseCo public void setAdditionalFieldPosition(@PathVariable PurchaseContext.PurchaseContextType purchaseContextType, @PathVariable String publicIdentifier, @PathVariable long id, - @RequestParam int newPosition, + @RequestParam("newPosition") int newPosition, Principal principal) { // accessService.checkPurchaseContextOwnershipAndTicketAdditionalFieldIds(principal, purchaseContextType, publicIdentifier, Set.of(id)); diff --git a/src/main/java/alfio/controller/api/admin/AdminPaymentsApiController.java b/src/main/java/alfio/controller/api/admin/AdminPaymentsApiController.java index dbadc33d7..80d3f1eee 100644 --- a/src/main/java/alfio/controller/api/admin/AdminPaymentsApiController.java +++ b/src/main/java/alfio/controller/api/admin/AdminPaymentsApiController.java @@ -78,8 +78,8 @@ public AdminPaymentsApiController(PurchaseContextSearchManager purchaseContextSe @GetMapping("/{purchaseContextType}/{publicIdentifier}/list") PageAndContent> getPaymentsForPurchaseContext(@PathVariable PurchaseContext.PurchaseContextType purchaseContextType, @PathVariable String publicIdentifier, - @RequestParam(required = false) Integer page, - @RequestParam(required = false) String search, + @RequestParam(value = "page", required = false) Integer page, + @RequestParam(value = "search", required = false) String search, Principal principal) { return purchaseContextManager.findBy(purchaseContextType, publicIdentifier) .map(purchaseContext -> { @@ -112,7 +112,7 @@ ResponseEntity updateTransactionData(@PathVariable PurchaseContext.Purch @GetMapping("/{purchaseContextType}/{publicIdentifier}/download") void exportPayments(@PathVariable PurchaseContext.PurchaseContextType purchaseContextType, @PathVariable String publicIdentifier, - @RequestParam(required = false) String search, + @RequestParam(value = "search", required = false) String search, Principal principal, HttpServletResponse response) throws IOException { var purchaseContextOptional = purchaseContextManager.findBy(purchaseContextType, publicIdentifier); diff --git a/src/main/java/alfio/controller/api/admin/AdminReservationApiController.java b/src/main/java/alfio/controller/api/admin/AdminReservationApiController.java index 22059f0d6..054d9927f 100644 --- a/src/main/java/alfio/controller/api/admin/AdminReservationApiController.java +++ b/src/main/java/alfio/controller/api/admin/AdminReservationApiController.java @@ -78,9 +78,9 @@ public TicketReservation.TicketReservationStatus[] getAllStatus(@PathVariable Pu @GetMapping("/{purchaseContextType}/{publicIdentifier}/reservations/list") public PageAndContent> findAll(@PathVariable PurchaseContextType purchaseContextType, @PathVariable String publicIdentifier, - @RequestParam(required = false) Integer page, - @RequestParam(required = false) String search, - @RequestParam(required = false) List status, + @RequestParam(value = "page", required = false) Integer page, + @RequestParam(value = "search", required = false) String search, + @RequestParam(value = "status", required = false) List status, Principal principal) { return purchaseContextManager.findBy(purchaseContextType, publicIdentifier) @@ -254,17 +254,17 @@ public Result getPaymentInfo(@PathVariable PurchaseCo @PostMapping("/{purchaseContextType}/{publicIdentifier}/{reservationId}/cancel") public Result removeReservation(@PathVariable PurchaseContextType purchaseContextType, @PathVariable String publicIdentifier, @PathVariable String reservationId, - @RequestParam boolean refund, - @RequestParam(defaultValue = "false") boolean notify, - @RequestParam(defaultValue = "false") boolean issueCreditNote, + @RequestParam("refund") boolean refund, + @RequestParam(value = "notify", defaultValue = "false") boolean notify, + @RequestParam(value = "issueCreditNote", defaultValue = "false") boolean issueCreditNote, Principal principal) { accessService.checkReservationMembership(principal, purchaseContextType, publicIdentifier, reservationId); return adminReservationManager.removeReservation(purchaseContextType, publicIdentifier, reservationId, refund, notify, issueCreditNote, principal.getName()); } @PostMapping("/{purchaseContextType}/{publicIdentifier}/{reservationId}/credit") - public Result creditReservation(@PathVariable PurchaseContextType purchaseContextType, @PathVariable String publicIdentifier, @PathVariable String reservationId, @RequestParam boolean refund, - @RequestParam(defaultValue = "false") boolean notify, + public Result creditReservation(@PathVariable PurchaseContextType purchaseContextType, @PathVariable String publicIdentifier, @PathVariable String reservationId, @RequestParam("refund") boolean refund, + @RequestParam(value = "notify", defaultValue = "false") boolean notify, Principal principal) { accessService.checkReservationOwnership(principal, purchaseContextType, publicIdentifier, reservationId); adminReservationManager.creditReservation(purchaseContextType, publicIdentifier, reservationId, refund, notify, principal.getName()); diff --git a/src/main/java/alfio/controller/api/admin/AdminWaitingQueueApiController.java b/src/main/java/alfio/controller/api/admin/AdminWaitingQueueApiController.java index 75475d8f4..04cf9a7e1 100644 --- a/src/main/java/alfio/controller/api/admin/AdminWaitingQueueApiController.java +++ b/src/main/java/alfio/controller/api/admin/AdminWaitingQueueApiController.java @@ -117,7 +117,7 @@ public List loadAllSubscriptions(@PathVariable String @GetMapping("/download") public void downloadAllSubscriptions(@PathVariable String eventName, - @RequestParam(defaultValue = "excel") String format, + @RequestParam(name = "format", defaultValue = "excel") String format, Principal principal, HttpServletResponse response) throws IOException { accessService.checkEventOwnership(principal, eventName); var event = eventManager.getSingleEvent(eventName, principal.getName()); diff --git a/src/main/java/alfio/controller/api/admin/AttendeeBulkImportApiController.java b/src/main/java/alfio/controller/api/admin/AttendeeBulkImportApiController.java index fc739fa26..e623aec01 100644 --- a/src/main/java/alfio/controller/api/admin/AttendeeBulkImportApiController.java +++ b/src/main/java/alfio/controller/api/admin/AttendeeBulkImportApiController.java @@ -37,7 +37,7 @@ public class AttendeeBulkImportApiController { @PostMapping("") public Result createReservations(@PathVariable String eventName, @RequestBody AdminReservationModification body, - @RequestParam(defaultValue = "false", required = false) boolean oneReservationPerAttendee, + @RequestParam(name="oneReservationPerAttendee", defaultValue = "false", required = false) boolean oneReservationPerAttendee, Principal principal) { accessService.checkEventOwnership(principal, eventName); return requestManager.scheduleReservations(eventName, body, !oneReservationPerAttendee, principal.getName()); diff --git a/src/main/java/alfio/controller/api/admin/CheckInApiController.java b/src/main/java/alfio/controller/api/admin/CheckInApiController.java index 35f0acd7e..d267e6b8c 100644 --- a/src/main/java/alfio/controller/api/admin/CheckInApiController.java +++ b/src/main/java/alfio/controller/api/admin/CheckInApiController.java @@ -74,13 +74,13 @@ public static class TicketIdentifierCode { } @GetMapping("/check-in/{eventId}/ticket/{ticketIdentifier}") - public TicketAndCheckInResult findTicketWithUUID(@PathVariable int eventId, @PathVariable String ticketIdentifier, @RequestParam String qrCode, Principal principal) { + public TicketAndCheckInResult findTicketWithUUID(@PathVariable int eventId, @PathVariable String ticketIdentifier, @RequestParam("qrCode") String qrCode, Principal principal) { accessService.checkEventTicketIdentifierMembership(principal, eventId, ticketIdentifier, AccessService.CHECKIN_ROLES); return checkInManager.evaluateTicketStatus(eventId, ticketIdentifier, Optional.ofNullable(qrCode)); } @GetMapping("/check-in/event/{eventName}/ticket/{ticketIdentifier}") - public TicketAndCheckInResult findTicketWithUUID(@PathVariable String eventName, @PathVariable String ticketIdentifier, @RequestParam String qrCode, Principal principal) { + public TicketAndCheckInResult findTicketWithUUID(@PathVariable String eventName, @PathVariable String ticketIdentifier, @RequestParam("qrCode") String qrCode, Principal principal) { accessService.checkEventTicketIdentifierMembership(principal, eventName, ticketIdentifier, AccessService.CHECKIN_ROLES); return checkInManager.evaluateTicketStatus(eventName, ticketIdentifier, Optional.ofNullable(qrCode)); } @@ -104,7 +104,7 @@ public TicketAndCheckInResult checkIn(@PathVariable int eventId, public TicketAndCheckInResult checkIn(@PathVariable String eventName, @PathVariable String ticketIdentifier, @RequestBody TicketCode ticketCode, - @RequestParam(required = false) String offlineUser, + @RequestParam(value = "offlineUser", required = false) String offlineUser, Principal principal) { accessService.checkEventTicketIdentifierMembership(principal, eventName, ticketIdentifier, AccessService.CHECKIN_ROLES); String username = principal.getName(); @@ -115,8 +115,8 @@ public TicketAndCheckInResult checkIn(@PathVariable String eventName, @PostMapping("/check-in/event/{eventName}/bulk") public Map bulkCheckIn(@PathVariable String eventName, @RequestBody List ticketIdentifierCodes, - @RequestParam(required = false) String offlineUser, - @RequestParam(required = false, defaultValue = "false") boolean forceCheckInPaymentOnSite, + @RequestParam(value = "offlineUser", required = false) String offlineUser, + @RequestParam(value = "forceCheckInPaymentOnSite", required = false, defaultValue = "false") boolean forceCheckInPaymentOnSite, Principal principal) { accessService.checkEventMembership(principal, eventName, AccessService.CHECKIN_ROLES); String username = principal.getName(); @@ -171,7 +171,7 @@ public ResponseEntity revertCheckIn(@PathVariable String eventName, public TicketAndCheckInResult confirmOnSitePayment(@PathVariable String eventName, @PathVariable String ticketIdentifier, @RequestBody TicketCode ticketCode, - @RequestParam(required = false) String offlineUser, + @RequestParam(value = "offlineUser", required = false) String offlineUser, Principal principal) { accessService.checkEventTicketIdentifierMembership(principal, eventName, ticketIdentifier, AccessService.CHECKIN_ROLES); String username = principal.getName(); @@ -195,7 +195,7 @@ public OnSitePaymentConfirmation confirmOnSitePayment(@PathVariable int eventId, @GetMapping("/check-in/{eventId}/ticket-identifiers") public List findAllIdentifiersForAdminCheckIn(@PathVariable int eventId, - @RequestParam(required = false) Long changedSince, + @RequestParam(value = "changedSince", required = false) Long changedSince, HttpServletResponse response, Principal principal) { accessService.checkEventMembership(principal, eventId, AccessService.CHECKIN_ROLES); @@ -205,8 +205,8 @@ public List findAllIdentifiersForAdminCheckIn(@PathVariable int eventId @GetMapping("/check-in/event/{publicIdentifier}/attendees") public ResponseEntity searchAttendees(@PathVariable String publicIdentifier, - @RequestParam(required = false) String query, - @RequestParam(required = false, defaultValue = "0") int page, + @RequestParam(value = "query", required = false) String query, + @RequestParam(value = "page", required = false, defaultValue = "0") int page, Principal principal) { accessService.checkEventMembership(principal, publicIdentifier, AccessService.CHECKIN_ROLES); if (StringUtils.isBlank(query) || StringUtils.isBlank(publicIdentifier)) { @@ -239,7 +239,7 @@ public ResponseEntity getLabelLayoutForEvent(@PathVariable String e @GetMapping("/check-in/{eventName}/offline-identifiers") public List getOfflineIdentifiers(@PathVariable String eventName, - @RequestParam(required = false) Long changedSince, + @RequestParam(value = "changedSince", required = false) Long changedSince, HttpServletResponse resp, Principal principal) { var event = accessService.checkEventMembership(principal, eventName, AccessService.CHECKIN_ROLES); diff --git a/src/main/java/alfio/controller/api/admin/ConfigurationApiController.java b/src/main/java/alfio/controller/api/admin/ConfigurationApiController.java index db9e51222..3801eebaa 100644 --- a/src/main/java/alfio/controller/api/admin/ConfigurationApiController.java +++ b/src/main/java/alfio/controller/api/admin/ConfigurationApiController.java @@ -275,8 +275,8 @@ public ResponseEntity regenerateInvoices(@PathVariable Integer eventId, } @PutMapping("/generate-tickets-for-subscriptions") - public ResponseEntity generateTicketsForSubscriptions(@RequestParam(required = false) Integer eventId, - @RequestParam(required = false) Integer organizationId, + public ResponseEntity generateTicketsForSubscriptions(@RequestParam(value = "eventId", required = false) Integer eventId, + @RequestParam(value = "organizationId", required = false) Integer organizationId, Principal principal) { boolean admin = RequestUtils.isAdmin(principal); Map jobMetadata = null; diff --git a/src/main/java/alfio/controller/api/admin/CustomMessagesApiController.java b/src/main/java/alfio/controller/api/admin/CustomMessagesApiController.java index 84a7f4755..edec73354 100644 --- a/src/main/java/alfio/controller/api/admin/CustomMessagesApiController.java +++ b/src/main/java/alfio/controller/api/admin/CustomMessagesApiController.java @@ -54,7 +54,7 @@ public String handleException(IllegalStateException ex) { @PostMapping("/preview") public Map preview(@PathVariable String eventName, - @RequestParam(required = false) Integer categoryId, + @RequestParam(required = false, value = "categoryId") Integer categoryId, @RequestBody List messageModifications, Principal principal) { accessService.checkEventOwnership(principal, eventName); return customMessageManager.generatePreview(eventName, Optional.ofNullable(categoryId), messageModifications, principal.getName()); @@ -62,7 +62,7 @@ public Map preview(@PathVariable String eventName, @PostMapping("/send") public void send(@PathVariable String eventName, - @RequestParam(required = false) Integer categoryId, + @RequestParam(required = false, value = "categoryId") Integer categoryId, @RequestBody List messageModifications, Principal principal) { accessService.checkEventOwnership(principal, eventName); diff --git a/src/main/java/alfio/controller/api/admin/EmailMessageApiController.java b/src/main/java/alfio/controller/api/admin/EmailMessageApiController.java index 4368380c1..d80ab4dba 100644 --- a/src/main/java/alfio/controller/api/admin/EmailMessageApiController.java +++ b/src/main/java/alfio/controller/api/admin/EmailMessageApiController.java @@ -49,8 +49,8 @@ public class EmailMessageApiController { @GetMapping("/") public PageAndContent> loadEmailMessages(@PathVariable PurchaseContext.PurchaseContextType purchaseContextType, @PathVariable String publicIdentifier, - @RequestParam(required = false) Integer page, - @RequestParam(required = false) String search, + @RequestParam(value = "page", required = false) Integer page, + @RequestParam(value = "search", required = false) String search, Principal principal) { accessService.checkPurchaseContextOwnership(principal, purchaseContextType, publicIdentifier); var purchaseContext = purchaseContextManager.findBy(purchaseContextType, publicIdentifier).orElseThrow(); diff --git a/src/main/java/alfio/controller/api/admin/EventApiController.java b/src/main/java/alfio/controller/api/admin/EventApiController.java index 99f06e698..95f04a57f 100644 --- a/src/main/java/alfio/controller/api/admin/EventApiController.java +++ b/src/main/java/alfio/controller/api/admin/EventApiController.java @@ -157,7 +157,7 @@ public List getPaymentProxies( @PathVariable in @GetMapping(value = "/events", headers = "Authorization") public List getAllEventsForExternal(Principal principal, HttpServletRequest request, - @RequestParam(required = false, defaultValue = "false") boolean includeOnline) { + @RequestParam(value = "includeOnline", required = false, defaultValue = "false") boolean includeOnline) { List userOrganizations = userManager.findUserOrganizations(principal.getName()).stream().map(Organization::getId).collect(toList()); return eventManager.getActiveEvents().stream() .filter(e -> userOrganizations.contains(e.getOrganizationId()) && (includeOnline || e.getFormat() != Event.EventFormat.ONLINE)) @@ -266,7 +266,7 @@ private static ValidationResult validateAdditionalTicketFields(List getEventNamesByIds(@RequestParam List eventIds, Principal principal) { + public Map getEventNamesByIds(@RequestParam("eventIds") List eventIds, Principal principal) { // only used by admin it seems accessService.ensureAdmin(principal); return eventManager.getEventNamesByIds(eventIds, principal); @@ -286,7 +286,7 @@ public String insertEvent(@RequestBody EventModification eventModification, Prin } @PutMapping("/events/{id}/status") - public String activateEvent(@PathVariable int id, @RequestParam boolean active, Principal principal) { + public String activateEvent(@PathVariable int id, @RequestParam("active") boolean active, Principal principal) { accessService.checkEventOwnership(principal, id); eventManager.toggleActiveFlag(id, principal.getName(), active); return OK; @@ -358,7 +358,7 @@ public ResponseEntity rearrangeCategories(@PathVariable String eventName private static final List ITALIAN_E_INVOICING_FIELDS = List.of(FISCAL_CODE, REFERENCE_TYPE, "Addressee Code", "PEC"); @GetMapping("/events/{eventName}/export") - public void downloadAllTicketsCSV(@PathVariable String eventName, @RequestParam(defaultValue = "excel") String format, HttpServletRequest request, HttpServletResponse response, Principal principal) throws IOException { + public void downloadAllTicketsCSV(@PathVariable String eventName, @RequestParam(name = "format", defaultValue = "excel") String format, HttpServletRequest request, HttpServletResponse response, Principal principal) throws IOException { accessService.checkEventOwnership(principal, eventName); List fields = Arrays.asList(Optional.ofNullable(request.getParameterValues("fields")).orElse(new String[] {})); Event event = loadEvent(eventName, principal); @@ -455,7 +455,7 @@ private Stream exportLines(String eventName, Principal principal, List } @GetMapping("/events/{eventName}/sponsor-scan/export") - public void downloadSponsorScanExport(@PathVariable String eventName, @RequestParam(defaultValue = "excel") String format, HttpServletResponse response, Principal principal) throws IOException { + public void downloadSponsorScanExport(@PathVariable String eventName, @RequestParam(name = "format", defaultValue = "excel") String format, HttpServletResponse response, Principal principal) throws IOException { accessService.checkEventOwnership(principal, eventName); var event = eventManager.getSingleEvent(eventName, principal.getName()); List fields = purchaseContextFieldRepository.findAdditionalFieldsForEvent(event.getId()); @@ -567,7 +567,7 @@ public String confirmPayment(@PathVariable String eventName, public String deletePendingPayment(@PathVariable String eventName, @PathVariable String reservationId, @RequestParam(required = false, value = "credit", defaultValue = "false") Boolean creditReservation, - @RequestParam(required = false, defaultValue = "true") Boolean notify, + @RequestParam(required = false, value = "notify", defaultValue = "true") Boolean notify, Principal principal) { accessService.checkEventAndReservationOwnership(principal, eventName, Set.of(reservationId)); ticketReservationManager.deleteOfflinePayment(loadEvent(eventName, principal), reservationId, false, Boolean.TRUE.equals(creditReservation), notify, principal.getName()); @@ -749,8 +749,8 @@ public List getSupportedLanguages() { @GetMapping("/events/{eventName}/category/{categoryId}/ticket") public PageAndContent> getTicketsInCategory(@PathVariable String eventName, @PathVariable int categoryId, - @RequestParam(required = false) Integer page, - @RequestParam(required = false) String search, + @RequestParam(value = "page", required = false) Integer page, + @RequestParam(value = "search", required = false) String search, Principal principal) { accessService.checkCategoryOwnership(principal, eventName, categoryId); EventAndOrganizationId event = eventManager.getEventAndOrganizationId(eventName, principal.getName()); diff --git a/src/main/java/alfio/controller/api/admin/ExportApiController.java b/src/main/java/alfio/controller/api/admin/ExportApiController.java index 94d0adb1b..325bf832b 100644 --- a/src/main/java/alfio/controller/api/admin/ExportApiController.java +++ b/src/main/java/alfio/controller/api/admin/ExportApiController.java @@ -52,8 +52,8 @@ public ExportApiController(ExportManager exportManager) { } @GetMapping("/reservations") - public void downloadAllEvents(@RequestParam String from, - @RequestParam String to, + public void downloadAllEvents(@RequestParam(name = "from") String from, + @RequestParam(name = "to") String to, HttpServletResponse response, Principal principal) throws IOException { var allEvents = exportManager.reservationsForInterval(LocalDate.parse(requireNonNull(from)), diff --git a/src/main/java/alfio/controller/api/admin/ExtensionApiController.java b/src/main/java/alfio/controller/api/admin/ExtensionApiController.java index 17c5bb2b3..9642c753e 100644 --- a/src/main/java/alfio/controller/api/admin/ExtensionApiController.java +++ b/src/main/java/alfio/controller/api/admin/ExtensionApiController.java @@ -216,10 +216,10 @@ private static void ensureIdsArePresent(List toUpdate, L // @GetMapping("/log") - public PageAndContent> getLog(@RequestParam(required = false) String path, - @RequestParam(required = false) String name, - @RequestParam(required = false) ExtensionLog.Type type, - @RequestParam(required = false, defaultValue = "0") Integer page, Principal principal) { + public PageAndContent> getLog(@RequestParam(required = false, name = "path") String path, + @RequestParam(required = false, name = "name") String name, + @RequestParam(required = false, name = "type") ExtensionLog.Type type, + @RequestParam(required = false, name = "page", defaultValue = "0") Integer page, Principal principal) { accessService.ensureAdmin(principal); final int pageSize = 50; Pair, Integer> res = extensionService.getLog(StringUtils.trimToNull(path), StringUtils.trimToNull(name), type, pageSize, (page == null ? 0 : page) * pageSize); diff --git a/src/main/java/alfio/controller/api/admin/GroupApiController.java b/src/main/java/alfio/controller/api/admin/GroupApiController.java index 2c9e569c9..2bd3f9ec6 100644 --- a/src/main/java/alfio/controller/api/admin/GroupApiController.java +++ b/src/main/java/alfio/controller/api/admin/GroupApiController.java @@ -54,7 +54,7 @@ public String handleDuplicateGroupItemException(DuplicateGroupItemException exc) } @GetMapping("/for/{organizationId}") - public ResponseEntity> loadAllGroupsForOrganization(@PathVariable int organizationId, @RequestParam(defaultValue = "false", required = false) boolean showAll, Principal principal) { + public ResponseEntity> loadAllGroupsForOrganization(@PathVariable int organizationId, @RequestParam(name = "showAll", defaultValue = "false", required = false) boolean showAll, Principal principal) { accessService.checkOrganizationOwnership(principal, organizationId); if (showAll) { return ResponseEntity.ok(groupManager.getAllForOrganization(organizationId)); @@ -166,7 +166,7 @@ public ResponseEntity linkGroup(@PathVariable int groupId, @RequestBody public ResponseEntity unlinkGroup(@PathVariable int organizationId, @PathVariable int configurationId, @PathVariable int eventId, - @RequestParam(required = false) Integer categoryId, + @RequestParam(name = "categoryId", required = false) Integer categoryId, Principal principal) { accessService.checkGroupLinkOwnership(principal, configurationId, organizationId, eventId, categoryId); groupManager.disableLink(configurationId); diff --git a/src/main/java/alfio/controller/api/admin/LocationApiController.java b/src/main/java/alfio/controller/api/admin/LocationApiController.java index 08a1c47e7..5127284a1 100644 --- a/src/main/java/alfio/controller/api/admin/LocationApiController.java +++ b/src/main/java/alfio/controller/api/admin/LocationApiController.java @@ -62,7 +62,7 @@ public List getTimezones() { } @GetMapping("/location/timezone") - public String getTimezone(@RequestParam double lat, @RequestParam double lng) { + public String getTimezone(@RequestParam("lat") double lat, @RequestParam("lng") double lng) { String tzId = TimezoneMapper.tzNameAt(lat, lng); return getTimezones().contains(tzId) ? tzId : null; } @@ -71,8 +71,8 @@ public String getTimezone(@RequestParam double lat, @RequestParam double lng) { @GetMapping("/location/static-map-image") public String getMapImage( - @RequestParam(required = false) String lat, - @RequestParam(required = false) String lng) { + @RequestParam(name = "lat", required = false) String lat, + @RequestParam(name = "lng", required = false) String lng) { return LocationDescriptor.getMapUrl(lat, lng, getGeoConf()); } diff --git a/src/main/java/alfio/controller/api/admin/PollAdminApiController.java b/src/main/java/alfio/controller/api/admin/PollAdminApiController.java index f99fe12c2..9ce75630a 100644 --- a/src/main/java/alfio/controller/api/admin/PollAdminApiController.java +++ b/src/main/java/alfio/controller/api/admin/PollAdminApiController.java @@ -118,7 +118,7 @@ ResponseEntity updateStatus(@PathVariable String eventName, @GetMapping("/{pollId}/filter-tickets") ResponseEntity> findAdditionalAttendees(@PathVariable String eventName, @PathVariable Long pollId, - @RequestParam String filter, + @RequestParam("filter") String filter, Principal principal) { if(StringUtils.isBlank(filter)) { return ResponseEntity.badRequest().build(); diff --git a/src/main/java/alfio/controller/api/admin/PromoCodeDiscountApiController.java b/src/main/java/alfio/controller/api/admin/PromoCodeDiscountApiController.java index c5ad1ae90..ea6edfaa5 100644 --- a/src/main/java/alfio/controller/api/admin/PromoCodeDiscountApiController.java +++ b/src/main/java/alfio/controller/api/admin/PromoCodeDiscountApiController.java @@ -116,7 +116,7 @@ public int countPromoCodeUse(@PathVariable int promoCodeId, Principal principal) @GetMapping("/promo-code/{promoCodeId}/detailed-usage") public List retrieveDetailedUsage(@PathVariable int promoCodeId, - @RequestParam(required = false) String eventShortName, + @RequestParam(value = "eventShortName", required = false) String eventShortName, Principal principal) { Integer eventId = null; if (StringUtils.isNotBlank(eventShortName)) { diff --git a/src/main/java/alfio/controller/api/admin/ResourceController.java b/src/main/java/alfio/controller/api/admin/ResourceController.java index 1af0766e5..4e4783c48 100644 --- a/src/main/java/alfio/controller/api/admin/ResourceController.java +++ b/src/main/java/alfio/controller/api/admin/ResourceController.java @@ -106,9 +106,9 @@ public void getTemplate(@PathVariable TemplateResource name, @PathVariable Strin @PostMapping("/overridable-template/{name}/{locale}/preview") public void previewTemplate(@PathVariable TemplateResource name, @PathVariable String locale, - @RequestParam(required = false) Integer organizationId, - @RequestParam(required = false) Integer eventId, - @RequestParam(required = false) UUID subscriptionDescriptorId, + @RequestParam(required = false, value = "organizationId") Integer organizationId, + @RequestParam(required = false, value = "eventId") Integer eventId, + @RequestParam(required = false, value = "subscriptionDescriptorId") UUID subscriptionDescriptorId, @RequestBody UploadBase64FileModification template, Principal principal, HttpServletResponse response) throws IOException { diff --git a/src/main/java/alfio/controller/api/admin/SubscriptionApiController.java b/src/main/java/alfio/controller/api/admin/SubscriptionApiController.java index 8455dd86b..8315070cf 100644 --- a/src/main/java/alfio/controller/api/admin/SubscriptionApiController.java +++ b/src/main/java/alfio/controller/api/admin/SubscriptionApiController.java @@ -99,7 +99,7 @@ ResponseEntity update(@PathVariable int organizationId, @PatchMapping("/{subscriptionId}/is-public") ResponseEntity setPublicState(@PathVariable int organizationId, @PathVariable UUID subscriptionId, - @RequestParam boolean status, + @RequestParam("status") boolean status, Principal principal) { accessService.checkOrganizationOwnership(principal, organizationId); return ResponseEntity.ok(subscriptionManager.setPublicStatus(subscriptionId, organizationId, status)); diff --git a/src/main/java/alfio/controller/api/admin/UsersApiController.java b/src/main/java/alfio/controller/api/admin/UsersApiController.java index 79faaf811..4b30c77a6 100644 --- a/src/main/java/alfio/controller/api/admin/UsersApiController.java +++ b/src/main/java/alfio/controller/api/admin/UsersApiController.java @@ -186,7 +186,7 @@ public String editUser(@RequestBody UserModification userModification, Principal } @PostMapping("/users/new") - public UserWithPasswordAndQRCode insertUser(@RequestBody UserModification userModification, @RequestParam String baseUrl, Principal principal) { + public UserWithPasswordAndQRCode insertUser(@RequestBody UserModification userModification, @RequestParam("baseUrl") String baseUrl, Principal principal) { accessService.checkOrganizationOwnership(principal, userModification.getOrganizationId()); Role requested = Role.valueOf(userModification.getRole()); Validate.isTrue(userManager.getAvailableRoles(principal.getName()).stream().anyMatch(requested::equals), String.format("Requested role %s is not available for current user", userModification.getRole())); @@ -275,7 +275,7 @@ public void updateCurrentUser(@RequestBody UserModification userModification, Pr } @PutMapping("/users/{id}/reset-password") - public UserWithPasswordAndQRCode resetPassword(@PathVariable("id") int userId, @RequestParam String baseUrl, Principal principal) { + public UserWithPasswordAndQRCode resetPassword(@PathVariable("id") int userId, @RequestParam("baseUrl") String baseUrl, Principal principal) { UserWithPassword userWithPassword = userManager.resetPassword(userId, principal); return new UserWithPasswordAndQRCode(userWithPassword, Base64.getEncoder().encodeToString(generateQRCode(userWithPassword, baseUrl))); } diff --git a/src/main/java/alfio/controller/api/admin/UtilsApiController.java b/src/main/java/alfio/controller/api/admin/UtilsApiController.java index 51de4e381..9cf4f1828 100644 --- a/src/main/java/alfio/controller/api/admin/UtilsApiController.java +++ b/src/main/java/alfio/controller/api/admin/UtilsApiController.java @@ -63,12 +63,12 @@ public ResponseEntity handleMissingServletRequestParameterException(Exce } @GetMapping("/short-name/generate") - public String generateShortName(@RequestParam String displayName) { + public String generateShortName(@RequestParam("displayName") String displayName) { return eventNameManager.generateShortName(displayName); } @PostMapping("/short-name/validate") - public boolean validateShortName(@RequestParam String shortName, HttpServletResponse response) { + public boolean validateShortName(@RequestParam("shortName") String shortName, HttpServletResponse response) { boolean unique = eventNameManager.isUnique(shortName); if(!unique) { response.setStatus(HttpServletResponse.SC_CONFLICT); diff --git a/src/main/java/alfio/controller/api/v1/AttendeeApiController.java b/src/main/java/alfio/controller/api/v1/AttendeeApiController.java index a4b0a08ce..c7163e80d 100644 --- a/src/main/java/alfio/controller/api/v1/AttendeeApiController.java +++ b/src/main/java/alfio/controller/api/v1/AttendeeApiController.java @@ -95,7 +95,7 @@ public ResponseEntity> scanBadges(@RequestBody List } @GetMapping("/{eventKey}/sponsor-scan/mine") - public ResponseEntity> getScannedBadges(@PathVariable("eventKey") String eventShortName, @RequestParam(required = false) String from, Principal principal) { + public ResponseEntity> getScannedBadges(@PathVariable("eventKey") String eventShortName, @RequestParam(value = "from", required = false) String from, Principal principal) { ZonedDateTime start = Optional.ofNullable(StringUtils.trimToNull(from)) .map(EventUtil.JSON_DATETIME_FORMATTER::parse) diff --git a/src/main/java/alfio/controller/api/v2/TranslationsApiController.java b/src/main/java/alfio/controller/api/v2/TranslationsApiController.java index 8204a7855..8ae3296c8 100644 --- a/src/main/java/alfio/controller/api/v2/TranslationsApiController.java +++ b/src/main/java/alfio/controller/api/v2/TranslationsApiController.java @@ -49,13 +49,13 @@ public TranslationsApiController(MessageSourceManager messageSourceManager, Conf @GetMapping("/public/i18n/bundle/{lang}") public Map getPublicTranslations(@PathVariable String lang, - @RequestParam(defaultValue = "true", required = false) boolean withSystemOverride) { + @RequestParam(value = "withSystemOverride", defaultValue = "true", required = false) boolean withSystemOverride) { return messageSourceManager.getBundleAsMap("alfio.i18n.public", withSystemOverride, lang, MessageSourceManager.PUBLIC_FRONTEND); } @GetMapping("/admin/i18n/bundle/{lang}") public Map getAdminTranslations(@PathVariable String lang, - @RequestParam(defaultValue = "true", required = false) boolean withSystemOverride) { + @RequestParam(value = "withSystemOverride", defaultValue = "true", required = false) boolean withSystemOverride) { return messageSourceManager.getBundleAsMap("alfio.i18n.public", withSystemOverride, lang, MessageSourceManager.ADMIN_FRONTEND); } diff --git a/src/main/java/alfio/controller/api/v2/user/EventApiV2Controller.java b/src/main/java/alfio/controller/api/v2/user/EventApiV2Controller.java index 6e36153ca..3f33f9664 100644 --- a/src/main/java/alfio/controller/api/v2/user/EventApiV2Controller.java +++ b/src/main/java/alfio/controller/api/v2/user/EventApiV2Controller.java @@ -137,7 +137,7 @@ public ResponseEntity> subscribeToWaitingList(@PathVa } @GetMapping("event/{eventName}/ticket-categories") - public ResponseEntity getTicketCategories(@PathVariable String eventName, @RequestParam(required = false) String code) { + public ResponseEntity getTicketCategories(@PathVariable String eventName, @RequestParam(value = "code", required = false) String code) { // return eventRepository.findOptionalByShortName(eventName).filter(e -> e.getStatus() != Event.Status.DISABLED).map(event -> { @@ -249,7 +249,7 @@ private static int getMaxAmountOfTicketsPerReservation(Map { @@ -289,7 +289,7 @@ public void getCalendar(@PathVariable String eventName, */ @PostMapping(value = "event/{eventName}/reserve-tickets") public ResponseEntity> reserveTickets(@PathVariable String eventName, - @RequestParam String lang, + @RequestParam("lang") String lang, @RequestBody ReservationForm reservation, BindingResult bindingResult, ServletWebRequest request, @@ -335,7 +335,7 @@ private Optional createTicketReservation(ReservationForm reservation, @GetMapping("event/{eventName}/validate-code") public ResponseEntity> validateCode(@PathVariable String eventName, - @RequestParam String code) { + @RequestParam("code") String code) { var res = promoCodeRequestManager.checkCode(eventName, code); if(res.isSuccess()) { diff --git a/src/main/java/alfio/controller/api/v2/user/PollApiController.java b/src/main/java/alfio/controller/api/v2/user/PollApiController.java index abfb9c2e5..14d55a6a4 100644 --- a/src/main/java/alfio/controller/api/v2/user/PollApiController.java +++ b/src/main/java/alfio/controller/api/v2/user/PollApiController.java @@ -36,7 +36,7 @@ public class PollApiController { private final PollManager pollManager; @GetMapping("") - ResponseEntity>> getAll(@PathVariable String eventName, @RequestParam String pin) { + ResponseEntity>> getAll(@PathVariable String eventName, @RequestParam("pin") String pin) { var result = pollManager.getActiveForEvent(eventName, pin); if(result.isSuccess()) { return ResponseEntity.ok(ValidatedResponse.fromResult(result, "pin")); @@ -45,7 +45,7 @@ ResponseEntity>> getAll(@PathVariable String eventN } @GetMapping("/{pollId}") - ResponseEntity> getSingle(@PathVariable String eventName, @PathVariable Long pollId, @RequestParam String pin) { + ResponseEntity> getSingle(@PathVariable String eventName, @PathVariable Long pollId, @RequestParam("pin") String pin) { var result = pollManager.getSingleActiveForEvent(eventName, pollId, pin); if(result.isSuccess()) { return ResponseEntity.ok(ValidatedResponse.fromResult(result, "pin")); diff --git a/src/main/java/alfio/controller/api/v2/user/ReservationApiV2Controller.java b/src/main/java/alfio/controller/api/v2/user/ReservationApiV2Controller.java index e4393e14a..e75e79762 100644 --- a/src/main/java/alfio/controller/api/v2/user/ReservationApiV2Controller.java +++ b/src/main/java/alfio/controller/api/v2/user/ReservationApiV2Controller.java @@ -287,7 +287,7 @@ public ResponseEntity backToBooking(@PathVariable String reservationId) @PostMapping("/reservation/{reservationId}") public ResponseEntity> confirmOverview(@PathVariable String reservationId, - @RequestParam String lang, + @RequestParam("lang") String lang, @RequestBody PaymentForm paymentForm, BindingResult bindingResult, HttpServletRequest request, @@ -368,8 +368,8 @@ private static ResponseEntity> build @PostMapping("/reservation/{reservationId}/validate-to-overview") public ResponseEntity> validateToOverview(@PathVariable String reservationId, - @RequestParam String lang, - @RequestParam(defaultValue = "false") boolean ignoreWarnings, + @RequestParam("lang") String lang, + @RequestParam(value = "ignoreWarnings", defaultValue = "false") boolean ignoreWarnings, @RequestBody ContactAndTicketsForm contactAndTicketsForm, BindingResult br, Authentication principal) { @@ -552,7 +552,7 @@ private Optional> getPurchaseContextAnd public ResponseEntity reSendReservationConfirmationEmail(@PathVariable PurchaseContextType purchaseContextType, @PathVariable String publicIdentifier, @PathVariable String reservationId, - @RequestParam String lang, + @RequestParam("lang") String lang, Principal principal) { @@ -701,7 +701,7 @@ public ResponseEntity> applyCode(@PathVariable String } @DeleteMapping("/reservation/{reservationId}/remove-code") - public ResponseEntity removeCode(@PathVariable String reservationId, @RequestParam ReservationCodeForm.ReservationCodeType type) { + public ResponseEntity removeCode(@PathVariable String reservationId, @RequestParam("type") ReservationCodeForm.ReservationCodeType type) { boolean res = false; if (type == ReservationCodeForm.ReservationCodeType.SUBSCRIPTION) { res = purchaseContextManager.getReservationWithPurchaseContext(reservationId).map(et -> ticketReservationManager.removeSubscription(et.getRight())).orElse(false); diff --git a/src/main/java/alfio/controller/payment/PayPalCallbackController.java b/src/main/java/alfio/controller/payment/PayPalCallbackController.java index 4e39b9a5f..5ec5e97a9 100644 --- a/src/main/java/alfio/controller/payment/PayPalCallbackController.java +++ b/src/main/java/alfio/controller/payment/PayPalCallbackController.java @@ -48,7 +48,7 @@ public String payPalSuccess(@PathVariable PurchaseContext.PurchaseContextType pu @PathVariable String reservationId, @RequestParam(value = "token", required = false) String payPalPaymentId, @RequestParam(value = "PayerID", required = false) String payPalPayerID, - @RequestParam String hmac) { + @RequestParam(value = "hmac") String hmac) { var optionalPurchaseContext = purchaseContextManager.findByReservationId(reservationId) .filter(pc -> pc.getType() == purchaseContextType && pc.getPublicIdentifier().equals(purchaseContextId));