From b88ce86638272641f2a83b09ce4cf1e56d62c36c Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Tue, 20 Jun 2017 17:20:00 +0300 Subject: [PATCH] Data annotation contains toString, equals and hashcode impls --- .../thingsboard/server/dao/cassandra/CassandraCluster.java | 2 +- .../thingsboard/server/dao/device/DeviceSearchQuery.java | 2 +- .../server/dao/model/sql/AdminSettingsEntity.java | 4 ---- .../org/thingsboard/server/dao/model/sql/AlarmEntity.java | 5 ----- .../org/thingsboard/server/dao/model/sql/AssetEntity.java | 5 ----- .../server/dao/model/sql/AttributeKvCompositeKey.java | 6 +++--- .../thingsboard/server/dao/model/sql/AttributeKvEntity.java | 4 ---- .../server/dao/model/sql/ComponentDescriptorEntity.java | 4 ---- .../thingsboard/server/dao/model/sql/CustomerEntity.java | 4 ---- .../thingsboard/server/dao/model/sql/DashboardEntity.java | 4 ---- .../server/dao/model/sql/DashboardInfoEntity.java | 4 ---- .../server/dao/model/sql/DeviceCredentialsEntity.java | 4 ---- .../org/thingsboard/server/dao/model/sql/DeviceEntity.java | 4 ---- .../org/thingsboard/server/dao/model/sql/EventEntity.java | 4 ---- .../server/dao/model/sql/PluginMetaDataEntity.java | 4 ---- .../server/dao/model/sql/RelationCompositeKey.java | 6 +++--- .../thingsboard/server/dao/model/sql/RelationEntity.java | 4 ---- .../server/dao/model/sql/RuleMetaDataEntity.java | 4 ---- .../server/dao/model/sql/TenantDeviceTypeEntity.java | 4 ---- .../org/thingsboard/server/dao/model/sql/TenantEntity.java | 4 ---- .../thingsboard/server/dao/model/sql/TsKvCompositeKey.java | 6 +++--- .../org/thingsboard/server/dao/model/sql/TsKvEntity.java | 4 ---- .../server/dao/model/sql/TsKvLatestCompositeKey.java | 2 -- .../thingsboard/server/dao/model/sql/TsKvLatestEntity.java | 4 ---- .../server/dao/model/sql/UserCredentialsEntity.java | 4 ---- .../org/thingsboard/server/dao/model/sql/UserEntity.java | 6 ------ .../thingsboard/server/dao/model/sql/WidgetTypeEntity.java | 4 ---- .../server/dao/model/sql/WidgetsBundleEntity.java | 4 ---- .../server/dao/sql/widget/JpaWidgetsBundleDaoTest.java | 1 - 29 files changed, 11 insertions(+), 106 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java b/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java index 8649122248..e3b6bfa786 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java +++ b/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 { diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceSearchQuery.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceSearchQuery.java index eb9d9dee3d..c57dd93694 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceSearchQuery.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java index 717caf52ff..e268c4577f 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AdminSettingsEntity.java +++ b/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 { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java index c6642d6dbd..d9f6623f0b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AlarmEntity.java +++ b/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 { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java index 6c05fb7879..bd24fbdd06 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AssetEntity.java +++ b/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 { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvCompositeKey.java index 830b73575d..7424e1fb89 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvCompositeKey.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java index dd3f28362f..2ea58afcf2 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/AttributeKvEntity.java +++ b/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, Serializable { @Id diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java index 2843762dcd..2da59a7552 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/ComponentDescriptorEntity.java +++ b/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 { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java index b9b810f667..12c4980092 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/CustomerEntity.java +++ b/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 { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java index 82c9fa1722..2153db2fa8 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardEntity.java +++ b/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 { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java index 9a2e5110e3..024c05be63 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DashboardInfoEntity.java +++ b/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 { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java index cf31775c67..cc36fc0159 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceCredentialsEntity.java +++ b/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 { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java index 02e8c2804a..06c90658ec 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/DeviceEntity.java +++ b/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 { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java index 7384e37e9b..033aaa5fdf 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EventEntity.java +++ b/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 { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java index 66617be1d4..3972310d3d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/PluginMetaDataEntity.java +++ b/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 { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java index 4333c5ec5b..21e6635be8 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationCompositeKey.java +++ b/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 diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java index 78c96d987c..3ee09d42ae 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RelationEntity.java +++ b/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 { @Id diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java index b1d47c75cb..6191672c9e 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/RuleMetaDataEntity.java +++ b/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 { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantDeviceTypeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantDeviceTypeEntity.java index db818a0fea..3b717505cc 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantDeviceTypeEntity.java +++ b/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; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java index 327ad26206..755ca8c64c 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TenantEntity.java +++ b/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 { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvCompositeKey.java index 87948df3b1..48fc75c152 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvCompositeKey.java +++ b/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 diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvEntity.java index 7d6901ddfa..603da6f3a4 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvEntity.java +++ b/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 { @Id diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestCompositeKey.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestCompositeKey.java index 32b02be80e..ab6006f610 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestCompositeKey.java +++ b/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 diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestEntity.java index 9abcdb9280..b9a4543e23 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/TsKvLatestEntity.java +++ b/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 { @Id diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java index 97d2a8c088..999b78b41b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserCredentialsEntity.java +++ b/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 { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java index 250d91ba63..f76b2d8da9 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/UserEntity.java +++ b/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 { @Transient private static final long serialVersionUID = -271106508790582977L; @@ -117,8 +113,6 @@ public class UserEntity implements SearchTextEntity { this.id = id; } - - @Override public User toData() { User user = new User(new UserId(id)); diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java index 93756536d7..4f96b6445a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetTypeEntity.java +++ b/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 { @Transient diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java index 2e50cd2d16..90b1b71303 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/WidgetsBundleEntity.java +++ b/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 { @Transient diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java index 9733d4bb7f..7a89644cd5 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java +++ b/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());