Replica2: restrict scope

28 files changed, 140 insertions, 140 deletions

diff --git a/src/main/java/derms/replica/replica2/AlreadyBorrowedException.java b/src/main/java/derms/replica/replica2/AlreadyBorrowedException.java
index fb185b1..f8c01c6 100644
--- a/src/main/java/derms/replica/replica2/AlreadyBorrowedException.java
+++ b/src/main/java/derms/replica/replica2/AlreadyBorrowedException.java
@@ -1,7 +1,7 @@
 package derms.replica.replica2;
 
-public class AlreadyBorrowedException extends Exception {
-  public AlreadyBorrowedException(String message) {
+class AlreadyBorrowedException extends Exception {
+  AlreadyBorrowedException(String message) {
     super(message);
   }
 }
diff --git a/src/main/java/derms/replica/replica2/AnnounceListener.java b/src/main/java/derms/replica/replica2/AnnounceListener.java
index 71aae9d..ee43662 100644
--- a/src/main/java/derms/replica/replica2/AnnounceListener.java
+++ b/src/main/java/derms/replica/replica2/AnnounceListener.java
@@ -6,7 +6,7 @@ import java.io.ObjectInputStream;
 import java.net.*;
 import java.util.logging.Logger;
 
-public class AnnounceListener implements Runnable {
+class AnnounceListener implements Runnable {
 	private static final int bufsize = 1024;
 
 	private InetSocketAddress groupAddr;
@@ -14,7 +14,7 @@ public class AnnounceListener implements Runnable {
 	private Servers servers;
 	private Logger log;
 
-	public AnnounceListener(InetSocketAddress groupAddr, InetAddress localAddr, Servers servers) throws IOException {
+	AnnounceListener(InetSocketAddress groupAddr, InetAddress localAddr, Servers servers) throws IOException {
 		this.groupAddr = groupAddr;
 		this.localAddr = localAddr;
 		this.servers = servers;
diff --git a/src/main/java/derms/replica/replica2/Announcer.java b/src/main/java/derms/replica/replica2/Announcer.java
index 546e55b..436d06d 100644
--- a/src/main/java/derms/replica/replica2/Announcer.java
+++ b/src/main/java/derms/replica/replica2/Announcer.java
@@ -4,15 +4,15 @@ import java.io.IOException;
 import java.net.*;
 import java.util.logging.Logger;
 
-public class Announcer implements Runnable {
-	public static final long intervalMillis = 3000;
+class Announcer implements Runnable {
+	static final long intervalMillis = 3000;
 
 	private SocketAddress group;
 	private InetAddress localAddr;
 	private City city;
 	private Logger log;
 
-	public Announcer(SocketAddress group, InetAddress localAddr, City city) throws IOException {
+	Announcer(SocketAddress group, InetAddress localAddr, City city) throws IOException {
 		this.group = group;
 		this.localAddr = localAddr;
 		this.city = city;
diff --git a/src/main/java/derms/replica/replica2/City.java b/src/main/java/derms/replica/replica2/City.java
index b027d44..63aa2cd 100644
--- a/src/main/java/derms/replica/replica2/City.java
+++ b/src/main/java/derms/replica/replica2/City.java
@@ -2,18 +2,18 @@ package derms.replica.replica2;
 
 import java.io.Serializable;
 
-public class City implements Serializable {
-	public static final int codeLen = 3;
+class City implements Serializable {
+	static final int codeLen = 3;
 
 	private String code;
 
-	public City(String code) throws IllegalArgumentException {
+	City(String code) throws IllegalArgumentException {
 		if (code.length() != codeLen)
 			throw new IllegalArgumentException("Invalid city: "+code+"; must be "+codeLen+" letters");
 		this.code = code;
 	}
 
-	public City() {
+	City() {
 		this("XXX");
 	}
 
diff --git a/src/main/java/derms/replica/replica2/CoordinatorID.java b/src/main/java/derms/replica/replica2/CoordinatorID.java
index 701ded7..79b292f 100644
--- a/src/main/java/derms/replica/replica2/CoordinatorID.java
+++ b/src/main/java/derms/replica/replica2/CoordinatorID.java
@@ -2,16 +2,16 @@ package derms.replica.replica2;
 
 import java.io.Serializable;
 
-public class CoordinatorID implements Serializable {
-  public String city;
-  public short num;
+class CoordinatorID implements Serializable {
+  String city;
+  short num;
 
-  public CoordinatorID(String city, short num) {
+  CoordinatorID(String city, short num) {
     this.city = city;
     this.num = num;
   }
 
-  public static CoordinatorID parse(String str) throws IllegalArgumentException {
+  static CoordinatorID parse(String str) throws IllegalArgumentException {
     if (str.length() != City.codeLen+ID.nDigits)
       throw new IllegalArgumentException("illegal coordinator ID: " + str);
 
diff --git a/src/main/java/derms/replica/replica2/CoordinatorServer.java b/src/main/java/derms/replica/replica2/CoordinatorServer.java
index ced9091..dbfcacb 100644
--- a/src/main/java/derms/replica/replica2/CoordinatorServer.java
+++ b/src/main/java/derms/replica/replica2/CoordinatorServer.java
@@ -10,15 +10,15 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
-public class CoordinatorServer {
-	public static final Duration timeout = Duration.ofSeconds(5);
+class CoordinatorServer {
+	static final Duration timeout = Duration.ofSeconds(5);
 
 	private City city;
 	private Resources resources;
 	private Servers servers;
 	private Logger log;
 
-	public CoordinatorServer(City city, Resources resources, Servers servers) throws IOException {
+	CoordinatorServer(City city, Resources resources, Servers servers) throws IOException {
 		super();
 		this.city = city;
 		this.resources = resources;
@@ -26,11 +26,11 @@ public class CoordinatorServer {
 		this.log = DermsLogger.getLogger(this.getClass());
 	}
 
-	public CoordinatorServer() throws IOException {
+	CoordinatorServer() throws IOException {
 		this(new City(), new Resources(), new Servers());
 	}
 
-	public void requestResource(CoordinatorID cid, ResourceID rid, int duration)
+	void requestResource(CoordinatorID cid, ResourceID rid, int duration)
 			throws ServerCommunicationError, NoSuchResourceException,
 			AlreadyBorrowedException, InvalidDurationException
 	{
@@ -67,7 +67,7 @@ public class CoordinatorServer {
 		}
 	}
 
-	public Resource[] findResource(CoordinatorID cid, ResourceType rname) throws ServerCommunicationError {
+	Resource[] findResource(CoordinatorID cid, ResourceType rname) throws ServerCommunicationError {
 		log.info("Find Resource "+rname+" from "+cid);
 		FindResource.Request request = new FindResource.Request(cid, rname);
 		Collection<Resource> response = ConcurrentHashMap.newKeySet();
@@ -102,7 +102,7 @@ public class CoordinatorServer {
 		return arr;
 	}
 
-	public void returnResource(CoordinatorID cid, ResourceID rid)
+	void returnResource(CoordinatorID cid, ResourceID rid)
 			throws ServerCommunicationError, NoSuchResourceException, NotBorrowedException
 	{
 		log.info("Return resource "+rid+" from "+cid);
@@ -139,7 +139,7 @@ public class CoordinatorServer {
 		}
 	}
 
-	public void swapResource(CoordinatorID cid, ResourceID oldRID, ResourceID newRID) throws ServerCommunicationError, NoSuchResourceException {
+	void swapResource(CoordinatorID cid, ResourceID oldRID, ResourceID newRID) throws ServerCommunicationError, NoSuchResourceException {
 		log.info(cid+": swap "+oldRID+", "+newRID);
 
 		InetAddress server = servers.get(new City(oldRID.city));
diff --git a/src/main/java/derms/replica/replica2/DermsLogger.java b/src/main/java/derms/replica/replica2/DermsLogger.java
index 0495620..82642e4 100644
--- a/src/main/java/derms/replica/replica2/DermsLogger.java
+++ b/src/main/java/derms/replica/replica2/DermsLogger.java
@@ -6,12 +6,12 @@ import java.util.logging.Handler;
 import java.util.logging.Logger;
 import java.util.logging.SimpleFormatter;
 
-public class DermsLogger {
-	public static final String logFile = "server.log";
+class DermsLogger {
+	static final String logFile = "server.log";
 
 	private static Logger log = null;
 
-	public static Logger getLogger(Class clazz) throws IOException {
+	static Logger getLogger(Class clazz) throws IOException {
 		if (log == null) {
 			log = Logger.getLogger(clazz.getName());
 			Handler fileHandler = new FileHandler(logFile);
diff --git a/src/main/java/derms/replica/replica2/FindResource.java b/src/main/java/derms/replica/replica2/FindResource.java
index ac5f29d..ca47f4c 100644
--- a/src/main/java/derms/replica/replica2/FindResource.java
+++ b/src/main/java/derms/replica/replica2/FindResource.java
@@ -9,16 +9,16 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.logging.Logger;
 
-public class FindResource {
-	public static final int port = 5558;
+class FindResource {
+	static final int port = 5558;
 
-	public static class Client implements Runnable {
+	static class Client implements Runnable {
 		private InetAddress serverAddr;
 		private Request request;
 		private Collection<Resource> response;
 		private Logger log;
 
-		public Client(Request request, InetAddress serverAddr, Collection<Resource> response) throws IOException {
+		Client(Request request, InetAddress serverAddr, Collection<Resource> response) throws IOException {
 			this.serverAddr = serverAddr;
 			this.request = request;
 			this.response = response;
@@ -68,7 +68,7 @@ public class FindResource {
 		}
 	}
 
-	public static class Server implements Runnable {
+	static class Server implements Runnable {
 		private static final int bufsize = 4096;
 
 		private InetAddress localAddr;
@@ -76,7 +76,7 @@ public class FindResource {
 		private ExecutorService pool;
 		private Logger log;
 
-		public Server(InetAddress localAddr, Resources resources) throws IOException {
+		Server(InetAddress localAddr, Resources resources) throws IOException {
 			this.localAddr = localAddr;
 			this.resources = resources;
 			this.pool = Executors.newWorkStealingPool();
@@ -122,11 +122,11 @@ public class FindResource {
 		}
 	}
 
-	public static class Request implements Serializable {
+	static class Request implements Serializable {
 		private CoordinatorID cid;
 		private ResourceType rname;
 
-		public Request(CoordinatorID cid, ResourceType rname) {
+		Request(CoordinatorID cid, ResourceType rname) {
 			this.cid = cid;
 			this.rname = rname;
 		}
diff --git a/src/main/java/derms/replica/replica2/Hosts.java b/src/main/java/derms/replica/replica2/Hosts.java
index 16eba3d..6217ca2 100644
--- a/src/main/java/derms/replica/replica2/Hosts.java
+++ b/src/main/java/derms/replica/replica2/Hosts.java
@@ -4,10 +4,10 @@ import java.net.UnknownHostException;
 import java.util.HashMap;
 import java.util.Map;
 
-public class Hosts {
+class Hosts {
     private static Map<City, String> hosts = null;
 
-    public static String get(City city) throws UnknownHostException {
+    static String get(City city) throws UnknownHostException {
         if (hosts == null)
             init();
 
diff --git a/src/main/java/derms/replica/replica2/ID.java b/src/main/java/derms/replica/replica2/ID.java
index cd31d36..b0caebd 100644
--- a/src/main/java/derms/replica/replica2/ID.java
+++ b/src/main/java/derms/replica/replica2/ID.java
@@ -1,5 +1,5 @@
 package derms.replica.replica2;
 
-public class ID {
-	public static final int nDigits = 4;
+class ID {
+	static final int nDigits = 4;
 }
diff --git a/src/main/java/derms/replica/replica2/InvalidDurationException.java b/src/main/java/derms/replica/replica2/InvalidDurationException.java
index a5702b2..4db2bbb 100644
--- a/src/main/java/derms/replica/replica2/InvalidDurationException.java
+++ b/src/main/java/derms/replica/replica2/InvalidDurationException.java
@@ -1,7 +1,7 @@
 package derms.replica.replica2;
 
-public class InvalidDurationException extends Exception {
-  public InvalidDurationException (String message) {
+class InvalidDurationException extends Exception {
+  InvalidDurationException (String message) {
     super(message);
   }
 }
diff --git a/src/main/java/derms/replica/replica2/NoSuchResourceException.java b/src/main/java/derms/replica/replica2/NoSuchResourceException.java
index 0dcb2f8..3548d32 100644
--- a/src/main/java/derms/replica/replica2/NoSuchResourceException.java
+++ b/src/main/java/derms/replica/replica2/NoSuchResourceException.java
@@ -1,7 +1,7 @@
 package derms.replica.replica2;
 
-public  class NoSuchResourceException extends Exception {
-  public NoSuchResourceException(String message) {
+class NoSuchResourceException extends Exception {
+  NoSuchResourceException(String message) {
     super(message);
   }
 }
diff --git a/src/main/java/derms/replica/replica2/NotBorrowedException.java b/src/main/java/derms/replica/replica2/NotBorrowedException.java
index 19db8c1..e077e4c 100644
--- a/src/main/java/derms/replica/replica2/NotBorrowedException.java
+++ b/src/main/java/derms/replica/replica2/NotBorrowedException.java
@@ -1,7 +1,7 @@
 package derms.replica.replica2;
 
-public  class NotBorrowedException extends Exception {
-  public NotBorrowedException (String message) {
+class NotBorrowedException extends Exception {
+  NotBorrowedException (String message) {
     super(message);
   }
 }
diff --git a/src/main/java/derms/replica/replica2/ObjectPacket.java b/src/main/java/derms/replica/replica2/ObjectPacket.java
index 65b032f..bd711db 100644
--- a/src/main/java/derms/replica/replica2/ObjectPacket.java
+++ b/src/main/java/derms/replica/replica2/ObjectPacket.java
@@ -4,8 +4,8 @@ import java.io.*;
 import java.net.DatagramPacket;
 import java.net.SocketAddress;
 
-public class ObjectPacket {
-	public static DatagramPacket create(Serializable obj, SocketAddress remoteAddr) throws IOException {
+class ObjectPacket {
+	static DatagramPacket create(Serializable obj, SocketAddress remoteAddr) throws IOException {
 		ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
 		ObjectOutputStream objStream = new ObjectOutputStream(byteStream);
 		objStream.writeObject(obj);
@@ -15,7 +15,7 @@ public class ObjectPacket {
 		return new DatagramPacket(buf, buf.length, remoteAddr);
 	}
 
-	public static <E> E deserialize(DatagramPacket pkt, Class<E> clazz) throws IOException {
+	static <E> E deserialize(DatagramPacket pkt, Class<E> clazz) throws IOException {
 		ObjectInputStream objectStream;
 		try {
 			objectStream = new ObjectInputStream(
diff --git a/src/main/java/derms/replica/replica2/Replica2.java b/src/main/java/derms/replica/replica2/Replica2.java
index f0c6bbf..2c58d92 100644
--- a/src/main/java/derms/replica/replica2/Replica2.java
+++ b/src/main/java/derms/replica/replica2/Replica2.java
@@ -13,12 +13,12 @@ import java.util.concurrent.Executors;
 import java.util.logging.Logger;
 
 public class Replica2 implements Replica {
-	public static final InetSocketAddress announceGroup = new InetSocketAddress("225.5.5.5", 5555);
+	static final InetSocketAddress announceGroup = new InetSocketAddress("225.5.5.5", 5555);
 
-	public final City city;
-	public final InetAddress localAddr;
-	public final Resources resources;
-	public final Servers servers;
+	final City city;
+	final InetAddress localAddr;
+	final Resources resources;
+	final Servers servers;
 	private final Logger log;
 	private final ResponderServer responderServer;
 	private final CoordinatorServer coordinatorServer;
diff --git a/src/main/java/derms/replica/replica2/RequestResource.java b/src/main/java/derms/replica/replica2/RequestResource.java
index 44d85be..7388aa8 100644
--- a/src/main/java/derms/replica/replica2/RequestResource.java
+++ b/src/main/java/derms/replica/replica2/RequestResource.java
@@ -8,22 +8,22 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.logging.Logger;
 
-public class RequestResource {
-	public static final int port = 5557;
-	public static final int bufsize = 4096;
+class RequestResource {
+	static final int port = 5557;
+	static final int bufsize = 4096;
 
-	public static class Client {
+	static class Client {
 		private CoordinatorID coordinatorID;
 		private ResourceID resourceID;
 		private int duration;
 
-		public Client(CoordinatorID coordinatorID, ResourceID resourceID, int duration) {
+		Client(CoordinatorID coordinatorID, ResourceID resourceID, int duration) {
 			this.coordinatorID = coordinatorID;
 			this.resourceID = resourceID;
 			this.duration = duration;
 		}
 
-		public Response sendRequest(InetAddress serverAddr) throws IOException {
+		Response sendRequest(InetAddress serverAddr) throws IOException {
 			Request request = new Request(coordinatorID, resourceID, duration);
 			DatagramSocket sock;
 			try {
@@ -61,13 +61,13 @@ public class RequestResource {
 		}
 	}
 
-	public static class Server implements Runnable {
+	static class Server implements Runnable {
 		private InetAddress localAddr;
 		private Resources resources;
 		private ExecutorService pool;
 		private Logger log;
 
-		public Server(InetAddress localAddr, Resources resources) throws IOException {
+		Server(InetAddress localAddr, Resources resources) throws IOException {
 			this.localAddr = localAddr;
 			this.resources = resources;
 			pool = Executors.newWorkStealingPool();
@@ -202,9 +202,9 @@ public class RequestResource {
 		}
 	}
 
-	public static class Response implements Serializable {
-		public Status status;
-		public String message;
+	static class Response implements Serializable {
+		Status status;
+		String message;
 
 		private Response(Status status, String message) {
 			this.status = status;
diff --git a/src/main/java/derms/replica/replica2/Resource.java b/src/main/java/derms/replica/replica2/Resource.java
index e4b54a2..fd1b20d 100644
--- a/src/main/java/derms/replica/replica2/Resource.java
+++ b/src/main/java/derms/replica/replica2/Resource.java
@@ -2,15 +2,15 @@ package derms.replica.replica2;
 
 import java.io.Serializable;
 
-public  class Resource implements Serializable {
-  public ResourceID id;
-  public ResourceType type;
-  public int duration;
-  public boolean isBorrowed;
-  public CoordinatorID borrower;
-  public int borrowDuration;
+class Resource implements Serializable {
+  ResourceID id;
+  ResourceType type;
+  int duration;
+  boolean isBorrowed;
+  CoordinatorID borrower;
+  int borrowDuration;
 
-  public Resource(ResourceID id, ResourceType type, int duration, boolean isBorrowed, CoordinatorID borrower, int borrowDuration) {
+  Resource(ResourceID id, ResourceType type, int duration, boolean isBorrowed, CoordinatorID borrower, int borrowDuration) {
     this.id = id;
     this.type = type;
     this.duration = duration;
@@ -19,11 +19,11 @@ public  class Resource implements Serializable {
     this.borrowDuration = borrowDuration;
   }
 
-  public Resource(ResourceID id, ResourceType type, int duration) {
+  Resource(ResourceID id, ResourceType type, int duration) {
     this(id, type, duration, false, new CoordinatorID(), -1);
   }
 
-  public Resource() {
+  Resource() {
     this(new ResourceID(), ResourceType.AMBULANCE, 0);
   }
 
diff --git a/src/main/java/derms/replica/replica2/ResourceAvailability.java b/src/main/java/derms/replica/replica2/ResourceAvailability.java
index c3edbd8..8bfa7bb 100644
--- a/src/main/java/derms/replica/replica2/ResourceAvailability.java
+++ b/src/main/java/derms/replica/replica2/ResourceAvailability.java
@@ -8,16 +8,16 @@ import java.net.InetSocketAddress;
 import java.util.Collection;
 import java.util.logging.Logger;
 
-public class ResourceAvailability {
-	public static final int port = 5556;
+class ResourceAvailability {
+	static final int port = 5556;
 
-	public static class Client implements Runnable {
+	static class Client implements Runnable {
 		private InetAddress serverAddr;
 		private ResourceType request;
 		private Collection<Resource> resources;
 		private Logger log;
 
-		public Client(InetAddress serverAddr, ResourceType request, Collection<Resource> response) throws IOException {
+		Client(InetAddress serverAddr, ResourceType request, Collection<Resource> response) throws IOException {
 			this.serverAddr = serverAddr;
 			this.request = request;
 			this.resources = response;
@@ -69,14 +69,14 @@ public class ResourceAvailability {
 		}
 	}
 
-	public static class Server implements Runnable {
-		public static final int bufsize = 1024;
+	static class Server implements Runnable {
+		static final int bufsize = 1024;
 
 		private InetAddress localAddr;
 		private Resources resources;
 		private Logger log;
 
-		public Server(InetAddress localAddr, Resources resources) throws IOException {
+		Server(InetAddress localAddr, Resources resources) throws IOException {
 			this.localAddr = localAddr;
 			this.resources = resources;
 			this.log = DermsLogger.getLogger(this.getClass());
diff --git a/src/main/java/derms/replica/replica2/ResourceID.java b/src/main/java/derms/replica/replica2/ResourceID.java
index 8081ace..d4cc4cf 100644
--- a/src/main/java/derms/replica/replica2/ResourceID.java
+++ b/src/main/java/derms/replica/replica2/ResourceID.java
@@ -2,20 +2,20 @@ package derms.replica.replica2;
 
 import java.io.Serializable;
 
-public class ResourceID implements Serializable {
-  public String city;
-  public short num;
+class ResourceID implements Serializable {
+  String city;
+  short num;
 
-  public ResourceID (String city, short num) {
+  ResourceID (String city, short num) {
     this.city = city;
     this.num = num;
   }
 
-  public ResourceID() {
+  ResourceID() {
     this("XXX", (short) 1111);
   }
 
-  public static ResourceID parse(String s) throws IllegalArgumentException {
+  static ResourceID parse(String s) throws IllegalArgumentException {
     if (s.length() != City.codeLen+ID.nDigits) {
       throw new IllegalArgumentException("invalid resource ID: "+s);
     }
diff --git a/src/main/java/derms/replica/replica2/ResourceTransfer.java b/src/main/java/derms/replica/replica2/ResourceTransfer.java
index 98750c7..bb3a907 100644
--- a/src/main/java/derms/replica/replica2/ResourceTransfer.java
+++ b/src/main/java/derms/replica/replica2/ResourceTransfer.java
@@ -8,10 +8,10 @@ import java.net.SocketAddress;
 import java.util.ArrayList;
 import java.util.List;
 
-public class ResourceTransfer {
-	public static final int bufsize = 1024;
+class ResourceTransfer {
+	static final int bufsize = 1024;
 
-	public static void send(Resource[] resources, SocketAddress remoteAddr) throws IOException {
+	static void send(Resource[] resources, SocketAddress remoteAddr) throws IOException {
 		DatagramSocket sock = new DatagramSocket();
 
 		for (Resource resource : resources) {
@@ -24,7 +24,7 @@ public class ResourceTransfer {
 		sock.close();
 	}
 
-	public static Resource[] receive(DatagramSocket sock) throws IOException {
+	static Resource[] receive(DatagramSocket sock) throws IOException {
 		List<Resource> resources = new ArrayList<Resource>();
 		byte[] buf = new byte[bufsize];
 		DatagramPacket response = new DatagramPacket(buf, buf.length);
diff --git a/src/main/java/derms/replica/replica2/ResourceType.java b/src/main/java/derms/replica/replica2/ResourceType.java
index 19b6c8a..86e35ba 100644
--- a/src/main/java/derms/replica/replica2/ResourceType.java
+++ b/src/main/java/derms/replica/replica2/ResourceType.java
@@ -2,12 +2,12 @@ package derms.replica.replica2;
 
 import java.io.Serializable;
 
-public enum ResourceType implements Serializable {
+enum ResourceType implements Serializable {
   AMBULANCE,
   FIRETRUCK,
   PERSONNEL;
 
-  public static ResourceType parse(String s) throws IllegalArgumentException {
+  static ResourceType parse(String s) throws IllegalArgumentException {
     switch (s) {
       case "AMBULANCE": return ResourceType.AMBULANCE;
       case "FIRETRUCK": return ResourceType.FIRETRUCK;
diff --git a/src/main/java/derms/replica/replica2/Resources.java b/src/main/java/derms/replica/replica2/Resources.java
index 71d78ca..03bf33f 100644
--- a/src/main/java/derms/replica/replica2/Resources.java
+++ b/src/main/java/derms/replica/replica2/Resources.java
@@ -6,14 +6,14 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class Resources {
+class Resources {
 	private Map<ResourceType, Map<ResourceID, Resource>> resources;
 
-	public Resources() {
+	Resources() {
 		this.resources = new ConcurrentHashMap<ResourceType, Map<ResourceID, Resource>>();
 	}
 
-	public List<Resource> borrowed(CoordinatorID borrower, ResourceType name) {
+	List<Resource> borrowed(CoordinatorID borrower, ResourceType name) {
 		List<Resource> borrowed = new ArrayList<Resource>();
 		Resource[] namedResources = getByName(name);
 		for (Resource r : namedResources) {
@@ -24,7 +24,7 @@ public class Resources {
 		return borrowed;
 	}
 
-	public Resource getByID(ResourceID id) throws NoSuchElementException {
+	Resource getByID(ResourceID id) throws NoSuchElementException {
 		for (Map<ResourceID, Resource> rids : resources.values()) {
 			Resource resource = rids.get(id);
 			if (resource != null) {
@@ -34,7 +34,7 @@ public class Resources {
 		throw new NoSuchElementException("No such resource "+id);
 	}
 
-	public Resource[] getByName(ResourceType name) {
+	Resource[] getByName(ResourceType name) {
 		Map<ResourceID, Resource> rids = resources.get(name);
 		if (rids == null) {
 			return new Resource[0];
@@ -43,7 +43,7 @@ public class Resources {
 		return rids.values().toArray(r);
 	}
 
-	public void add(Resource r) {
+	void add(Resource r) {
 		Map<ResourceID, Resource> rids;
 		synchronized (resources) {
 			rids = resources.get(r.type);
@@ -62,7 +62,7 @@ public class Resources {
 		}
 	}
 
-	public void removeByID(ResourceID id) throws NoSuchElementException {
+	void removeByID(ResourceID id) throws NoSuchElementException {
 		for (Map<ResourceID, Resource> rids : resources.values()) {
 			if (rids.containsKey(id)) {
 				rids.remove(id);
diff --git a/src/main/java/derms/replica/replica2/ResponderID.java b/src/main/java/derms/replica/replica2/ResponderID.java
index 5d342c9..63bbcb8 100644
--- a/src/main/java/derms/replica/replica2/ResponderID.java
+++ b/src/main/java/derms/replica/replica2/ResponderID.java
@@ -1,10 +1,10 @@
 package derms.replica.replica2;
 
-public class ResponderID {
-	public City city;
-	public short num;
+class ResponderID {
+	City city;
+	short num;
 
-	public ResponderID(City city, short num) {
+	ResponderID(City city, short num) {
 		this.city = city;
 		this.num = num;
 	}
diff --git a/src/main/java/derms/replica/replica2/ResponderServer.java b/src/main/java/derms/replica/replica2/ResponderServer.java
index d294924..bcd0a92 100644
--- a/src/main/java/derms/replica/replica2/ResponderServer.java
+++ b/src/main/java/derms/replica/replica2/ResponderServer.java
@@ -11,31 +11,31 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
-public class ResponderServer {
-	public static final Duration timeout = Duration.ofSeconds(5);
+class ResponderServer {
+	static final Duration timeout = Duration.ofSeconds(5);
 
 	private City city;
 	private Resources resources;
 	private Servers servers;
 	private Logger log;
 
-	public ResponderServer(City city, Resources resources, Servers servers) throws IOException {
+	ResponderServer(City city, Resources resources, Servers servers) throws IOException {
 		this.city = city;
 		this.resources = resources;
 		this.servers = servers;
 		this.log = DermsLogger.getLogger(this.getClass());
 	}
 
-	public ResponderServer() throws IOException {
+	ResponderServer() throws IOException {
 		this(new City(), new Resources(), new Servers());
 	}
 
-	public void addResource(Resource r) {
+	void addResource(Resource r) {
 		resources.add(r);
 		log.info("Added resource "+r+" - success");
 	}
 
-	public void removeResource(ResourceID rid, int duration) throws NoSuchResourceException {
+	void removeResource(ResourceID rid, int duration) throws NoSuchResourceException {
 		log.info("Remove duration "+duration+" from "+rid);
 		try {
 			Resource resource = resources.getByID(rid);
@@ -62,7 +62,7 @@ public class ResponderServer {
 		}
 	}
 
-	public Resource[] listResourceAvailability(ResourceType rname) throws ServerCommunicationError {
+	Resource[] listResourceAvailability(ResourceType rname) throws ServerCommunicationError {
 		log.info("Request for available "+rname);
 		Collection<Resource> availableResources = ConcurrentHashMap.newKeySet();
 		ExecutorService pool = Executors.newFixedThreadPool(servers.size());
diff --git a/src/main/java/derms/replica/replica2/ReturnResource.java b/src/main/java/derms/replica/replica2/ReturnResource.java
index 0b45db5..9c8935d 100644
--- a/src/main/java/derms/replica/replica2/ReturnResource.java
+++ b/src/main/java/derms/replica/replica2/ReturnResource.java
@@ -8,20 +8,20 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.logging.Logger;
 
-public class ReturnResource {
+class ReturnResource {
 	public static final int port = 5559;
 	public static final int bufsize = 4096;
 
-	public static class Client {
+	static class Client {
 		private CoordinatorID coordinatorID;
 		private ResourceID resourceID;
 
-		public Client(CoordinatorID cid, ResourceID rid) {
+		Client(CoordinatorID cid, ResourceID rid) {
 			this.coordinatorID = cid;
 			this.resourceID = rid;
 		}
 
-		public Response sendRequest(InetAddress serverAddr) throws IOException {
+		Response sendRequest(InetAddress serverAddr) throws IOException {
 			Request request = new Request(coordinatorID, resourceID);
 			DatagramSocket sock;
 			try {
@@ -59,13 +59,13 @@ public class ReturnResource {
 		}
 	}
 
-	public static class Server implements Runnable {
+	static class Server implements Runnable {
 		private InetAddress localAddr;
 		private Resources resources;
 		private ExecutorService pool;
 		private Logger log;
 
-		public Server(InetAddress localAddr, Resources resources) throws IOException {
+		Server(InetAddress localAddr, Resources resources) throws IOException {
 			this.localAddr = localAddr;
 			this.resources = resources;
 			pool = Executors.newWorkStealingPool();
@@ -179,16 +179,16 @@ public class ReturnResource {
 		}
 	}
 
-	public static class Response implements Serializable {
-		public Status status;
-		public String message;
+	static class Response implements Serializable {
+		Status status;
+		String message;
 
 		private Response(Status status, String message) {
 			this.status = status;
 			this.message = message;
 		}
 
-		public enum Status {
+		enum Status {
 			SUCCESS, NO_SUCH_RESOURCE, NOT_BORROWED
 		}
 	}
diff --git a/src/main/java/derms/replica/replica2/ServerCommunicationError.java b/src/main/java/derms/replica/replica2/ServerCommunicationError.java
index bde3639..bef5d46 100644
--- a/src/main/java/derms/replica/replica2/ServerCommunicationError.java
+++ b/src/main/java/derms/replica/replica2/ServerCommunicationError.java
@@ -1,7 +1,7 @@
 package derms.replica.replica2;
 
-public  class ServerCommunicationError extends Exception {
-  public ServerCommunicationError(String message) {
+class ServerCommunicationError extends Exception {
+  ServerCommunicationError(String message) {
     super(message);
   }
 }
diff --git a/src/main/java/derms/replica/replica2/Servers.java b/src/main/java/derms/replica/replica2/Servers.java
index 4d24745..4728e24 100644
--- a/src/main/java/derms/replica/replica2/Servers.java
+++ b/src/main/java/derms/replica/replica2/Servers.java
@@ -5,11 +5,11 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class Servers {
+class Servers {
 	private Map<City, InetAddress> servers = new ConcurrentHashMap<City, InetAddress>();
 
 	/** Returns the address of the server located in the specified city, or null if there is no server in the city. */
-	public InetAddress get(City city) {
+	InetAddress get(City city) {
 		return servers.get(city);
 	}
 
@@ -20,15 +20,15 @@ public class Servers {
 	 * @param addr the address of the server
 	 * @return the previous server address, or null if there was no server associated with this city.
 	 */
-	public InetAddress put(City city, InetAddress addr) {
+	InetAddress put(City city, InetAddress addr) {
 		return servers.put(city, addr);
 	}
 
-	public Collection<InetAddress> all() {
+	Collection<InetAddress> all() {
 		return servers.values();
 	}
 
-	public int size() {
+	int size() {
 		return servers.size();
 	}
 }
diff --git a/src/main/java/derms/replica/replica2/SwapResource.java b/src/main/java/derms/replica/replica2/SwapResource.java
index a3b88e8..bcdd222 100644
--- a/src/main/java/derms/replica/replica2/SwapResource.java
+++ b/src/main/java/derms/replica/replica2/SwapResource.java
@@ -8,22 +8,22 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.logging.Logger;
 
-public class SwapResource {
-	public static final int port = 5560;
-	public static final int bufSize = 4096;
+class SwapResource {
+	static final int port = 5560;
+	static final int bufSize = 4096;
 
-	public static class Client {
+	static class Client {
 		private CoordinatorID cid;
 		private ResourceID oldRID;
 		private ResourceID newRID;
 
-		public Client(CoordinatorID cid, ResourceID oldRID, ResourceID newRID) {
+		Client(CoordinatorID cid, ResourceID oldRID, ResourceID newRID) {
 			this.cid = cid;
 			this.oldRID = oldRID;
 			this.newRID = newRID;
 		}
 
-		public Response sendRequest(InetAddress serverAddr) throws IOException {
+		Response sendRequest(InetAddress serverAddr) throws IOException {
 			Request request = new Request(cid, oldRID, newRID);
 			DatagramSocket sock;
 			try {
@@ -61,14 +61,14 @@ public class SwapResource {
 		}
 	}
 
-	public static class Server implements Runnable {
+	static class Server implements Runnable {
 		private InetAddress localAddr;
 		private Resources resources;
 		private Servers servers;
 		private ExecutorService pool;
 		private Logger log;
 
-		public Server(InetAddress localAddr, Resources resources, Servers servers) throws IOException {
+		Server(InetAddress localAddr, Resources resources, Servers servers) throws IOException {
 			this.localAddr = localAddr;
 			this.resources = resources;
 			this.servers = servers;
@@ -224,16 +224,16 @@ public class SwapResource {
 		}
 	}
 
-	public static class Response implements Serializable {
-		public Status status;
-		public String message;
+	static class Response implements Serializable {
+		Status status;
+		String message;
 
 		private Response(Status status, String message) {
 			this.status = status;
 			this.message = message;
 		}
 
-		public enum Status {
+		enum Status {
 			SUCCESS,
 			FAILURE,
 			NO_SUCH_RESOURCE,