|
25 | 25 | import com.huawei.push.reponse.SendResponse; |
26 | 26 | import com.huawei.push.reponse.TopicListResponse; |
27 | 27 | import com.huawei.push.reponse.TopicSendResponse; |
28 | | -import com.huawei.push.util.ResponceCodeProcesser; |
29 | 28 | import com.huawei.push.util.ValidatorUtils; |
30 | | - |
31 | 29 | import org.apache.commons.lang3.StringUtils; |
32 | 30 | import org.apache.http.client.HttpResponseException; |
33 | 31 | import org.apache.http.client.methods.CloseableHttpResponse; |
@@ -107,16 +105,16 @@ private SendResponse sendRequest(TopicMessage message, String operation, String |
107 | 105 | SendResponse sendResponse; |
108 | 106 | if (StringUtils.equals(operation, TopicOperation.LIST.getValue())) { |
109 | 107 | JSONArray topics = jsonObject.getJSONArray("topics"); |
110 | | - sendResponse = TopicListResponse.fromCode(code, ResponceCodeProcesser.process(Integer.valueOf(code)), requestId, topics); |
| 108 | + sendResponse = TopicListResponse.fromCode(code, msg, requestId, topics); |
111 | 109 | } else { |
112 | 110 | Integer failureCount = jsonObject.getInteger("failureCount"); |
113 | 111 | Integer successCount = jsonObject.getInteger("successCount"); |
114 | 112 | JSONArray errors = jsonObject.getJSONArray("errors"); |
115 | | - sendResponse = TopicSendResponse.fromCode(code, ResponceCodeProcesser.process(Integer.valueOf(code)), requestId, failureCount, successCount, errors); |
| 113 | + sendResponse = TopicSendResponse.fromCode(code, msg, requestId, failureCount, successCount, errors); |
116 | 114 | } |
117 | 115 | return sendResponse; |
118 | 116 | } else { |
119 | | - String errorMsg = MessageFormat.format("error code : {0}, error message : {1}", String.valueOf(code), ResponceCodeProcesser.process(Integer.valueOf(code))); |
| 117 | + String errorMsg = MessageFormat.format("error code : {0}, error message : {1}", String.valueOf(code), msg); |
120 | 118 | throw new HuaweiMesssagingException(HuaweiMessaging.KNOWN_ERROR, errorMsg); |
121 | 119 | } |
122 | 120 | } |
@@ -150,9 +148,9 @@ private SendResponse sendRequest(Message message, boolean validateOnly, String a |
150 | 148 | String msg = jsonObject.getString("msg"); |
151 | 149 | String requestId = jsonObject.getString("requestId"); |
152 | 150 | if (StringUtils.equals(code, "80000000")) { |
153 | | - return SendResponse.fromCode(code, ResponceCodeProcesser.process(Integer.valueOf(code)), requestId); |
| 151 | + return SendResponse.fromCode(code, msg, requestId); |
154 | 152 | } else { |
155 | | - String errorMsg = MessageFormat.format("error code : {0}, error message : {1}", String.valueOf(code), ResponceCodeProcesser.process(Integer.valueOf(code))); |
| 153 | + String errorMsg = MessageFormat.format("error code : {0}, error message : {1}", String.valueOf(code), msg); |
156 | 154 | throw new HuaweiMesssagingException(HuaweiMessaging.KNOWN_ERROR, errorMsg); |
157 | 155 | } |
158 | 156 | } |
|
0 commit comments