renamed UserData to UserEmailInfo

application/src/main/java/org/thingsboard/server/controller/UserController.java

@@ -41,7 +41,7 @@ import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.MailService;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.UserData;
+import org.thingsboard.server.common.data.UserEmailInfo;
 import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.CustomerId;
@@ -51,7 +51,6 @@ import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.query.EntityDataPageLink;
 import org.thingsboard.server.common.data.query.EntityDataQuery;
-import org.thingsboard.server.common.data.query.EntityDataSortOrder;
 import org.thingsboard.server.common.data.query.EntityKey;
 import org.thingsboard.server.common.data.query.EntityTypeFilter;
 import org.thingsboard.server.common.data.query.TsValue;
@@ -76,7 +75,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import static org.thingsboard.server.common.data.StringUtils.isNotEmpty;
 import static org.thingsboard.server.common.data.query.EntityKeyType.ENTITY_FIELD;
 import static org.thingsboard.server.controller.ControllerConstants.CUSTOMER_ID;
 import static org.thingsboard.server.controller.ControllerConstants.CUSTOMER_ID_PARAM_DESCRIPTION;
@@ -327,7 +325,7 @@ public class UserController extends BaseController {
     @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/users/info", method = RequestMethod.GET)
     @ResponseBody
-    public PageData<UserData> findUsersByQuery(
+    public PageData<UserEmailInfo> findUsersByQuery(
             @ApiParam(value = PAGE_SIZE_DESCRIPTION, required = true)
             @RequestParam int pageSize,
             @ApiParam(value = PAGE_NUMBER_DESCRIPTION, required = true)
@@ -352,7 +350,7 @@ public class UserController extends BaseController {
         return entityQueryService.findEntityDataByQuery(securityUser, query).mapData(entityData ->
         {
             Map<String, TsValue> fieldValues = entityData.getLatest().get(ENTITY_FIELD);
-            return new UserData(UserId.fromString(entityData.getEntityId().getId().toString()),
+            return new UserEmailInfo(UserId.fromString(entityData.getEntityId().getId().toString()),
                     fieldValues.get("email").getValue(),
                     fieldValues.get("firstName").getValue(),
                     fieldValues.get("lastName").getValue());

application/src/test/java/org/thingsboard/server/controller/BaseUserControllerTest.java

@@ -18,7 +18,6 @@ package org.thingsboard.server.controller;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.jetbrains.annotations.NotNull;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Ignore;
@@ -35,7 +34,7 @@ import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.User;
-import org.thingsboard.server.common.data.UserData;
+import org.thingsboard.server.common.data.UserEmailInfo;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -64,7 +63,7 @@ import static org.thingsboard.server.dao.model.ModelConstants.SYSTEM_TENANT;
 public abstract class BaseUserControllerTest extends AbstractControllerTest {
 
     private IdComparator<User> idComparator = new IdComparator<>();
-    private IdComparator<UserData> userDataIdComparator = new IdComparator<>();
+    private IdComparator<UserEmailInfo> userDataIdComparator = new IdComparator<>();
 
     private CustomerId customerNUULId = (CustomerId) createEntityId_NULL_UUID(new Customer());
 
@@ -811,7 +810,7 @@ public abstract class BaseUserControllerTest extends AbstractControllerTest {
         createUserAndLogin(user2, "testPassword2");
 
         PageLink pageLink = new PageLink(10, 0, searchText);
-        List<UserData> usersInfo = getUsersInfo(pageLink);
+        List<UserEmailInfo> usersInfo = getUsersInfo(pageLink);
 
         Assert.assertEquals(usersInfo.size(), 0);
 
@@ -854,9 +853,9 @@ public abstract class BaseUserControllerTest extends AbstractControllerTest {
 
         // find users by search text
         PageLink pageLink = new PageLink(10, 0, searchText);
-        List<UserData> usersInfo = getUsersInfo(pageLink);
+        List<UserEmailInfo> usersInfo = getUsersInfo(pageLink);
 
-        List<UserData> expectedUserInfos = customerUsersContainingWord.stream().map(customerUser -> new UserData(customerUser.getId(),
+        List<UserEmailInfo> expectedUserInfos = customerUsersContainingWord.stream().map(customerUser -> new UserEmailInfo(customerUser.getId(),
                 customerUser.getEmail(), customerUser.getFirstName() == null ? "" : customerUser.getFirstName(),
                         customerUser.getLastName() == null ? "" : customerUser.getLastName()))
                 .sorted(userDataIdComparator).collect(Collectors.toList());
@@ -907,9 +906,9 @@ public abstract class BaseUserControllerTest extends AbstractControllerTest {
         // find users by search text
         loginUser(tenantAdmin.getEmail(), "testPassword1");
         PageLink pageLink = new PageLink(10, 0, searchText);
-        List<UserData> usersInfo = getUsersInfo(pageLink);
+        List<UserEmailInfo> usersInfo = getUsersInfo(pageLink);
 
-        List<UserData> expectedUserInfos = usersContainingWord.stream().map(customerUser -> new UserData(customerUser.getId(),
+        List<UserEmailInfo> expectedUserInfos = usersContainingWord.stream().map(customerUser -> new UserEmailInfo(customerUser.getId(),
                         customerUser.getEmail(), customerUser.getFirstName() == null ? "" : customerUser.getFirstName(),
                         customerUser.getLastName() == null ? "" : customerUser.getLastName()))
                 .sorted(userDataIdComparator).collect(Collectors.toList());
@@ -969,9 +968,9 @@ public abstract class BaseUserControllerTest extends AbstractControllerTest {
         return tenantAdmin;
     }
 
-    private List<UserData> getUsersInfo(PageLink pageLink) throws Exception {
+    private List<UserEmailInfo> getUsersInfo(PageLink pageLink) throws Exception {
-        List<UserData> loadedCustomerUsers = new ArrayList<>();
+        List<UserEmailInfo> loadedCustomerUsers = new ArrayList<>();
-        PageData<UserData> pageData = null;
+        PageData<UserEmailInfo> pageData = null;
         do {
             pageData = doGetTypedWithPageLink("/api/users/info?", new TypeReference<>() {}, pageLink);
             loadedCustomerUsers.addAll(pageData.getData());

common/data/src/main/java/org/thingsboard/server/common/data/UserData.java → common/data/src/main/java/org/thingsboard/server/common/data/UserEmailInfo.java

@@ -25,7 +25,7 @@ import org.thingsboard.server.common.data.id.UserId;
 @ApiModel
 @Data
 @AllArgsConstructor
-public class UserData implements HasId<UserId> {
+public class UserEmailInfo implements HasId<UserId> {
 
     @ApiModelProperty(position = 1, value = "User id")
     private UserId id;