From 39070ead536873841e93caecf615da19e2e2875e Mon Sep 17 00:00:00 2001 From: dashevchenko Date: Thu, 16 Feb 2023 12:23:22 +0200 Subject: [PATCH] refactoring --- .../server/controller/UserController.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/controller/UserController.java b/application/src/main/java/org/thingsboard/server/controller/UserController.java index 711c67383d..7e768b747f 100644 --- a/application/src/main/java/org/thingsboard/server/controller/UserController.java +++ b/application/src/main/java/org/thingsboard/server/controller/UserController.java @@ -376,15 +376,11 @@ public class UserController extends BaseController { EntityDataQuery query = new EntityDataQuery(entityFilter, pageLink, entityFields, null, keyFilters); - try { - return entityQueryService.findEntityDataByQuery(securityUser, query).mapData(entityData -> - new UserData(UserId.fromString(entityData.getEntityId().getId().toString()), - entityData.getLatest().get(ENTITY_FIELD).get("email").getValue(), - entityData.getLatest().get(ENTITY_FIELD).get("firstName").getValue(), - entityData.getLatest().get(ENTITY_FIELD).get("lastName").getValue())); - } catch (Exception e) { - throw handleException(e); - } + return entityQueryService.findEntityDataByQuery(securityUser, query).mapData(entityData -> + new UserData(UserId.fromString(entityData.getEntityId().getId().toString()), + entityData.getLatest().get(ENTITY_FIELD).get("email").getValue(), + entityData.getLatest().get(ENTITY_FIELD).get("firstName").getValue(), + entityData.getLatest().get(ENTITY_FIELD).get("lastName").getValue())); } @ApiOperation(value = "Get Tenant Users (getTenantAdmins)",