From 0270bc9b885012580b157ec38d28131a490f80d4 Mon Sep 17 00:00:00 2001 From: dashevchenko Date: Wed, 19 Mar 2025 18:33:55 +0200 Subject: [PATCH] refactoring --- .../dao/device/DeviceConnectivityServiceImpl.java | 2 +- .../server/dao/util/DeviceConnectivityUtil.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceConnectivityServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceConnectivityServiceImpl.java index d05d2fbb09..606388e465 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceConnectivityServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceConnectivityServiceImpl.java @@ -201,7 +201,7 @@ public class DeviceConnectivityServiceImpl implements DeviceConnectivityService pemContentBuilder.append("-----END CERTIFICATE-----\n"); } } - } catch (IOException e) { + } catch (Exception e) { String msg = String.format("Failed to read %s server certificate!", path); log.warn(msg); throw new RuntimeException(msg, e); diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/DeviceConnectivityUtil.java b/dao/src/main/java/org/thingsboard/server/dao/util/DeviceConnectivityUtil.java index b9b707f0d1..56e0e44778 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/util/DeviceConnectivityUtil.java +++ b/dao/src/main/java/org/thingsboard/server/dao/util/DeviceConnectivityUtil.java @@ -214,24 +214,24 @@ public class DeviceConnectivityUtil { return null; } - StringBuilder mqttDockerCommand = new StringBuilder(); - mqttDockerCommand.append(DOCKER_RUN).append(isLocalhost(host) ? ADD_DOCKER_INTERNAL_HOST : "").append(COAP_IMAGE); + StringBuilder coapDockerCommand = new StringBuilder(); + coapDockerCommand.append(DOCKER_RUN).append(isLocalhost(host) ? ADD_DOCKER_INTERNAL_HOST : "").append(COAP_IMAGE); if (isLocalhost(host)) { coapCommand = coapCommand.replace(host, HOST_DOCKER_INTERNAL); } if (COAPS.equals(protocol)) { - mqttDockerCommand.append("/bin/sh -c \"") + coapDockerCommand.append("/bin/sh -c \"") .append(getCurlPemCertCommand(baseUrl, protocol)) .append(" && ") .append(coapCommand) .append("\""); } else { - mqttDockerCommand.append(coapCommand); + coapDockerCommand.append(coapCommand); } - return mqttDockerCommand.toString(); + return coapDockerCommand.toString(); } public static String getHost(String baseUrl, DeviceConnectivityInfo properties, String protocol) throws URISyntaxException {