Changed exception responses elemnt names
This commit is contained in:
parent
a72930d1af
commit
7c4e81b18f
4 changed files with 10 additions and 6 deletions
|
|
@ -24,7 +24,7 @@ public class GlobalExceptionHandler {
|
|||
headers.setContentType(new MediaType("application", "xml", Charset.forName("windows-1251")));
|
||||
CommonError commonError = getCommonError(ex);
|
||||
commonError.setStatus("error");
|
||||
commonError.setErrorCode(ex.getErrorMessage().getSubject().getErrorCode());
|
||||
commonError.setErrorCode(ex.getErrorMessage().getSubject().getCode());
|
||||
commonError.setErrorText(messageResolver.resolve(ex.getErrorMessage()));
|
||||
|
||||
if (ex instanceof SignalClientException) {
|
||||
|
|
|
|||
|
|
@ -17,9 +17,9 @@ public class MonitoringDownloadError implements CommonError {
|
|||
|
||||
@XmlElement(name = "Status", required = true)
|
||||
protected String status;
|
||||
@XmlElement(name = "ErrorCode",required = true)
|
||||
@XmlElement(name = "Code",required = true)
|
||||
protected String errorCode;
|
||||
@XmlElement(name = "ErrorText",required = true)
|
||||
@XmlElement(name = "Message",required = true)
|
||||
protected String errorText;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,9 +17,9 @@ public class MonitoringReportListError implements CommonError {
|
|||
|
||||
@XmlElement(name = "Status", required = true)
|
||||
protected String status;
|
||||
@XmlElement(name = "ErrorCode",required = true)
|
||||
@XmlElement(name = "Code",required = true)
|
||||
protected String errorCode;
|
||||
@XmlElement(name = "ErrorText",required = true)
|
||||
@XmlElement(name = "Message",required = true)
|
||||
protected String errorText;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,10 @@ import java.util.Arrays;
|
|||
public class SimpleMessageResolver {
|
||||
public String resolve(EnumKeyMessage errorMessage) {
|
||||
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()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue