mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 01:41:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Organize grpc/protobuf imports properly

Browse Source
This commit is contained in:
Chris Beams 2020-03-26 17:10:59 +01:00
parent aed3453142
commit b8db1cdf78
No known key found for this signature in database
GPG Key ID: 3D214F8F5BC5ED73
6 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/codeStyles/Project.xml
View File

@ -33,6 +33,10 @@
<emptyLine />
<package name="bisq.asset" withSubpackages="true" static="false" />
<emptyLine />
<package name="bisq.grpc" withSubpackages="true" static="false" />
<emptyLine />
<package name="protobuf" withSubpackages="true" static="false" />
<emptyLine />
<package name="io.grpc" withSubpackages="true" static="false" />
<emptyLine />
<package name="com.google.protobuf" withSubpackages="true" static="false" />

16
cli/src/main/java/bisq/cli/app/CliCommand.java
View File

@ -1,5 +1,12 @@
package bisq.cli.app;
import bisq.grpc.GetBalanceGrpc;
import bisq.grpc.GetBalanceRequest;
import bisq.grpc.GetVersionGrpc;
import bisq.grpc.GetVersionRequest;
import bisq.grpc.StopServerGrpc;
import bisq.grpc.StopServerRequest;
import io.grpc.ManagedChannel;
import io.grpc.StatusRuntimeException;
@ -13,15 +20,6 @@ import lombok.extern.slf4j.Slf4j;
import static java.lang.System.currentTimeMillis;
import bisq.grpc.GetBalanceGrpc;
import bisq.grpc.GetBalanceRequest;
import bisq.grpc.GetVersionGrpc;
import bisq.grpc.GetVersionRequest;
import bisq.grpc.StopServerGrpc;
import bisq.grpc.StopServerRequest;
@Slf4j
final class CliCommand {

24
core/src/main/java/bisq/core/grpc/BisqGrpcServer.java
View File

@ -22,19 +22,6 @@ import bisq.core.payment.PaymentAccount;
import bisq.core.trade.handlers.TransactionResultHandler;
import bisq.core.trade.statistics.TradeStatistics2;
import io.grpc.Server;
import io.grpc.ServerBuilder;
import io.grpc.stub.StreamObserver;
import java.io.IOException;
import java.util.List;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import bisq.grpc.GetBalanceGrpc;
import bisq.grpc.GetBalanceReply;
import bisq.grpc.GetBalanceRequest;
@ -57,6 +44,17 @@ import bisq.grpc.StopServerGrpc;
import bisq.grpc.StopServerReply;
import bisq.grpc.StopServerRequest;
import io.grpc.Server;
import io.grpc.ServerBuilder;
import io.grpc.stub.StreamObserver;
import java.io.IOException;
import java.util.List;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
/**
* gRPC server. Gets a instance of BisqFacade passed to access data from the running Bisq instance.

6
core/src/test/java/bisq/core/util/ProtoUtilTest.java
View File

@ -21,15 +21,13 @@ import bisq.core.offer.OpenOffer;
import bisq.common.proto.ProtoUtil;
import protobuf.OfferPayload;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import protobuf.OfferPayload;
@SuppressWarnings("UnusedAssignment")
public class ProtoUtilTest {

6
p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/GetUpdatedDataRequest.java
View File

@ -23,6 +23,8 @@ import bisq.network.p2p.SendersNodeAddressMessage;
import bisq.common.app.Version;
import bisq.common.proto.ProtoUtil;
import protobuf.NetworkEnvelope;
import com.google.protobuf.ByteString;
import java.util.Set;
@ -34,10 +36,6 @@ import lombok.extern.slf4j.Slf4j;
import static com.google.common.base.Preconditions.checkNotNull;
import protobuf.NetworkEnvelope;
@Slf4j
@EqualsAndHashCode(callSuper = true)
@Value

4
p2p/src/main/java/bisq/network/p2p/peers/getdata/messages/PreliminaryGetDataRequest.java
View File

@ -24,6 +24,8 @@ import bisq.common.app.Capabilities;
import bisq.common.app.Version;
import bisq.common.proto.ProtoUtil;
import protobuf.NetworkEnvelope;
import com.google.protobuf.ByteString;
import java.util.Set;
@ -35,8 +37,6 @@ import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import protobuf.NetworkEnvelope;
@Slf4j
@EqualsAndHashCode(callSuper = true)
@Value