From c21a442e033a4e0cc56fda607252876cc9b00e8c Mon Sep 17 00:00:00 2001 From: Yuriy Lytvynchuk Date: Mon, 18 Jul 2022 15:58:00 +0300 Subject: [PATCH 1/4] processException extension for tbHttpClient --- .../thingsboard/rule/engine/rest/TbHttpClient.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbHttpClient.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbHttpClient.java index e035d415ed..d2becf8e3e 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbHttpClient.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbHttpClient.java @@ -40,6 +40,8 @@ import org.springframework.util.concurrent.ListenableFuture; import org.springframework.util.concurrent.ListenableFutureCallback; import org.springframework.web.client.AsyncRestTemplate; import org.springframework.web.client.HttpClientErrorException; +import org.springframework.web.client.HttpServerErrorException; +import org.springframework.web.client.UnknownHttpStatusCodeException; import org.springframework.web.util.UriComponentsBuilder; import org.thingsboard.rule.engine.api.TbContext; import org.thingsboard.rule.engine.api.TbNodeException; @@ -266,6 +268,16 @@ public class TbHttpClient { metaData.putValue(STATUS, httpClientErrorException.getStatusText()); metaData.putValue(STATUS_CODE, httpClientErrorException.getRawStatusCode() + ""); metaData.putValue(ERROR_BODY, httpClientErrorException.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()); } From 626f4c71d74b1c367ea05ad2e9a3e12a230032c3 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 19 Jul 2022 13:06:35 +0300 Subject: [PATCH 2/4] Version set to 3.4.0 --- application/pom.xml | 2 +- common/actor/pom.xml | 2 +- common/cache/pom.xml | 2 +- common/cluster-api/pom.xml | 2 +- common/coap-server/pom.xml | 2 +- common/dao-api/pom.xml | 2 +- common/data/pom.xml | 2 +- common/edge-api/pom.xml | 2 +- common/message/pom.xml | 2 +- common/pom.xml | 2 +- common/queue/pom.xml | 2 +- common/stats/pom.xml | 2 +- common/transport/coap/pom.xml | 2 +- common/transport/http/pom.xml | 2 +- common/transport/lwm2m/pom.xml | 2 +- common/transport/mqtt/pom.xml | 2 +- common/transport/pom.xml | 2 +- common/transport/snmp/pom.xml | 2 +- common/transport/transport-api/pom.xml | 2 +- common/util/pom.xml | 2 +- common/version-control/pom.xml | 2 +- dao/pom.xml | 2 +- msa/black-box-tests/pom.xml | 2 +- msa/js-executor/pom.xml | 2 +- msa/pom.xml | 2 +- msa/tb-node/pom.xml | 2 +- msa/tb/pom.xml | 2 +- msa/transport/coap/pom.xml | 2 +- msa/transport/http/pom.xml | 2 +- msa/transport/lwm2m/pom.xml | 2 +- msa/transport/mqtt/pom.xml | 2 +- msa/transport/pom.xml | 2 +- msa/transport/snmp/pom.xml | 2 +- msa/vc-executor-docker/pom.xml | 2 +- msa/vc-executor/pom.xml | 2 +- msa/web-ui/pom.xml | 2 +- netty-mqtt/pom.xml | 4 ++-- pom.xml | 2 +- rest-client/pom.xml | 2 +- rule-engine/pom.xml | 2 +- rule-engine/rule-engine-api/pom.xml | 2 +- rule-engine/rule-engine-components/pom.xml | 2 +- tools/pom.xml | 2 +- transport/coap/pom.xml | 2 +- transport/http/pom.xml | 2 +- transport/lwm2m/pom.xml | 2 +- transport/mqtt/pom.xml | 2 +- transport/pom.xml | 2 +- transport/snmp/pom.xml | 2 +- ui-ngx/pom.xml | 2 +- 50 files changed, 51 insertions(+), 51 deletions(-) diff --git a/application/pom.xml b/application/pom.xml index 6d1e009d00..bdc87aea52 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 thingsboard application diff --git a/common/actor/pom.xml b/common/actor/pom.xml index a06fa00b55..3936ea3c2d 100644 --- a/common/actor/pom.xml +++ b/common/actor/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 common org.thingsboard.common diff --git a/common/cache/pom.xml b/common/cache/pom.xml index b52984e0fc..223d713da1 100644 --- a/common/cache/pom.xml +++ b/common/cache/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 common org.thingsboard.common diff --git a/common/cluster-api/pom.xml b/common/cluster-api/pom.xml index b531f26597..52c83c45a1 100644 --- a/common/cluster-api/pom.xml +++ b/common/cluster-api/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 common org.thingsboard.common diff --git a/common/coap-server/pom.xml b/common/coap-server/pom.xml index fad7c87420..3f1af6cae7 100644 --- a/common/coap-server/pom.xml +++ b/common/coap-server/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 common org.thingsboard.common diff --git a/common/dao-api/pom.xml b/common/dao-api/pom.xml index 931d7dc6d4..4c6adfae43 100644 --- a/common/dao-api/pom.xml +++ b/common/dao-api/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 common org.thingsboard.common diff --git a/common/data/pom.xml b/common/data/pom.xml index 539dd0d9e3..5bf0bb2da8 100644 --- a/common/data/pom.xml +++ b/common/data/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 common org.thingsboard.common diff --git a/common/edge-api/pom.xml b/common/edge-api/pom.xml index 0381a19de9..3da6451021 100644 --- a/common/edge-api/pom.xml +++ b/common/edge-api/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 common org.thingsboard.common diff --git a/common/message/pom.xml b/common/message/pom.xml index 3948f8e7b8..435b1ee283 100644 --- a/common/message/pom.xml +++ b/common/message/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 common org.thingsboard.common diff --git a/common/pom.xml b/common/pom.xml index 62bb46e81c..a07c8b4f44 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 thingsboard common diff --git a/common/queue/pom.xml b/common/queue/pom.xml index e2197d566f..d1af4c88af 100644 --- a/common/queue/pom.xml +++ b/common/queue/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 common org.thingsboard.common diff --git a/common/stats/pom.xml b/common/stats/pom.xml index 7802793d64..8ff13853d8 100644 --- a/common/stats/pom.xml +++ b/common/stats/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 common org.thingsboard.common diff --git a/common/transport/coap/pom.xml b/common/transport/coap/pom.xml index 98cf0b807a..3fa5a33e0e 100644 --- a/common/transport/coap/pom.xml +++ b/common/transport/coap/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard.common - 3.4.0-SNAPSHOT + 3.4.0 transport org.thingsboard.common.transport diff --git a/common/transport/http/pom.xml b/common/transport/http/pom.xml index 1096d58f2a..9de3742c94 100644 --- a/common/transport/http/pom.xml +++ b/common/transport/http/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard.common - 3.4.0-SNAPSHOT + 3.4.0 transport org.thingsboard.common.transport diff --git a/common/transport/lwm2m/pom.xml b/common/transport/lwm2m/pom.xml index 2fb1f533aa..3a1aa00c7d 100644 --- a/common/transport/lwm2m/pom.xml +++ b/common/transport/lwm2m/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard.common - 3.4.0-SNAPSHOT + 3.4.0 transport org.thingsboard.common.transport diff --git a/common/transport/mqtt/pom.xml b/common/transport/mqtt/pom.xml index c029e7c9ac..52a0385d35 100644 --- a/common/transport/mqtt/pom.xml +++ b/common/transport/mqtt/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard.common - 3.4.0-SNAPSHOT + 3.4.0 transport org.thingsboard.common.transport diff --git a/common/transport/pom.xml b/common/transport/pom.xml index a061c963f4..e3c708d7dc 100644 --- a/common/transport/pom.xml +++ b/common/transport/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 common org.thingsboard.common diff --git a/common/transport/snmp/pom.xml b/common/transport/snmp/pom.xml index ee1d8f2a0d..676ef242bc 100644 --- a/common/transport/snmp/pom.xml +++ b/common/transport/snmp/pom.xml @@ -21,7 +21,7 @@ org.thingsboard.common - 3.4.0-SNAPSHOT + 3.4.0 transport diff --git a/common/transport/transport-api/pom.xml b/common/transport/transport-api/pom.xml index 51373e2a4a..7bdb9c2769 100644 --- a/common/transport/transport-api/pom.xml +++ b/common/transport/transport-api/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard.common - 3.4.0-SNAPSHOT + 3.4.0 transport org.thingsboard.common.transport diff --git a/common/util/pom.xml b/common/util/pom.xml index 147497ef04..a79f3caf51 100644 --- a/common/util/pom.xml +++ b/common/util/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 common org.thingsboard.common diff --git a/common/version-control/pom.xml b/common/version-control/pom.xml index 998ae0879b..1ed63af4f3 100644 --- a/common/version-control/pom.xml +++ b/common/version-control/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 common org.thingsboard.common diff --git a/dao/pom.xml b/dao/pom.xml index 1528a74869..3a1725766e 100644 --- a/dao/pom.xml +++ b/dao/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 thingsboard dao diff --git a/msa/black-box-tests/pom.xml b/msa/black-box-tests/pom.xml index 29279b0bed..b4ebbacbff 100644 --- a/msa/black-box-tests/pom.xml +++ b/msa/black-box-tests/pom.xml @@ -21,7 +21,7 @@ org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 msa org.thingsboard.msa diff --git a/msa/js-executor/pom.xml b/msa/js-executor/pom.xml index 3ecf153f51..43cdbd2c7f 100644 --- a/msa/js-executor/pom.xml +++ b/msa/js-executor/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 msa org.thingsboard.msa diff --git a/msa/pom.xml b/msa/pom.xml index dd40348bc8..f1f7615693 100644 --- a/msa/pom.xml +++ b/msa/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 thingsboard msa diff --git a/msa/tb-node/pom.xml b/msa/tb-node/pom.xml index f451f84b4e..58a232c261 100644 --- a/msa/tb-node/pom.xml +++ b/msa/tb-node/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 msa org.thingsboard.msa diff --git a/msa/tb/pom.xml b/msa/tb/pom.xml index a69b358e64..cc8ef5c628 100644 --- a/msa/tb/pom.xml +++ b/msa/tb/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 msa org.thingsboard.msa diff --git a/msa/transport/coap/pom.xml b/msa/transport/coap/pom.xml index 2e633016bf..4e4690af96 100644 --- a/msa/transport/coap/pom.xml +++ b/msa/transport/coap/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard.msa - 3.4.0-SNAPSHOT + 3.4.0 transport org.thingsboard.msa.transport diff --git a/msa/transport/http/pom.xml b/msa/transport/http/pom.xml index 76cd3e9725..f7a68b825f 100644 --- a/msa/transport/http/pom.xml +++ b/msa/transport/http/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard.msa - 3.4.0-SNAPSHOT + 3.4.0 transport org.thingsboard.msa.transport diff --git a/msa/transport/lwm2m/pom.xml b/msa/transport/lwm2m/pom.xml index 51a019f45f..7ff560f9fe 100644 --- a/msa/transport/lwm2m/pom.xml +++ b/msa/transport/lwm2m/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard.msa - 3.4.0-SNAPSHOT + 3.4.0 transport org.thingsboard.msa.transport diff --git a/msa/transport/mqtt/pom.xml b/msa/transport/mqtt/pom.xml index 5f84fc3693..bd0a2d1efd 100644 --- a/msa/transport/mqtt/pom.xml +++ b/msa/transport/mqtt/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard.msa - 3.4.0-SNAPSHOT + 3.4.0 transport org.thingsboard.msa.transport diff --git a/msa/transport/pom.xml b/msa/transport/pom.xml index ca73383c39..4165623f85 100644 --- a/msa/transport/pom.xml +++ b/msa/transport/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 msa org.thingsboard.msa diff --git a/msa/transport/snmp/pom.xml b/msa/transport/snmp/pom.xml index 4156ee9b90..f87b030c13 100644 --- a/msa/transport/snmp/pom.xml +++ b/msa/transport/snmp/pom.xml @@ -21,7 +21,7 @@ org.thingsboard.msa transport - 3.4.0-SNAPSHOT + 3.4.0 org.thingsboard.msa.transport diff --git a/msa/vc-executor-docker/pom.xml b/msa/vc-executor-docker/pom.xml index 39fc35f32a..1cfb44f32f 100644 --- a/msa/vc-executor-docker/pom.xml +++ b/msa/vc-executor-docker/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 msa org.thingsboard.msa diff --git a/msa/vc-executor/pom.xml b/msa/vc-executor/pom.xml index 0125354371..b8fecca06b 100644 --- a/msa/vc-executor/pom.xml +++ b/msa/vc-executor/pom.xml @@ -21,7 +21,7 @@ org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 msa org.thingsboard.msa diff --git a/msa/web-ui/pom.xml b/msa/web-ui/pom.xml index 24039f8aa3..85a699fd66 100644 --- a/msa/web-ui/pom.xml +++ b/msa/web-ui/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 msa org.thingsboard.msa diff --git a/netty-mqtt/pom.xml b/netty-mqtt/pom.xml index 662d677f8b..25b79512fb 100644 --- a/netty-mqtt/pom.xml +++ b/netty-mqtt/pom.xml @@ -19,11 +19,11 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 thingsboard netty-mqtt - 3.4.0-SNAPSHOT + 3.4.0 jar Netty MQTT Client diff --git a/pom.xml b/pom.xml index cb2264773d..07cf428191 100755 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard thingsboard - 3.4.0-SNAPSHOT + 3.4.0 pom Thingsboard diff --git a/rest-client/pom.xml b/rest-client/pom.xml index 40c07c965f..4311238237 100644 --- a/rest-client/pom.xml +++ b/rest-client/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 thingsboard rest-client diff --git a/rule-engine/pom.xml b/rule-engine/pom.xml index 44ee42a487..f756afc1fc 100644 --- a/rule-engine/pom.xml +++ b/rule-engine/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 thingsboard rule-engine diff --git a/rule-engine/rule-engine-api/pom.xml b/rule-engine/rule-engine-api/pom.xml index 8a30088dcd..f849983ba1 100644 --- a/rule-engine/rule-engine-api/pom.xml +++ b/rule-engine/rule-engine-api/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 rule-engine org.thingsboard.rule-engine diff --git a/rule-engine/rule-engine-components/pom.xml b/rule-engine/rule-engine-components/pom.xml index ebbfffc1b3..5b0c84c7e6 100644 --- a/rule-engine/rule-engine-components/pom.xml +++ b/rule-engine/rule-engine-components/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 rule-engine org.thingsboard.rule-engine diff --git a/tools/pom.xml b/tools/pom.xml index 802d479890..b7f990b114 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 thingsboard tools diff --git a/transport/coap/pom.xml b/transport/coap/pom.xml index 52569eed4a..ac6dc7b55f 100644 --- a/transport/coap/pom.xml +++ b/transport/coap/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 transport org.thingsboard.transport diff --git a/transport/http/pom.xml b/transport/http/pom.xml index 51fc2a6cef..dc69bc7980 100644 --- a/transport/http/pom.xml +++ b/transport/http/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 transport org.thingsboard.transport diff --git a/transport/lwm2m/pom.xml b/transport/lwm2m/pom.xml index adf3baba30..98ee9c3dc1 100644 --- a/transport/lwm2m/pom.xml +++ b/transport/lwm2m/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 transport org.thingsboard.transport diff --git a/transport/mqtt/pom.xml b/transport/mqtt/pom.xml index 8691e5db25..a7bc20e901 100644 --- a/transport/mqtt/pom.xml +++ b/transport/mqtt/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 transport org.thingsboard.transport diff --git a/transport/pom.xml b/transport/pom.xml index 267540e242..1decaabcd7 100644 --- a/transport/pom.xml +++ b/transport/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 thingsboard transport diff --git a/transport/snmp/pom.xml b/transport/snmp/pom.xml index 64a7ff0f29..77ad673be7 100644 --- a/transport/snmp/pom.xml +++ b/transport/snmp/pom.xml @@ -21,7 +21,7 @@ org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 transport diff --git a/ui-ngx/pom.xml b/ui-ngx/pom.xml index fce2719dc9..41d5792740 100644 --- a/ui-ngx/pom.xml +++ b/ui-ngx/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.thingsboard - 3.4.0-SNAPSHOT + 3.4.0 thingsboard org.thingsboard From 3365de9a2c63e6adc568412f38f185bb1b4c04cf Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 20 Jul 2022 13:28:31 +0300 Subject: [PATCH 3/4] Fix upgrade script --- .../server/service/install/update/DefaultDataUpdateService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java index cb560bb5ff..b90da586fc 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java +++ b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java @@ -156,8 +156,8 @@ public class DefaultDataUpdateService implements DataUpdateService { break; case "3.3.4": log.info("Updating data from version 3.3.4 to 3.4.0 ..."); - rateLimitsUpdater.updateEntities(); tenantsProfileQueueConfigurationUpdater.updateEntities(); + rateLimitsUpdater.updateEntities(); break; default: throw new RuntimeException("Unable to update data, unsupported fromVersion: " + fromVersion); From 145fabf18e7907fceabd3c054239f2e165874cd8 Mon Sep 17 00:00:00 2001 From: Yuriy Lytvynchuk Date: Tue, 16 Aug 2022 16:30:01 +0300 Subject: [PATCH 4/4] HttpClientErrorException -> RestClientResponseException --- .../rule/engine/rest/TbHttpClient.java | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbHttpClient.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbHttpClient.java index d2becf8e3e..925f71b026 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbHttpClient.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rest/TbHttpClient.java @@ -39,9 +39,7 @@ import org.springframework.util.StringUtils; import org.springframework.util.concurrent.ListenableFuture; import org.springframework.util.concurrent.ListenableFutureCallback; import org.springframework.web.client.AsyncRestTemplate; -import org.springframework.web.client.HttpClientErrorException; -import org.springframework.web.client.HttpServerErrorException; -import org.springframework.web.client.UnknownHttpStatusCodeException; +import org.springframework.web.client.RestClientResponseException; import org.springframework.web.util.UriComponentsBuilder; import org.thingsboard.rule.engine.api.TbContext; import org.thingsboard.rule.engine.api.TbNodeException; @@ -263,21 +261,11 @@ public class TbHttpClient { private TbMsg processException(TbContext ctx, TbMsg origMsg, Throwable e) { TbMsgMetaData metaData = origMsg.getMetaData(); metaData.putValue(ERROR, e.getClass() + ": " + e.getMessage()); - if (e instanceof HttpClientErrorException) { - HttpClientErrorException httpClientErrorException = (HttpClientErrorException) e; - metaData.putValue(STATUS, httpClientErrorException.getStatusText()); - metaData.putValue(STATUS_CODE, httpClientErrorException.getRawStatusCode() + ""); - metaData.putValue(ERROR_BODY, httpClientErrorException.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()); + if (e instanceof RestClientResponseException) { + RestClientResponseException restClientResponseException = (RestClientResponseException) e; + metaData.putValue(STATUS, restClientResponseException.getStatusText()); + metaData.putValue(STATUS_CODE, restClientResponseException.getRawStatusCode() + ""); + metaData.putValue(ERROR_BODY, restClientResponseException.getResponseBodyAsString()); } return ctx.transformMsg(origMsg, origMsg.getType(), origMsg.getOriginator(), metaData, origMsg.getData()); }