mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 07:07:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove @Nullable around supportedCapabilities in GetDataResponse

Browse source 
The only two users of this constructor are the fromProto path which
already creates an empty Capabilities object if one is not provided and
the internal usage of Capabilities.app which is initialized to empty.

Remove the @Nullable so future readers aren't confused.
This commit is contained in:
Julian Knutsen 2019-11-22 11:36:53 -08:00
parent a0fae12068
commit c503bcbaed
No known key found for this signature in database
GPG key ID: D85F536DB3615B2D
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetDataResponse.java
View file

@ -29,7 +29,6 @@ import bisq.common.proto.network.NetworkEnvelope;
import bisq.common.proto.network.NetworkProtoResolver;
import java.util.HashSet;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
@ -39,8 +38,6 @@ import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import javax.annotation.Nullable;
@Slf4j
@EqualsAndHashCode(callSuper = true)
@Value
@ -54,10 +51,9 @@ public final class GetDataResponse extends NetworkEnvelope implements SupportedC
private final int requestNonce;
private final boolean isGetUpdatedDataResponse;
@Nullable
private final Capabilities supportedCapabilities;
public GetDataResponse(Set<ProtectedStorageEntry> dataSet,
public GetDataResponse(@NotNull Set<ProtectedStorageEntry> dataSet,
@NotNull Set<PersistableNetworkPayload> persistableNetworkPayloadSet,
int requestNonce,
boolean isGetUpdatedDataResponse) {
@ -73,11 +69,11 @@ public final class GetDataResponse extends NetworkEnvelope implements SupportedC
// PROTO BUFFER
///////////////////////////////////////////////////////////////////////////////////////////
private GetDataResponse(Set<ProtectedStorageEntry> dataSet,
private GetDataResponse(@NotNull Set<ProtectedStorageEntry> dataSet,
@NotNull Set<PersistableNetworkPayload> persistableNetworkPayloadSet,
int requestNonce,
boolean isGetUpdatedDataResponse,
@Nullable Capabilities supportedCapabilities,
@NotNull Capabilities supportedCapabilities,
int messageVersion) {
super(messageVersion);
@ -101,13 +97,12 @@ public final class GetDataResponse extends NetworkEnvelope implements SupportedC
.setProtectedStorageEntry((protobuf.ProtectedStorageEntry) protectedStorageEntry.toProtoMessage())
.build())
.collect(Collectors.toList()))
.setRequestNonce(requestNonce)
.setIsGetUpdatedDataResponse(isGetUpdatedDataResponse)
.addAllPersistableNetworkPayloadItems(persistableNetworkPayloadSet.stream()
.map(PersistableNetworkPayload::toProtoMessage)
.collect(Collectors.toList()));
Optional.ofNullable(supportedCapabilities).ifPresent(e -> builder.addAllSupportedCapabilities(Capabilities.toIntList(supportedCapabilities)));
.collect(Collectors.toList()))
.setRequestNonce(requestNonce)
.setIsGetUpdatedDataResponse(isGetUpdatedDataResponse)
.addAllSupportedCapabilities(Capabilities.toIntList(supportedCapabilities));
protobuf.NetworkEnvelope proto = getNetworkEnvelopeBuilder()
.setGetDataResponse(builder)