From 58464c54dc9f529c43eeb190aecb9ee8148a3d05 Mon Sep 17 00:00:00 2001 From: vzikratyi Date: Mon, 3 Aug 2020 17:31:02 +0300 Subject: [PATCH] Fix merge --- .../data/kv/BaseEntityAttributeKvEntry.java | 15 +++++---------- .../common/data/kv/EntityAttributeKvEntry.java | 5 ++--- .../server/dao/lock/LockServiceImpl.java | 4 +++- .../server/dao/model/sql/AttributeKvEntity.java | 2 +- .../server/dao/oauth2/OAuth2ServiceImpl.java | 6 +++--- .../server/dao/sql/lock/PsqlLockRepository.java | 2 -- 6 files changed, 14 insertions(+), 20 deletions(-) diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseEntityAttributeKvEntry.java b/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseEntityAttributeKvEntry.java index aac91f5613..5c97acd90e 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseEntityAttributeKvEntry.java +++ b/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; } } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/kv/EntityAttributeKvEntry.java b/common/data/src/main/java/org/thingsboard/server/common/data/kv/EntityAttributeKvEntry.java index b62576b8e0..ceb6c62a3c 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/kv/EntityAttributeKvEntry.java +++ b/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(); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/lock/LockServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/lock/LockServiceImpl.java index 703a6686a8..ff1e052f97 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/lock/LockServiceImpl.java +++ b/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 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 7787f21830..c652a67469 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 @@ -89,6 +89,6 @@ public class AttributeKvEntity implements ToData, Serializable kvEntry = new JsonDataEntry(id.getAttributeKey(), jsonValue); } - return new BaseEntityAttributeKvEntry(id.getEntityType(), id.getEntityId(), lastUpdateTs, kvEntry); + return new BaseEntityAttributeKvEntry(id.getEntityId(), lastUpdateTs, kvEntry); }; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java index 90d19a19f3..df1cd5a049 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java @@ -333,14 +333,14 @@ public class OAuth2ServiceImpl implements OAuth2Service { @Override public Map getAllOAuth2ClientsParams() { OAuth2ClientsParams systemOAuth2ClientsParams = getSystemOAuth2ClientsParams(); - ListenableFuture> jsonFuture = getAllOAuth2ClientsParamsAttribute(); + ListenableFuture> jsonFuture = getAllOAuth2ClientsParamsAttribute(); try { return Futures.transform(jsonFuture, clientsParamsByKvEntryKey -> { Map 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> getAllOAuth2ClientsParamsAttribute() { + private ListenableFuture> getAllOAuth2ClientsParamsAttribute() { ListenableFuture> entityAttributeKvEntriesFuture; try { entityAttributeKvEntriesFuture = attributesService.findAllByAttributeKey(OAUTH2_CLIENT_REGISTRATIONS_PARAMS); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/lock/PsqlLockRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/lock/PsqlLockRepository.java index 0ae44edffa..76c4b6ebc8 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/lock/PsqlLockRepository.java +++ b/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 {