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/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 ++ 12 files changed, 21 insertions(+), 42 deletions(-) delete mode 100644 src/main/java/derms/replica2/City.java (limited to 'src/main/java/derms/replica2') 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.*; -- cgit v1.2.3