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

clearing-validation http://git.mfd.msk/mfd/clearing/-/issues/12 IMDGMessageResolver поправил при работе с некорректными текстами ошибок (когда кол-во аргументов не совпадает, выдаёт более человекочитаемый текст + warn

Browse source
This commit is contained in:
AKurakin 2023-09-26 16:00:09 +03:00
parent 0761de4b7e
commit b9b3013b2d
2 changed files with 55 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,7 @@ import ru.spcex.platform.utils.enumeration.EnumMessage;
import ru.spcex.platform.utils.enumeration.IMessageResolver; import ru.spcex.platform.utils.enumeration.IMessageResolver;
import java.util.Arrays; import java.util.Arrays;
import java.util.MissingFormatArgumentException;
import java.util.function.Supplier; import java.util.function.Supplier;
/** /**
@ -35,7 +36,22 @@ public class IMDGMessageResolver implements IMessageResolver {
return simplFormatter.get(); return simplFormatter.get();
} }
String textTemplate = errId + " " + errorDictionary.getName(); String textTemplate = errId + " " + errorDictionary.getName();
return String.format(textTemplate, errMsg.getArgs()); try {
return String.format(textTemplate, errMsg.getArgs());
} catch (MissingFormatArgumentException errFormatting) { // MissingFormatArgumentException
int argExpected = 0;
int i = 0, li = -1;
while ((i = textTemplate.indexOf("%", i)) >= 0 && i != li) {
argExpected++;
li = i;
i++;
}
log.warn("Error dictionary {} text \"{}\" contains {} argument position, but message contains only: {}",
errId, textTemplate, argExpected, errMsg.getArgs().length);
Object[] arg = Arrays.copyOf(errMsg.getArgs(), Math.max(errMsg.getArgs().length, argExpected));
for (i = errMsg.getArgs().length; i < arg.length; i++) arg[i] = " ";
return String.format(textTemplate, arg);
}
} 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);
return simplFormatter.get(); return simplFormatter.get();

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

@ -16,15 +16,26 @@ class IMDGMessageResolverTest {
@Test @Test
void resolve() { void resolve() {
ImdgProvider imdgProvider = Mockito.mock(ImdgProvider.class); ImdgProvider imdgProvider = Mockito.mock(ImdgProvider.class);
Imdg<ErrorCodeDictionary> errorCodeDictionary = Mockito.mock(Imdg.class); {
ErrorCodeDictionary error1Dict = new ErrorCodeDictionary(); Imdg<ErrorCodeDictionary> errorCodeDictionary = Mockito.mock(Imdg.class);
error1Dict.setId(1L); ErrorCodeDictionary error1Dict = new ErrorCodeDictionary();
error1Dict.setCode("TEST"); error1Dict.setId(1L);
error1Dict.setName("Error 1 test. Two arg %s, %s."); error1Dict.setCode("TEST");
Mockito.when(errorCodeDictionary.getSingleObjectByID(1L)).thenReturn(error1Dict); error1Dict.setName("Error 1 test. Two arg %s, %s.");
Mockito.when(imdgProvider.getImdg(IMDGDistributedNames.Map_ErrorCodeDictionary, ErrorCodeDictionary.class)) Mockito.when(errorCodeDictionary.getSingleObjectByID(1L)).thenReturn(error1Dict);
.thenReturn(errorCodeDictionary); ErrorCodeDictionary error2Dict = new ErrorCodeDictionary();
error2Dict.setId(2L);
error2Dict.setCode("TEST");
error2Dict.setName("Error 2 test. Two ar \\%QW.");
Mockito.when(errorCodeDictionary.getSingleObjectByID(2L)).thenReturn(error2Dict);
ErrorCodeDictionary error3Dict = new ErrorCodeDictionary();
error3Dict.setId(3L);
error3Dict.setCode("TEST");
error3Dict.setName("Error 3 test only.");
Mockito.when(errorCodeDictionary.getSingleObjectByID(3L)).thenReturn(error3Dict);
Mockito.when(imdgProvider.getImdg(IMDGDistributedNames.Map_ErrorCodeDictionary, ErrorCodeDictionary.class))
.thenReturn(errorCodeDictionary);
}
IMDGMessageResolver resolver = new IMDGMessageResolver(imdgProvider); IMDGMessageResolver resolver = new IMDGMessageResolver(imdgProvider);
@ -39,20 +50,32 @@ class IMDGMessageResolverTest {
} }
{ {
String text = resolver.resolve(new EnumMessage(err1, "one only this")); String text = resolver.resolve(new EnumMessage(err1, "one only this"));
//assertEquals("Error 1 test. Two arg one only this, %s.", text); assertEquals("1 Error 1 test. Two arg one only this, .", text);
// java.util.MissingFormatArgumentException: Format specifier '%s' // java.util.MissingFormatArgumentException: Format specifier '%s'
assertEquals("(1) args [one only this]", text); // assertEquals("(1) args [one only this]", text);
} }
{ {
String text = resolver.resolve(new EnumMessage(err1)); String text = resolver.resolve(new EnumMessage(err1));
//assertEquals("Error 1 test. Two arg %s, %s.", text); assertEquals("1 Error 1 test. Two arg , .", text);
// java.util.MissingFormatArgumentException: Format specifier '%s' // java.util.MissingFormatArgumentException: Format specifier '%s'
assertEquals("(1) args []", text); // assertEquals("(1) args []", text);
}
{
String text = resolver.resolve(new EnumMessage(ClearingErrorInternalTest.TestError2, "text"));
// java.util.UnknownFormatConversionException: Conversion = 'Q'
assertEquals("(2) args [text]", text);
}
{
String text = resolver.resolve(new EnumMessage(ClearingErrorInternalTest.TestError3, "text"));
assertEquals("3 Error 3 test only.", text);
text = resolver.resolve(new EnumMessage(ClearingErrorInternalTest.TestError3));
assertEquals("3 Error 3 test only.", text);
} }
} }
static enum ClearingErrorInternalTest implements IErrorEnumId { // see ClearingErrorInternal enum ClearingErrorInternalTest implements IErrorEnumId { // see ClearingErrorInternal
TestError(1L); TestError(1L), TestError2(2L), TestError3(3L);
private final Long id; private final Long id;
ClearingErrorInternalTest(Long id) { ClearingErrorInternalTest(Long id) {