Fixing issue with PathVariables to comply with Spring Framework 6

RWS · Apr 9, 2024 · a66d5cf · a66d5cf
1 parent 6a7e446
commit a66d5cf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...dynamic-documentation/src/main/java/com/sdl/dxa/modules/ish/controller/IshController.java b/...dynamic-documentation/src/main/java/com/sdl/dxa/modules/ish/controller/IshController.java
@@ -118,8 +118,8 @@ public IshController() {
      */
     @RequestMapping(method = {GET, POST}, value = "/api/page/{publicationId}/{pageId}/**",
             produces = {APPLICATION_JSON_VALUE})
-    public ModelAndView getPage(@PathVariable Integer publicationId,
-                                @PathVariable Integer pageId,
+    public ModelAndView getPage(@PathVariable("publicationId") Integer publicationId,
+                                @PathVariable("pageId") Integer pageId,
                                 @RequestParam(value = "conditions", defaultValue = "") String conditions,
                                 final HttpServletRequest request,
                                 final HttpServletResponse response) throws ContentProviderException, IOException {
@@ -148,8 +148,8 @@ public ModelAndView getPage(@PathVariable Integer publicationId,
     @RequestMapping(method = GET, value = "/binary/{publicationId}/{binaryId}/**", produces = MediaType.ALL_VALUE)
     @ResponseBody
     public void getBinaryResource(HttpServletResponse response,
-                                  @PathVariable String publicationId,
-                                  @PathVariable String binaryId) throws ContentProviderException, BadRequestException, NotFoundException, IOException {
+                                  @PathVariable("publicationId") String publicationId,
+                                  @PathVariable("binaryId") String binaryId) throws ContentProviderException, BadRequestException, NotFoundException, IOException {
         int publicationIdInt = -1;
         try {
             publicationIdInt = Integer.parseInt(publicationId);

diff --git a/...src/main/java/com/sdl/dxa/modules/docs/mashup/controller/TridionDocsMashupController.java b/...src/main/java/com/sdl/dxa/modules/docs/mashup/controller/TridionDocsMashupController.java
@@ -143,8 +143,8 @@ private List<Topic> getTopics(DynamicWidget dynamicWidget, List<Topic> topics, P
      */
      @RequestMapping(method = GET, value ="/binary/{publicationId}/{binaryId}/**" ,produces = MediaType.ALL_VALUE)
     @ResponseBody
-    public ResponseEntity<InputStreamResource> getBinaryResource(@PathVariable Integer publicationId,
-                                                                 @PathVariable Integer binaryId)
+    public ResponseEntity<InputStreamResource> getBinaryResource(@PathVariable("publicationId") Integer publicationId,
+                                                                 @PathVariable("binaryId") Integer binaryId)
             throws ContentProviderException, IOException {
 
         HttpHeaders responseHeaders = new HttpHeaders();