This commit is contained in:
Carsten Otto
2022-05-10 20:07:09 +02:00
committed by Carsten Otto
parent 0305d8ac8d
commit b07f2ce38c
2 changed files with 10 additions and 6 deletions

View File

@@ -37,7 +37,8 @@ public class UiDataServiceImpl extends UiDataService {
public UiDataServiceImpl(
ChannelController channelController,
StatusController statusController,
WarningsController warningsController, NodeController nodeController,
WarningsController warningsController,
NodeController nodeController,
NodeService nodeService,
ChannelService channelService
) {
@@ -62,7 +63,9 @@ public class UiDataServiceImpl extends UiDataService {
@Override
public List<OpenChannelDto> getOpenChannels() {
ChannelsDto openChannels = statusController.getOpenChannels();
return openChannels.channels().stream().map(this::toOpenChannelDto).toList();
return openChannels.channels().stream()
.map(this::toOpenChannelDto)
.toList();
}
private OpenChannelDto toOpenChannelDto(ChannelId channelId) {

View File

@@ -12,7 +12,8 @@ import de.cotto.lndmanagej.ui.dto.StatusModel;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import static java.util.stream.Collectors.toSet;
public abstract class UiDataService {
@@ -33,13 +34,13 @@ public abstract class UiDataService {
public List<NodeDto> createNodeList(Collection<OpenChannelDto> openChannels) {
Set<Pubkey> pubkeys = openChannels.stream()
.map(OpenChannelDto::remotePubkey)
.collect(Collectors.toSet());
.collect(toSet());
return pubkeys.stream()
.map(this::getNode)
.collect(Collectors.toList());
.toList();
}
public List<NodeDto> createNodeList() {
return createNodeList(this.getOpenChannels());
return createNodeList(getOpenChannels());
}
}