dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5753 from smatvienko-tb/pagelink_sorted

Browse Source 
Unsorted page link replaced with sort by id ASC.
This commit is contained in:
Igor Kulikov 2021-12-20 18:13:36 +02:00 committed by GitHub
commit ca5a2e5d80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java
View File

@ -36,6 +36,9 @@ import java.util.stream.Collectors;
public abstract class DaoUtil { public abstract class DaoUtil {
public static final String DEFAULT_SORT_PROPERTY = "id";
public static final Sort DEFAULT_SORT = Sort.by(Sort.Direction.ASC, DEFAULT_SORT_PROPERTY);
private DaoUtil() { private DaoUtil() {
} }
@ -70,7 +73,7 @@ public abstract class DaoUtil {
public static Sort toSort(SortOrder sortOrder, Map<String,String> columnMap) { public static Sort toSort(SortOrder sortOrder, Map<String,String> columnMap) {
if (sortOrder == null) { if (sortOrder == null) {
return Sort.unsorted(); return DEFAULT_SORT;
} else { } else {
String property = sortOrder.getProperty(); String property = sortOrder.getProperty();
if (columnMap.containsKey(property)) { if (columnMap.containsKey(property)) {

7
dao/src/test/java/org/thingsboard/server/dao/service/BaseOtaPackageServiceTest.java
View File

@ -44,6 +44,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE; import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE;
public abstract class BaseOtaPackageServiceTest extends AbstractServiceTest { public abstract class BaseOtaPackageServiceTest extends AbstractServiceTest {
@ -58,7 +59,7 @@ public abstract class BaseOtaPackageServiceTest extends AbstractServiceTest {
private static final ByteBuffer DATA = ByteBuffer.wrap(new byte[]{(int) DATA_SIZE}); private static final ByteBuffer DATA = ByteBuffer.wrap(new byte[]{(int) DATA_SIZE});
private static final String URL = "http://firmware.test.org"; private static final String URL = "http://firmware.test.org";
private IdComparator<OtaPackageInfo> idComparator = new IdComparator<>(); private final IdComparator<OtaPackageInfo> idComparator = new IdComparator<>();
private TenantId tenantId; private TenantId tenantId;
@ -565,7 +566,7 @@ public abstract class BaseOtaPackageServiceTest extends AbstractServiceTest {
Collections.sort(firmwares, idComparator); Collections.sort(firmwares, idComparator);
Collections.sort(loadedFirmwares, idComparator); Collections.sort(loadedFirmwares, idComparator);
Assert.assertEquals(firmwares, loadedFirmwares); assertThat(firmwares).isEqualTo(loadedFirmwares);
otaPackageService.deleteOtaPackagesByTenantId(tenantId); otaPackageService.deleteOtaPackagesByTenantId(tenantId);
@ -620,7 +621,7 @@ public abstract class BaseOtaPackageServiceTest extends AbstractServiceTest {
Collections.sort(firmwares, idComparator); Collections.sort(firmwares, idComparator);
Collections.sort(loadedFirmwares, idComparator); Collections.sort(loadedFirmwares, idComparator);
Assert.assertEquals(firmwares, loadedFirmwares); assertThat(firmwares).isEqualTo(loadedFirmwares);
otaPackageService.deleteOtaPackagesByTenantId(tenantId); otaPackageService.deleteOtaPackagesByTenantId(tenantId);