From 7ca515fb448086d394cf717a550267aadd9f3b83 Mon Sep 17 00:00:00 2001 From: Bondar Bogdan <36962546+bogdan-bondar@users.noreply.github.com> Date: Tue, 8 Sep 2020 13:56:18 +0200 Subject: [PATCH] introduced paging while retrieving the target/ds tags (#1006) Signed-off-by: Bogdan Bondar --- .../ui/common/tagdetails/AbstractTagToken.java | 2 -- .../ui/common/tagdetails/DistributionTagToken.java | 11 ++++++----- .../hawkbit/ui/common/tagdetails/TargetTagToken.java | 10 +++++----- .../ui/management/bulkupload/TargetBulkTokenTags.java | 4 ++-- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/AbstractTagToken.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/AbstractTagToken.java index 328801ca9..f0105105d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/AbstractTagToken.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/AbstractTagToken.java @@ -33,8 +33,6 @@ import org.vaadin.spring.events.EventBus.UIEventBus; */ public abstract class AbstractTagToken implements TagAssignmentListener, MasterEntityAwareComponent { - protected static final int MAX_TAG_QUERY = 1000; - protected TagPanelLayout tagPanelLayout; protected final SpPermissionChecker checker; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/DistributionTagToken.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/DistributionTagToken.java index 8edeeed68..98849c183 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/DistributionTagToken.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/DistributionTagToken.java @@ -24,9 +24,9 @@ import org.eclipse.hawkbit.ui.common.data.proxies.ProxyTag; import org.eclipse.hawkbit.ui.common.event.EntityModifiedEventPayload; import org.eclipse.hawkbit.ui.common.event.EntityModifiedEventPayload.EntityModifiedEventType; import org.eclipse.hawkbit.ui.common.event.EventTopics; +import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil; import org.eclipse.hawkbit.ui.utils.UINotification; import org.eclipse.hawkbit.ui.utils.VaadinMessageSource; -import org.springframework.data.domain.PageRequest; import org.vaadin.spring.events.EventBus.UIEventBus; /** @@ -106,15 +106,16 @@ public class DistributionTagToken extends AbstractTagToken @Override protected List getAllTags() { - return distributionSetTagManagement.findAll(PageRequest.of(0, MAX_TAG_QUERY)).getContent().stream() + return HawkbitCommonUtil.getEntitiesByPageableProvider(distributionSetTagManagement::findAll).stream() .map(tagMapper::map).collect(Collectors.toList()); } @Override protected List getAssignedTags() { - return getMasterEntity().map(masterEntity -> distributionSetTagManagement - .findByDistributionSet(PageRequest.of(0, MAX_TAG_QUERY), masterEntity.getId()).getContent().stream() - .map(tagMapper::map).collect(Collectors.toList())).orElse(Collections.emptyList()); + return getMasterEntity().map(masterEntity -> HawkbitCommonUtil + .getEntitiesByPageableProvider( + p -> distributionSetTagManagement.findByDistributionSet(p, masterEntity.getId())) + .stream().map(tagMapper::map).collect(Collectors.toList())).orElse(Collections.emptyList()); } @Override diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TargetTagToken.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TargetTagToken.java index 29f33bd57..ab7d562af 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TargetTagToken.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TargetTagToken.java @@ -24,9 +24,9 @@ import org.eclipse.hawkbit.ui.common.data.proxies.ProxyTarget; import org.eclipse.hawkbit.ui.common.event.EntityModifiedEventPayload; import org.eclipse.hawkbit.ui.common.event.EntityModifiedEventPayload.EntityModifiedEventType; import org.eclipse.hawkbit.ui.common.event.EventTopics; +import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil; import org.eclipse.hawkbit.ui.utils.UINotification; import org.eclipse.hawkbit.ui.utils.VaadinMessageSource; -import org.springframework.data.domain.PageRequest; import org.vaadin.spring.events.EventBus.UIEventBus; /** @@ -106,15 +106,15 @@ public class TargetTagToken extends AbstractTagToken { @Override protected List getAllTags() { - return targetTagManagement.findAll(PageRequest.of(0, MAX_TAG_QUERY)).stream() + return HawkbitCommonUtil.getEntitiesByPageableProvider(targetTagManagement::findAll).stream() .map(tag -> new ProxyTag(tag.getId(), tag.getName(), tag.getColour())).collect(Collectors.toList()); } @Override protected List getAssignedTags() { - return getMasterEntity().map(masterEntity -> targetTagManagement - .findByTarget(PageRequest.of(0, MAX_TAG_QUERY), masterEntity.getControllerId()).stream() - .map(tagMapper::map).collect(Collectors.toList())).orElse(Collections.emptyList()); + return getMasterEntity().map(masterEntity -> HawkbitCommonUtil + .getEntitiesByPageableProvider(p -> targetTagManagement.findByTarget(p, masterEntity.getControllerId())) + .stream().map(tagMapper::map).collect(Collectors.toList())).orElse(Collections.emptyList()); } @Override diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/TargetBulkTokenTags.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/TargetBulkTokenTags.java index 7b450e114..3da3b42ee 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/TargetBulkTokenTags.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/TargetBulkTokenTags.java @@ -20,9 +20,9 @@ import org.eclipse.hawkbit.ui.common.data.mappers.TagToProxyTagMapper; import org.eclipse.hawkbit.ui.common.data.proxies.ProxyTag; import org.eclipse.hawkbit.ui.common.data.proxies.ProxyTarget; import org.eclipse.hawkbit.ui.common.tagdetails.AbstractTagToken; +import org.eclipse.hawkbit.ui.utils.HawkbitCommonUtil; import org.eclipse.hawkbit.ui.utils.UINotification; import org.eclipse.hawkbit.ui.utils.VaadinMessageSource; -import org.springframework.data.domain.PageRequest; import org.springframework.util.CollectionUtils; import org.vaadin.spring.events.EventBus.UIEventBus; @@ -60,7 +60,7 @@ public class TargetBulkTokenTags extends AbstractTagToken { @Override protected List getAllTags() { - return tagManagement.findAll(PageRequest.of(0, MAX_TAG_QUERY)).stream() + return HawkbitCommonUtil.getEntitiesByPageableProvider(tagManagement::findAll).stream() .map(tag -> new ProxyTag(tag.getId(), tag.getName(), tag.getColour())).collect(Collectors.toList()); }