From 55a21d26330e88cb93a490a0d9fb34eb7052e638 Mon Sep 17 00:00:00 2001 From: Michael Hirsch Date: Mon, 19 Dec 2016 16:33:09 +0100 Subject: [PATCH] remove getEntity call on event (#396) Signed-off-by: Michael Hirsch --- .../ui/management/targettable/TargetTable.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java index fd63610b6..d1e3750a5 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java @@ -28,6 +28,7 @@ import java.util.stream.Stream; import org.apache.commons.collections4.CollectionUtils; import org.eclipse.hawkbit.repository.FilterParams; import org.eclipse.hawkbit.repository.TargetManagement; +import org.eclipse.hawkbit.repository.event.remote.entity.RemoteEntityEvent; import org.eclipse.hawkbit.repository.model.NamedEntity; import org.eclipse.hawkbit.repository.model.Target; import org.eclipse.hawkbit.repository.model.TargetIdName; @@ -130,7 +131,7 @@ public class TargetTable extends AbstractTable { // history, re-select // the updated target so the action history gets // refreshed. - reselectTargetIfSelectedInStream(eventContainer.getEvents().stream().map(event -> event.getEntity())); + publishTargetSelectedEntityForRefresh(eventContainer.getEvents().stream()); } @EventBusListenerMethod(scope = EventScope.UI) @@ -144,16 +145,14 @@ public class TargetTable extends AbstractTable { .filter(event -> visibleItemIds.contains(new TargetIdName(event.getEntityId(), null, null))) .forEach(event -> updateVisibleItemOnEvent(event.getEntity().getTargetInfo())); } - // workaround until push is available for action - // history, re-select - // the updated target so the action history gets - // refreshed. - reselectTargetIfSelectedInStream(eventContainer.getEvents().stream().map(event -> event.getEntity())); + publishTargetSelectedEntityForRefresh(eventContainer.getEvents().stream()); } - private void reselectTargetIfSelectedInStream(final Stream targets) { - targets.filter(target -> isLastSelectedTarget(target.getTargetIdName())).findAny().ifPresent( - target -> eventBus.publish(this, new TargetTableEvent(BaseEntityEventType.SELECTED_ENTITY, target))); + private void publishTargetSelectedEntityForRefresh( + final Stream> targetEntityEventStream) { + targetEntityEventStream.filter(event -> isLastSelectedTarget(new TargetIdName(event.getEntityId(), null, null))) + .findAny().ifPresent(event -> eventBus.publish(this, + new TargetTableEvent(BaseEntityEventType.SELECTED_ENTITY, event.getEntity()))); } @EventBusListenerMethod(scope = EventScope.UI)