Revert changes to UserCredentials

common/data/src/main/java/org/thingsboard/server/common/data/security/UserCredentials.java

@@ -16,12 +16,12 @@
 package org.thingsboard.server.common.data.security;
 
 import lombok.EqualsAndHashCode;
-import org.thingsboard.server.common.data.SearchTextBasedWithAdditionalInfo;
+import org.thingsboard.server.common.data.BaseData;
 import org.thingsboard.server.common.data.id.UserCredentialsId;
 import org.thingsboard.server.common.data.id.UserId;
 
 @EqualsAndHashCode(callSuper = true)
-public class UserCredentials extends SearchTextBasedWithAdditionalInfo<UserCredentialsId> {
+public class UserCredentials extends BaseData<UserCredentialsId> {
 
     private static final long serialVersionUID = -2108436378880529163L;
 
@@ -87,11 +87,6 @@ public class UserCredentials extends SearchTextBasedWithAdditionalInfo<UserCrede
     public void setResetToken(String resetToken) {
         this.resetToken = resetToken;
     }
-    
-    @Override
-    public String getSearchText() {
-        return null;
-    }
 
     @Override
     public String toString() {

dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java

@@ -15,18 +15,14 @@
  */
 package org.thingsboard.server.dao.model.sql;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.id.UserCredentialsId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.security.UserCredentials;
 import org.thingsboard.server.dao.model.BaseEntity;
 import org.thingsboard.server.dao.model.BaseSqlEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.mapping.JsonStringType;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -35,7 +31,6 @@ import java.util.UUID;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TypeDef(name = "json", typeClass = JsonStringType.class)
 @Entity
 @Table(name = ModelConstants.USER_CREDENTIALS_COLUMN_FAMILY_NAME)
 public final class UserCredentialsEntity extends BaseSqlEntity<UserCredentials> implements BaseEntity<UserCredentials> {
@@ -55,10 +50,6 @@ public final class UserCredentialsEntity extends BaseSqlEntity<UserCredentials>
     @Column(name = ModelConstants.USER_CREDENTIALS_RESET_TOKEN_PROPERTY, unique = true)
     private String resetToken;
 
-    @Type(type = "json")
-    @Column(name = ModelConstants.ADDITIONAL_INFO_PROPERTY)
-    private JsonNode additionalInfo;
-
     public UserCredentialsEntity() {
         super();
     }
@@ -75,7 +66,6 @@ public final class UserCredentialsEntity extends BaseSqlEntity<UserCredentials>
         this.password = userCredentials.getPassword();
         this.activateToken = userCredentials.getActivateToken();
         this.resetToken = userCredentials.getResetToken();
-        this.additionalInfo = userCredentials.getAdditionalInfo();
     }
 
     @Override
@@ -89,7 +79,6 @@ public final class UserCredentialsEntity extends BaseSqlEntity<UserCredentials>
         userCredentials.setPassword(password);
         userCredentials.setActivateToken(activateToken);
         userCredentials.setResetToken(resetToken);
-        userCredentials.setAdditionalInfo(additionalInfo);
         return userCredentials;
     }
 

dao/src/main/resources/sql/schema-entities.sql

@@ -370,8 +370,7 @@ CREATE TABLE IF NOT EXISTS user_credentials (
     enabled boolean,
     password varchar(255),
     reset_token varchar(255) UNIQUE,
-    user_id uuid UNIQUE,
+    user_id uuid UNIQUE
-    additional_info varchar
 );
 
 CREATE TABLE IF NOT EXISTS widget_type (