DeviceEdgeProcessor - minor refactoring

4 years ago · 6a383eef01
1 changed files with 1 additions and 3 deletions
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceEdgeProcessor.java
@ -245,11 +245,9 @@ public class DeviceEdgeProcessor extends BaseEdgeProcessor {
            if (deviceDataOpt.isPresent()) {
                device.setDeviceData(deviceDataOpt.get());
            }
+            deviceValidator.validate(device, Device::getTenantId);
            if (created) {
-                deviceValidator.validate(device, Device::getTenantId);
                device.setId(deviceId);
-            } else {
-                deviceValidator.validate(device, Device::getTenantId);
            }
            Device savedDevice = deviceService.saveDevice(device, false);
            tbClusterService.onDeviceUpdated(savedDevice, created ? null : device, false);