treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

IMDGMessageResolver добавил номер ошибки в текст

Browse source
This commit is contained in:
AKurakin 2023-05-31 15:30:20 +03:00
parent 29b7bd7f38
commit 329e2dda28
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
clearing-parent/clearing-validation/src/main/java/ru/spcex/clearing/util/services/IMDGMessageResolver.java
View file

@ -28,12 +28,13 @@ public class IMDGMessageResolver implements IMessageResolver {
if (errMsg == null) return "null"; if (errMsg == null) return "null";
Supplier<String> simplFormatter = () -> String.format("(%d) args %s", errMsg.getSubject().getId(), Arrays.toString(errMsg.getArgs())); Supplier<String> simplFormatter = () -> String.format("(%d) args %s", errMsg.getSubject().getId(), Arrays.toString(errMsg.getArgs()));
try { try {
ErrorCodeDictionary errorDictionary = errorCodeDictionaryIMDG.getSingleObjectByID(errMsg.getSubject().getId()); Long errId = errMsg.getSubject().getId();
ErrorCodeDictionary errorDictionary = errorCodeDictionaryIMDG.getSingleObjectByID(errId);
if (errorDictionary == null) { if (errorDictionary == null) {
log.warn("ERROR_CODE_DICTIONARY not found for id={}", errMsg.getSubject().getId()); log.warn("ERROR_CODE_DICTIONARY not found for id={}", errMsg.getSubject().getId());
return simplFormatter.get(); return simplFormatter.get();
} }
String textTemplate = errorDictionary.getName(); String textTemplate = errId + " " + errorDictionary.getName();
return String.format(textTemplate, errMsg.getArgs()); return String.format(textTemplate, errMsg.getArgs());
} catch (Exception errFormatting) { // MissingFormatArgumentException } catch (Exception errFormatting) { // MissingFormatArgumentException
log.warn("Error in message resolver for error {} id {}. Format error: {}", errMsg.getSubject(), errMsg.getSubject().getId(), errFormatting); log.warn("Error in message resolver for error {} id {}. Format error: {}", errMsg.getSubject(), errMsg.getSubject().getId(), errFormatting);

4
clearing-parent/clearing-validation/src/test/java/ru/spcex/clearing/util/services/IMDGMessageResolverTest.java
View file

@ -31,11 +31,11 @@ class IMDGMessageResolverTest {
IErrorEnumId err1 = ClearingErrorInternalTest.TestError; IErrorEnumId err1 = ClearingErrorInternalTest.TestError;
{ {
String text = resolver.resolve(new EnumMessage(err1, "a", "and", "b")); String text = resolver.resolve(new EnumMessage(err1, "a", "and", "b"));
assertEquals("Error 1 test. Two arg a, and.", text); assertEquals("1 Error 1 test. Two arg a, and.", text);
} }
{ {
String text = resolver.resolve(new EnumMessage(err1, "a", "and")); String text = resolver.resolve(new EnumMessage(err1, "a", "and"));
assertEquals("Error 1 test. Two arg a, and.", text); assertEquals("1 Error 1 test. Two arg a, and.", text);
} }
{ {
String text = resolver.resolve(new EnumMessage(err1, "one only this")); String text = resolver.resolve(new EnumMessage(err1, "one only this"));