hash() for Request and Response

2 files changed, 15 insertions, 16 deletions

diff --git a/src/main/java/derms/Request.java b/src/main/java/derms/Request.java
index 4132cfa..80c7d5a 100644
--- a/src/main/java/derms/Request.java
+++ b/src/main/java/derms/Request.java
@@ -2,16 +2,7 @@ package derms;
 
 import derms.net.MessagePayload;
 
-// TODO
 public class Request implements MessagePayload {
-
-
-    @Override
-    public int hash() {
-        // TODO
-        return -1;
-    }
-
     private String function = "";
     private String clientID = "";
     private String resourceType = "";
@@ -29,6 +20,13 @@ public class Request implements MessagePayload {
         setClientID(clientID);
     }
 
+    @Override
+    public int hash() {
+        return function.hashCode() + clientID.hashCode() + resourceType.hashCode()
+                + OldResourceType.hashCode() + resourceID.hashCode() + duration + sequenceNumber
+                + MessageType.hashCode();
+    }
+
     public Request(int rmNumber, String bugType) {
         setMessageType(bugType + rmNumber);
     }
diff --git a/src/main/java/derms/Response.java b/src/main/java/derms/Response.java
index ce5002d..ba2c05c 100644
--- a/src/main/java/derms/Response.java
+++ b/src/main/java/derms/Response.java
@@ -2,14 +2,7 @@ package derms;
 
 import derms.net.MessagePayload;
 
-// TODO
 public class Response implements MessagePayload {
-
-    @Override
-    public int hash() {
-        // TODO
-        return  -1;
-    }
     private int sequenceID = 0;
     private String response = "";
     private int rmNumber = 0;
@@ -38,6 +31,14 @@ public class Response implements MessagePayload {
         setDuration(Integer.parseInt(messageParts[9]));
     }
 
+    @Override
+    public int hash() {
+        return  sequenceID + response.hashCode() + rmNumber + function.hashCode()
+                + userID.hashCode() + newResourceID.hashCode() + newResourceType.hashCode()
+                + oldResourceID.hashCode() + oldResourceType.hashCode() + duration
+                + udpMessage.hashCode();
+    }
+
     public int getSequenceID() {
         return sequenceID;
     }