Fix merge

common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseEntityAttributeKvEntry.java

@@ -19,26 +19,21 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.thingsboard.server.common.data.EntityType;
 
+import java.util.UUID;
+
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class BaseEntityAttributeKvEntry extends BaseAttributeKvEntry implements EntityAttributeKvEntry {
 
-    private final EntityType entityType;
-    private final String entityId;
+    private final UUID entityId;
 
-    public BaseEntityAttributeKvEntry(EntityType entityType, String entityId, long lastUpdateTs, KvEntry kv) {
+    public BaseEntityAttributeKvEntry(UUID entityId, long lastUpdateTs, KvEntry kv) {
         super(kv, lastUpdateTs);
-        this.entityType = entityType;
         this.entityId = entityId;
     }
 
     @Override
-    public EntityType getEntityType() {
-        return entityType;
-    }
-
-    @Override
-    public String getEntityId() {
+    public UUID getEntityId() {
         return entityId;
     }
 }

common/data/src/main/java/org/thingsboard/server/common/data/kv/EntityAttributeKvEntry.java

@@ -15,10 +15,9 @@
  */
 package org.thingsboard.server.common.data.kv;
 
-import org.thingsboard.server.common.data.EntityType;
+import java.util.UUID;
 
 public interface EntityAttributeKvEntry extends AttributeKvEntry {
 
-    EntityType getEntityType();
-    String getEntityId();
+    UUID getEntityId();
 }

dao/src/main/java/org/thingsboard/server/dao/lock/LockServiceImpl.java

@@ -31,7 +31,9 @@ public class LockServiceImpl implements LockService {
 
     @PostConstruct
     public void init(){
-        log.warn("Locking with DB is not enabled.");
+        if (lockRepository == null) {
+            log.warn("Locking with DB is not enabled.");
+        }
     }
 
     @Override

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

@@ -89,6 +89,6 @@ public class AttributeKvEntity implements ToData<AttributeKvEntry>, Serializable
             kvEntry = new JsonDataEntry(id.getAttributeKey(), jsonValue);
         }
 
-        return new BaseEntityAttributeKvEntry(id.getEntityType(), id.getEntityId(), lastUpdateTs, kvEntry);
+        return new BaseEntityAttributeKvEntry(id.getEntityId(), lastUpdateTs, kvEntry);
     };
 }

dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java

@@ -333,14 +333,14 @@ public class OAuth2ServiceImpl implements OAuth2Service {
     @Override
     public Map<TenantId, OAuth2ClientsParams> getAllOAuth2ClientsParams() {
         OAuth2ClientsParams systemOAuth2ClientsParams = getSystemOAuth2ClientsParams();
-        ListenableFuture<Map<String, String>> jsonFuture = getAllOAuth2ClientsParamsAttribute();
+        ListenableFuture<Map<UUID, String>> jsonFuture = getAllOAuth2ClientsParamsAttribute();
         try {
             return Futures.transform(jsonFuture,
                     clientsParamsByKvEntryKey -> {
                         Map<TenantId, OAuth2ClientsParams> tenantClientParams = clientsParamsByKvEntryKey != null ?
                                 clientsParamsByKvEntryKey.entrySet().stream()
                                         .collect(Collectors.toMap(
-                                                entry -> new TenantId(UUIDConverter.fromString(entry.getKey())),
+                                                entry -> new TenantId(entry.getKey()),
                                                 entry -> constructOAuth2ClientsParams(entry.getValue())
                                         ))
                                 : new HashMap<>();
@@ -405,7 +405,7 @@ public class OAuth2ServiceImpl implements OAuth2Service {
     }
 
     // TODO maybe it's better to load all tenants and get attribute for each one
-    private ListenableFuture<Map<String, String>> getAllOAuth2ClientsParamsAttribute() {
+    private ListenableFuture<Map<UUID, String>> getAllOAuth2ClientsParamsAttribute() {
         ListenableFuture<List<EntityAttributeKvEntry>> entityAttributeKvEntriesFuture;
         try {
             entityAttributeKvEntriesFuture = attributesService.findAllByAttributeKey(OAUTH2_CLIENT_REGISTRATIONS_PARAMS);

dao/src/main/java/org/thingsboard/server/dao/sql/lock/PsqlLockRepository.java

@@ -20,10 +20,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Repository;
 import org.thingsboard.server.dao.util.PsqlDao;
-import org.thingsboard.server.dao.util.SqlDao;
 
 @Slf4j
-@SqlDao
 @PsqlDao
 @Repository
 public class PsqlLockRepository implements LockRepository {