Browse Source

fix bug: Upload binary file - delete validate file

pull/6446/head
nickAS21 5 years ago
parent
commit
fd6044c2b8
  1. 9
      application/src/main/java/org/thingsboard/server/controller/BaseController.java
  2. 2
      application/src/main/java/org/thingsboard/server/controller/OtaPackageController.java

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

@ -321,15 +321,6 @@ public abstract class BaseController {
return reference;
}
<T> T checkNotNullBadRequest(T reference, String badRequestMessage) throws ThingsboardException {
if (reference == null) {
throw new ThingsboardException(badRequestMessage, ThingsboardErrorCode.BAD_REQUEST_PARAMS);
} else if (reference instanceof byte[] && ((byte[])reference).length == 0) {
throw new ThingsboardException(badRequestMessage, ThingsboardErrorCode.BAD_REQUEST_PARAMS);
}
return reference;
}
<T> T checkNotNull(Optional<T> reference) throws ThingsboardException {
return checkNotNull(reference, "Requested item wasn't found!");
}

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

@ -186,7 +186,6 @@ public class OtaPackageController extends BaseController {
@RequestPart MultipartFile file) throws ThingsboardException {
checkParameter(OTA_PACKAGE_ID, strOtaPackageId);
checkParameter(CHECKSUM_ALGORITHM, checksumAlgorithmStr);
checkNotNullBadRequest(file, "Parameter file can't be empty!");
try {
OtaPackageId otaPackageId = new OtaPackageId(toUUID(strOtaPackageId));
OtaPackageInfo info = checkOtaPackageInfoId(otaPackageId, Operation.READ);
@ -204,7 +203,6 @@ public class OtaPackageController extends BaseController {
ChecksumAlgorithm checksumAlgorithm = ChecksumAlgorithm.valueOf(checksumAlgorithmStr.toUpperCase());
byte[] bytes = file.getBytes();
checkNotNullBadRequest(bytes, "Parameter file can't be empty!");
if (StringUtils.isEmpty(checksum)) {
checksum = otaPackageService.generateChecksum(checksumAlgorithm, ByteBuffer.wrap(bytes));
}

Loading…
Cancel
Save