From cb479767593be781b3295ca67979d6be375153e3 Mon Sep 17 00:00:00 2001 From: Sam Anthony Date: Mon, 2 Dec 2024 19:03:09 -0500 Subject: combine replica2.City and replica3.City --- src/main/java/derms/City.java | 40 ++++++++++++++++++++++ src/main/java/derms/replica2/AnnounceListener.java | 2 ++ src/main/java/derms/replica2/Announcer.java | 2 ++ src/main/java/derms/replica2/City.java | 38 -------------------- src/main/java/derms/replica2/CoordinatorID.java | 2 ++ .../java/derms/replica2/CoordinatorServer.java | 2 ++ src/main/java/derms/replica2/Hosts.java | 2 ++ src/main/java/derms/replica2/Replica2.java | 5 +-- src/main/java/derms/replica2/ResourceID.java | 2 ++ src/main/java/derms/replica2/ResponderID.java | 2 ++ src/main/java/derms/replica2/ResponderServer.java | 2 ++ src/main/java/derms/replica2/Servers.java | 2 ++ src/main/java/derms/replica2/SwapResource.java | 2 ++ src/main/java/derms/replica3/City.java | 40 ---------------------- src/main/java/derms/replica3/MTLServer.java | 1 + src/main/java/derms/replica3/QUEServer.java | 2 ++ src/main/java/derms/replica3/Replica3.java | 5 +-- src/main/java/derms/replica3/SHEServer.java | 2 ++ 18 files changed, 67 insertions(+), 86 deletions(-) create mode 100644 src/main/java/derms/City.java delete mode 100644 src/main/java/derms/replica2/City.java delete mode 100644 src/main/java/derms/replica3/City.java diff --git a/src/main/java/derms/City.java b/src/main/java/derms/City.java new file mode 100644 index 0000000..9fc71b8 --- /dev/null +++ b/src/main/java/derms/City.java @@ -0,0 +1,40 @@ +package derms; + +import java.io.Serializable; + +public class City implements Serializable { + public static final int codeLen = 3; + + private String code; + + public City(String code) throws IllegalArgumentException { + if (code.length() != codeLen) + throw new IllegalArgumentException("Invalid city: "+code+"; must be "+codeLen+" letters"); + this.code = code; + } + + public City() { + this("XXX"); + } + + public String getCode() { return code; } + + @Override + public String toString() { + return code; + } + + @Override + public boolean equals(Object obj) { + if (obj == null || this.getClass() != obj.getClass()) { + return false; + } + City other = (City) obj; + return this.code.equals(other.code); + } + + @Override + public int hashCode() { + return code.hashCode(); + } +} diff --git a/src/main/java/derms/replica2/AnnounceListener.java b/src/main/java/derms/replica2/AnnounceListener.java index dd21b8d..d4746b4 100644 --- a/src/main/java/derms/replica2/AnnounceListener.java +++ b/src/main/java/derms/replica2/AnnounceListener.java @@ -1,5 +1,7 @@ package derms.replica2; +import derms.City; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/src/main/java/derms/replica2/Announcer.java b/src/main/java/derms/replica2/Announcer.java index 508349e..638f1e7 100644 --- a/src/main/java/derms/replica2/Announcer.java +++ b/src/main/java/derms/replica2/Announcer.java @@ -1,5 +1,7 @@ package derms.replica2; +import derms.City; + import java.io.IOException; import java.net.*; import java.util.logging.Logger; diff --git a/src/main/java/derms/replica2/City.java b/src/main/java/derms/replica2/City.java deleted file mode 100644 index a5a2f4c..0000000 --- a/src/main/java/derms/replica2/City.java +++ /dev/null @@ -1,38 +0,0 @@ -package derms.replica2; - -import java.io.Serializable; - -public class City implements Serializable { - static final int codeLen = 3; - - private String code; - - City(String code) throws IllegalArgumentException { - if (code.length() != codeLen) - throw new IllegalArgumentException("Invalid city: "+code+"; must be "+codeLen+" letters"); - this.code = code; - } - - public City() { - this("XXX"); - } - - @Override - public String toString() { - return code; - } - - @Override - public boolean equals(Object obj) { - if (obj == null || this.getClass() != obj.getClass()) { - return false; - } - City other = (City) obj; - return this.code.equals(other.code); - } - - @Override - public int hashCode() { - return code.hashCode(); - } -} diff --git a/src/main/java/derms/replica2/CoordinatorID.java b/src/main/java/derms/replica2/CoordinatorID.java index a466796..9929b6f 100644 --- a/src/main/java/derms/replica2/CoordinatorID.java +++ b/src/main/java/derms/replica2/CoordinatorID.java @@ -1,5 +1,7 @@ package derms.replica2; +import derms.City; + import java.io.Serializable; class CoordinatorID implements Serializable { diff --git a/src/main/java/derms/replica2/CoordinatorServer.java b/src/main/java/derms/replica2/CoordinatorServer.java index 0683638..4bff1be 100644 --- a/src/main/java/derms/replica2/CoordinatorServer.java +++ b/src/main/java/derms/replica2/CoordinatorServer.java @@ -1,5 +1,7 @@ package derms.replica2; +import derms.City; + import java.io.IOException; import java.net.InetAddress; import java.time.Duration; diff --git a/src/main/java/derms/replica2/Hosts.java b/src/main/java/derms/replica2/Hosts.java index 1392b15..8df77c1 100644 --- a/src/main/java/derms/replica2/Hosts.java +++ b/src/main/java/derms/replica2/Hosts.java @@ -1,5 +1,7 @@ package derms.replica2; +import derms.City; + import java.net.UnknownHostException; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/derms/replica2/Replica2.java b/src/main/java/derms/replica2/Replica2.java index 4815f5f..7e88004 100644 --- a/src/main/java/derms/replica2/Replica2.java +++ b/src/main/java/derms/replica2/Replica2.java @@ -1,9 +1,6 @@ package derms.replica2; -import derms.Replica; -import derms.ReplicaManager; -import derms.Request; -import derms.Response; +import derms.*; import derms.util.ThreadPool; import sun.reflect.generics.reflectiveObjects.NotImplementedException; diff --git a/src/main/java/derms/replica2/ResourceID.java b/src/main/java/derms/replica2/ResourceID.java index 24da3d3..82ca2da 100644 --- a/src/main/java/derms/replica2/ResourceID.java +++ b/src/main/java/derms/replica2/ResourceID.java @@ -1,5 +1,7 @@ package derms.replica2; +import derms.City; + import java.io.Serializable; class ResourceID implements Serializable { diff --git a/src/main/java/derms/replica2/ResponderID.java b/src/main/java/derms/replica2/ResponderID.java index 480b471..22f09c7 100644 --- a/src/main/java/derms/replica2/ResponderID.java +++ b/src/main/java/derms/replica2/ResponderID.java @@ -1,5 +1,7 @@ package derms.replica2; +import derms.City; + class ResponderID { City city; short num; diff --git a/src/main/java/derms/replica2/ResponderServer.java b/src/main/java/derms/replica2/ResponderServer.java index 02ff6b6..058583e 100644 --- a/src/main/java/derms/replica2/ResponderServer.java +++ b/src/main/java/derms/replica2/ResponderServer.java @@ -1,5 +1,7 @@ package derms.replica2; +import derms.City; + import java.io.IOException; import java.net.InetAddress; import java.time.Duration; diff --git a/src/main/java/derms/replica2/Servers.java b/src/main/java/derms/replica2/Servers.java index 498b7ce..8cd5efd 100644 --- a/src/main/java/derms/replica2/Servers.java +++ b/src/main/java/derms/replica2/Servers.java @@ -1,5 +1,7 @@ package derms.replica2; +import derms.City; + import java.net.InetAddress; import java.util.Collection; import java.util.Map; diff --git a/src/main/java/derms/replica2/SwapResource.java b/src/main/java/derms/replica2/SwapResource.java index cc65f29..654681d 100644 --- a/src/main/java/derms/replica2/SwapResource.java +++ b/src/main/java/derms/replica2/SwapResource.java @@ -1,5 +1,7 @@ package derms.replica2; +import derms.City; + import java.io.IOException; import java.io.Serializable; import java.net.*; diff --git a/src/main/java/derms/replica3/City.java b/src/main/java/derms/replica3/City.java deleted file mode 100644 index 89fd8ce..0000000 --- a/src/main/java/derms/replica3/City.java +++ /dev/null @@ -1,40 +0,0 @@ -package derms.replica3; - -import java.io.Serializable; - -public class City implements Serializable { - static final int codeLen = 3; - - private String code; - - City(String code) throws IllegalArgumentException { - if (code.length() != codeLen) - throw new IllegalArgumentException("Invalid city: "+code+"; must be "+codeLen+" letters"); - this.code = code; - } - - public City() { - this("XXX"); - } - public String getCode(){ - return code; - } - @Override - public String toString() { - return code; - } - - @Override - public boolean equals(Object obj) { - if (obj == null || this.getClass() != obj.getClass()) { - return false; - } - City other = (City) obj; - return this.code.equals(other.code); - } - - @Override - public int hashCode() { - return code.hashCode(); - } -} diff --git a/src/main/java/derms/replica3/MTLServer.java b/src/main/java/derms/replica3/MTLServer.java index 9e7ea5c..c2e7e1a 100644 --- a/src/main/java/derms/replica3/MTLServer.java +++ b/src/main/java/derms/replica3/MTLServer.java @@ -11,6 +11,7 @@ import java.net.DatagramSocket; import java.net.SocketException; import java.nio.charset.StandardCharsets; +import derms.City; import derms.replica3.Constants; import derms.replica3.Constants; diff --git a/src/main/java/derms/replica3/QUEServer.java b/src/main/java/derms/replica3/QUEServer.java index c03d329..b74e4ee 100644 --- a/src/main/java/derms/replica3/QUEServer.java +++ b/src/main/java/derms/replica3/QUEServer.java @@ -2,6 +2,8 @@ package derms.replica3; //import logger.Logger; +import derms.City; + import java.io.IOException; import java.net.DatagramPacket; import java.net.DatagramSocket; diff --git a/src/main/java/derms/replica3/Replica3.java b/src/main/java/derms/replica3/Replica3.java index bf2597a..8863c9e 100644 --- a/src/main/java/derms/replica3/Replica3.java +++ b/src/main/java/derms/replica3/Replica3.java @@ -1,9 +1,6 @@ package derms.replica3; -import derms.Replica; -import derms.ReplicaManager; -import derms.Request; -import derms.Response; +import derms.*; import sun.reflect.generics.reflectiveObjects.NotImplementedException; import java.io.IOException; diff --git a/src/main/java/derms/replica3/SHEServer.java b/src/main/java/derms/replica3/SHEServer.java index 9d29a70..64f4da4 100644 --- a/src/main/java/derms/replica3/SHEServer.java +++ b/src/main/java/derms/replica3/SHEServer.java @@ -1,5 +1,7 @@ package derms.replica3; +import derms.City; + import java.io.IOException; import java.net.DatagramPacket; import java.net.DatagramSocket; -- cgit v1.2.3