From 7d4f51b3ea29492731d12408ef721356d1bb5aa0 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Mon, 15 Jan 2024 16:47:28 -0800 Subject: [PATCH] Fix test --- .../wisemapping/config/mvc/MvcAppConfig.java | 1 - .../config/mvc/MvcSecurityConfig.java | 2 -- .../wisemapping/rest/AccountController.java | 8 ++++---- .../src/main/webapp/WEB-INF/log4j2-stdout.xml | 19 ------------------- .../com/wisemapping/test/rest/RestHelper.java | 2 +- 5 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 wise-webapp/src/main/webapp/WEB-INF/log4j2-stdout.xml diff --git a/wise-webapp/src/main/java/com/wisemapping/config/mvc/MvcAppConfig.java b/wise-webapp/src/main/java/com/wisemapping/config/mvc/MvcAppConfig.java index 6dfaaad2..6d3795c0 100644 --- a/wise-webapp/src/main/java/com/wisemapping/config/mvc/MvcAppConfig.java +++ b/wise-webapp/src/main/java/com/wisemapping/config/mvc/MvcAppConfig.java @@ -16,7 +16,6 @@ import org.springframework.web.servlet.view.JstlView; @SpringBootApplication @EnableWebMvc -@ImportResource(value = {"classpath:spring/wisemapping-servlet.xml"}) @ComponentScan("com.wisemapping.webmvc") public class MvcAppConfig implements WebMvcConfigurer { @Override diff --git a/wise-webapp/src/main/java/com/wisemapping/config/mvc/MvcSecurityConfig.java b/wise-webapp/src/main/java/com/wisemapping/config/mvc/MvcSecurityConfig.java index 25cdc898..a9855948 100644 --- a/wise-webapp/src/main/java/com/wisemapping/config/mvc/MvcSecurityConfig.java +++ b/wise-webapp/src/main/java/com/wisemapping/config/mvc/MvcSecurityConfig.java @@ -11,7 +11,6 @@ import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.servlet.util.matcher.MvcRequestMatcher; import org.springframework.web.servlet.handler.HandlerMappingIntrospector; - @Configuration @EnableWebSecurity public class MvcSecurityConfig { @@ -19,7 +18,6 @@ public class MvcSecurityConfig { @Bean @Order(1) public SecurityFilterChain embeddedDisabledXOrigin(@NotNull final HttpSecurity http, @NotNull final MvcRequestMatcher.Builder mvc) throws Exception { - http .securityMatchers((matchers) -> matchers.requestMatchers(mvc.pattern("/c/maps/*/embed"))) diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java b/wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java index e8c8dfb3..3ae26732 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java @@ -53,7 +53,7 @@ public class AccountController extends BaseController { @Autowired private LabelService labelService; - @RequestMapping(method = RequestMethod.PUT, value = "account/password", consumes = {"text/plain"}) + @RequestMapping(method = RequestMethod.PUT, value = "api/restfull/account/password", consumes = {"text/plain"}) @ResponseStatus(value = HttpStatus.NO_CONTENT) public void changePassword(@RequestBody String password) throws PasswordTooLongException { if (password == null) { @@ -75,7 +75,7 @@ public class AccountController extends BaseController { return new RestUser(user); } - @RequestMapping(method = RequestMethod.PUT, value = "account/firstname", consumes = {"text/plain"}) + @RequestMapping(method = RequestMethod.PUT, value = "api/restfull/account/firstname", consumes = {"text/plain"}) @ResponseStatus(value = HttpStatus.NO_CONTENT) public void changeFirstname(@RequestBody String firstname) { if (firstname == null) { @@ -87,7 +87,7 @@ public class AccountController extends BaseController { userService.updateUser(user); } - @RequestMapping(method = RequestMethod.PUT, value = "account/lastname", consumes = {"text/plain"}) + @RequestMapping(method = RequestMethod.PUT, value = "api/restfull/account/lastname", consumes = {"text/plain"}) @ResponseStatus(value = HttpStatus.NO_CONTENT) public void changeLastName(@RequestBody String lastname) { if (lastname == null) { @@ -99,7 +99,7 @@ public class AccountController extends BaseController { userService.updateUser(user); } - @RequestMapping(method = RequestMethod.PUT, value = "account/locale", consumes = {"text/plain"}) + @RequestMapping(method = RequestMethod.PUT, value = "api/restfull/account/locale", consumes = {"text/plain"}) @ResponseStatus(value = HttpStatus.NO_CONTENT) public void changeLanguage(@RequestBody String language) { if (language == null) { diff --git a/wise-webapp/src/main/webapp/WEB-INF/log4j2-stdout.xml b/wise-webapp/src/main/webapp/WEB-INF/log4j2-stdout.xml deleted file mode 100644 index cdcb0171..00000000 --- a/wise-webapp/src/main/webapp/WEB-INF/log4j2-stdout.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/wise-webapp/src/test/java/com/wisemapping/test/rest/RestHelper.java b/wise-webapp/src/test/java/com/wisemapping/test/rest/RestHelper.java index 2209b1ad..9c67648c 100644 --- a/wise-webapp/src/test/java/com/wisemapping/test/rest/RestHelper.java +++ b/wise-webapp/src/test/java/com/wisemapping/test/rest/RestHelper.java @@ -16,7 +16,7 @@ import java.util.List; public class RestHelper { public static final String HOST_PORT = "http://localhost:8080"; - public static final String BASE_REST_URL = HOST_PORT + "/service"; + public static final String BASE_REST_URL = HOST_PORT + "/api/restfull"; public static final String ADMIN_CREDENTIALS = "admin@wisemapping.org" + ":" + "test"; public static final String COLOR = "#000000";