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

Rest Client improvements

Browse Source
This commit is contained in:
YevhenBondarenko 2020-02-19 15:39:22 +02:00
parent 308fa1fd8c
commit 64e0c42ab7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/src/main/java/org/thingsboard/client/tools/RestClient.java
View File

@ -1317,8 +1317,8 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
return restTemplate.postForEntity(baseURL + "/api/entityView", entityView, EntityView.class).getBody(); return restTemplate.postForEntity(baseURL + "/api/entityView", entityView, EntityView.class).getBody();
} }
public void deleteEntityView(String entityViewId) { public void deleteEntityView(EntityViewId entityViewId) {
restTemplate.delete(baseURL + "/api/entityView/{entityViewId}", entityViewId); restTemplate.delete(baseURL + "/api/entityView/{entityViewId}", entityViewId.getId());
} }
public Optional<EntityView> getTenantEntityView(String entityViewName) { public Optional<EntityView> getTenantEntityView(String entityViewName) {
@ -1445,14 +1445,14 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
restTemplate.postForLocation(baseURL + "/api/plugins/rpc/oneway/{deviceId}", requestBody, deviceId.getId()); restTemplate.postForLocation(baseURL + "/api/plugins/rpc/oneway/{deviceId}", requestBody, deviceId.getId());
} }
public JsonNode handleTwoWayDeviceRPCRequest(String deviceId, JsonNode requestBody) { public JsonNode handleTwoWayDeviceRPCRequest(DeviceId deviceId, JsonNode requestBody) {
return restTemplate.exchange( return restTemplate.exchange(
baseURL + "/api/plugins/rpc/twoway/{deviceId}", baseURL + "/api/plugins/rpc/twoway/{deviceId}",
HttpMethod.POST, HttpMethod.POST,
new HttpEntity<>(requestBody), new HttpEntity<>(requestBody),
new ParameterizedTypeReference<JsonNode>() { new ParameterizedTypeReference<JsonNode>() {
}, },
deviceId).getBody(); deviceId.getId()).getBody();
} }
public Optional<RuleChain> getRuleChainById(RuleChainId ruleChainId) { public Optional<RuleChain> getRuleChainById(RuleChainId ruleChainId) {
@ -1917,7 +1917,7 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
}).getBody(); }).getBody();
} }
public Optional<WidgetType> getWidgetTypeById(WidgetsBundleId widgetTypeId) { public Optional<WidgetType> getWidgetTypeById(WidgetTypeId widgetTypeId) {
try { try {
ResponseEntity<WidgetType> widgetType = ResponseEntity<WidgetType> widgetType =
restTemplate.getForEntity(baseURL + "/api/widgetType/{widgetTypeId}", WidgetType.class, widgetTypeId.getId()); restTemplate.getForEntity(baseURL + "/api/widgetType/{widgetTypeId}", WidgetType.class, widgetTypeId.getId());