From 3f54cb233e96d14c63026ea2ebc4bd4779e233fb Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Thu, 18 Feb 2016 12:48:39 +0100
Subject: [PATCH] Rename RequiresOwnerIsOnlineMessage to
 RequiresOwnerIsOnlinePayload

---
 core/src/main/java/io/bitsquare/trade/offer/Offer.java      | 4 ++--
 .../io/bitsquare/p2p/messaging/DecryptedMsgWithPubKey.java  | 1 +
 .../main/java/io/bitsquare/p2p/storage/P2PDataStorage.java  | 6 +++---
 ...OnlineMessage.java => RequiresOwnerIsOnlinePayload.java} | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename network/src/main/java/io/bitsquare/p2p/storage/messages/{RequiresOwnerIsOnlineMessage.java => RequiresOwnerIsOnlinePayload.java} (88%)

diff --git a/core/src/main/java/io/bitsquare/trade/offer/Offer.java b/core/src/main/java/io/bitsquare/trade/offer/Offer.java
index 4a72b380da..e6a4f5adbe 100644
--- a/core/src/main/java/io/bitsquare/trade/offer/Offer.java
+++ b/core/src/main/java/io/bitsquare/trade/offer/Offer.java
@@ -25,7 +25,7 @@ import io.bitsquare.common.handlers.ResultHandler;
 import io.bitsquare.common.util.JsonExclude;
 import io.bitsquare.locale.Country;
 import io.bitsquare.p2p.NodeAddress;
-import io.bitsquare.p2p.storage.messages.RequiresOwnerIsOnlineMessage;
+import io.bitsquare.p2p.storage.messages.RequiresOwnerIsOnlinePayload;
 import io.bitsquare.p2p.storage.messages.StorageMessage;
 import io.bitsquare.payment.PaymentMethod;
 import io.bitsquare.trade.protocol.availability.OfferAvailabilityModel;
@@ -47,7 +47,7 @@ import java.util.concurrent.TimeUnit;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
-public final class Offer implements StorageMessage, RequiresOwnerIsOnlineMessage {
+public final class Offer implements StorageMessage, RequiresOwnerIsOnlinePayload {
     // That object is sent over the wire, so we need to take care of version compatibility.
     @JsonExclude
     private static final long serialVersionUID = Version.P2P_NETWORK_VERSION;
diff --git a/network/src/main/java/io/bitsquare/p2p/messaging/DecryptedMsgWithPubKey.java b/network/src/main/java/io/bitsquare/p2p/messaging/DecryptedMsgWithPubKey.java
index deabec8e1e..98998eb42b 100644
--- a/network/src/main/java/io/bitsquare/p2p/messaging/DecryptedMsgWithPubKey.java
+++ b/network/src/main/java/io/bitsquare/p2p/messaging/DecryptedMsgWithPubKey.java
@@ -22,6 +22,7 @@ import io.bitsquare.p2p.Message;
 
 import java.security.PublicKey;
 
+// TODO is that sent over wire????
 public final class DecryptedMsgWithPubKey implements DirectMessage {
     // That object is sent over the wire, so we need to take care of version compatibility.
     private static final long serialVersionUID = Version.P2P_NETWORK_VERSION;
diff --git a/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java b/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java
index 8cac6c53fd..4a1105eb34 100644
--- a/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java
+++ b/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java
@@ -137,9 +137,9 @@ public class P2PDataStorage implements MessageListener, ConnectionListener {
             map.values().stream()
                     .forEach(protectedData -> {
                         ExpirableMessage expirableMessage = protectedData.expirableMessage;
-                        if (expirableMessage instanceof RequiresOwnerIsOnlineMessage) {
-                            RequiresOwnerIsOnlineMessage requiresOwnerIsOnlineMessage = (RequiresOwnerIsOnlineMessage) expirableMessage;
-                            NodeAddress ownerNodeAddress = requiresOwnerIsOnlineMessage.getOwnerNodeAddress();
+                        if (expirableMessage instanceof RequiresOwnerIsOnlinePayload) {
+                            RequiresOwnerIsOnlinePayload requiresOwnerIsOnlinePayload = (RequiresOwnerIsOnlinePayload) expirableMessage;
+                            NodeAddress ownerNodeAddress = requiresOwnerIsOnlinePayload.getOwnerNodeAddress();
                             if (ownerNodeAddress.equals(connection.getPeersNodeAddressOptional().get())) {
                                 // We have a RequiresLiveOwnerData data object with the node address of the 
                                 // disconnected peer. We remove that data from our map.
diff --git a/network/src/main/java/io/bitsquare/p2p/storage/messages/RequiresOwnerIsOnlineMessage.java b/network/src/main/java/io/bitsquare/p2p/storage/messages/RequiresOwnerIsOnlinePayload.java
similarity index 88%
rename from network/src/main/java/io/bitsquare/p2p/storage/messages/RequiresOwnerIsOnlineMessage.java
rename to network/src/main/java/io/bitsquare/p2p/storage/messages/RequiresOwnerIsOnlinePayload.java
index 18234f65ea..d131f794fc 100644
--- a/network/src/main/java/io/bitsquare/p2p/storage/messages/RequiresOwnerIsOnlineMessage.java
+++ b/network/src/main/java/io/bitsquare/p2p/storage/messages/RequiresOwnerIsOnlinePayload.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * This is used for the offers to avoid dead offers in case the offerer is in sleep/hibernate mode or the app has
  * terminated without sending the remove message (e.g. in case of a crash).
  */
-public interface RequiresOwnerIsOnlineMessage extends Serializable {
+public interface RequiresOwnerIsOnlinePayload extends Serializable {
     /**
      * @return NodeAddress of the data owner
      */