From ea19c4accef8ecdade503b488cb849db86da30d7 Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Tue, 20 Jun 2023 12:06:56 +0300
Subject: [PATCH] refactoring

---
 .../transport/coap/efento/CoapEfentoTransportResource.java    | 4 +---
 .../transport/coap/efento/adaptor/EfentoCoapAdaptor.java      | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResource.java b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResource.java
index e2e08a669a..97788bbc5d 100644
--- a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResource.java
+++ b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResource.java
@@ -184,7 +184,7 @@ public class CoapEfentoTransportResource extends AbstractCoapTransportResource {
                             validateEfentoTransportConfiguration(deviceProfile);
                             JsonObject config = getEfentoConfiguration(protoConfig);
                             transportService.process(sessionInfo,
-                                    transportContext.getEfentoCoapAdaptor().convertToPostAttribute(sessionId, config),
+                                    transportContext.getEfentoCoapAdaptor().convertToPostAttributes(sessionId, config),
                                     new CoapEfentoCallback(exchange, CoAP.ResponseCode.CREATED, CoAP.ResponseCode.INTERNAL_SERVER_ERROR));
                             reportSubscriptionInfo(sessionInfo, false, false);
                         } catch (AdaptorException e) {
@@ -336,7 +336,6 @@ public class CoapEfentoTransportResource extends AbstractCoapTransportResource {
     private EfentoTelemetry getEfentoDeviceInfo(DeviceInfoProtos.ProtoDeviceInfo protoDeviceInfo) {
         JsonObject values = new JsonObject();
         values.addProperty("sw_version", protoDeviceInfo.getSwVersion());
-        values.addProperty("cloud_token", protoDeviceInfo.getCloudToken());
 
         //memory statistics
         values.addProperty("nv_storage_status", getStorageStatus(protoDeviceInfo.getMemoryStatistics(0)));
@@ -424,7 +423,6 @@ public class CoapEfentoTransportResource extends AbstractCoapTransportResource {
         values.addProperty("timestamp", getDate(config.getHashTimestamp()));
         values.addProperty("current_time", getDate(config.getCurrentTime()));
         values.addProperty("apn", getString(config.getApn(), "\u007F", "Automatic"));
-        values.addProperty("cloud_token", config.getCloudToken());
         values.addProperty("token_config", getTokenConfigString(config.getCloudTokenConfig()));
         values.addProperty("data_server", config.getDataServerIp() + ":" + config.getDataServerPort() +
                 "/" + config.getDataEndpoint());
diff --git a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/adaptor/EfentoCoapAdaptor.java b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/adaptor/EfentoCoapAdaptor.java
index 6dec0a7002..fde2d69181 100644
--- a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/adaptor/EfentoCoapAdaptor.java
+++ b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/adaptor/EfentoCoapAdaptor.java
@@ -42,7 +42,7 @@ public class EfentoCoapAdaptor {
         }
     }
 
-    public TransportProtos.PostAttributeMsg convertToPostAttribute(UUID sessionId, JsonObject deviceInfo) throws AdaptorException {
+    public TransportProtos.PostAttributeMsg convertToPostAttributes(UUID sessionId, JsonObject deviceInfo) throws AdaptorException {
         try {
             return JsonConverter.convertToAttributesProto(deviceInfo);
         } catch (Exception ex) {