From 43549dee0a8214c1bb02c874dcfd7ba37a8ef310 Mon Sep 17 00:00:00 2001
From: Sam Anthony <sam@samanthony.xyz>
Date: Fri, 22 Nov 2024 12:02:08 -0500
Subject: ReliableUnicastSender

---
 src/main/java/derms/net/rmulticast/Hashable.java          | 5 -----
 src/main/java/derms/net/rmulticast/Message.java           | 2 ++
 src/main/java/derms/net/rmulticast/MessagePayload.java    | 5 -----
 src/main/java/derms/net/rmulticast/NullPayload.java       | 2 ++
 src/main/java/derms/net/rmulticast/Prune.java             | 1 +
 src/main/java/derms/net/rmulticast/Receive.java           | 1 +
 src/main/java/derms/net/rmulticast/ReceivedSet.java       | 2 ++
 src/main/java/derms/net/rmulticast/ReliableMulticast.java | 1 +
 src/main/java/derms/net/rmulticast/Retransmit.java        | 1 +
 src/main/java/derms/net/rmulticast/Timeout.java           | 1 +
 10 files changed, 11 insertions(+), 10 deletions(-)
 delete mode 100644 src/main/java/derms/net/rmulticast/Hashable.java
 delete mode 100644 src/main/java/derms/net/rmulticast/MessagePayload.java

(limited to 'src/main/java/derms/net/rmulticast')

diff --git a/src/main/java/derms/net/rmulticast/Hashable.java b/src/main/java/derms/net/rmulticast/Hashable.java
deleted file mode 100644
index f00f62b..0000000
--- a/src/main/java/derms/net/rmulticast/Hashable.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package derms.net.rmulticast;
-
-public interface Hashable {
-    int hash();
-}
diff --git a/src/main/java/derms/net/rmulticast/Message.java b/src/main/java/derms/net/rmulticast/Message.java
index 21f8d19..281eb4f 100644
--- a/src/main/java/derms/net/rmulticast/Message.java
+++ b/src/main/java/derms/net/rmulticast/Message.java
@@ -1,5 +1,7 @@
 package derms.net.rmulticast;
 
+import derms.net.MessagePayload;
+
 import java.io.Serializable;
 import java.net.InetAddress;
 
diff --git a/src/main/java/derms/net/rmulticast/MessagePayload.java b/src/main/java/derms/net/rmulticast/MessagePayload.java
deleted file mode 100644
index ca36831..0000000
--- a/src/main/java/derms/net/rmulticast/MessagePayload.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package derms.net.rmulticast;
-
-import java.io.Serializable;
-
-public interface MessagePayload extends Serializable, Hashable {}
diff --git a/src/main/java/derms/net/rmulticast/NullPayload.java b/src/main/java/derms/net/rmulticast/NullPayload.java
index 4c818e4..e051d2f 100644
--- a/src/main/java/derms/net/rmulticast/NullPayload.java
+++ b/src/main/java/derms/net/rmulticast/NullPayload.java
@@ -1,5 +1,7 @@
 package derms.net.rmulticast;
 
+import derms.net.MessagePayload;
+
 class NullPayload implements MessagePayload {
     @Override
     public int hash() {
diff --git a/src/main/java/derms/net/rmulticast/Prune.java b/src/main/java/derms/net/rmulticast/Prune.java
index 04f8423..77ab6a7 100644
--- a/src/main/java/derms/net/rmulticast/Prune.java
+++ b/src/main/java/derms/net/rmulticast/Prune.java
@@ -1,5 +1,6 @@
 package derms.net.rmulticast;
 
+import derms.net.MessagePayload;
 import derms.util.Wait;
 
 import java.net.InetAddress;
diff --git a/src/main/java/derms/net/rmulticast/Receive.java b/src/main/java/derms/net/rmulticast/Receive.java
index 3d25e75..c9e1acf 100644
--- a/src/main/java/derms/net/rmulticast/Receive.java
+++ b/src/main/java/derms/net/rmulticast/Receive.java
@@ -1,6 +1,7 @@
 package derms.net.rmulticast;
 
 import derms.net.ConcurrentMulticastSocket;
+import derms.net.MessagePayload;
 import derms.net.Packet;
 
 import java.io.IOException;
diff --git a/src/main/java/derms/net/rmulticast/ReceivedSet.java b/src/main/java/derms/net/rmulticast/ReceivedSet.java
index 5bd3d85..47a3791 100644
--- a/src/main/java/derms/net/rmulticast/ReceivedSet.java
+++ b/src/main/java/derms/net/rmulticast/ReceivedSet.java
@@ -1,5 +1,7 @@
 package derms.net.rmulticast;
 
+import derms.net.MessagePayload;
+
 import java.net.InetAddress;
 import java.time.Instant;
 import java.util.*;
diff --git a/src/main/java/derms/net/rmulticast/ReliableMulticast.java b/src/main/java/derms/net/rmulticast/ReliableMulticast.java
index 6edab5d..c201e3a 100644
--- a/src/main/java/derms/net/rmulticast/ReliableMulticast.java
+++ b/src/main/java/derms/net/rmulticast/ReliableMulticast.java
@@ -1,6 +1,7 @@
 package derms.net.rmulticast;
 
 import derms.net.ConcurrentMulticastSocket;
+import derms.net.MessagePayload;
 import derms.net.Packet;
 
 import java.io.IOException;
diff --git a/src/main/java/derms/net/rmulticast/Retransmit.java b/src/main/java/derms/net/rmulticast/Retransmit.java
index 6205697..9d5e10b 100644
--- a/src/main/java/derms/net/rmulticast/Retransmit.java
+++ b/src/main/java/derms/net/rmulticast/Retransmit.java
@@ -1,6 +1,7 @@
 package derms.net.rmulticast;
 
 import derms.net.ConcurrentMulticastSocket;
+import derms.net.MessagePayload;
 import derms.net.Packet;
 
 import java.net.DatagramPacket;
diff --git a/src/main/java/derms/net/rmulticast/Timeout.java b/src/main/java/derms/net/rmulticast/Timeout.java
index bfae630..5c47e0c 100644
--- a/src/main/java/derms/net/rmulticast/Timeout.java
+++ b/src/main/java/derms/net/rmulticast/Timeout.java
@@ -1,5 +1,6 @@
 package derms.net.rmulticast;
 
+import derms.net.MessagePayload;
 import derms.util.Wait;
 
 import java.time.Duration;
-- 
cgit v1.2.3