From c221f82ba480941f9325e4f80078edf40b2c8e5e Mon Sep 17 00:00:00 2001 From: Michael Hirsch Date: Thu, 17 Nov 2016 20:11:16 +0100 Subject: [PATCH] use ID property for sorting because its indexed on DB (#350) Signed-off-by: Michael Hirsch --- .../distributions/dstable/ManageDistBeanQuery.java | 14 +++++++------- .../ui/filtermanagement/CustomTargetBeanQuery.java | 2 +- .../management/dstable/DistributionBeanQuery.java | 2 +- .../ui/management/targettable/TargetBeanQuery.java | 7 ++++--- .../ui/rollout/rollout/RolloutBeanQuery.java | 2 +- .../rolloutgroup/RolloutGroupBeanQuery.java | 2 +- .../RolloutGroupTargetsBeanQuery.java | 2 +- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/ManageDistBeanQuery.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/ManageDistBeanQuery.java index 81ece7340..e270d5a68 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/ManageDistBeanQuery.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/ManageDistBeanQuery.java @@ -40,7 +40,7 @@ import com.google.common.base.Strings; public class ManageDistBeanQuery extends AbstractBeanQuery { private static final long serialVersionUID = 5176481314404662215L; - private Sort sort = new Sort(Direction.ASC, "createdAt"); + private Sort sort = new Sort(Direction.ASC, "id"); private String searchText; private transient DistributionSetManagement distributionSetManagement; private transient Page firstPageDistributionSets; @@ -68,8 +68,8 @@ public class ManageDistBeanQuery extends AbstractBeanQuery { distributionSetType = (DistributionSetType) queryConfig .get(SPUIDefinitions.FILTER_BY_DISTRIBUTION_SET_TYPE); } - if(queryConfig.get(SPUIDefinitions.FILTER_BY_DS_COMPLETE) != null) { - dsComplete = (Boolean)queryConfig.get(SPUIDefinitions.FILTER_BY_DS_COMPLETE); + if (queryConfig.get(SPUIDefinitions.FILTER_BY_DS_COMPLETE) != null) { + dsComplete = (Boolean) queryConfig.get(SPUIDefinitions.FILTER_BY_DS_COMPLETE); } } @@ -101,8 +101,8 @@ public class ManageDistBeanQuery extends AbstractBeanQuery { new OffsetBasedPageRequest(startIndex, count, sort), false, dsComplete); } else { final DistributionSetFilter distributionSetFilter = new DistributionSetFilterBuilder().setIsDeleted(false) - .setIsComplete(dsComplete) - .setSearchText(searchText).setSelectDSWithNoTag(Boolean.FALSE).setType(distributionSetType).build(); + .setIsComplete(dsComplete).setSearchText(searchText).setSelectDSWithNoTag(Boolean.FALSE) + .setType(distributionSetType).build(); distBeans = getDistributionSetManagement().findDistributionSetsByFilters( new PageRequest(startIndex / count, count, sort), distributionSetFilter); } @@ -127,8 +127,8 @@ public class ManageDistBeanQuery extends AbstractBeanQuery { new PageRequest(0, SPUIDefinitions.PAGE_SIZE, sort), false, dsComplete); } else { final DistributionSetFilter distributionSetFilter = new DistributionSetFilterBuilder().setIsDeleted(false) - .setIsComplete(dsComplete) - .setSearchText(searchText).setSelectDSWithNoTag(Boolean.FALSE).setType(distributionSetType).build(); + .setIsComplete(dsComplete).setSearchText(searchText).setSelectDSWithNoTag(Boolean.FALSE) + .setType(distributionSetType).build(); firstPageDistributionSets = getDistributionSetManagement().findDistributionSetsByFilters( new PageRequest(0, SPUIDefinitions.PAGE_SIZE, sort), distributionSetFilter); } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java index f7670e316..0fbfff613 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java @@ -45,7 +45,7 @@ import com.google.common.base.Strings; public class CustomTargetBeanQuery extends AbstractBeanQuery { private static final long serialVersionUID = 6490445732785388071L; - private Sort sort = new Sort(Direction.DESC, "createdAt"); + private Sort sort = new Sort(Direction.ASC, "id"); private transient TargetManagement targetManagement; private FilterManagementUIState filterManagementUIState; private transient I18N i18N; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionBeanQuery.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionBeanQuery.java index 407e27b2f..64a76c174 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionBeanQuery.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionBeanQuery.java @@ -41,7 +41,7 @@ import com.google.common.base.Strings; public class DistributionBeanQuery extends AbstractBeanQuery { private static final long serialVersionUID = 5862679853949173536L; - private Sort sort = new Sort(Direction.ASC, "createdAt"); + private Sort sort = new Sort(Direction.ASC, "id"); private Collection distributionTags; private String searchText; private String pinnedControllerId; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBeanQuery.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBeanQuery.java index 367ef44df..435ae8c21 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBeanQuery.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBeanQuery.java @@ -20,8 +20,8 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import org.eclipse.hawkbit.repository.FilterParams; import org.apache.commons.collections4.CollectionUtils; +import org.eclipse.hawkbit.repository.FilterParams; import org.eclipse.hawkbit.repository.OffsetBasedPageRequest; import org.eclipse.hawkbit.repository.TargetManagement; import org.eclipse.hawkbit.repository.model.DistributionSet; @@ -52,7 +52,7 @@ public class TargetBeanQuery extends AbstractBeanQuery { private static final long serialVersionUID = -5645680058303167558L; - private Sort sort = new Sort(TARGET_TABLE_CREATE_AT_SORT_ORDER, "createdAt"); + private Sort sort = new Sort(TARGET_TABLE_CREATE_AT_SORT_ORDER, "id"); private transient Collection status; private transient Boolean overdueState; private String[] targetTags; @@ -211,7 +211,8 @@ public class TargetBeanQuery extends AbstractBeanQuery { private boolean isAnyFilterSelected() { final boolean isFilterSelected = isTagSelected() || isOverdueFilterEnabled(); - return isFilterSelected || CollectionUtils.isNotEmpty(status) || distributionId != null || !isNullOrEmpty(searchText); + return isFilterSelected || CollectionUtils.isNotEmpty(status) || distributionId != null + || !isNullOrEmpty(searchText); } private TargetManagement getTargetManagement() { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutBeanQuery.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutBeanQuery.java index e13be8f3f..90258fa7f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutBeanQuery.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutBeanQuery.java @@ -47,7 +47,7 @@ public class RolloutBeanQuery extends AbstractBeanQuery { private final String searchText; - private Sort sort = new Sort(Direction.ASC, "createdAt"); + private Sort sort = new Sort(Direction.ASC, "id"); private transient RolloutManagement rolloutManagement; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupBeanQuery.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupBeanQuery.java index ab66b425d..d3cb01ef2 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupBeanQuery.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupBeanQuery.java @@ -42,7 +42,7 @@ public class RolloutGroupBeanQuery extends AbstractBeanQuery private static final long serialVersionUID = 5342450502894318589L; - private Sort sort = new Sort(Direction.ASC, "createdAt"); + private Sort sort = new Sort(Direction.ASC, "id"); private transient Page firstPageRolloutGroupSets = null; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsBeanQuery.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsBeanQuery.java index 487f05ae5..acf7aba61 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsBeanQuery.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsBeanQuery.java @@ -39,7 +39,7 @@ public class RolloutGroupTargetsBeanQuery extends AbstractBeanQuery private static final long serialVersionUID = -8841076207255485907L; - private final Sort sort = new Sort(Direction.ASC, "createdAt"); + private final Sort sort = new Sort(Direction.ASC, "id"); private transient Page firstPageTargetSets = null;