Changed TbOtaPackageService

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

@@ -179,41 +179,13 @@ public class OtaPackageController extends BaseController {
                                              @ApiParam(value = "OTA Package checksum algorithm.", allowableValues = OTA_PACKAGE_CHECKSUM_ALGORITHM_ALLOWABLE_VALUES)
                                              @RequestParam(CHECKSUM_ALGORITHM) String checksumAlgorithmStr,
                                              @ApiParam(value = "OTA Package data.")
-                                             @RequestPart MultipartFile file) throws ThingsboardException, IOException {
+                                             @RequestPart MultipartFile file) throws ThingsboardException {
         checkParameter(OTA_PACKAGE_ID, strOtaPackageId);
         checkParameter(CHECKSUM_ALGORITHM, checksumAlgorithmStr);
-        try {
-            OtaPackageId otaPackageId = new OtaPackageId(toUUID(strOtaPackageId));
-            ChecksumAlgorithm checksumAlgorithm = ChecksumAlgorithm.valueOf(checksumAlgorithmStr.toUpperCase());
-
-            if (StringUtils.isEmpty(checksum)) {
-                checksum = ChecksumUtil.generateChecksum(checksumAlgorithm, file.getInputStream());
-            }
-            OtaPackageInfo savedOtaPackage = saveOtaPackageWithData(otaPackageId, file, checksum, checksumAlgorithm);
-            return savedOtaPackage;
-        } catch (Exception e) {
-            throw handleException(e);
-        }
-    }
-
-    private OtaPackage saveOtaPackageWithData(OtaPackageId otaPackageId, MultipartFile file, String checksum, ChecksumAlgorithm checksumAlgorithm) throws ThingsboardException, IOException {
+        OtaPackageId otaPackageId = new OtaPackageId(toUUID(strOtaPackageId));
         OtaPackageInfo info = checkOtaPackageInfoId(otaPackageId, Operation.READ);
-        OtaPackage otaPackage = new OtaPackage(otaPackageId);
-        otaPackage.setCreatedTime(info.getCreatedTime());
-        otaPackage.setTenantId(info.getTenantId());
-        otaPackage.setDeviceProfileId(info.getDeviceProfileId());
-        otaPackage.setType(info.getType());
-        otaPackage.setTitle(info.getTitle());
-        otaPackage.setVersion(info.getVersion());
-        otaPackage.setTag(info.getTag());
-        otaPackage.setAdditionalInfo(info.getAdditionalInfo());
-        otaPackage.setChecksumAlgorithm(checksumAlgorithm);
-        otaPackage.setChecksum(checksum);
-        otaPackage.setFileName(file.getOriginalFilename());
-        otaPackage.setContentType(file.getContentType());
-        otaPackage.setDataSize(file.getSize());
-        otaPackage.setData(file.getInputStream());
-        return otaPackageService.saveOtaPackage(otaPackage);
+        ChecksumAlgorithm checksumAlgorithm = ChecksumAlgorithm.valueOf(checksumAlgorithmStr.toUpperCase());
+        return tbOtaPackageService.saveOtaPackageData(info, checksum, checksumAlgorithm, file, getCurrentUser());
     }
 
     @ApiOperation(value = "Get OTA Package Infos (getOtaPackages)",

application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/OtaPackageMsgConstructor.java

@@ -24,6 +24,8 @@ import org.thingsboard.server.gen.edge.v1.OtaPackageUpdateMsg;
 import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 
+import java.io.IOException;
+
 @Component
 @TbCoreComponent
 public class OtaPackageMsgConstructor {
@@ -62,7 +64,11 @@ public class OtaPackageMsgConstructor {
             builder.setDataSize(otaPackage.getDataSize());
         }
         if (otaPackage.getData() != null) {
-            builder.setData(ByteString.copyFrom(otaPackage.getData().array()));
+            try {
+                builder.setData(ByteString.copyFrom(otaPackage.getData().readAllBytes()));
+            } catch (IOException e){
+                throw new RuntimeException(e);
+            }
         }
         return builder.build();
     }

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

@@ -1,12 +1,12 @@
 /**
  * Copyright © 2016-2022 The Thingsboard Authors
- *
+ * <p>
  * 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
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * 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.
@@ -18,22 +18,19 @@ package org.thingsboard.server.service.entitiy.ota;
 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.StringUtils;
-import org.thingsboard.server.common.data.User;
+import org.springframework.web.multipart.MultipartFile;
+import org.thingsboard.server.common.data.*;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.OtaPackageId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.ota.ChecksumAlgorithm;
 import org.thingsboard.server.dao.ota.OtaPackageService;
+import org.thingsboard.server.dao.ota.util.ChecksumUtil;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.entitiy.AbstractTbEntityService;
 
-import java.nio.ByteBuffer;
+import java.io.IOException;
 
 @Service
 @TbCoreComponent
@@ -64,12 +61,12 @@ public class DefaultTbOtaPackageService extends AbstractTbEntityService implemen
 
     @Override
     public OtaPackageInfo saveOtaPackageData(OtaPackageInfo otaPackageInfo, String checksum, ChecksumAlgorithm checksumAlgorithm,
-                                             byte[] data, String filename, String contentType, User user) throws ThingsboardException {
+                                             MultipartFile file, User user) throws ThingsboardException {
         TenantId tenantId = otaPackageInfo.getTenantId();
         OtaPackageId otaPackageId = otaPackageInfo.getId();
         try {
             if (StringUtils.isEmpty(checksum)) {
-                checksum = otaPackageService.generateChecksum(checksumAlgorithm, ByteBuffer.wrap(data));
+                checksum = ChecksumUtil.generateChecksum(checksumAlgorithm, file.getInputStream());
             }
             OtaPackage otaPackage = new OtaPackage(otaPackageId);
             otaPackage.setCreatedTime(otaPackageInfo.getCreatedTime());
@@ -82,14 +79,18 @@ public class DefaultTbOtaPackageService extends AbstractTbEntityService implemen
             otaPackage.setAdditionalInfo(otaPackageInfo.getAdditionalInfo());
             otaPackage.setChecksumAlgorithm(checksumAlgorithm);
             otaPackage.setChecksum(checksum);
-            otaPackage.setFileName(filename);
-            otaPackage.setContentType(contentType);
-            otaPackage.setData(ByteBuffer.wrap(data));
-            otaPackage.setDataSize((long) data.length);
+            otaPackage.setFileName(file.getOriginalFilename());
+            otaPackage.setContentType(file.getContentType());
+            otaPackage.setData(file.getInputStream());
+            otaPackage.setDataSize(file.getSize());
             OtaPackageInfo savedOtaPackage = otaPackageService.saveOtaPackage(otaPackage);
             notificationEntityService.notifyCreateOrUpdateOrDelete(tenantId, null, savedOtaPackage.getId(),
                     savedOtaPackage, user, ActionType.UPDATED, true, null);
             return savedOtaPackage;
+        } catch (IOException e){
+            notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.OTA_PACKAGE), ActionType.UPDATED,
+                    user, e, otaPackageId.toString());
+            throw new RuntimeException(e);
         } catch (Exception e) {
             notificationEntityService.logEntityAction(tenantId, emptyId(EntityType.OTA_PACKAGE), ActionType.UPDATED,
                     user, e, otaPackageId.toString());

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

@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.service.entitiy.ota;
 
+import org.springframework.web.multipart.MultipartFile;
 import org.thingsboard.server.common.data.OtaPackageInfo;
 import org.thingsboard.server.common.data.SaveOtaPackageInfoRequest;
 import org.thingsboard.server.common.data.User;
@@ -26,7 +27,7 @@ public interface TbOtaPackageService {
     OtaPackageInfo save(SaveOtaPackageInfoRequest saveOtaPackageInfoRequest, User user) throws ThingsboardException;
 
     OtaPackageInfo saveOtaPackageData(OtaPackageInfo otaPackageInfo, String checksum, ChecksumAlgorithm checksumAlgorithm,
-                                      byte[] data, String filename, String contentType, User user) throws ThingsboardException;
+                                      MultipartFile file, User user) throws ThingsboardException;
 
     void delete(OtaPackageInfo otaPackageInfo, User user) throws ThingsboardException;