Commit 6bfc1b8930941da05411dff59176c0d4471d889e

Authored by ShvaykaD
2 parents 12667d89 8e279bbb

Merge branch 'master' of github.com:thingsboard/thingsboard

@@ -1456,7 +1456,7 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable { @@ -1456,7 +1456,7 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
1456 params.put("relationTypeGroup", relationTypeGroup.name()); 1456 params.put("relationTypeGroup", relationTypeGroup.name());
1457 1457
1458 return restTemplate.exchange( 1458 return restTemplate.exchange(
1459 - baseURL + "/api/relations?toId={toId}&toType={toType}&relationTypeGroup={relationTypeGroup}", 1459 + baseURL + "/api/relations/info?toId={toId}&toType={toType}&relationTypeGroup={relationTypeGroup}",
1460 HttpMethod.GET, 1460 HttpMethod.GET,
1461 HttpEntity.EMPTY, 1461 HttpEntity.EMPTY,
1462 new ParameterizedTypeReference<List<EntityRelationInfo>>() { 1462 new ParameterizedTypeReference<List<EntityRelationInfo>>() {
@@ -1491,7 +1491,7 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable { @@ -1491,7 +1491,7 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
1491 1491
1492 public List<EntityRelationInfo> findInfoByQuery(EntityRelationsQuery query) { 1492 public List<EntityRelationInfo> findInfoByQuery(EntityRelationsQuery query) {
1493 return restTemplate.exchange( 1493 return restTemplate.exchange(
1494 - baseURL + "/api/relations", 1494 + baseURL + "/api/relations/info",
1495 HttpMethod.POST, 1495 HttpMethod.POST,
1496 new HttpEntity<>(query), 1496 new HttpEntity<>(query),
1497 new ParameterizedTypeReference<List<EntityRelationInfo>>() { 1497 new ParameterizedTypeReference<List<EntityRelationInfo>>() {