Data annotation contains toString, equals and hashcode impls

dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java

@@ -35,9 +35,9 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+@Data
 @Component
 @Slf4j
-@Data
 @NoSqlDao
 public class CassandraCluster {
 

dao/src/main/java/org/thingsboard/server/dao/device/DeviceSearchQuery.java

@@ -18,9 +18,9 @@ package org.thingsboard.server.dao.device;
 import lombok.Data;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.relation.EntityRelation;
-import org.thingsboard.server.dao.relation.RelationsSearchParameters;
 import org.thingsboard.server.dao.relation.EntityRelationsQuery;
 import org.thingsboard.server.dao.relation.EntityTypeFilter;
+import org.thingsboard.server.dao.relation.RelationsSearchParameters;
 
 import javax.annotation.Nullable;
 import java.util.Collections;

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

@@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql;
 import com.datastax.driver.core.utils.UUIDs;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.AdminSettings;
@@ -36,8 +34,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.*;
 @Entity
 @TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ADMIN_SETTINGS_COLUMN_FAMILY_NAME)
-@EqualsAndHashCode
-@ToString
 public final class AdminSettingsEntity implements BaseEntity<AdminSettings> {
 
     @Transient

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

@@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql;
 import com.datastax.driver.core.utils.UUIDs;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.EntityType;
@@ -31,7 +29,6 @@ import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.model.BaseEntity;
 import org.thingsboard.server.dao.model.ModelConstants;
-import org.thingsboard.server.dao.util.JacksonUtil;
 import org.thingsboard.server.dao.util.JsonStringType;
 
 import javax.persistence.*;
@@ -43,8 +40,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.*;
 @Entity
 @TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ALARM_COLUMN_FAMILY_NAME)
-@EqualsAndHashCode
-@ToString
 public final class AlarmEntity implements BaseEntity<Alarm> {
 
     @Transient

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

@@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql;
 import com.datastax.driver.core.utils.UUIDs;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.asset.Asset;
@@ -28,7 +26,6 @@ import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.dao.model.SearchTextEntity;
-import org.thingsboard.server.dao.util.JacksonUtil;
 import org.thingsboard.server.dao.util.JsonStringType;
 
 import javax.persistence.*;
@@ -40,8 +37,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.*;
 @Entity
 @TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ASSET_COLUMN_FAMILY_NAME)
