minor improvements

application/src/main/java/org/thingsboard/server/controller/BaseController.java

@@ -113,7 +113,6 @@ import org.thingsboard.server.dao.audit.AuditLogService;
 import org.thingsboard.server.dao.customer.CustomerService;
 import org.thingsboard.server.dao.dashboard.DashboardService;
 import org.thingsboard.server.dao.device.ClaimDevicesService;
-import org.thingsboard.server.dao.device.DeviceConnectivityService;
 import org.thingsboard.server.dao.device.DeviceCredentialsService;
 import org.thingsboard.server.dao.device.DeviceProfileService;
 import org.thingsboard.server.dao.device.DeviceService;
@@ -209,9 +208,6 @@ public abstract class BaseController {
     @Autowired
     protected DeviceService deviceService;
 
-    @Autowired
-    protected DeviceConnectivityService deviceConnectivityService;
-
     @Autowired
     protected DeviceProfileService deviceProfileService;
 

application/src/main/java/org/thingsboard/server/controller/DeviceConnectivityController.java

@@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.dao.device.DeviceConnectivityService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.system.SystemSecurityService;
@@ -46,7 +47,6 @@ import static org.thingsboard.server.controller.ControllerConstants.DEVICE_ID;
 import static org.thingsboard.server.controller.ControllerConstants.DEVICE_ID_PARAM_DESCRIPTION;
 import static org.thingsboard.server.controller.ControllerConstants.PROTOCOL;
 import static org.thingsboard.server.controller.ControllerConstants.PROTOCOL_PARAM_DESCRIPTION;
-import static org.thingsboard.server.controller.ControllerConstants.SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH;
 import static org.thingsboard.server.controller.ControllerConstants.TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH;
 import static org.thingsboard.server.dao.util.DeviceConnectivityUtil.PEM_CERT_FILE_NAME;
 
@@ -57,6 +57,7 @@ import static org.thingsboard.server.dao.util.DeviceConnectivityUtil.PEM_CERT_FI
 @Slf4j
 public class DeviceConnectivityController extends BaseController {
 
+    private final DeviceConnectivityService deviceConnectivityService;
     private final SystemSecurityService systemSecurityService;
 
     @ApiOperation(value = "Get commands to publish device telemetry (getDevicePublishTelemetryCommands)",
@@ -86,11 +87,11 @@ public class DeviceConnectivityController extends BaseController {
         return deviceConnectivityService.findDevicePublishTelemetryCommands(baseUrl, device);
     }
 
-    @ApiOperation(value = "Download mqtt ssl certificate using file path defined in device.connectivity properties (downloadMqttServerCertificate)", notes = "Download Mqtt server certificate." + SYSTEM_OR_TENANT_AUTHORITY_PARAGRAPH)
+    @ApiOperation(value = "Download server certificate using file path defined in device.connectivity properties (downloadServerCertificate)", notes = "Download server certificate.")
     @RequestMapping(value = "/device-connectivity/{protocol}/certificate/download", method = RequestMethod.GET)
     @ResponseBody
-    public ResponseEntity<org.springframework.core.io.Resource> downloadMqttServerCertificate(@ApiParam(value = PROTOCOL_PARAM_DESCRIPTION)
-                                                                                              @PathVariable(PROTOCOL) String protocol) throws ThingsboardException, IOException {
+    public ResponseEntity<org.springframework.core.io.Resource> downloadServerCertificate(@ApiParam(value = PROTOCOL_PARAM_DESCRIPTION)
+                                                                                          @PathVariable(PROTOCOL) String protocol) throws ThingsboardException, IOException {
         checkParameter(PROTOCOL, protocol);
         var pemCert =
                 checkNotNull(deviceConnectivityService.getPemCertFile(protocol), protocol + " pem cert file is not found!");

ui-ngx/src/assets/locale/locale.constant-en_US.json

@@ -1397,7 +1397,7 @@
             "device-created-check-connectivity": "Device created. Let's check connectivity!",
             "loading-check-connectivity-command": "Loading check connectivity commands...",
             "use-following-instructions": "Use the following instructions for sending telemetry on behalf of the device using shell",
-            "execute-following-command": "Executive the following command",
+            "execute-following-command": "Execute the following command",
             "install-curl-windows": "Starting Windows 10 b17063, cURL is available by default",
             "install-mqtt-windows": "Use the instructions to download, install, setup and run mosquitto_pub",
             "install-coap-client": "Use the instructions to download, install, setup and run coap-client",