Move getBaseEnvelope to Message. Cleanup

This commit is contained in:
Manfred Karrer 2017-03-21 23:28:43 -05:00
parent 552a151516
commit 9e085102c8
29 changed files with 55 additions and 63 deletions

View file

@ -50,7 +50,7 @@ import io.bisq.protobuffer.payload.arbitration.DisputeResult;
import io.bisq.protobuffer.payload.crypto.PubKeyRing;
import io.bisq.protobuffer.payload.p2p.NodeAddress;
import io.bisq.protobuffer.payload.trade.Contract;
import io.bisq.protobuffer.persisted.arbitration.DisputeList;
import io.bisq.protobuffer.persistence.arbitration.DisputeList;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import org.bitcoinj.core.AddressFormatException;

View file

@ -28,7 +28,7 @@ import io.bisq.protobuffer.crypto.KeyRing;
import io.bisq.protobuffer.payload.arbitration.Arbitrator;
import io.bisq.protobuffer.payload.filter.Filter;
import io.bisq.protobuffer.payload.p2p.NodeAddress;
import io.bisq.protobuffer.persisted.alert.AlertPersistable;
import io.bisq.protobuffer.persistence.alert.AlertPersistable;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty;
import javafx.collections.FXCollections;

View file

@ -22,7 +22,6 @@
<artifactId>protobuffer</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>io.bisq</groupId>
<artifactId>jtorproxy</artifactId>

View file

@ -48,16 +48,5 @@
<artifactId>protobuf-java</artifactId>
<version>3.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>

View file

