From 96b6ff3841d7f6ab68c0798048859c55ae4034fc Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sun, 4 Feb 2024 21:10:48 -0800 Subject: [PATCH] Fix typo on path. --- .../config/rest/RestAppConfig.java | 12 +++++----- .../wisemapping/rest/AccountController.java | 2 +- .../com/wisemapping/rest/AdminController.java | 4 ++-- .../wisemapping/rest/JwtAuthController.java | 2 +- .../com/wisemapping/rest/LabelController.java | 4 ++-- .../wisemapping/rest/MindmapController.java | 6 ++--- .../com/wisemapping/rest/UserController.java | 4 ++-- .../com/wisemapping/test/rest/RestHelper.java | 2 +- .../test/rest/RestJwtAuthControllerTest.java | 6 ++--- .../test/rest/RestLabelControllerTest.java | 2 +- .../test/rest/RestMindmapControllerTest.java | 24 +++++++++---------- .../test/rest/RestUserControllerTest.java | 8 +++---- 12 files changed, 38 insertions(+), 38 deletions(-) diff --git a/wise-api/src/main/java/com/wisemapping/config/rest/RestAppConfig.java b/wise-api/src/main/java/com/wisemapping/config/rest/RestAppConfig.java index ef9e7666..65546bd1 100644 --- a/wise-api/src/main/java/com/wisemapping/config/rest/RestAppConfig.java +++ b/wise-api/src/main/java/com/wisemapping/config/rest/RestAppConfig.java @@ -39,12 +39,12 @@ public class RestAppConfig { .securityMatcher("/**") .addFilterAfter(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class) .authorizeHttpRequests(auth -> auth - .requestMatchers(mvc.pattern("/api/restfull/users/")).permitAll() - .requestMatchers(mvc.pattern("/api/restfull/authenticate")).permitAll() - .requestMatchers(mvc.pattern("/api/restfull/users/resetPassword")).permitAll() - .requestMatchers(mvc.pattern("/api/restfull/oauth2/googlecallback")).permitAll() - .requestMatchers(mvc.pattern("/api/restfull/oauth2/confirmaccountsync")).permitAll() - .requestMatchers(mvc.pattern("/api/restfull/admin/**")).hasAnyRole("ADMIN") + .requestMatchers(mvc.pattern("/api/restful/users/")).permitAll() + .requestMatchers(mvc.pattern("/api/restful/authenticate")).permitAll() + .requestMatchers(mvc.pattern("/api/restful/users/resetPassword")).permitAll() + .requestMatchers(mvc.pattern("/api/restful/oauth2/googlecallback")).permitAll() + .requestMatchers(mvc.pattern("/api/restful/oauth2/confirmaccountsync")).permitAll() + .requestMatchers(mvc.pattern("/api/restful/admin/**")).hasAnyRole("ADMIN") .requestMatchers(mvc.pattern("/**")).hasAnyRole("USER", "ADMIN") .anyRequest().authenticated() ) diff --git a/wise-api/src/main/java/com/wisemapping/rest/AccountController.java b/wise-api/src/main/java/com/wisemapping/rest/AccountController.java index 52a870dc..5435c9c3 100644 --- a/wise-api/src/main/java/com/wisemapping/rest/AccountController.java +++ b/wise-api/src/main/java/com/wisemapping/rest/AccountController.java @@ -39,7 +39,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; @RestController -@RequestMapping("/api/restfull/account/") +@RequestMapping("/api/restful/account/") @PreAuthorize("isAuthenticated() and hasRole('ROLE_USER')") public class AccountController extends BaseController { @Qualifier("userService") diff --git a/wise-api/src/main/java/com/wisemapping/rest/AdminController.java b/wise-api/src/main/java/com/wisemapping/rest/AdminController.java index 3c4d1ac3..a82e6695 100644 --- a/wise-api/src/main/java/com/wisemapping/rest/AdminController.java +++ b/wise-api/src/main/java/com/wisemapping/rest/AdminController.java @@ -36,7 +36,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; @RestController -@RequestMapping("/api/restfull/admin") +@RequestMapping("/api/restful/admin") @PreAuthorize("isAuthenticated() and hasRole('ROLE_ADMIN')") public class AdminController extends BaseController { @Qualifier("userService") @@ -101,7 +101,7 @@ public class AdminController extends BaseController { // Finally create the user ... delegated.setAuthenticationType(AuthenticationType.DATABASE); userService.createUser(delegated, false, true); - response.setHeader("Location", "/api/restfull/admin/users/" + user.getId()); + response.setHeader("Location", "/api/restful/admin/users/" + user.getId()); } @RequestMapping(method = RequestMethod.PUT, value = "/users/{id}/password", consumes = {"text/plain"}) diff --git a/wise-api/src/main/java/com/wisemapping/rest/JwtAuthController.java b/wise-api/src/main/java/com/wisemapping/rest/JwtAuthController.java index 95e5b969..879ec8a1 100644 --- a/wise-api/src/main/java/com/wisemapping/rest/JwtAuthController.java +++ b/wise-api/src/main/java/com/wisemapping/rest/JwtAuthController.java @@ -39,7 +39,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @CrossOrigin -@RequestMapping("/api/restfull") +@RequestMapping("/api/restful") public class JwtAuthController { @Autowired diff --git a/wise-api/src/main/java/com/wisemapping/rest/LabelController.java b/wise-api/src/main/java/com/wisemapping/rest/LabelController.java index 694524f4..8136559d 100644 --- a/wise-api/src/main/java/com/wisemapping/rest/LabelController.java +++ b/wise-api/src/main/java/com/wisemapping/rest/LabelController.java @@ -40,7 +40,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; @RestController -@RequestMapping("/api/restfull/labels") +@RequestMapping("/api/restful/labels") @PreAuthorize("isAuthenticated() and hasRole('ROLE_USER')") public class LabelController extends BaseController { @@ -63,7 +63,7 @@ public class LabelController extends BaseController { final Label label = createLabel(restLabel); // Return the new created label ... - response.setHeader("Location", "/api/restfull/labels/" + label.getId()); + response.setHeader("Location", "/api/restful/labels/" + label.getId()); response.setHeader("ResourceId", Long.toString(label.getId())); } diff --git a/wise-api/src/main/java/com/wisemapping/rest/MindmapController.java b/wise-api/src/main/java/com/wisemapping/rest/MindmapController.java index 13850c9c..f4784bc3 100644 --- a/wise-api/src/main/java/com/wisemapping/rest/MindmapController.java +++ b/wise-api/src/main/java/com/wisemapping/rest/MindmapController.java @@ -46,7 +46,7 @@ import java.util.stream.Collectors; @RestController -@RequestMapping("/api/restfull/maps") +@RequestMapping("/api/restful/maps") public class MindmapController extends BaseController { private final Logger logger = LogManager.getLogger(); @@ -548,7 +548,7 @@ public class MindmapController extends BaseController { mindmapService.addMindmap(mindmap, user); // Return the new created map ... - response.setHeader("Location", "/api/restfull/maps/" + mindmap.getId()); + response.setHeader("Location", "/api/restful/maps/" + mindmap.getId()); response.setHeader("ResourceId", Integer.toString(mindmap.getId())); } @@ -576,7 +576,7 @@ public class MindmapController extends BaseController { mindmapService.addMindmap(clonedMap, user); // Return the new created map ... - response.setHeader("Location", "/api/restfull/maps/" + clonedMap.getId()); + response.setHeader("Location", "/api/restful/maps/" + clonedMap.getId()); response.setHeader("ResourceId", Integer.toString(clonedMap.getId())); } diff --git a/wise-api/src/main/java/com/wisemapping/rest/UserController.java b/wise-api/src/main/java/com/wisemapping/rest/UserController.java index b10b8ed0..a8ca2c2b 100644 --- a/wise-api/src/main/java/com/wisemapping/rest/UserController.java +++ b/wise-api/src/main/java/com/wisemapping/rest/UserController.java @@ -48,7 +48,7 @@ import java.util.Arrays; import java.util.List; @RestController -@RequestMapping("/api/restfull/users") +@RequestMapping("/api/restful/users") @CrossOrigin public class UserController extends BaseController { @@ -99,7 +99,7 @@ public class UserController extends BaseController { user.setAuthenticationType(AuthenticationType.DATABASE); userService.createUser(user, false, true); - response.setHeader("Location", "/api/restfull/users/" + user.getId()); + response.setHeader("Location", "/api/restful/users/" + user.getId()); } @RequestMapping(method = RequestMethod.PUT, value = "/resetPassword", produces = { "application/json" }) diff --git a/wise-api/src/test/java/com/wisemapping/test/rest/RestHelper.java b/wise-api/src/test/java/com/wisemapping/test/rest/RestHelper.java index d2538f74..9a4e84e3 100644 --- a/wise-api/src/test/java/com/wisemapping/test/rest/RestHelper.java +++ b/wise-api/src/test/java/com/wisemapping/test/rest/RestHelper.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.List; public class RestHelper { - public static final String BASE_REST_URL = "/api/restfull"; + public static final String BASE_REST_URL = "/api/restful"; static HttpHeaders createHeaders(@NotNull MediaType mediaType) { List acceptableMediaTypes = new ArrayList<>(); diff --git a/wise-api/src/test/java/com/wisemapping/test/rest/RestJwtAuthControllerTest.java b/wise-api/src/test/java/com/wisemapping/test/rest/RestJwtAuthControllerTest.java index cbda0815..f00f44ff 100644 --- a/wise-api/src/test/java/com/wisemapping/test/rest/RestJwtAuthControllerTest.java +++ b/wise-api/src/test/java/com/wisemapping/test/rest/RestJwtAuthControllerTest.java @@ -71,7 +71,7 @@ public class RestJwtAuthControllerTest { final String userJson = objectMapper.writeValueAsString(user); final MvcResult result = mockMvc.perform( - post("/api/restfull/authenticate"). + post("/api/restful/authenticate"). contentType(MediaType.APPLICATION_JSON) .content(userJson)) .andExpect(status().isOk()).andReturn(); @@ -86,7 +86,7 @@ public class RestJwtAuthControllerTest { final String userJson = objectMapper.writeValueAsString(user); mockMvc.perform( - post("/api/restfull/authenticate"). + post("/api/restful/authenticate"). contentType(MediaType.APPLICATION_JSON) .content(userJson)) .andExpect(status().is4xxClientError()); @@ -99,7 +99,7 @@ public class RestJwtAuthControllerTest { final String userJson = objectMapper.writeValueAsString(user); mockMvc.perform( - post("/api/restfull/authenticate"). + post("/api/restful/authenticate"). contentType(MediaType.APPLICATION_JSON) .content(userJson)) .andExpect(status().is4xxClientError()); diff --git a/wise-api/src/test/java/com/wisemapping/test/rest/RestLabelControllerTest.java b/wise-api/src/test/java/com/wisemapping/test/rest/RestLabelControllerTest.java index 6740e10b..bd3ed821 100644 --- a/wise-api/src/test/java/com/wisemapping/test/rest/RestLabelControllerTest.java +++ b/wise-api/src/test/java/com/wisemapping/test/rest/RestLabelControllerTest.java @@ -134,7 +134,7 @@ public class RestLabelControllerTest { // Create a new label ... final HttpEntity createUserEntity = new HttpEntity<>(restLabel, requestHeaders); - final ResponseEntity result = template.exchange("/api/restfull/labels", HttpMethod.POST, createUserEntity, String.class); + final ResponseEntity result = template.exchange("/api/restful/labels", HttpMethod.POST, createUserEntity, String.class); if (!result.getStatusCode().is2xxSuccessful()) { throw new IllegalStateException(result.toString()); } diff --git a/wise-api/src/test/java/com/wisemapping/test/rest/RestMindmapControllerTest.java b/wise-api/src/test/java/com/wisemapping/test/rest/RestMindmapControllerTest.java index d26b3ebe..078e2928 100644 --- a/wise-api/src/test/java/com/wisemapping/test/rest/RestMindmapControllerTest.java +++ b/wise-api/src/test/java/com/wisemapping/test/rest/RestMindmapControllerTest.java @@ -128,7 +128,7 @@ public class RestMindmapControllerTest { // Add map with same name ... HttpEntity createUserEntity = new HttpEntity<>(requestHeaders); - final ResponseEntity response = restTemplate.exchange("/api/restfull/maps?title=" + title, HttpMethod.POST, createUserEntity, String.class); + final ResponseEntity response = restTemplate.exchange("/api/restful/maps?title=" + title, HttpMethod.POST, createUserEntity, String.class); assertEquals(HttpStatus.BAD_REQUEST, response.getStatusCode()); assertTrue(Objects.requireNonNull(response.getBody()).contains("You have already a map with the same name")); } @@ -254,7 +254,7 @@ public class RestMindmapControllerTest { addNewMap(secondTemplate, title2); final TestRestTemplate superadminTemplate = this.restTemplate.withBasicAuth("admin@wisemapping.org", "test"); - final ResponseEntity exchange = superadminTemplate.exchange("/api/restfull/admin/users/" + secondUser.getId(), HttpMethod.DELETE, null, String.class); + final ResponseEntity exchange = superadminTemplate.exchange("/api/restful/admin/users/" + secondUser.getId(), HttpMethod.DELETE, null, String.class); assertTrue(exchange.getStatusCode().is2xxSuccessful(), "Status Code:" + exchange.getStatusCode() + "- " + exchange.getBody()); // Validate that the two maps are there ... @@ -490,15 +490,15 @@ public class RestMindmapControllerTest { // Create a sample map ... final String mapTitle = "removeLabelFromMindmap"; final URI mindmapUri = addNewMap(restTemplate, mapTitle); - final String mapId = mindmapUri.getPath().replace("/api/restfull/maps/", ""); + final String mapId = mindmapUri.getPath().replace("/api/restful/maps/", ""); // Assign label to map ... - String labelId = labelUri.getPath().replace("/api/restfull/labels/", ""); + String labelId = labelUri.getPath().replace("/api/restful/labels/", ""); HttpEntity labelEntity = new HttpEntity<>(labelId, requestHeaders); - restTemplate.postForLocation("/api/restfull/maps/" + mapId + "/labels", labelEntity); + restTemplate.postForLocation("/api/restful/maps/" + mapId + "/labels", labelEntity); // Remove label from map - final ResponseEntity exchange = restTemplate.exchange("/api/restfull//maps/" + mapId + "/labels/" + labelId, HttpMethod.DELETE, null, String.class); + final ResponseEntity exchange = restTemplate.exchange("/api/restful//maps/" + mapId + "/labels/" + labelId, HttpMethod.DELETE, null, String.class); assertTrue(exchange.getStatusCode().is2xxSuccessful()); @@ -535,12 +535,12 @@ public class RestMindmapControllerTest { // Create a sample map ... final String mapTitle = "Maps 1 - "; final URI mindmapUri = addNewMap(restTemplate, mapTitle); - final String mapId = mindmapUri.getPath().replace("/api/restfull/maps/", ""); + final String mapId = mindmapUri.getPath().replace("/api/restful/maps/", ""); // Assign label to map ... - String labelId = labelUri.getPath().replace("/api/restfull/labels/", ""); + String labelId = labelUri.getPath().replace("/api/restful/labels/", ""); HttpEntity labelEntity = new HttpEntity<>(labelId, requestHeaders); - restTemplate.postForLocation("/api/restfull/maps/" + mapId + "/labels", labelEntity); + restTemplate.postForLocation("/api/restful/maps/" + mapId + "/labels", labelEntity); // Check that the label has been assigned ... Optional mindmapInfo = fetchMap(requestHeaders, restTemplate, mapId); @@ -636,7 +636,7 @@ public class RestMindmapControllerTest { final String maps = fetchMaps(requestHeaders, restTemplate).getMindmapsInfo().stream().map(map -> String.valueOf(map.getId())).collect(Collectors.joining(",")); - final ResponseEntity exchange = restTemplate.exchange("/api/restfull/maps/batch?ids=" + maps, HttpMethod.DELETE, null, String.class); + final ResponseEntity exchange = restTemplate.exchange("/api/restful/maps/batch?ids=" + maps, HttpMethod.DELETE, null, String.class); assertTrue(exchange.getStatusCode().is2xxSuccessful(), "Status code:" + exchange.getStatusCode() + " - " + exchange.getBody()); // Validate that the two maps are there ... @@ -769,7 +769,7 @@ public class RestMindmapControllerTest { @NotNull private RestMindmapList fetchMaps(final HttpHeaders requestHeaders, final TestRestTemplate template) throws RestClientException { final HttpEntity findMapEntity = new HttpEntity<>(requestHeaders); - final ResponseEntity response = template.exchange("/api/restfull/maps/", HttpMethod.GET, findMapEntity, RestMindmapList.class); + final ResponseEntity response = template.exchange("/api/restful/maps/", HttpMethod.GET, findMapEntity, RestMindmapList.class); assertTrue(response.getStatusCode().is2xxSuccessful(), response.toString()); return Objects.requireNonNull(response.getBody()); @@ -804,7 +804,7 @@ public class RestMindmapControllerTest { // Create a new map ... final HttpHeaders requestHeaders = createHeaders(MediaType.APPLICATION_XML); HttpEntity createUserEntity = new HttpEntity<>(xml, requestHeaders); - return template.postForLocation("/api/restfull/maps?title=" + title, createUserEntity); + return template.postForLocation("/api/restful/maps?title=" + title, createUserEntity); } private URI addNewMap(@NotNull TestRestTemplate template, @NotNull String title) { diff --git a/wise-api/src/test/java/com/wisemapping/test/rest/RestUserControllerTest.java b/wise-api/src/test/java/com/wisemapping/test/rest/RestUserControllerTest.java index f487c19e..661fd86a 100644 --- a/wise-api/src/test/java/com/wisemapping/test/rest/RestUserControllerTest.java +++ b/wise-api/src/test/java/com/wisemapping/test/rest/RestUserControllerTest.java @@ -66,7 +66,7 @@ public class RestUserControllerTest { final String userJson = objectMapper.writeValueAsString(result); mockMvc.perform( - post("/api/restfull/admin/users"). + post("/api/restful/admin/users"). contentType(MediaType.APPLICATION_JSON) .content(userJson) .with(user("test@wisemapping.org").roles("ADMIN"))) @@ -81,7 +81,7 @@ public class RestUserControllerTest { @Test void resetPasswordInvalidUser() throws Exception { this.mockMvc.perform - (put("/api/restfull/users/resetPassword?email=doesnotexist@example.com")) + (put("/api/restful/users/resetPassword?email=doesnotexist@example.com")) .andDo(print()) .andExpect(status().is4xxClientError()) .andExpect(content().string(containsString("The email provided is not a valid user account."))); @@ -91,7 +91,7 @@ public class RestUserControllerTest { void resetPasswordValidUser() throws Exception { final RestUser user = createUser(); this.mockMvc.perform - (put("/api/restfull/users/resetPassword?email=" + user.getEmail())) + (put("/api/restful/users/resetPassword?email=" + user.getEmail())) .andDo(print()) .andExpect(status().isOk()); } @@ -104,7 +104,7 @@ public class RestUserControllerTest { final String userJson = objectMapper.writeValueAsString(user); mockMvc.perform( - post("/api/restfull/users/"). + post("/api/restful/users/"). contentType(MediaType.APPLICATION_JSON) .content(userJson)) .andExpect(status().isCreated());