Merge branch 'develop/3.3-firmware' of https://github.com/YevhenBondarenko/thingsboard into YevhenBondarenko-develop/3.3-firmware

application/src/main/resources/thingsboard.yml

@@ -437,6 +437,9 @@ spring.resources.chain:
     content:
       enabled: "true"
 
+spring.servlet.multipart.max-file-size: "50MB"
+spring.servlet.multipart.max-request-size: "50MB"
+
 spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation: "true"
 spring.jpa.properties.hibernate.order_by.default_null_ordering: "last"
 

application/src/test/java/org/thingsboard/server/controller/BaseFirmwareControllerTest.java

@@ -0,0 +1,302 @@
+/**
+ * Copyright © 2016-2021 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.controller;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.test.web.servlet.request.MockMultipartHttpServletRequestBuilder;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.Firmware;
+import org.thingsboard.server.common.data.FirmwareInfo;
+import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.page.PageData;
+import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.security.Authority;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+public abstract class BaseFirmwareControllerTest extends AbstractControllerTest {
+
+    private IdComparator<FirmwareInfo> idComparator = new IdComparator<>();
+
+    public static final String TITLE = "My firmware";
+    private static final String FILE_NAME = "filename.txt";
+    private static final String VERSION = "v1.0";
+    private static final String CONTENT_TYPE = "text/plain";
+    private static final String CHECKSUM_ALGORITHM = "sha256";
+    private static final String CHECKSUM = "4bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a";
+    private static final ByteBuffer DATA = ByteBuffer.wrap(new byte[]{1});
+
+    private Tenant savedTenant;
+    private User tenantAdmin;
+
+    @Before
+    public void beforeTest() throws Exception {
+        loginSysAdmin();
+
+        Tenant tenant = new Tenant();
+        tenant.setTitle("My tenant");
+        savedTenant = doPost("/api/tenant", tenant, Tenant.class);
+        Assert.assertNotNull(savedTenant);
+
+        tenantAdmin = new User();
+        tenantAdmin.setAuthority(Authority.TENANT_ADMIN);
+        tenantAdmin.setTenantId(savedTenant.getId());
+        tenantAdmin.setEmail("tenant2@thingsboard.org");
+        tenantAdmin.setFirstName("Joe");
+        tenantAdmin.setLastName("Downs");
+
+        tenantAdmin = createUserAndLogin(tenantAdmin, "testPassword1");
+    }
+
+    @After
+    public void afterTest() throws Exception {
+        loginSysAdmin();
+
+        doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
+                .andExpect(status().isOk());
+    }
+
+    @Test
+    public void testSaveFirmware() throws Exception {
+        FirmwareInfo firmwareInfo = new FirmwareInfo();
+        firmwareInfo.setTitle(TITLE);
+        firmwareInfo.setVersion(VERSION);
+
+        FirmwareInfo savedFirmwareInfo = save(firmwareInfo);
+
+        Assert.assertNotNull(savedFirmwareInfo);
+        Assert.assertNotNull(savedFirmwareInfo.getId());
+        Assert.assertTrue(savedFirmwareInfo.getCreatedTime() > 0);
+        Assert.assertEquals(savedTenant.getId(), savedFirmwareInfo.getTenantId());
+        Assert.assertEquals(firmwareInfo.getTitle(), savedFirmwareInfo.getTitle());
+        Assert.assertEquals(firmwareInfo.getVersion(), savedFirmwareInfo.getVersion());
+
+        savedFirmwareInfo.setAdditionalInfo(JacksonUtil.newObjectNode());
+
+        save(savedFirmwareInfo);
+
+        FirmwareInfo foundFirmwareInfo = doGet("/api/firmware/info/" + savedFirmwareInfo.getId().getId().toString(), FirmwareInfo.class);
+        Assert.assertEquals(foundFirmwareInfo.getTitle(), savedFirmwareInfo.getTitle());
+    }
+
+    @Test
+    public void testSaveFirmwareData() throws Exception {
+        FirmwareInfo firmwareInfo = new FirmwareInfo();
+        firmwareInfo.setTitle(TITLE);
+        firmwareInfo.setVersion(VERSION);
+
+        FirmwareInfo savedFirmwareInfo = save(firmwareInfo);
+
+        Assert.assertNotNull(savedFirmwareInfo);
+        Assert.assertNotNull(savedFirmwareInfo.getId());
+        Assert.assertTrue(savedFirmwareInfo.getCreatedTime() > 0);
+        Assert.assertEquals(savedTenant.getId(), savedFirmwareInfo.getTenantId());
+        Assert.assertEquals(firmwareInfo.getTitle(), savedFirmwareInfo.getTitle());
+        Assert.assertEquals(firmwareInfo.getVersion(), savedFirmwareInfo.getVersion());
+
+        savedFirmwareInfo.setAdditionalInfo(JacksonUtil.newObjectNode());
+
+        save(savedFirmwareInfo);
+
+        FirmwareInfo foundFirmwareInfo = doGet("/api/firmware/info/" + savedFirmwareInfo.getId().getId().toString(), FirmwareInfo.class);
+        Assert.assertEquals(foundFirmwareInfo.getTitle(), savedFirmwareInfo.getTitle());
+
+        MockMultipartFile testData = new MockMultipartFile("file", FILE_NAME, CONTENT_TYPE, DATA.array());
+
+        Firmware savedFirmware = savaData("/api/firmware/" + savedFirmwareInfo.getId().getId().toString() + "?checksum={checksum}&checksumAlgorithm={checksumAlgorithm}", testData, CHECKSUM, CHECKSUM_ALGORITHM);
+
+        Assert.assertEquals(FILE_NAME, savedFirmware.getFileName());
+        Assert.assertEquals(CONTENT_TYPE, savedFirmware.getContentType());
+    }
+
+    @Test
+    public void testUpdateFirmwareFromDifferentTenant() throws Exception {
+        FirmwareInfo firmwareInfo = new FirmwareInfo();
+        firmwareInfo.setTitle(TITLE);
+        firmwareInfo.setVersion(VERSION);
+
+        FirmwareInfo savedFirmwareInfo = save(firmwareInfo);
+
+        loginDifferentTenant();
+        doPost("/api/firmware", savedFirmwareInfo, FirmwareInfo.class, status().isForbidden());
+        deleteDifferentTenant();
+    }
+
+    @Test
+    public void testFindFirmwareInfoById() throws Exception {
+        FirmwareInfo firmwareInfo = new FirmwareInfo();
+        firmwareInfo.setTitle(TITLE);
+        firmwareInfo.setVersion(VERSION);
+
+        FirmwareInfo savedFirmwareInfo = save(firmwareInfo);
+
+        FirmwareInfo foundFirmware = doGet("/api/firmware/info/" + savedFirmwareInfo.getId().getId().toString(), FirmwareInfo.class);
+        Assert.assertNotNull(foundFirmware);
+        Assert.assertEquals(savedFirmwareInfo, foundFirmware);
+    }
+
+    @Test
+    public void testFindFirmwareById() throws Exception {
+        FirmwareInfo firmwareInfo = new FirmwareInfo();
+        firmwareInfo.setTitle(TITLE);
+        firmwareInfo.setVersion(VERSION);
+
+        FirmwareInfo savedFirmwareInfo = save(firmwareInfo);
+
+        MockMultipartFile testData = new MockMultipartFile("file", FILE_NAME, CONTENT_TYPE, DATA.array());
+
+        Firmware savedFirmware = savaData("/api/firmware/" + savedFirmwareInfo.getId().getId().toString() + "?checksum={checksum}&checksumAlgorithm={checksumAlgorithm}", testData, CHECKSUM, CHECKSUM_ALGORITHM);
+
+        Firmware foundFirmware = doGet("/api/firmware/" + savedFirmwareInfo.getId().getId().toString(), Firmware.class);
+        Assert.assertNotNull(foundFirmware);
+        Assert.assertEquals(savedFirmware, foundFirmware);
+    }
+
+    @Test
+    public void testDeleteFirmware() throws Exception {
+        FirmwareInfo firmwareInfo = new FirmwareInfo();
+        firmwareInfo.setTitle(TITLE);
+        firmwareInfo.setVersion(VERSION);
+
+        FirmwareInfo savedFirmwareInfo = save(firmwareInfo);
+
+        doDelete("/api/firmware/" + savedFirmwareInfo.getId().getId().toString())
+                .andExpect(status().isOk());
+
+        doGet("/api/firmware/info/" + savedFirmwareInfo.getId().getId().toString())
+                .andExpect(status().isNotFound());
+    }
+
+    @Test
+    public void testFindTenantFirmwares() throws Exception {
+        List<FirmwareInfo> firmwares = new ArrayList<>();
+        for (int i = 0; i < 165; i++) {
+            FirmwareInfo firmwareInfo = new FirmwareInfo();
+            firmwareInfo.setTitle(TITLE);
+            firmwareInfo.setVersion(VERSION + i);
+
+            FirmwareInfo savedFirmwareInfo = save(firmwareInfo);
+
+            if (i > 100) {
+                MockMultipartFile testData = new MockMultipartFile("file", FILE_NAME, CONTENT_TYPE, DATA.array());
+
+                Firmware savedFirmware = savaData("/api/firmware/" + savedFirmwareInfo.getId().getId().toString() + "?checksum={checksum}&checksumAlgorithm={checksumAlgorithm}", testData, CHECKSUM, CHECKSUM_ALGORITHM);
+                firmwares.add(new FirmwareInfo(savedFirmware));
+            } else {
+                firmwares.add(savedFirmwareInfo);
+            }
+        }
+
+        List<FirmwareInfo> loadedFirmwares = new ArrayList<>();
+        PageLink pageLink = new PageLink(24);
+        PageData<FirmwareInfo> pageData;
+        do {
+            pageData = doGetTypedWithPageLink("/api/firmwares?",
+                    new TypeReference<>() {
+                    }, pageLink);
+            loadedFirmwares.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageLink.nextPageLink();
+            }
+        } while (pageData.hasNext());
+
+        Collections.sort(firmwares, idComparator);
+        Collections.sort(loadedFirmwares, idComparator);
+
+        Assert.assertEquals(firmwares, loadedFirmwares);
+    }
+
+    @Test
+    public void testFindTenantFirmwaresByHasData() throws Exception {
+        List<FirmwareInfo> firmwaresWithData = new ArrayList<>();
+        List<FirmwareInfo> firmwaresWithoutData = new ArrayList<>();
+
+        for (int i = 0; i < 165; i++) {
+            FirmwareInfo firmwareInfo = new FirmwareInfo();
+            firmwareInfo.setTitle(TITLE);
+            firmwareInfo.setVersion(VERSION + i);
+
+            FirmwareInfo savedFirmwareInfo = save(firmwareInfo);
+
+            if (i > 100) {
+                MockMultipartFile testData = new MockMultipartFile("file", FILE_NAME, CONTENT_TYPE, DATA.array());
+
+                Firmware savedFirmware = savaData("/api/firmware/" + savedFirmwareInfo.getId().getId().toString() + "?checksum={checksum}&checksumAlgorithm={checksumAlgorithm}", testData, CHECKSUM, CHECKSUM_ALGORITHM);
+                firmwaresWithData.add(new FirmwareInfo(savedFirmware));
+            } else {
+                firmwaresWithoutData.add(savedFirmwareInfo);
+            }
+        }
+
+        List<FirmwareInfo> loadedFirmwaresWithData = new ArrayList<>();
+        PageLink pageLink = new PageLink(24);
+        PageData<FirmwareInfo> pageData;
+        do {
+            pageData = doGetTypedWithPageLink("/api/firmwares/true?",
+                    new TypeReference<>() {
+                    }, pageLink);
+            loadedFirmwaresWithData.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageLink.nextPageLink();
+            }
+        } while (pageData.hasNext());
+
+        List<FirmwareInfo> loadedFirmwaresWithoutData = new ArrayList<>();
+        pageLink = new PageLink(24);
+        do {
+            pageData = doGetTypedWithPageLink("/api/firmwares/false?",
+                    new TypeReference<>() {
+                    }, pageLink);
+            loadedFirmwaresWithoutData.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageLink.nextPageLink();
+            }
+        } while (pageData.hasNext());
+
+        Collections.sort(firmwaresWithData, idComparator);
+        Collections.sort(firmwaresWithoutData, idComparator);
+        Collections.sort(loadedFirmwaresWithData, idComparator);
+        Collections.sort(loadedFirmwaresWithoutData, idComparator);
+
+        Assert.assertEquals(firmwaresWithData, loadedFirmwaresWithData);
+        Assert.assertEquals(firmwaresWithoutData, loadedFirmwaresWithoutData);
+    }
+
+
+    private FirmwareInfo save(FirmwareInfo firmwareInfo) throws Exception {
+        return doPost("/api/firmware", firmwareInfo, FirmwareInfo.class);
+    }
+
+    protected Firmware savaData(String urlTemplate, MockMultipartFile content, String... params) throws Exception {
+        MockMultipartHttpServletRequestBuilder postRequest = MockMvcRequestBuilders.multipart(urlTemplate, params);
+        postRequest.file(content);
+        setJwtToken(postRequest);
+        return readResponse(mockMvc.perform(postRequest).andExpect(status().isOk()), Firmware.class);
+    }
+
+}

application/src/test/java/org/thingsboard/server/controller/sql/FirmwareControllerSqlTest.java

@@ -0,0 +1,23 @@
+/**
+ * Copyright © 2016-2021 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.controller.sql;
+
+import org.thingsboard.server.controller.BaseFirmwareControllerTest;
+import org.thingsboard.server.dao.service.DaoSqlTest;
+
+@DaoSqlTest
+public class FirmwareControllerSqlTest extends BaseFirmwareControllerTest {
+}

common/data/src/main/java/org/thingsboard/server/common/data/FirmwareInfo.java

@@ -46,6 +46,7 @@ public class FirmwareInfo extends SearchTextBasedWithAdditionalInfo<FirmwareId>
         this.tenantId = firmwareInfo.getTenantId();
         this.title = firmwareInfo.getTitle();
         this.version = firmwareInfo.getVersion();
+        this.hasData = firmwareInfo.isHasData();
     }
 
     @Override

dao/src/test/java/org/thingsboard/server/dao/service/BaseFirmwareServiceTest.java

@@ -336,6 +336,20 @@ public abstract class BaseFirmwareServiceTest extends AbstractServiceTest {
         firmwareService.deleteFirmware(tenantId, savedFirmware.getId());
     }
 
+    @Test
+    public void testFindFirmwareInfoById() {
+        FirmwareInfo firmware = new FirmwareInfo();
+        firmware.setTenantId(tenantId);
+        firmware.setTitle(TITLE);
+        firmware.setVersion(VERSION);
+        FirmwareInfo savedFirmware = firmwareService.saveFirmwareInfo(firmware);
+
+        FirmwareInfo foundFirmware = firmwareService.findFirmwareInfoById(tenantId, savedFirmware.getId());
+        Assert.assertNotNull(foundFirmware);
+        Assert.assertEquals(savedFirmware, foundFirmware);
+        firmwareService.deleteFirmware(tenantId, savedFirmware.getId());
+    }
+
     @Test
     public void testDeleteFirmware() {
         Firmware firmware = new Firmware();
@@ -403,24 +417,46 @@ public abstract class BaseFirmwareServiceTest extends AbstractServiceTest {
     public void testFindTenantFirmwaresByTenantIdAndHasData() {
         List<FirmwareInfo> firmwares = new ArrayList<>();
         for (int i = 0; i < 165; i++) {
-            Firmware firmware = new Firmware();
+            FirmwareInfo firmwareInfo = new FirmwareInfo();
-            firmware.setTenantId(tenantId);
+            firmwareInfo.setTenantId(tenantId);
-            firmware.setTitle(TITLE);
+            firmwareInfo.setTitle(TITLE);
-            firmware.setVersion(VERSION + i);
+            firmwareInfo.setVersion(VERSION + i);
+            firmwares.add(firmwareService.saveFirmwareInfo(firmwareInfo));
+        }
+
+        List<FirmwareInfo> loadedFirmwares = new ArrayList<>();
+        PageLink pageLink = new PageLink(16);
+        PageData<FirmwareInfo> pageData;
+        do {
+            pageData = firmwareService.findTenantFirmwaresByTenantIdAndHasData(tenantId, false, pageLink);
+            loadedFirmwares.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageLink.nextPageLink();
+            }
+        } while (pageData.hasNext());
+
+        Collections.sort(firmwares, idComparator);
+        Collections.sort(loadedFirmwares, idComparator);
+
+        Assert.assertEquals(firmwares, loadedFirmwares);
+
+        firmwares.forEach(f -> {
+            Firmware firmware = new Firmware(f.getId());
+            firmware.setCreatedTime(f.getCreatedTime());
+            firmware.setTenantId(f.getTenantId());
+            firmware.setTitle(f.getTitle());
+            firmware.setVersion(f.getVersion());
             firmware.setFileName(FILE_NAME);
             firmware.setContentType(CONTENT_TYPE);
             firmware.setChecksumAlgorithm(CHECKSUM_ALGORITHM);
             firmware.setChecksum(CHECKSUM);
             firmware.setData(DATA);
+            firmwareService.saveFirmware(firmware);
+            f.setHasData(true);
+        });
 
-            FirmwareInfo info = new FirmwareInfo(firmwareService.saveFirmware(firmware));
+        loadedFirmwares = new ArrayList<>();
-            info.setHasData(true);
+        pageLink = new PageLink(16);
-            firmwares.add(info);
-        }
-
-        List<FirmwareInfo> loadedFirmwares = new ArrayList<>();
-        PageLink pageLink = new PageLink(16);
-        PageData<FirmwareInfo> pageData;
         do {
             pageData = firmwareService.findTenantFirmwaresByTenantIdAndHasData(tenantId, true, pageLink);
             loadedFirmwares.addAll(pageData.getData());