From 80b47bafaa06a40683176d87251db6a72bf0dd42 Mon Sep 17 00:00:00 2001
From: Yuriy Lytvynchuk <yuriy.litv@gmail.com>
Date: Fri, 26 Aug 2022 10:07:25 +0300
Subject: [PATCH] refactor code

---
 .../server/dao/device/DeviceCredentialsService.java          | 4 +---
 .../server/dao/device/DeviceCredentialsServiceImpl.java      | 2 +-
 .../rule/engine/metadata/TbFetchDeviceCredentialsNode.java   | 5 ++---
 .../engine/metadata/TbFetchDeviceCredentialsNodeTest.java    | 3 +--
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsService.java
index ae082939d3..42d6d10a1a 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsService.java
@@ -20,8 +20,6 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import com.fasterxml.jackson.databind.JsonNode;
 
-import java.util.List;
-
 public interface DeviceCredentialsService {
 
     DeviceCredentials findDeviceCredentialsByDeviceId(TenantId tenantId, DeviceId deviceId);
@@ -34,7 +32,7 @@ public interface DeviceCredentialsService {
 
     void formatCredentials(DeviceCredentials deviceCredentials);
 
-    JsonNode credentialsInfo(DeviceCredentials deviceCredentials);
+    JsonNode toCredentialsInfo(DeviceCredentials deviceCredentials);
 
     void deleteDeviceCredentials(TenantId tenantId, DeviceCredentials deviceCredentials);
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java
index 001766e28f..c4cbabfb3d 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java
@@ -139,7 +139,7 @@ public class DeviceCredentialsServiceImpl extends AbstractCachedEntityService<St
     }
 
     @Override
-    public JsonNode credentialsInfo(DeviceCredentials deviceCredentials) {
+    public JsonNode toCredentialsInfo(DeviceCredentials deviceCredentials) {
         switch (deviceCredentials.getCredentialsType()) {
             case ACCESS_TOKEN:
                 return JacksonUtil.valueToTree(deviceCredentials.getCredentialsId());
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNode.java
index 650dd269b8..3de1510c1b 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNode.java
@@ -18,7 +18,6 @@ package org.thingsboard.rule.engine.metadata;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.BooleanUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.RuleNode;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -61,7 +60,7 @@ public class TbFetchDeviceCredentialsNode implements TbNode {
     @Override
     public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException {
         this.config = TbNodeUtils.convert(configuration, TbFetchDeviceCredentialsNodeConfiguration.class);
-        fetchToMetadata = BooleanUtils.toBooleanDefaultIfNull(config.isFetchToMetadata(), true);
+        this.fetchToMetadata = config.isFetchToMetadata();
     }
 
     @Override
@@ -80,7 +79,7 @@ public class TbFetchDeviceCredentialsNode implements TbNode {
 
         TbMsg transformedMsg;
         String credentialsType = deviceCredentials.getCredentialsType().name();
-        JsonNode credentialsInfo = ctx.getDeviceCredentialsService().credentialsInfo(deviceCredentials);
+        JsonNode credentialsInfo = ctx.getDeviceCredentialsService().toCredentialsInfo(deviceCredentials);
         if (fetchToMetadata) {
             TbMsgMetaData metaData = msg.getMetaData();
             metaData.putValue(CREDENTIALS_TYPE, credentialsType);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNodeTest.java
index b1e0c75482..0fc7799bca 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNodeTest.java
@@ -78,7 +78,7 @@ public class TbFetchDeviceCredentialsNodeTest {
         }).given(deviceCredentialsService).findDeviceCredentialsByDeviceId(any(), any());
         willAnswer(invocation -> {
             return JacksonUtil.newObjectNode();
-        }).given(deviceCredentialsService).credentialsInfo(any());
+        }).given(deviceCredentialsService).toCredentialsInfo(any());
     }
 
     @AfterEach
@@ -154,4 +154,3 @@ public class TbFetchDeviceCredentialsNodeTest {
         return TbMsg.newMsg("POST_ATTRIBUTES_REQUEST", entityId, metaData, data, callback);
     }
 }
-