-@EqualsAndHashCode
-@ToString
 public final class AssetEntity implements SearchTextEntity<Asset> {
 
     @Transient

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

@@ -15,7 +15,9 @@
  */
 package org.thingsboard.server.dao.model.sql;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.UUID;
@@ -23,8 +25,6 @@ import java.util.UUID;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@EqualsAndHashCode
-@ToString
 public class AttributeKvCompositeKey implements Serializable {
     private String entityType;
     private UUID entityId;

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

@@ -16,8 +16,6 @@
 package org.thingsboard.server.dao.model.sql;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.thingsboard.server.common.data.kv.*;
 import org.thingsboard.server.dao.model.ToData;
 
@@ -31,8 +29,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.*;
 @Entity
 @Table(name = "attribute_kv")
 @IdClass(AttributeKvCompositeKey.class)
-@EqualsAndHashCode
-@ToString
 public class AttributeKvEntity implements ToData<AttributeKvEntry>, Serializable {
 
     @Id

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

@@ -17,8 +17,6 @@ package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.id.ComponentDescriptorId;
@@ -36,8 +34,6 @@ import java.util.UUID;
 @Entity
 @TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.COMPONENT_DESCRIPTOR_COLUMN_FAMILY_NAME)
-@EqualsAndHashCode
-@ToString
 public class ComponentDescriptorEntity implements SearchTextEntity<ComponentDescriptor> {
 
     @Transient

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

@@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql;
 import com.datastax.driver.core.utils.UUIDs;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.Customer;
@@ -36,8 +34,6 @@ import java.util.UUID;
 @Entity
 @TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.CUSTOMER_COLUMN_FAMILY_NAME)
-@EqualsAndHashCode
-@ToString
 public final class CustomerEntity implements SearchTextEntity<Customer> {
 
     @Transient

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

@@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql;
 import com.datastax.driver.core.utils.UUIDs;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.Dashboard;
@@ -37,8 +35,6 @@ import java.util.UUID;
 @Entity
 @TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME)
-@EqualsAndHashCode
-@ToString
 public final class DashboardEntity implements SearchTextEntity<Dashboard> {
 
     @Transient

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

@@ -17,8 +17,6 @@ package org.thingsboard.server.dao.model.sql;
 
 import com.datastax.driver.core.utils.UUIDs;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.thingsboard.server.common.data.DashboardInfo;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DashboardId;
@@ -32,8 +30,6 @@ import java.util.UUID;
 @Data
 @Entity
 @Table(name = ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME)
-@EqualsAndHashCode
-@ToString
 public class DashboardInfoEntity implements SearchTextEntity<DashboardInfo> {
 
     @Transient

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

@@ -17,8 +17,6 @@ package org.thingsboard.server.dao.model.sql;
 
 import com.datastax.driver.core.utils.UUIDs;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.thingsboard.server.common.data.id.DeviceCredentialsId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
@@ -32,8 +30,6 @@ import java.util.UUID;
 @Data
 @Entity
 @Table(name = ModelConstants.DEVICE_CREDENTIALS_COLUMN_FAMILY_NAME)
-@EqualsAndHashCode
-@ToString
 public final class DeviceCredentialsEntity implements BaseEntity<DeviceCredentials> {
 
     @Transient

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

@@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql;
 import com.datastax.driver.core.utils.UUIDs;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.Device;
@@ -37,8 +35,6 @@ import java.util.UUID;
 @Entity
 @TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.DEVICE_COLUMN_FAMILY_NAME)
-@EqualsAndHashCode
-@ToString
 public final class DeviceEntity implements SearchTextEntity<Device> {
 
     @Transient

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

@@ -18,9 +18,7 @@ package org.thingsboard.server.dao.model.sql;
 import com.datastax.driver.core.utils.UUIDs;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import lombok.ToString;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.EntityType;
@@ -39,8 +37,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.*;
 @TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = EVENT_COLUMN_FAMILY_NAME)
 @NoArgsConstructor
-@EqualsAndHashCode
-@ToString
 public class EventEntity implements BaseEntity<Event> {
 
     @Transient

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

@@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql;
 import com.datastax.driver.core.utils.UUIDs;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.id.PluginId;
@@ -37,8 +35,6 @@ import java.util.UUID;
 @Entity
 @TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.PLUGIN_COLUMN_FAMILY_NAME)
-@EqualsAndHashCode
-@ToString
 public class PluginMetaDataEntity implements SearchTextEntity<PluginMetaData> {
 
     @Transient

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

@@ -15,7 +15,9 @@
  */
 package org.thingsboard.server.dao.model.sql;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.thingsboard.server.common.data.relation.EntityRelation;
 
 import javax.persistence.Transient;
@@ -25,8 +27,6 @@ import java.util.UUID;
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
-@EqualsAndHashCode
-@ToString
 public class RelationCompositeKey implements Serializable {
 
     @Transient

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

@@ -17,8 +17,6 @@ package org.thingsboard.server.dao.model.sql;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
@@ -37,8 +35,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.*;
 @TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = RELATION_COLUMN_FAMILY_NAME)
 @IdClass(RelationCompositeKey.class)
-@EqualsAndHashCode
-@ToString
 public final class RelationEntity implements ToData<EntityRelation> {
 
     @Id

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

@@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql;
 import com.datastax.driver.core.utils.UUIDs;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.id.RuleId;
@@ -38,8 +36,6 @@ import java.util.UUID;
 @Entity
 @TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.RULE_COLUMN_FAMILY_NAME)
-@EqualsAndHashCode
-@ToString
 public class RuleMetaDataEntity implements SearchTextEntity<RuleMetaData> {
 
     @Transient

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

@@ -17,15 +17,11 @@ package org.thingsboard.server.dao.model.sql;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 
 import java.util.UUID;
 
 @AllArgsConstructor
 @Data
-@EqualsAndHashCode
-@ToString
 public class TenantDeviceTypeEntity {
     private UUID tenantId;
     private String type;

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

@@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql;
 import com.datastax.driver.core.utils.UUIDs;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.Tenant;
@@ -35,8 +33,6 @@ import java.util.UUID;
 @Entity
 @TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.TENANT_COLUMN_FAMILY_NAME)
-@EqualsAndHashCode
-@ToString
 public final class TenantEntity implements SearchTextEntity<Tenant> {
 
     @Transient

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

@@ -15,7 +15,9 @@
  */
 package org.thingsboard.server.dao.model.sql;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import javax.persistence.Transient;
 import java.io.Serializable;
@@ -24,8 +26,6 @@ import java.util.UUID;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@EqualsAndHashCode
-@ToString
 public class TsKvCompositeKey implements Serializable{
 
     @Transient

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

@@ -16,8 +16,6 @@
 package org.thingsboard.server.dao.model.sql;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.dao.model.ToData;
 
@@ -30,8 +28,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.*;
 @Entity
 @Table(name = "ts_kv")
 @IdClass(TsKvCompositeKey.class)
-@EqualsAndHashCode
-@ToString
 public final class TsKvEntity implements ToData<TsKvEntry> {
 
     @Id

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

@@ -24,8 +24,6 @@ import java.util.UUID;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode
-@ToString
 public class TsKvLatestCompositeKey implements Serializable{
 
     @Transient

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

@@ -16,8 +16,6 @@
 package org.thingsboard.server.dao.model.sql;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.thingsboard.server.common.data.kv.*;
 import org.thingsboard.server.dao.model.ToData;
 
@@ -30,8 +28,6 @@ import static org.thingsboard.server.dao.model.ModelConstants.*;
 @Entity
 @Table(name = "ts_kv_latest")
 @IdClass(TsKvLatestCompositeKey.class)
-@EqualsAndHashCode
-@ToString
 public final class TsKvLatestEntity implements ToData<TsKvEntry> {
 
     @Id

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

@@ -17,8 +17,6 @@ package org.thingsboard.server.dao.model.sql;
 
 import com.datastax.driver.core.utils.UUIDs;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.thingsboard.server.common.data.id.UserCredentialsId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.security.UserCredentials;
@@ -31,8 +29,6 @@ import java.util.UUID;
 @Data
 @Entity
 @Table(name = ModelConstants.USER_CREDENTIALS_COLUMN_FAMILY_NAME)
-@EqualsAndHashCode
-@ToString
 public final class UserCredentialsEntity implements BaseEntity<UserCredentials> {
 
     @Transient

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

@@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql;
 import com.datastax.driver.core.utils.UUIDs;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.User;
@@ -41,8 +39,6 @@ import java.util.UUID;
 @Entity
 @TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.USER_PG_HIBERNATE_COLUMN_FAMILY_NAME)
-@EqualsAndHashCode
-@ToString
 public class UserEntity implements SearchTextEntity<User> {
     @Transient
     private static final long serialVersionUID = -271106508790582977L;
@@ -117,8 +113,6 @@ public class UserEntity implements SearchTextEntity<User> {
         this.id = id;
     }
 
-
-
     @Override
     public User toData() {
         User user = new User(new UserId(id));

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

@@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql;
 import com.datastax.driver.core.utils.UUIDs;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.hibernate.annotations.Type;
 import org.hibernate.annotations.TypeDef;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -36,8 +34,6 @@ import java.util.UUID;
 @Entity
 @TypeDef(name = "json", typeClass = JsonStringType.class)
 @Table(name = ModelConstants.WIDGET_TYPE_COLUMN_FAMILY_NAME)
-@EqualsAndHashCode
-@ToString
 public final class WidgetTypeEntity implements BaseEntity<WidgetType> {
 
     @Transient

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

@@ -18,8 +18,6 @@ package org.thingsboard.server.dao.model.sql;
 
 import com.datastax.driver.core.utils.UUIDs;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.WidgetsBundleId;
 import org.thingsboard.server.common.data.widget.WidgetsBundle;
@@ -32,8 +30,6 @@ import java.util.UUID;
 @Data
 @Entity
 @Table(name = ModelConstants.WIDGETS_BUNDLE_COLUMN_FAMILY_NAME)
-@EqualsAndHashCode
-@ToString
 public final class WidgetsBundleEntity implements SearchTextEntity<WidgetsBundle> {
 
     @Transient

dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java

@@ -60,7 +60,6 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
 
     @Test
     @DatabaseSetup(value = "classpath:dbunit/widgets_bundle.xml", type= DatabaseOperation.DELETE_ALL)
-   // @DatabaseTearDown(value = "classpath:dbunit/empty_dataset.xml", type= DatabaseOperation.DELETE_ALL)
     public void testFindSystemWidgetsBundles() {
         createSystemWidgetBundles(30, "WB_");
         assertEquals(30, widgetsBundleDao.find().size());