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

Changed exception responses elemnt names

Browse source
This commit is contained in:
Mikhail Trofimov 2025-07-03 17:24:31 +03:00
parent a72930d1af
commit 7c4e81b18f
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ru/nbch/credit_tracker/config/rest/GlobalExceptionHandler.java
View file

@ -24,7 +24,7 @@ public class GlobalExceptionHandler {
headers.setContentType(new MediaType("application", "xml", Charset.forName("windows-1251"))); headers.setContentType(new MediaType("application", "xml", Charset.forName("windows-1251")));
CommonError commonError = getCommonError(ex); CommonError commonError = getCommonError(ex);
commonError.setStatus("error"); commonError.setStatus("error");
commonError.setErrorCode(ex.getErrorMessage().getSubject().getErrorCode()); commonError.setErrorCode(ex.getErrorMessage().getSubject().getCode());
commonError.setErrorText(messageResolver.resolve(ex.getErrorMessage())); commonError.setErrorText(messageResolver.resolve(ex.getErrorMessage()));
if (ex instanceof SignalClientException) { if (ex instanceof SignalClientException) {

4
src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringDownloadError.java
View file

@ -17,9 +17,9 @@ public class MonitoringDownloadError implements CommonError {
@XmlElement(name = "Status", required = true) @XmlElement(name = "Status", required = true)
protected String status; protected String status;
@XmlElement(name = "ErrorCode",required = true) @XmlElement(name = "Code",required = true)
protected String errorCode; protected String errorCode;
@XmlElement(name = "ErrorText",required = true) @XmlElement(name = "Message",required = true)
protected String errorText; protected String errorText;
} }

4
src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringReportListError.java
View file

@ -17,9 +17,9 @@ public class MonitoringReportListError implements CommonError {
@XmlElement(name = "Status", required = true) @XmlElement(name = "Status", required = true)
protected String status; protected String status;
@XmlElement(name = "ErrorCode",required = true) @XmlElement(name = "Code",required = true)
protected String errorCode; protected String errorCode;
@XmlElement(name = "ErrorText",required = true) @XmlElement(name = "Message",required = true)
protected String errorText; protected String errorText;
} }

6
src/main/java/ru/nbch/credit_tracker/utils/error/SimpleMessageResolver.java
View file

@ -8,6 +8,10 @@ import java.util.Arrays;
public class SimpleMessageResolver { public class SimpleMessageResolver {
public String resolve(EnumKeyMessage errorMessage) { public String resolve(EnumKeyMessage errorMessage) {
if (errorMessage == null) return "null"; if (errorMessage == null) return "null";
return String.format("%s %s", errorMessage.getSubject().getKey(), Arrays.toString(errorMessage.getArgs())); if(errorMessage.getArgs().length == 0) {
return errorMessage.getSubject().getKey();
} else {
return String.format("%s %s", errorMessage.getSubject().getKey(), Arrays.toString(errorMessage.getArgs()));
}
} }
} }