From 950907d3980f9602f8b10a53cf036f5e5698118b Mon Sep 17 00:00:00 2001
From: zbeacon <ibarkov.ua@gmail.com>
Date: Tue, 29 Sep 2020 11:30:32 +0300
Subject: [PATCH] Refactoring according to comments from @YevhenBondarenko

---
 .../server/dao/device/provision/ProvisionResponse.java      | 6 ++----
 .../server/transport/mqtt/MqttTransportHandler.java         | 4 ----
 .../server/common/transport/adaptor/JsonConverter.java      | 3 +--
 .../org/thingsboard/server/dao/device/DeviceProfileDao.java | 1 -
 .../server/dao/sql/device/JpaDeviceProfileDao.java          | 1 -
 5 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/device/provision/ProvisionResponse.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/device/provision/ProvisionResponse.java
index 509823eeb2..d38b53b134 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/device/provision/ProvisionResponse.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/device/provision/ProvisionResponse.java
@@ -15,13 +15,11 @@
  */
 package org.thingsboard.server.dao.device.provision;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 
 @Data
-@AllArgsConstructor
 public class ProvisionResponse {
-    private DeviceCredentials deviceCredentials;
-    private ProvisionResponseStatus responseStatus;
+    private final DeviceCredentials deviceCredentials;
+    private final ProvisionResponseStatus responseStatus;
 }
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
index 37738b89a6..127bceb10a 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
@@ -167,10 +167,6 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
             case PINGREQ:
                 ctx.writeAndFlush(new MqttMessage(new MqttFixedHeader(PINGRESP, false, AT_MOST_ONCE, false, 0)));
                 break;
-//            case SUBSCRIBE:
-//                deviceSessionCtx.setDeviceInfo(TransportDeviceInfo);
-//                processSubscribe(ctx, (MqttSubscribeMessage) msg);
-//                break;
             case DISCONNECT:
                 ctx.close();
                 break;
diff --git a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/adaptor/JsonConverter.java b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/adaptor/JsonConverter.java
index c63c4d7bb8..13dda0a10a 100644
--- a/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/adaptor/JsonConverter.java
+++ b/common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/adaptor/JsonConverter.java
@@ -417,8 +417,7 @@ public class JsonConverter {
             if (toGateway) {
                 result.addProperty("id", requestId);
             }
-            result.addProperty("deviceId", new DeviceId(
-                    new UUID(payload.getDeviceCredentials().getDeviceIdMSB(), payload.getDeviceCredentials().getDeviceIdLSB())).toString());
+            result.addProperty("deviceId", new UUID(payload.getDeviceCredentials().getDeviceIdMSB(), payload.getDeviceCredentials().getDeviceIdLSB()).toString());
             result.addProperty("credentialsType", payload.getDeviceCredentials().getCredentialsType().name());
             result.addProperty("credentialsId", payload.getDeviceCredentials().getCredentialsId());
             result.addProperty("credentialsValue",
diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileDao.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileDao.java
index 3c5a9269a1..2d65448d02 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileDao.java
@@ -22,7 +22,6 @@ import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.dao.Dao;
 
-import java.util.Optional;
 import java.util.UUID;
 
 public interface DeviceProfileDao extends Dao<DeviceProfile> {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceProfileDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceProfileDao.java
index 6fa5768603..3a812e78da 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceProfileDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceProfileDao.java
@@ -29,7 +29,6 @@ import org.thingsboard.server.dao.model.sql.DeviceProfileEntity;
 import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
 
 import java.util.Objects;
-import java.util.Optional;
 import java.util.UUID;
 
 @Component