lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

remove getEntity call on event (#396)

Browse Source 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
This commit is contained in:
Michael Hirsch
2016-12-19 16:33:09 +01:00
committed by Kai Zimmermann
parent 2dec35915c
commit 55a21d2633
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTable.java
View File

@@ -28,6 +28,7 @@ import java.util.stream.Stream;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.eclipse.hawkbit.repository.FilterParams; import org.eclipse.hawkbit.repository.FilterParams;
import org.eclipse.hawkbit.repository.TargetManagement; 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.NamedEntity;
import org.eclipse.hawkbit.repository.model.Target; import org.eclipse.hawkbit.repository.model.Target;
import org.eclipse.hawkbit.repository.model.TargetIdName; import org.eclipse.hawkbit.repository.model.TargetIdName;
@@ -130,7 +131,7 @@ public class TargetTable extends AbstractTable<Target, TargetIdName> {
// history, re-select // history, re-select
// the updated target so the action history gets // the updated target so the action history gets
// refreshed. // refreshed.
reselectTargetIfSelectedInStream(eventContainer.getEvents().stream().map(event -> event.getEntity())); publishTargetSelectedEntityForRefresh(eventContainer.getEvents().stream());
} }
@EventBusListenerMethod(scope = EventScope.UI) @EventBusListenerMethod(scope = EventScope.UI)
@@ -144,16 +145,14 @@ public class TargetTable extends AbstractTable<Target, TargetIdName> {
.filter(event -> visibleItemIds.contains(new TargetIdName(event.getEntityId(), null, null))) .filter(event -> visibleItemIds.contains(new TargetIdName(event.getEntityId(), null, null)))
.forEach(event -> updateVisibleItemOnEvent(event.getEntity().getTargetInfo())); .forEach(event -> updateVisibleItemOnEvent(event.getEntity().getTargetInfo()));
} }
// workaround until push is available for action publishTargetSelectedEntityForRefresh(eventContainer.getEvents().stream());
// history, re-select
// the updated target so the action history gets
// refreshed.
reselectTargetIfSelectedInStream(eventContainer.getEvents().stream().map(event -> event.getEntity()));
} }
private void reselectTargetIfSelectedInStream(final Stream<Target> targets) { private void publishTargetSelectedEntityForRefresh(
targets.filter(target -> isLastSelectedTarget(target.getTargetIdName())).findAny().ifPresent( final Stream<? extends RemoteEntityEvent<Target>> targetEntityEventStream) {
target -> eventBus.publish(this, new TargetTableEvent(BaseEntityEventType.SELECTED_ENTITY, target))); 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) @EventBusListenerMethod(scope = EventScope.UI)