From 922847baf6fac4a00dbbf0d53ec8e4407e249973 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Fri, 26 Jul 2024 14:03:49 +0200
Subject: [PATCH] minor refactoring

---
 .../dao/model/sql/AttributeKvEntity.java      | 18 ++++++-----
 .../server/dao/model/sql/RelationEntity.java  |  8 +++--
 .../server/dao/model/sql/VersionedEntity.java | 30 -------------------
 3 files changed, 15 insertions(+), 41 deletions(-)
 delete mode 100644 dao/src/main/java/org/thingsboard/server/dao/model/sql/VersionedEntity.java

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 d7bd23db4d..615932ddde 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
@@ -15,8 +15,12 @@
  */
 package org.thingsboard.server.dao.model.sql;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
 import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
 import org.thingsboard.server.common.data.kv.BooleanDataEntry;
@@ -27,11 +31,6 @@ import org.thingsboard.server.common.data.kv.LongDataEntry;
 import org.thingsboard.server.common.data.kv.StringDataEntry;
 import org.thingsboard.server.dao.model.ToData;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.EmbeddedId;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import jakarta.persistence.Transient;
 import java.io.Serializable;
 
 import static org.thingsboard.server.dao.model.ModelConstants.BOOLEAN_VALUE_COLUMN;
@@ -40,12 +39,12 @@ import static org.thingsboard.server.dao.model.ModelConstants.JSON_VALUE_COLUMN;
 import static org.thingsboard.server.dao.model.ModelConstants.LAST_UPDATE_TS_COLUMN;
 import static org.thingsboard.server.dao.model.ModelConstants.LONG_VALUE_COLUMN;
 import static org.thingsboard.server.dao.model.ModelConstants.STRING_VALUE_COLUMN;
+import static org.thingsboard.server.dao.model.ModelConstants.VERSION_COLUMN;
 
 @Data
-@EqualsAndHashCode(callSuper = true)
 @Entity
 @Table(name = "attribute_kv")
-public class AttributeKvEntity extends VersionedEntity implements ToData<AttributeKvEntry>, Serializable {
+public class AttributeKvEntity implements ToData<AttributeKvEntry>, Serializable {
 
     @EmbeddedId
     private AttributeKvCompositeKey id;
@@ -68,6 +67,9 @@ public class AttributeKvEntity extends VersionedEntity implements ToData<Attribu
     @Column(name = LAST_UPDATE_TS_COLUMN)
     private Long lastUpdateTs;
 
+    @Column(name = VERSION_COLUMN)
+    private Long version;
+
     @Transient
     protected String strKey;
 
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 2aa5c3e573..bc4e837314 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
@@ -23,7 +23,6 @@ import jakarta.persistence.Id;
 import jakarta.persistence.IdClass;
 import jakarta.persistence.Table;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.relation.RelationTypeGroup;
@@ -40,13 +39,13 @@ import static org.thingsboard.server.dao.model.ModelConstants.RELATION_TO_ID_PRO
 import static org.thingsboard.server.dao.model.ModelConstants.RELATION_TO_TYPE_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.RELATION_TYPE_GROUP_PROPERTY;
 import static org.thingsboard.server.dao.model.ModelConstants.RELATION_TYPE_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.VERSION_COLUMN;
 
-@EqualsAndHashCode(callSuper = true)
 @Data
 @Entity
 @Table(name = RELATION_TABLE_NAME)
 @IdClass(RelationCompositeKey.class)
-public final class RelationEntity extends VersionedEntity implements ToData<EntityRelation> {
+public final class RelationEntity implements ToData<EntityRelation> {
 
     @Id
     @Column(name = RELATION_FROM_ID_PROPERTY, columnDefinition = "uuid")
@@ -72,6 +71,9 @@ public final class RelationEntity extends VersionedEntity implements ToData<Enti
     @Column(name = RELATION_TYPE_PROPERTY)
     private String relationType;
 
+    @Column(name = VERSION_COLUMN)
+    private Long version;
+
     @Convert(converter = JsonConverter.class)
     @Column(name = ADDITIONAL_INFO_PROPERTY)
     private JsonNode additionalInfo;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/VersionedEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/VersionedEntity.java
deleted file mode 100644
index 2dfee6466a..0000000000
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/VersionedEntity.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Copyright © 2016-2024 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.dao.model.sql;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.MappedSuperclass;
-import lombok.Data;
-
-import static org.thingsboard.server.dao.model.ModelConstants.VERSION_COLUMN;
-
-@Data
-@MappedSuperclass
-public abstract class VersionedEntity {
-
-    @Column(name = VERSION_COLUMN)
-    protected Long version;
-}