@ -1,12 +1,17 @@
package io.bisq.protobuffer.message;
import io.bisq.common.app.Version;
import io.bisq.generated.protobuffer.PB;
import io.bisq.protobuffer.Marshaller;
import java.io.Serializable;
public interface Message extends Serializable, Marshaller {
static PB.Envelope.Builder getBaseEnvelope() {
return PB.Envelope.newBuilder().setP2PNetworkVersion(Version.P2P_NETWORK_VERSION);
}
int getMessageVersion();
PB.Envelope toProto();

View file

@ -2,8 +2,8 @@ package io.bisq.protobuffer.message.alert;
import io.bisq.common.app.Version;
import io.bisq.generated.protobuffer.PB;
import io.bisq.protobuffer.message.Message;
import io.bisq.protobuffer.message.p2p.MailboxMessage;
import io.bisq.protobuffer.payload.Payload;
import io.bisq.protobuffer.payload.alert.PrivateNotification;
import io.bisq.protobuffer.payload.p2p.NodeAddress;
import org.slf4j.Logger;
@ -42,7 +42,7 @@ public class PrivateNotificationMessage implements MailboxMessage {
@Override
public PB.Envelope toProto() {
PB.Envelope.Builder baseEnvelope = Payload.getBaseEnvelope();
PB.Envelope.Builder baseEnvelope = Message.getBaseEnvelope();
return baseEnvelope.setPrivateNotificationMessage(baseEnvelope.getPrivateNotificationMessageBuilder()
.setMessageVersion(messageVersion)
.setUid(uid)

View file

@ -19,7 +19,7 @@ package io.bisq.protobuffer.message.arbitration;
import io.bisq.common.app.Version;
import io.bisq.generated.protobuffer.PB;
import io.bisq.protobuffer.payload.Payload;
import io.bisq.protobuffer.message.Message;
import io.bisq.protobuffer.payload.arbitration.Attachment;
import io.bisq.protobuffer.payload.p2p.NodeAddress;
import javafx.beans.property.BooleanProperty;
@ -204,7 +204,7 @@ public final class DisputeCommunicationMessage extends DisputeMessage {
@Override
public PB.Envelope toProto() {
PB.Envelope.Builder baseEnvelope = Payload.getBaseEnvelope();
PB.Envelope.Builder baseEnvelope = Message.getBaseEnvelope();
return baseEnvelope.setDisputeCommunicationMessage(PB.DisputeCommunicationMessage.newBuilder()
.setDate(date)
.setTradeId(tradeId)

View file

@ -19,7 +19,7 @@ package io.bisq.protobuffer.message.arbitration;
import io.bisq.common.app.Version;
import io.bisq.generated.protobuffer.PB;
import io.bisq.protobuffer.payload.Payload;
import io.bisq.protobuffer.message.Message;
import io.bisq.protobuffer.payload.arbitration.DisputeResult;
import io.bisq.protobuffer.payload.p2p.NodeAddress;
@ -62,7 +62,7 @@ public final class DisputeResultMessage extends DisputeMessage {
@Override
public PB.Envelope toProto() {
PB.Envelope.Builder baseEnvelope = Payload.getBaseEnvelope();
PB.Envelope.Builder baseEnvelope = Message.getBaseEnvelope();
return baseEnvelope.setDisputeResultMessage(PB.DisputeResultMessage.newBuilder()
.setDisputeResult(disputeResult.toProto())
.setMyNodeAddress(myNodeAddress.toProto())

View file

@ -19,7 +19,7 @@ package io.bisq.protobuffer.message.arbitration;
import io.bisq.common.app.Version;
import io.bisq.generated.protobuffer.PB;
import io.bisq.protobuffer.payload.Payload;
import io.bisq.protobuffer.message.Message;
import io.bisq.protobuffer.payload.arbitration.Dispute;
import io.bisq.protobuffer.payload.p2p.NodeAddress;
@ -68,7 +68,7 @@ public final class OpenNewDisputeMessage extends DisputeMessage {
@Override
public PB.Envelope toProto() {
PB.Envelope.Builder baseEnvelope = Payload.getBaseEnvelope();
PB.Envelope.Builder baseEnvelope = Message.getBaseEnvelope();
return baseEnvelope.setOpenNewDisputeMessage(PB.OpenNewDisputeMessage.newBuilder()
.setDispute(dispute.toProto()).setMyNodeAddress(myNodeAddress.toProto()).setUid(getUID())).build();
}

View file

@ -19,7 +19,7 @@ package io.bisq.protobuffer.message.arbitration;
import io.bisq.common.app.Version;
import io.bisq.generated.protobuffer.PB;
import io.bisq.protobuffer.payload.Payload;
import io.bisq.protobuffer.message.Message;
import io.bisq.protobuffer.payload.arbitration.Dispute;
import io.bisq.protobuffer.payload.p2p.NodeAddress;
@ -67,7 +67,7 @@ public final class PeerOpenedDisputeMessage extends DisputeMessage {
@Override
public PB.Envelope toProto() {
PB.Envelope.Builder baseEnvelope = Payload.getBaseEnvelope();
PB.Envelope.Builder baseEnvelope = Message.getBaseEnvelope();
return baseEnvelope.setPeerOpenedDisputeMessage(PB.PeerOpenedDisputeMessage.newBuilder()
.setDispute(dispute.toProto())
.setMyNodeAddress(myNodeAddress.toProto())

View file

@ -20,7 +20,7 @@ package io.bisq.protobuffer.message.arbitration;
import com.google.protobuf.ByteString;
import io.bisq.common.app.Version;
import io.bisq.generated.protobuffer.PB;
import io.bisq.protobuffer.payload.Payload;
import io.bisq.protobuffer.message.Message;
import io.bisq.protobuffer.payload.p2p.NodeAddress;
import java.util.Arrays;
@ -75,7 +75,7 @@ public final class PeerPublishedPayoutTxMessage extends DisputeMessage {
@Override
public PB.Envelope toProto() {
PB.Envelope.Builder baseEnvelope = Payload.getBaseEnvelope();
PB.Envelope.Builder baseEnvelope = Message.getBaseEnvelope();
return baseEnvelope.setPeerPublishedPayoutTxMessage(PB.PeerPublishedPayoutTxMessage.newBuilder()
.setTransaction(ByteString.copyFrom(transaction))
.setTradeId(tradeId)

View file

@ -21,8 +21,8 @@ package io.bisq.protobuffer.message.offer;
import io.bisq.common.app.Capabilities;
import io.bisq.common.app.Version;
import io.bisq.generated.protobuffer.PB;
import io.bisq.protobuffer.message.Message;
import io.bisq.protobuffer.message.p2p.SupportedCapabilitiesMessage;
import io.bisq.protobuffer.payload.Payload;
import io.bisq.protobuffer.payload.offer.AvailabilityResult;
import javax.annotation.Nullable;
@ -62,7 +62,7 @@ public final class OfferAvailabilityResponse extends OfferMessage implements Sup
@Override
public PB.Envelope toProto() {
PB.Envelope.Builder baseEnvelope = Payload.getBaseEnvelope();
PB.Envelope.Builder baseEnvelope = Message.getBaseEnvelope();
return baseEnvelope.setOfferAvailabilityResponse(PB.OfferAvailabilityResponse.newBuilder().setMessageVersion(getMessageVersion())
.setOfferId(offerId)
.setAvailabilityResult(PB.AvailabilityResult.forNumber(availabilityResult.ordinal()))

View file

@ -2,7 +2,7 @@ package io.bisq.protobuffer.message.p2p.peers.keepalive;
import io.bisq.common.app.Version;
import io.bisq.generated.protobuffer.PB;
import io.bisq.protobuffer.payload.Payload;
import io.bisq.protobuffer.message.Message;
public final class Ping extends KeepAliveMessage {
// That object is sent over the wire, so we need to take care of version compatibility.
@ -17,7 +17,7 @@ public final class Ping extends KeepAliveMessage {
}
public PB.Envelope toProto() {
PB.Envelope.Builder baseEnvelope = Payload.getBaseEnvelope();
PB.Envelope.Builder baseEnvelope = Message.getBaseEnvelope();
return baseEnvelope.setPing(baseEnvelope.getPingBuilder()
.setNonce(nonce)
.setLastRoundTripTime(lastRoundTripTime)).build();

View file

@ -2,7 +2,7 @@ package io.bisq.protobuffer.message.p2p.peers.keepalive;
import io.bisq.common.app.Version;
import io.bisq.generated.protobuffer.PB;
import io.bisq.protobuffer.payload.Payload;
import io.bisq.protobuffer.message.Message;
public final class Pong extends KeepAliveMessage {
// That object is sent over the wire, so we need to take care of version compatibility.
@ -23,7 +23,7 @@ public final class Pong extends KeepAliveMessage {
@Override
public PB.Envelope toProto() {
PB.Envelope.Builder baseEnvelope = Payload.getBaseEnvelope();
PB.Envelope.Builder baseEnvelope = Message.getBaseEnvelope();
return baseEnvelope.setPong(PB.Pong.newBuilder().setRequestNonce(requestNonce)).build();
}
}

View file

@ -2,7 +2,7 @@ package io.bisq.protobuffer.message.p2p.storage;
import io.bisq.common.app.Version;
import io.bisq.generated.protobuffer.PB;
import io.bisq.protobuffer.payload.Payload;
import io.bisq.protobuffer.message.Message;
import io.bisq.protobuffer.payload.p2p.storage.ProtectedMailboxStorageEntry;
import io.bisq.protobuffer.payload.p2p.storage.ProtectedStorageEntry;
@ -40,7 +40,7 @@ public final class AddDataMessage extends BroadcastMessage {
@Override
public PB.Envelope toProto() {
PB.Envelope.Builder baseEnvelope = Payload.getBaseEnvelope();
PB.Envelope.Builder baseEnvelope = Message.getBaseEnvelope();
PB.AddDataMessage.Builder builder;
PB.ProtectedStorageEntryOrProtectedMailboxStorageEntry.Builder choiceBuilder;
choiceBuilder = PB.ProtectedStorageEntryOrProtectedMailboxStorageEntry.newBuilder();

View file

@ -2,7 +2,7 @@ package io.bisq.protobuffer.message.p2p.storage;
import io.bisq.common.app.Version;
import io.bisq.generated.protobuffer.PB;
import io.bisq.protobuffer.payload.Payload;
import io.bisq.protobuffer.message.Message;
import io.bisq.protobuffer.payload.p2p.storage.ProtectedStorageEntry;
public final class RemoveDataMessage extends BroadcastMessage {
@ -40,7 +40,7 @@ public final class RemoveDataMessage extends BroadcastMessage {
@Override
public PB.Envelope toProto() {
PB.Envelope.Builder baseEnvelope = Payload.getBaseEnvelope();
PB.Envelope.Builder baseEnvelope = Message.getBaseEnvelope();
return baseEnvelope.setRemoveDataMessage(PB.RemoveDataMessage.newBuilder()
.setProtectedStorageEntry((PB.ProtectedStorageEntry) protectedStorageEntry.toProto())).build();

View file

@ -2,7 +2,7 @@ package io.bisq.protobuffer.message.p2p.storage;
import io.bisq.common.app.Version;
import io.bisq.generated.protobuffer.PB;
import io.bisq.protobuffer.payload.Payload;
import io.bisq.protobuffer.message.Message;
import io.bisq.protobuffer.payload.p2p.storage.ProtectedMailboxStorageEntry;
public final class RemoveMailboxDataMessage extends BroadcastMessage {
@ -39,7 +39,7 @@ public final class RemoveMailboxDataMessage extends BroadcastMessage {
@Override
public PB.Envelope toProto() {
PB.Envelope.Builder baseEnvelope = Payload.getBaseEnvelope();
PB.Envelope.Builder baseEnvelope = Message.getBaseEnvelope();
return baseEnvelope.setRemoveMailboxDataMessage(PB.RemoveMailboxDataMessage.newBuilder()
.setProtectedStorageEntry(protectedMailboxStorageEntry.toProto())).build();

View file

@ -20,8 +20,8 @@ package io.bisq.protobuffer.message.trade;
import com.google.protobuf.ByteString;
import io.bisq.common.app.Version;
import io.bisq.generated.protobuffer.PB;
import io.bisq.protobuffer.message.Message;
import io.bisq.protobuffer.message.p2p.MailboxMessage;
import io.bisq.protobuffer.payload.Payload;
import io.bisq.protobuffer.payload.p2p.NodeAddress;
import javax.annotation.concurrent.Immutable;
@ -84,7 +84,7 @@ public final class DepositTxPublishedMessage extends TradeMessage implements Mai
@Override
public PB.Envelope toProto() {
PB.Envelope.Builder baseEnvelope = Payload.getBaseEnvelope();
PB.Envelope.Builder baseEnvelope = Message.getBaseEnvelope();
return baseEnvelope.setDepositTxPublishedMessage(PB.DepositTxPublishedMessage.newBuilder()
.setMessageVersion(getMessageVersion())
.setTradeId(tradeId)

View file

@ -19,8 +19,8 @@ package io.bisq.protobuffer.message.trade;
import io.bisq.common.app.Version;
import io.bisq.generated.protobuffer.PB;
import io.bisq.protobuffer.message.Message;
import io.bisq.protobuffer.message.p2p.MailboxMessage;
import io.bisq.protobuffer.payload.Payload;
import io.bisq.protobuffer.payload.p2p.NodeAddress;
import javax.annotation.concurrent.Immutable;
@ -93,7 +93,7 @@ public final class FiatTransferStartedMessage extends TradeMessage implements Ma
@Override
public PB.Envelope toProto() {
PB.Envelope.Builder baseEnvelope = Payload.getBaseEnvelope();
PB.Envelope.Builder baseEnvelope = Message.getBaseEnvelope();
return baseEnvelope.setFiatTransferStartedMessage(baseEnvelope.getFiatTransferStartedMessageBuilder()
.setMessageVersion(getMessageVersion())
.setTradeId(tradeId)

View file

@ -20,8 +20,8 @@ package io.bisq.protobuffer.message.trade;
import com.google.protobuf.ByteString;
import io.bisq.common.app.Version;
import io.bisq.generated.protobuffer.PB;
import io.bisq.protobuffer.message.Message;
import io.bisq.protobuffer.message.p2p.MailboxMessage;
import io.bisq.protobuffer.payload.Payload;
import io.bisq.protobuffer.payload.p2p.NodeAddress;
import javax.annotation.concurrent.Immutable;
@ -103,7 +103,7 @@ public final class FinalizePayoutTxRequest extends TradeMessage implements Mailb
@Override
public PB.Envelope toProto() {
PB.Envelope.Builder baseEnvelope = Payload.getBaseEnvelope();
PB.Envelope.Builder baseEnvelope = Message.getBaseEnvelope();
return baseEnvelope.setFinalizePayoutTxRequest(PB.FinalizePayoutTxRequest.newBuilder()
.setMessageVersion(getMessageVersion())
.setTradeId(tradeId)

View file

@ -20,8 +20,8 @@ package io.bisq.protobuffer.message.trade;
import com.google.protobuf.ByteString;
import io.bisq.common.app.Version;
import io.bisq.generated.protobuffer.PB;
import io.bisq.protobuffer.message.Message;
import io.bisq.protobuffer.message.p2p.MailboxMessage;
import io.bisq.protobuffer.payload.Payload;
import io.bisq.protobuffer.payload.btc.RawTransactionInput;
import io.bisq.protobuffer.payload.crypto.PubKeyRing;
import io.bisq.protobuffer.payload.p2p.NodeAddress;
@ -164,7 +164,7 @@ public final class PayDepositRequest extends TradeMessage implements MailboxMess
@Override
public PB.Envelope toProto() {
PB.Envelope.Builder baseEnvelope = Payload.getBaseEnvelope();
PB.Envelope.Builder baseEnvelope = Message.getBaseEnvelope();
PB.PayDepositRequest.Builder builderForValue = PB.PayDepositRequest.newBuilder()
.setTradeId(tradeId)
.setTradeAmount(tradeAmount)

View file

@ -20,8 +20,8 @@ package io.bisq.protobuffer.message.trade;
import com.google.protobuf.ByteString;
import io.bisq.common.app.Version;
import io.bisq.generated.protobuffer.PB;
import io.bisq.protobuffer.message.Message;
import io.bisq.protobuffer.message.p2p.MailboxMessage;
import io.bisq.protobuffer.payload.Payload;
import io.bisq.protobuffer.payload.p2p.NodeAddress;
import javax.annotation.concurrent.Immutable;
@ -84,7 +84,7 @@ public final class PayoutTxFinalizedMessage extends TradeMessage implements Mail
@Override
public PB.Envelope toProto() {
PB.Envelope.Builder baseEnvelope = Payload.getBaseEnvelope();
PB.Envelope.Builder baseEnvelope = Message.getBaseEnvelope();
return baseEnvelope.setPayoutTxFinalizedMessage(baseEnvelope.getPayoutTxFinalizedMessageBuilder()
.setUid(uid)
.setMessageVersion(getMessageVersion())

View file

@ -21,7 +21,7 @@ import com.google.protobuf.ByteString;
import io.bisq.common.app.Version;
import io.bisq.common.util.Utilities;
import io.bisq.generated.protobuffer.PB;
import io.bisq.protobuffer.payload.Payload;
import io.bisq.protobuffer.message.Message;
import io.bisq.protobuffer.payload.btc.RawTransactionInput;
import io.bisq.protobuffer.payload.payment.PaymentAccountPayload;
import org.slf4j.Logger;
@ -77,7 +77,7 @@ public final class PublishDepositTxRequest extends TradeMessage {
@Override
public PB.Envelope toProto() {
PB.Envelope.Builder baseEnvelope = Payload.getBaseEnvelope();
PB.Envelope.Builder baseEnvelope = Message.getBaseEnvelope();
return baseEnvelope.setPublishDepositTxRequest(baseEnvelope.getPublishDepositTxRequestBuilder()
.setMessageVersion(getMessageVersion())
.setTradeId(tradeId)

View file

@ -1,14 +1,9 @@
package io.bisq.protobuffer.payload;
import io.bisq.common.app.Version;
import io.bisq.generated.protobuffer.PB;
import io.bisq.protobuffer.Marshaller;
/**
* Marker interface for data which is sent over the wire
*/
public interface Payload extends Marshaller {
static PB.Envelope.Builder getBaseEnvelope() {
return PB.Envelope.newBuilder().setP2PNetworkVersion(Version.P2P_NETWORK_VERSION);
}
}

View file

@ -26,7 +26,7 @@ import io.bisq.protobuffer.message.arbitration.DisputeCommunicationMessage;
import io.bisq.protobuffer.payload.Payload;
import io.bisq.protobuffer.payload.crypto.PubKeyRing;
import io.bisq.protobuffer.payload.trade.Contract;
import io.bisq.protobuffer.persisted.arbitration.DisputeList;
import io.bisq.protobuffer.persistence.arbitration.DisputeList;
import javafx.beans.property.*;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;

View file

@ -1,4 +1,4 @@
package io.bisq.protobuffer.persisted;
package io.bisq.protobuffer.persistence;
import io.bisq.common.app.Version;
import io.bisq.generated.protobuffer.PB;

View file

@ -15,16 +15,14 @@
* along with bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bisq.protobuffer.persisted.alert;
package io.bisq.protobuffer.persistence.alert;
import io.bisq.protobuffer.alert.AlertProto;
import io.bisq.protobuffer.persisted.PersistableNew;
import io.bisq.protobuffer.persistence.PersistableNew;
import io.bisq.vo.alert.AlertVO;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.concurrent.Immutable;
@Slf4j
@Immutable
public final class AlertPersistable extends AlertProto implements PersistableNew {
public AlertPersistable(AlertVO alertVO) {

View file

@ -15,7 +15,7 @@
* along with bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bisq.protobuffer.persisted.arbitration;
package io.bisq.protobuffer.persistence.arbitration;
import io.bisq.common.app.Version;
import io.bisq.common.persistance.Persistable;

View file

@ -11,5 +11,11 @@
<artifactId>vo</artifactId>
<dependencies>
<dependency>
<groupId>io.bisq</groupId>
<artifactId>common</artifactId>
<version>${project.parent.version}</version>
</dependency>
</dependencies>
</project>