vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-22 06:07:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression bug.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2020-11-23 18:17:48 -08:00
parent 3ef7f6a7f0
commit 7a5b4ca75a
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java
View File

@ -25,6 +25,7 @@ import com.wisemapping.mail.NotificationService;
import com.wisemapping.model.User; import com.wisemapping.model.User;
import com.wisemapping.rest.model.RestErrors; import com.wisemapping.rest.model.RestErrors;
import com.wisemapping.security.Utils; import com.wisemapping.security.Utils;
import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
@ -42,6 +43,8 @@ import java.util.Locale;
public class BaseController { public class BaseController {
final private Logger logger = Logger.getLogger("com.wisemapping.rest");
@Qualifier("messageSource") @Qualifier("messageSource")
@Autowired @Autowired
private ResourceBundleMessageSource messageSource; private ResourceBundleMessageSource messageSource;
@ -56,8 +59,8 @@ public class BaseController {
@ResponseStatus(HttpStatus.BAD_REQUEST) @ResponseStatus(HttpStatus.BAD_REQUEST)
@ResponseBody @ResponseBody
public RestErrors handleClientErrors(@NotNull IllegalArgumentException ex) { public RestErrors handleClientErrors(@NotNull IllegalArgumentException ex) {
System.err.println(ex.getMessage()); logger.error(ex.getMessage(), ex);
return new RestErrors(ex.getMessage(),Severity.WARNING); return new RestErrors(ex.getMessage(), Severity.WARNING);
} }
@ExceptionHandler(ImportUnexpectedException.class) @ExceptionHandler(ImportUnexpectedException.class)
@ -66,7 +69,7 @@ public class BaseController {
public RestErrors handleImportErrors(@NotNull ImportUnexpectedException ex, @NotNull HttpServletRequest request) { public RestErrors handleImportErrors(@NotNull ImportUnexpectedException ex, @NotNull HttpServletRequest request) {
final User user = Utils.getUser(); final User user = Utils.getUser();
notificationService.reportJavaException(ex, user, new String(ex.getFreemindXml()), request); notificationService.reportJavaException(ex, user, new String(ex.getFreemindXml()), request);
return new RestErrors(ex.getMessage(),Severity.SEVERE); return new RestErrors(ex.getMessage(), Severity.SEVERE);
} }
@ExceptionHandler(ValidationException.class) @ExceptionHandler(ValidationException.class)
@ -78,7 +81,7 @@ public class BaseController {
@ExceptionHandler(JsonHttpMessageNotReadableException.class) @ExceptionHandler(JsonHttpMessageNotReadableException.class)
@ResponseStatus(HttpStatus.BAD_REQUEST) @ResponseStatus(HttpStatus.BAD_REQUEST)
public RestErrors handleJSONErrors(@NotNull JsonHttpMessageNotReadableException ex) { public RestErrors handleJSONErrors(@NotNull JsonHttpMessageNotReadableException ex) {
return new RestErrors("Communication error",Severity.SEVERE); return new RestErrors("Communication error", Severity.SEVERE);
} }
@ExceptionHandler(java.lang.reflect.UndeclaredThrowableException.class) @ExceptionHandler(java.lang.reflect.UndeclaredThrowableException.class)
@ -98,7 +101,7 @@ public class BaseController {
@ResponseStatus(HttpStatus.BAD_REQUEST) @ResponseStatus(HttpStatus.BAD_REQUEST)
public RestErrors handleClientErrors(@NotNull ClientException ex) { public RestErrors handleClientErrors(@NotNull ClientException ex) {
final Locale locale = LocaleContextHolder.getLocale(); final Locale locale = LocaleContextHolder.getLocale();
return new RestErrors(ex.getMessage(messageSource, locale),ex.getSeverity(),ex.getTechInfo()); return new RestErrors(ex.getMessage(messageSource, locale), ex.getSeverity(), ex.getTechInfo());
} }
@ExceptionHandler(Exception.class) @ExceptionHandler(Exception.class)
@ -108,7 +111,7 @@ public class BaseController {
final User user = Utils.getUser(false); final User user = Utils.getUser(false);
notificationService.reportJavaException(ex, user, request); notificationService.reportJavaException(ex, user, request);
ex.printStackTrace(); ex.printStackTrace();
return new RestErrors(ex.getMessage(),Severity.SEVERE); return new RestErrors(ex.getMessage(), Severity.SEVERE);
} }

2
wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
View File

@ -653,7 +653,7 @@ public class MindmapController extends BaseController {
if (found == null) { if (found == null) {
throw new LabelCouldNotFoundException("Label could not be found. Id: " + labelId); throw new LabelCouldNotFoundException("Label could not be found. Id: " + labelId);
} }
for (String id : ",".split(ids)) { for (String id : ids.split(",")) {
final int mindmapId = Integer.parseInt(id); final int mindmapId = Integer.parseInt(id);
final Mindmap mindmap = findMindmapById(mindmapId); final Mindmap mindmap = findMindmapById(mindmapId);
final Label label = mindmap.findLabel(labelId); final Label label = mindmap.findLabel(labelId);