Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Fix] Properly handle UserMessageException has a warning in services

This commit is contained in:
Robert von Burg 2021-08-30 21:58:24 +02:00
parent 9f44738eac
commit 1b18366090
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
li.strolch.agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java
View File

@ -1824,7 +1824,7 @@ public abstract class AbstractTransaction implements StrolchTransaction {
sb.append(", close="); //$NON-NLS-1$
sb.append(formatNanoDuration(closeDuration));
}
logger.error(sb.toString());
logger.warn(sb.toString());
}
private void handleFailure(boolean throwEx, long closeStartNanos, Exception e) {

9
li.strolch.agent/src/main/java/li/strolch/service/api/AbstractService.java
View File

@ -570,12 +570,15 @@ public abstract class AbstractService<T extends ServiceArgument, U extends Servi
} catch (Exception e) {
U result = getResultInstance();
result.setState(ServiceResultState.EXCEPTION);
result.setMessage(e.getMessage());
result.setThrowable(e);
if (e instanceof UserMessageException)
if (e instanceof UserMessageException) {
result.setState(ServiceResultState.WARNING);
result.setI18nMessage(((UserMessageException) e).getI18nMsg());
} else {
result.setState(ServiceResultState.FAILED);
result.setThrowable(e);
}
return result;
}

3
li.strolch.model/src/main/java/li/strolch/model/UserMessageException.java
View File

@ -1,5 +1,7 @@
package li.strolch.model;
import java.util.Locale;
import li.strolch.utils.I18nMessage;
import li.strolch.utils.dbc.DBC;
@ -8,6 +10,7 @@ public class UserMessageException extends Exception {
private final I18nMessage i18nMsg;
public UserMessageException(I18nMessage i18nMsg) {
super(i18nMsg.getMessage(Locale.getDefault()));
DBC.PRE.assertNotNull("i18nMsg must not be null!", i18nMsg);
this.i18nMsg = i18nMsg;
}