dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HttpClientErrorException -> RestClientResponseException

Browse Source
This commit is contained in:
Yuriy Lytvynchuk 2022-08-16 16:30:01 +03:00
parent 6e5a782518
commit 145fabf18e
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbHttpClient.java
View File

@ -39,9 +39,7 @@ import org.springframework.util.StringUtils;
import org.springframework.util.concurrent.ListenableFuture; import org.springframework.util.concurrent.ListenableFuture;
import org.springframework.util.concurrent.ListenableFutureCallback; import org.springframework.util.concurrent.ListenableFutureCallback;
import org.springframework.web.client.AsyncRestTemplate; import org.springframework.web.client.AsyncRestTemplate;
import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestClientResponseException;
import org.springframework.web.client.HttpServerErrorException;
import org.springframework.web.client.UnknownHttpStatusCodeException;
import org.springframework.web.util.UriComponentsBuilder; import org.springframework.web.util.UriComponentsBuilder;
import org.thingsboard.rule.engine.api.TbContext; import org.thingsboard.rule.engine.api.TbContext;
import org.thingsboard.rule.engine.api.TbNodeException; import org.thingsboard.rule.engine.api.TbNodeException;
@ -263,21 +261,11 @@ public class TbHttpClient {
private TbMsg processException(TbContext ctx, TbMsg origMsg, Throwable e) { private TbMsg processException(TbContext ctx, TbMsg origMsg, Throwable e) {
TbMsgMetaData metaData = origMsg.getMetaData(); TbMsgMetaData metaData = origMsg.getMetaData();
metaData.putValue(ERROR, e.getClass() + ": " + e.getMessage()); metaData.putValue(ERROR, e.getClass() + ": " + e.getMessage());
if (e instanceof HttpClientErrorException) { if (e instanceof RestClientResponseException) {
HttpClientErrorException httpClientErrorException = (HttpClientErrorException) e; RestClientResponseException restClientResponseException = (RestClientResponseException) e;
metaData.putValue(STATUS, httpClientErrorException.getStatusText()); metaData.putValue(STATUS, restClientResponseException.getStatusText());
metaData.putValue(STATUS_CODE, httpClientErrorException.getRawStatusCode() + ""); metaData.putValue(STATUS_CODE, restClientResponseException.getRawStatusCode() + "");
metaData.putValue(ERROR_BODY, httpClientErrorException.getResponseBodyAsString()); metaData.putValue(ERROR_BODY, restClientResponseException.getResponseBodyAsString());
} else if (e instanceof HttpServerErrorException) {
HttpServerErrorException httpServerErrorException = (HttpServerErrorException) e;
metaData.putValue(STATUS, httpServerErrorException.getStatusText());
metaData.putValue(STATUS_CODE, httpServerErrorException.getRawStatusCode() + "");
metaData.putValue(ERROR_BODY, httpServerErrorException.getResponseBodyAsString());
} else if (e instanceof UnknownHttpStatusCodeException) {
UnknownHttpStatusCodeException unknownHttpStatusCodeException = (UnknownHttpStatusCodeException) e;
metaData.putValue(STATUS, unknownHttpStatusCodeException.getStatusText());
metaData.putValue(STATUS_CODE, unknownHttpStatusCodeException.getRawStatusCode() + "");
metaData.putValue(ERROR_BODY, unknownHttpStatusCodeException.getResponseBodyAsString());
} }
return ctx.transformMsg(origMsg, origMsg.getType(), origMsg.getOriginator(), metaData, origMsg.getData()); return ctx.transformMsg(origMsg, origMsg.getType(), origMsg.getOriginator(), metaData, origMsg.getData());
} }