Start implementing gossip initiator path

6 files changed, 160 insertions, 3 deletions

diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/AttributesMessage.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/AttributesMessage.java
new file mode 100644
index 0000000..49bda14
--- /dev/null
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/AttributesMessage.java
@@ -0,0 +1,31 @@
+package pl.edu.mimuw.cloudatlas.agent.messages;
+
+import java.util.Map;
+
+import pl.edu.mimuw.cloudatlas.model.AttributesMap;
+import pl.edu.mimuw.cloudatlas.model.PathName;
+
+public class AttributesMessage extends RemoteGossipGirlMessage {
+    private PathName path;
+    private AttributesMap attributes;
+    private long receiverGossipId;
+
+    public AttributesMessage(String messageId, long timestamp, PathName path, AttributesMap attributes, long receiverGossipId) {
+        super(messageId, timestamp, Type.ATTRIBUTES);
+        this.path = path;
+        this.attributes = attributes;
+        this.receiverGossipId = receiverGossipId;
+    }
+
+    public PathName getPath() {
+        return path;
+    }
+
+    public AttributesMap getAttributes() {
+        return attributes;
+    }
+
+    public long getReceiverGossipId() {
+        return receiverGossipId;
+    }
+}
diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/GossipGirlMessage.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/GossipGirlMessage.java
index 705d64a..2016447 100644
--- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/GossipGirlMessage.java
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/GossipGirlMessage.java
@@ -5,7 +5,10 @@ import pl.edu.mimuw.cloudatlas.agent.modules.ModuleType;
 
 public abstract class GossipGirlMessage extends AgentMessage {
     public enum Type {
-        INITIATE
+        ATTRIBUTES,
+        HEJKA,
+        INITIATE,
+        NO_CO_TAM
     }
 
     private Type type;
diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/HejkaMessage.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/HejkaMessage.java
new file mode 100644
index 0000000..340d939
--- /dev/null
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/HejkaMessage.java
@@ -0,0 +1,32 @@
+package pl.edu.mimuw.cloudatlas.agent.messages;
+
+import java.util.Map;
+
+import pl.edu.mimuw.cloudatlas.model.Attribute;
+import pl.edu.mimuw.cloudatlas.model.PathName;
+import pl.edu.mimuw.cloudatlas.model.ValueTime;
+
+public class HejkaMessage extends RemoteGossipGirlMessage {
+    private long senderGossipId;
+    private Map<PathName, ValueTime> zoneTimestamps;
+    private Map<Attribute, ValueTime> queryTimestamps;
+
+    public HejkaMessage(String messageId, long timestamp, long senderGossipId, Map<PathName, ValueTime> zoneTimestamps, Map<Attribute, ValueTime> queryTimestamps) {
+        super(messageId, timestamp, Type.HEJKA);
+        this.senderGossipId = senderGossipId;
+        this.zoneTimestamps = zoneTimestamps;
+        this.queryTimestamps = queryTimestamps;
+    }
+
+    public long getSenderGossipId() {
+        return senderGossipId;
+    }
+
+    public Map<PathName, ValueTime> getZoneTimestamps() {
+        return zoneTimestamps;
+    }
+
+    public Map<Attribute, ValueTime> getQueryTimestamps() {
+        return queryTimestamps;
+    }
+}
diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/InitiateGossipMessage.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/InitiateGossipMessage.java
index d216d59..955570e 100644
--- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/InitiateGossipMessage.java
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/InitiateGossipMessage.java
@@ -1,11 +1,24 @@
 package pl.edu.mimuw.cloudatlas.agent.messages;
 
 import pl.edu.mimuw.cloudatlas.agent.modules.ModuleType;
+import pl.edu.mimuw.cloudatlas.model.PathName;
+import pl.edu.mimuw.cloudatlas.model.ValueContact;
 
 public class InitiateGossipMessage extends GossipGirlMessage {
-    private long nextGossipId = 0;
+    private PathName ourPath;
+    private ValueContact theirContact;
 
-    public InitiateGossipMessage(String messageId, long timestamp) {
+    public InitiateGossipMessage(String messageId, long timestamp, PathName ourPath, ValueContact theirContact) {
         super(messageId, timestamp, Type.INITIATE);
+        this.ourPath = ourPath;
+        this.theirContact = theirContact;
+    }
+
+    public PathName getOurPath() {
+        return ourPath;
+    }
+
+    public ValueContact getTheirContact() {
+        return theirContact;
     }
 }
diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/NoCoTamMessage.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/NoCoTamMessage.java
new file mode 100644
index 0000000..3dd0c4d
--- /dev/null
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/NoCoTamMessage.java
@@ -0,0 +1,50 @@
+package pl.edu.mimuw.cloudatlas.agent.messages;
+
+import java.util.Map;
+
+import pl.edu.mimuw.cloudatlas.model.Attribute;
+import pl.edu.mimuw.cloudatlas.model.PathName;
+import pl.edu.mimuw.cloudatlas.model.ValueTime;
+
+public class NoCoTamMessage extends RemoteGossipGirlMessage {
+    private long receiverGossipId;
+    private long senderGossipId;
+    private Map<PathName, ValueTime> zoneTimestamps;
+    private Map<Attribute, ValueTime> queryTimestamps;
+    private ValueTime hejkaSendTimestamp;
+    private ValueTime hejkaReceiveTimestamp;
+
+    public NoCoTamMessage(String messageId, long timestamp, long receiverGossipId, long senderGossipId, Map<PathName, ValueTime> zoneTimestamps, Map<Attribute, ValueTime> queryTimestamps, ValueTime hejkaSendTimestamp, ValueTime hejkaReceiveTimestamp) {
+        super(messageId, timestamp, Type.NO_CO_TAM);
+        this.receiverGossipId = receiverGossipId;
+        this.senderGossipId = senderGossipId;
+        this.zoneTimestamps = zoneTimestamps;
+        this.queryTimestamps = queryTimestamps;
+        this.hejkaSendTimestamp = hejkaSendTimestamp;
+        this.hejkaReceiveTimestamp = hejkaReceiveTimestamp;
+    }
+
+    public long getReceiverGossipId() {
+        return receiverGossipId;
+    }
+
+    public long getSenderGossipId() {
+        return senderGossipId;
+    }
+
+    public Map<PathName, ValueTime> getZoneTimestamps() {
+        return zoneTimestamps;
+    }
+
+    public Map<Attribute, ValueTime> getQueryTimestamps() {
+        return queryTimestamps;
+    }
+
+    public ValueTime getHejkaSendTimestamp() {
+        return hejkaSendTimestamp;
+    }
+
+    public ValueTime getHejkaReceiveTimestamp() {
+        return hejkaReceiveTimestamp;
+    }
+}
diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/RemoteGossipGirlMessage.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/RemoteGossipGirlMessage.java
new file mode 100644
index 0000000..0a3a868
--- /dev/null
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/messages/RemoteGossipGirlMessage.java
@@ -0,0 +1,28 @@
+package pl.edu.mimuw.cloudatlas.agent.messages;
+
+import pl.edu.mimuw.cloudatlas.model.ValueTime;
+
+public class RemoteGossipGirlMessage extends GossipGirlMessage {
+    private ValueTime sentTimestamp;
+    private ValueTime receivedTimestamp;
+
+    public RemoteGossipGirlMessage(String messageId, long timestamp, Type type) {
+        super(messageId, timestamp, type);
+    }
+
+    public void setSentTimestamp(ValueTime sentTimestamp) {
+        this.sentTimestamp = sentTimestamp;
+    }
+
+    public void setReceivedTimestamp(ValueTime receivedTimestamp) {
+        this.receivedTimestamp = receivedTimestamp;
+    }
+
+    public ValueTime getSentTimestamp() {
+        return sentTimestamp;
+    }
+
+    public ValueTime getReceivedTimestamp() {
+        return receivedTimestamp;
+    }
+}