refactoring: OtaPackageController

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

@@ -17,6 +17,7 @@ package org.thingsboard.server.controller;
 
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.core.io.ByteArrayResource;
@@ -45,6 +46,7 @@ import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.entitiy.otaPackageController.TbOtaPackageService;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
 
@@ -73,8 +75,11 @@ import static org.thingsboard.server.controller.ControllerConstants.UUID_WIKI_LI
 @RestController
 @TbCoreComponent
 @RequestMapping("/api")
+@RequiredArgsConstructor
 public class OtaPackageController extends BaseController {
 
+    private final TbOtaPackageService tbOtaPackageService;
+
     public static final String OTA_PACKAGE_ID = "otaPackageId";
     public static final String CHECKSUM_ALGORITHM = "checksumAlgorithm";
 
@@ -154,19 +159,12 @@ public class OtaPackageController extends BaseController {
     @ResponseBody
     public OtaPackageInfo saveOtaPackageInfo(@ApiParam(value = "A JSON value representing the OTA Package.")
                                              @RequestBody SaveOtaPackageInfoRequest otaPackageInfo) throws ThingsboardException {
-        boolean created = otaPackageInfo.getId() == null;
+        otaPackageInfo.setTenantId(getTenantId());
-        try {
+        checkEntity(otaPackageInfo.getId(), otaPackageInfo, Resource.OTA_PACKAGE);
-            otaPackageInfo.setTenantId(getTenantId());
+
-            checkEntity(otaPackageInfo.getId(), otaPackageInfo, Resource.OTA_PACKAGE);
+        return tbOtaPackageService.save(otaPackageInfo, getCurrentUser());
-            OtaPackageInfo savedOtaPackageInfo = otaPackageService.saveOtaPackageInfo(new OtaPackageInfo(otaPackageInfo), otaPackageInfo.isUsesUrl());
+
-            logEntityAction(savedOtaPackageInfo.getId(), savedOtaPackageInfo,
+
-                    null, created ? ActionType.ADDED : ActionType.UPDATED, null);
-            return savedOtaPackageInfo;
-        } catch (Exception e) {
-            logEntityAction(emptyId(EntityType.OTA_PACKAGE), otaPackageInfo,
-                    null, created ? ActionType.ADDED : ActionType.UPDATED, e);
-            throw handleException(e);
-        }
     }
 
     @ApiOperation(value = "Save OTA Package data (saveOtaPackageData)",
@@ -188,17 +186,17 @@ public class OtaPackageController extends BaseController {
         checkParameter(CHECKSUM_ALGORITHM, checksumAlgorithmStr);
         try {
             OtaPackageId otaPackageId = new OtaPackageId(toUUID(strOtaPackageId));
-            OtaPackageInfo info = checkOtaPackageInfoId(otaPackageId, Operation.READ);
+            OtaPackageInfo otaPackageInfo = checkOtaPackageInfoId(otaPackageId, Operation.READ);
 
             OtaPackage otaPackage = new OtaPackage(otaPackageId);
-            otaPackage.setCreatedTime(info.getCreatedTime());
+            otaPackage.setCreatedTime(otaPackageInfo.getCreatedTime());
             otaPackage.setTenantId(getTenantId());
-            otaPackage.setDeviceProfileId(info.getDeviceProfileId());
+            otaPackage.setDeviceProfileId(otaPackageInfo.getDeviceProfileId());
-            otaPackage.setType(info.getType());
+            otaPackage.setType(otaPackageInfo.getType());
-            otaPackage.setTitle(info.getTitle());
+            otaPackage.setTitle(otaPackageInfo.getTitle());
-            otaPackage.setVersion(info.getVersion());
+            otaPackage.setVersion(otaPackageInfo.getVersion());
-            otaPackage.setTag(info.getTag());
+            otaPackage.setTag(otaPackageInfo.getTag());
-            otaPackage.setAdditionalInfo(info.getAdditionalInfo());
+            otaPackage.setAdditionalInfo(otaPackageInfo.getAdditionalInfo());
 
             ChecksumAlgorithm checksumAlgorithm = ChecksumAlgorithm.valueOf(checksumAlgorithmStr.toUpperCase());
 
@@ -213,11 +211,9 @@ public class OtaPackageController extends BaseController {
             otaPackage.setContentType(file.getContentType());
             otaPackage.setData(ByteBuffer.wrap(bytes));
             otaPackage.setDataSize((long) bytes.length);
-            OtaPackageInfo savedOtaPackage = otaPackageService.saveOtaPackage(otaPackage);
+            return tbOtaPackageService.saveOtaPackageData(otaPackageId, otaPackage, getCurrentUser(), null);
-            logEntityAction(savedOtaPackage.getId(), savedOtaPackage, null, ActionType.UPDATED, null);
-            return savedOtaPackage;
         } catch (Exception e) {
-            logEntityAction(emptyId(EntityType.OTA_PACKAGE), null, null, ActionType.UPDATED, e, strOtaPackageId);
+            tbOtaPackageService.saveOtaPackageData(null, null, getCurrentUser(), e);
             throw handleException(e);
         }
     }
@@ -289,11 +285,15 @@ public class OtaPackageController extends BaseController {
     public void deleteOtaPackage(@ApiParam(value = OTA_PACKAGE_ID_PARAM_DESCRIPTION)
                                  @PathVariable("otaPackageId") String strOtaPackageId) throws ThingsboardException {
         checkParameter(OTA_PACKAGE_ID, strOtaPackageId);
+        OtaPackageId otaPackageId = new OtaPackageId(toUUID(strOtaPackageId));
+        OtaPackageInfo otaPackageInfo = checkOtaPackageInfoId(otaPackageId, Operation.DELETE);
+
+        tbOtaPackageService.delete(otaPackageInfo, getCurrentUser());
         try {
-            OtaPackageId otaPackageId = new OtaPackageId(toUUID(strOtaPackageId));
+
-            OtaPackageInfo info = checkOtaPackageInfoId(otaPackageId, Operation.DELETE);
+
             otaPackageService.deleteOtaPackage(getTenantId(), otaPackageId);
-            logEntityAction(otaPackageId, info, null, ActionType.DELETED, null, strOtaPackageId);
+            logEntityAction(otaPackageId, otaPackageInfo, null, ActionType.DELETED, null, strOtaPackageId);
         } catch (Exception e) {
             logEntityAction(emptyId(EntityType.OTA_PACKAGE), null, null, ActionType.DELETED, e, strOtaPackageId);
             throw handleException(e);

application/src/main/java/org/thingsboard/server/service/entitiy/AbstractTbEntityService.java

@@ -54,6 +54,7 @@ import org.thingsboard.server.dao.entityview.EntityViewService;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
 import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.dao.ota.OtaPackageService;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
@@ -132,6 +133,8 @@ public abstract class AbstractTbEntityService {
     protected OtaPackageStateService otaPackageStateService;
     @Autowired
     protected RelationService relationService;
+    @Autowired
+    protected OtaPackageService otaPackageService;
 
     protected ListenableFuture<Void> removeAlarmsByEntityId(TenantId tenantId, EntityId entityId) {
         ListenableFuture<PageData<AlarmInfo>> alarmsFuture =

application/src/main/java/org/thingsboard/server/service/entitiy/otaPackageController/DefaultTbOtaPackageService.java

@@ -0,0 +1,94 @@
+/**
+ * Copyright © 2016-2022 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.entitiy.otaPackageController;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.OtaPackage;
+import org.thingsboard.server.common.data.OtaPackageInfo;
+import org.thingsboard.server.common.data.SaveOtaPackageInfoRequest;
+import org.thingsboard.server.common.data.audit.ActionType;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.OtaPackageId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.queue.util.TbCoreComponent;
+import org.thingsboard.server.service.entitiy.AbstractTbEntityService;
+import org.thingsboard.server.service.security.model.SecurityUser;
+
+@Service
+@TbCoreComponent
+@AllArgsConstructor
+@Slf4j
+public class DefaultTbOtaPackageService extends AbstractTbEntityService implements TbOtaPackageService {
+    @Override
+    public OtaPackageInfo save(SaveOtaPackageInfoRequest saveOtaPackageInfoRequest, SecurityUser user) throws ThingsboardException {
+        TenantId tenantId = saveOtaPackageInfoRequest.getTenantId();
+        ActionType actionType = saveOtaPackageInfoRequest.getId() == null ? ActionType.ADDED : ActionType.UPDATED;
+        try {
+            OtaPackageInfo savedOtaPackageInfo = otaPackageService.saveOtaPackageInfo(new OtaPackageInfo(saveOtaPackageInfoRequest), saveOtaPackageInfoRequest.isUsesUrl());
+            notificationEntityService.notifyEntity(tenantId, saveOtaPackageInfoRequest.getId(), saveOtaPackageInfoRequest, null,
+                    actionType, user, null);
+            return savedOtaPackageInfo;
+        } catch (Exception e) {
+            notificationEntityService.notifyEntity(tenantId, emptyId(EntityType.OTA_PACKAGE), saveOtaPackageInfoRequest, null,
+                    actionType, user, e);
+            throw handleException(e);
+        }
+    }
+
+    @Override
+    public void delete(OtaPackageInfo otaPackageInfo, SecurityUser user) throws ThingsboardException {
+        TenantId tenantId = otaPackageInfo.getTenantId();
+        OtaPackageId otaPackageId = otaPackageInfo.getId();
+        try {
+            otaPackageService.deleteOtaPackage(tenantId, otaPackageId);
+            notificationEntityService.notifyEntity(tenantId, otaPackageId, otaPackageInfo, null,
+                    ActionType.DELETED, user, null, otaPackageInfo.getId().toString());
+        } catch (Exception e) {
+            notificationEntityService.notifyEntity(tenantId, emptyId(EntityType.OTA_PACKAGE), null, null,
+                    ActionType.DELETED, user, e, otaPackageInfo.getId().toString());
+            throw handleException(e);
+        }
+
+
+    }
+
+    @Override
+    public OtaPackageInfo saveOtaPackageData(EntityId otaPackageId, OtaPackage otaPackage, SecurityUser user, Exception e) throws ThingsboardException {
+        TenantId tenantId = otaPackage.getTenantId();
+        if (e == null) {
+            try {
+                OtaPackageInfo savedOtaPackage = otaPackageService.saveOtaPackage(otaPackage);
+                notificationEntityService.notifyEntity(tenantId, savedOtaPackage.getId(), savedOtaPackage, null,
+                        ActionType.UPDATED, user, null);
+                return savedOtaPackage;
+            } catch (Exception e1) {
+                notificationEntityService.notifyEntity(tenantId, emptyId(EntityType.OTA_PACKAGE), null, null,
+                        ActionType.UPDATED, user, e1, otaPackageId.toString());
+                throw handleException(e1);
+            }
+        } else {
+            notificationEntityService.notifyEntity(tenantId, emptyId(EntityType.OTA_PACKAGE), null, null,
+                    ActionType.UPDATED, user, e, otaPackageId.toString());
+            throw handleException(e);
+        }
+    }
+
+
+}

application/src/main/java/org/thingsboard/server/service/entitiy/otaPackageController/TbOtaPackageService.java

@@ -0,0 +1,32 @@
+/**
+ * Copyright © 2016-2022 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.entitiy.otaPackageController;
+
+import org.thingsboard.server.common.data.OtaPackage;
+import org.thingsboard.server.common.data.OtaPackageInfo;
+import org.thingsboard.server.common.data.SaveOtaPackageInfoRequest;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.service.security.model.SecurityUser;
+
+public interface TbOtaPackageService  {
+
+    OtaPackageInfo save(SaveOtaPackageInfoRequest saveOtaPackageInfoRequest, SecurityUser user) throws ThingsboardException;
+
+    void  delete(OtaPackageInfo otaPackageInfo, SecurityUser user) throws ThingsboardException;
+
+    OtaPackageInfo saveOtaPackageData(EntityId otaPackageId, OtaPackage otaPackage, SecurityUser user, Exception e) throws ThingsboardException;
+}