From 91bb1ed504af2c413863c9b95c4d5d1bf3c3563f Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Wed, 16 Dec 2020 11:21:28 +0200
Subject: [PATCH] refactored findEntityTimeseriesAndAttributesKeysByQuery

---
 .../thingsboard/server/controller/EntityQueryController.java    | 2 +-
 .../server/service/query/DefaultEntityQueryService.java         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java b/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java
index 4325d6f2be..2df8298d23 100644
--- a/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java
@@ -84,7 +84,7 @@ public class EntityQueryController extends BaseController {
     }
 
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
-    @RequestMapping(value = "/entitiesQuery/find/keys/timeseries", method = RequestMethod.POST)
+    @RequestMapping(value = "/entitiesQuery/find/keys", method = RequestMethod.POST)
     @ResponseBody
     public DeferredResult<ResponseEntity> findEntityTimeseriesAndAttributesKeysByQuery(@RequestBody EntityDataQuery query,
                                                                                        @RequestParam("timeseries") boolean isTimeseries,
diff --git a/application/src/main/java/org/thingsboard/server/service/query/DefaultEntityQueryService.java b/application/src/main/java/org/thingsboard/server/service/query/DefaultEntityQueryService.java
index d8be5040c9..74c1b844ef 100644
--- a/application/src/main/java/org/thingsboard/server/service/query/DefaultEntityQueryService.java
+++ b/application/src/main/java/org/thingsboard/server/service/query/DefaultEntityQueryService.java
@@ -203,7 +203,7 @@ public class DefaultEntityQueryService implements EntityQueryService {
 
     private void replyWithResponse(DeferredResult<ResponseEntity> response, Set<EntityType> types, List<String> timeseriesKeys, List<String> attributesKeys) {
         ObjectNode json = JacksonUtil.newObjectNode();
-        addItemsToArrayNode(json.putArray("types"), types);
+        addItemsToArrayNode(json.putArray("entityTypes"), types);
         addItemsToArrayNode(json.putArray("timeseriesKeys"), timeseriesKeys);
         addItemsToArrayNode(json.putArray("attributesKeys"), attributesKeys);
         response.setResult(new ResponseEntity(json, HttpStatus.OK));