Skip to content

Commit 31501e4

Browse files
committed
Update HuaweiMessageClientImpl.java
1 parent 315c7c0 commit 31501e4

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

src/main/java/com/huawei/push/messaging/HuaweiMessageClientImpl.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@
2525
import com.huawei.push.reponse.SendResponse;
2626
import com.huawei.push.reponse.TopicListResponse;
2727
import com.huawei.push.reponse.TopicSendResponse;
28-
import com.huawei.push.util.ResponceCodeProcesser;
2928
import com.huawei.push.util.ValidatorUtils;
30-
3129
import org.apache.commons.lang3.StringUtils;
3230
import org.apache.http.client.HttpResponseException;
3331
import org.apache.http.client.methods.CloseableHttpResponse;
@@ -107,16 +105,16 @@ private SendResponse sendRequest(TopicMessage message, String operation, String
107105
SendResponse sendResponse;
108106
if (StringUtils.equals(operation, TopicOperation.LIST.getValue())) {
109107
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);
111109
} else {
112110
Integer failureCount = jsonObject.getInteger("failureCount");
113111
Integer successCount = jsonObject.getInteger("successCount");
114112
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);
116114
}
117115
return sendResponse;
118116
} 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);
120118
throw new HuaweiMesssagingException(HuaweiMessaging.KNOWN_ERROR, errorMsg);
121119
}
122120
}
@@ -150,9 +148,9 @@ private SendResponse sendRequest(Message message, boolean validateOnly, String a
150148
String msg = jsonObject.getString("msg");
151149
String requestId = jsonObject.getString("requestId");
152150
if (StringUtils.equals(code, "80000000")) {
153-
return SendResponse.fromCode(code, ResponceCodeProcesser.process(Integer.valueOf(code)), requestId);
151+
return SendResponse.fromCode(code, msg, requestId);
154152
} 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);
156154
throw new HuaweiMesssagingException(HuaweiMessaging.KNOWN_ERROR, errorMsg);
157155
}
158156
}

0 commit comments

Comments
 (0)