fix bugs and scripts

Neil DEVAS · Neil DEVAS · commit 30fb351fbf70 · 2018-10-04T18:19:01.000-04:00
diff --git a/code/Server/Server/Common/CarResourceManager.java b/code/Server/Server/Common/CarResourceManager.java
@@ -60,7 +60,7 @@ public int queryCarsPrice(int xid, String location) throws RemoteException {
     public boolean reserveItem(int xid, int customerID, String key, String location) throws RemoteException {
         Trace.info("RM::reserveItem(" + xid + ", customer=" + customerID + ", " + key + ", " + location + ") called");
         // Read customer object if it exists (and read lock it)
-        Customer customer = null;
+        ICustomer customer = null;
         try {
             customer = customerRM.getCustomer(xid, customerID);
             if (customer == null) {
@@ -82,7 +82,7 @@ public boolean reserveItem(int xid, int customerID, String key, String location)
             return false;
         } else {
             customer.reserve(key, location, item.getPrice());
-            writeData(xid, customer.getKey(), customer);
+            //writeData(xid, customer.getKey(), customer); // TODO why is this needed?
 
             // Decrease the number of available items in the storage
             item.setCount(item.getCount() - 1);
diff --git a/code/Server/Server/Common/Customer.java b/code/Server/Server/Common/Customer.java
@@ -41,7 +41,9 @@ public boolean reserve(String key, String location, int price) {
                 // NOTE: latest price overrides existing price
                 reservedItem.setPrice(price);
             }
+            System.out.println("I JUST PUT INTO HASHMAP");
             m_reservations.put(reservedItem.getKey(), reservedItem);
+            System.out.println("BSLD" + m_reservations.keySet().size());
             return true;
         }
     }
@@ -51,9 +53,13 @@ public ReservedItem getReservedItem(String key) {
     }
 
     public String getBill() {
+        // System.out.println("GEtting bill!!!!!");
         String s = "Bill for customer " + m_ID + "\n";
+        // System.out.println("CUSTOMER KEY SET LENGTH" + m_reservations.keySet());
         for (String key : m_reservations.keySet()) {
+            // System.out.println("INSIDE FOR LOOP");
             ReservedItem item = (ReservedItem) m_reservations.get(key);
+            System.out.println("ITEM KEY: " + item.getReservableItemKey());
             s += +item.getCount() + " " + item.getReservableItemKey() + " $" + item.getPrice() + "\n";
         }
         return s;
diff --git a/code/Server/Server/Common/CustomerResourceManager.java b/code/Server/Server/Common/CustomerResourceManager.java
@@ -70,6 +70,7 @@ public boolean deleteCustomer(int xid, int customerID) throws RemoteException {
     }
 
     public String queryCustomerInfo(int xid, int customerID) throws RemoteException {
+      System.out.println("INSIDE QUERY CUSTOMER INFO!!!!!!!!!!!!!!!");
         Trace.info("RM::queryCustomerInfo(" + xid + ", " + customerID + ") called");
         Customer customer = (Customer) readData(xid, Customer.getKey(customerID));
         if (customer == null) {
diff --git a/code/Server/Server/Common/FlightResourceManager.java b/code/Server/Server/Common/FlightResourceManager.java
@@ -64,7 +64,7 @@ public String getName() throws RemoteException {
     public boolean reserveItem(int xid, int customerID, String key, String location) throws RemoteException {
         Trace.info("RM::reserveItem(" + xid + ", customer=" + customerID + ", " + key + ", " + location + ") called");
         // Read customer object if it exists (and read lock it)
-        Customer customer = null;
+        ICustomer customer = null;
         try {
             customer = customerRM.getCustomer(xid, customerID);
             if (customer == null) {
@@ -86,7 +86,7 @@ public boolean reserveItem(int xid, int customerID, String key, String location)
             return false;
         } else {
             customer.reserve(key, location, item.getPrice());
-            writeData(xid, customer.getKey(), customer);
+            //writeData(xid, customer.getKey(), customer); TODO: why do we need this line
 
             // Decrease the number of available items in the storage
             item.setCount(item.getCount() - 1);
diff --git a/code/Server/Server/Common/RoomResourceManager.java b/code/Server/Server/Common/RoomResourceManager.java
@@ -64,7 +64,7 @@ public String getName() throws RemoteException {
     public boolean reserveItem(int xid, int customerID, String key, String location) throws RemoteException {
         Trace.info("RM::reserveItem(" + xid + ", customer=" + customerID + ", " + key + ", " + location + ") called");
         // Read customer object if it exists (and read lock it)
-        Customer customer = null;
+        ICustomer customer = null;
         try {
             customer = customerRM.getCustomer(xid, customerID);
             if (customer == null) {
@@ -86,7 +86,7 @@ public boolean reserveItem(int xid, int customerID, String key, String location)
             return false;
         } else {
             customer.reserve(key, location, item.getPrice());
-            writeData(xid, customer.getKey(), customer);
+            ///writeData(xid, customer.getKey(), customer); // TODO: why do we need this line
 
             // Decrease the number of available items in the storage
             item.setCount(item.getCount() - 1);
diff --git a/code/Server/Server/Interface/ICustomerResourceManager.java b/code/Server/Server/Interface/ICustomerResourceManager.java
@@ -2,6 +2,7 @@
 
 import Server.Common.Customer;
 import Server.TCP.IProxiable;
+import Server.Interface.ICustomer;
 
 import java.rmi.Remote;
 import java.rmi.RemoteException;
@@ -54,6 +55,6 @@ public String getName()
      *
      * @return the customer
      */
-    public Customer getCustomer(int xid, int customerID)
+    public ICustomer getCustomer(int xid, int customerID)
             throws RemoteException;
 }
diff --git a/code/Server/Server/TCP/AbstractProxyObject.java b/code/Server/Server/TCP/AbstractProxyObject.java
@@ -28,9 +28,8 @@ protected Message sendAndReceiveMessage(Message messageToSend)
             throws UnknownHostException, IOException, ClassNotFoundException
     {
         messageToSend.proxyObjectBoundName = boundName;
-
+        System.out.println("Socket ateempting to create on hostname and port: " + hostname + ", " + port);
         Socket socket = new Socket(hostname, port);
-
         ObjectOutputStream objectOutput =
                 new ObjectOutputStream(socket.getOutputStream());
         ObjectInputStream objectInput =
diff --git a/code/Server/Server/TCP/ProxyCustomer.java b/code/Server/Server/TCP/ProxyCustomer.java
@@ -52,7 +52,7 @@ public boolean reserve(String key, String location, int price) {
         message.proxyObjectBoundName = this.boundName;
         message.methodName = "reserve";
         message.methodArgs = new Object[]{key, location, price};
-        message.methodArgTypes = new Class[]{String.class, String.class, String.class};
+        message.methodArgTypes = new Class[]{String.class, String.class, int.class};
         Message recvMessage = null;
         try {
             recvMessage = sendAndReceiveMessage(message);
diff --git a/code/Server/Server/TCP/ProxyCustomerResourceManager.java b/code/Server/Server/TCP/ProxyCustomerResourceManager.java
@@ -122,7 +122,7 @@ public String getName() throws RemoteException {
      *
      * @return the customer
      */
-    public Customer getCustomer(int xid, int customerID) throws RemoteException {
+    public ICustomer getCustomer(int xid, int customerID) throws RemoteException {
         ProxyMethodCallMessage message = new ProxyMethodCallMessage();
         message.proxyObjectBoundName = this.boundName;
         message.methodName = "getCustomer";
@@ -140,7 +140,7 @@ public Customer getCustomer(int xid, int customerID) throws RemoteException {
             Trace.info("ProxyCustomerResourceManager::getCustomer(" + xid + "," + customerID + ") -> requestedValue is null");
             throw new RemoteException("Oh no!");
         } else {
-            return (Customer) recvMessage.requestedValue;
+            return (ICustomer) recvMessage.requestedValue;
         }
     }
 
diff --git a/code/Server/Server/TCP/ProxyFlightResourceManager.java b/code/Server/Server/TCP/ProxyFlightResourceManager.java
@@ -116,7 +116,7 @@ public boolean reserveFlight(int id, int customerID, int flightNumber) throws Re
         message.proxyObjectBoundName = this.boundName;
         message.methodName = "reserveFlight";
         message.methodArgs = new Object[]{id, customerID, flightNumber};
-        message.methodArgTypes = new Class[]{int.class, int.class, String.class};
+        message.methodArgTypes = new Class[]{int.class, int.class, int.class};
 
         Message recvMessage = null;
         try {
diff --git a/code/Server/Server/TCP/ProxyMiddlewareResourceManager.java b/code/Server/Server/TCP/ProxyMiddlewareResourceManager.java
@@ -54,6 +54,7 @@ public boolean addCars(int id, String location, int numCars, int price) throws R
         message.methodArgTypes = new Class[]{int.class, String.class, int.class, int.class};
         Message recvMessage = null;
         try {
+            System.out.println("about to send addCars message!!!!!!!");
             recvMessage = sendAndReceiveMessage(message);
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/code/Server/Server/TCP/TCPCarResourceManager.java b/code/Server/Server/TCP/TCPCarResourceManager.java
@@ -10,35 +10,39 @@ public class TCPCarResourceManager extends CarResourceManager implements IProxyR
 {
     private static String s_serverName = "CarServer";
     private static int s_serverPort = 2001;
+    private static String s_serverHost = "localhost";
     private static String s_tcpPrefix = "group25_";
     private static String s_customerServerHostname = "localhost";
     private static int s_customerServerPort = 2003;
 
     public static void main(String[] args)
     {
         if (args.length > 0) {
-            try {
-                s_serverPort = Integer.parseInt(args[0]);
-            } catch (Exception e) {
-                System.err.println((char) 27 + "[31;1mClient exception: " + (char) 27 + "[0m1st arg must be integer for carserver port (default 2001)");
-                e.printStackTrace();
-                System.exit(1);
-            }
-        }
-        if (args.length > 1) {
-            s_customerServerHostname = args[1];
+          s_serverHost = args[0];
+
+        } if (args.length > 1) {
+          try {
+              s_serverPort = Integer.parseInt(args[1]);
+          } catch (Exception e) {
+              System.err.println((char) 27 + "[31;1mClient exception: " + (char) 27 + "[0m1st arg must be integer for carserver port (default 2001)");
+              e.printStackTrace();
+              System.exit(1);
+          }
         }
         if (args.length > 2) {
+            s_customerServerHostname = args[2];
+        }
+        if (args.length > 3) {
             try {
-                s_customerServerPort = Integer.parseInt(args[2]);
+                s_customerServerPort = Integer.parseInt(args[3]);
             } catch (Exception e) {
                 System.err.println((char) 27 + "[31;1mClient exception: " + (char) 27 + "[0m3rd arg must be integer for customer server port (default 2003)");
                 e.printStackTrace();
                 System.exit(1);
             }
         }
 
-        TCPProxyObjectServer server = new TCPProxyObjectServer("localhost", s_serverPort);
+        TCPProxyObjectServer server = new TCPProxyObjectServer(s_serverHost, s_serverPort);
         TCPCarResourceManager carRM = new TCPCarResourceManager(s_serverName);
         carRM.customerRM = (ICustomerResourceManager) carRM.getProxyResourceManager(s_customerServerHostname,s_customerServerPort, "CustomerServer");
 
diff --git a/code/Server/Server/TCP/TCPCustomerResourceManager.java b/code/Server/Server/TCP/TCPCustomerResourceManager.java
@@ -7,21 +7,25 @@
 
 public class TCPCustomerResourceManager extends CustomerResourceManager {
     private static String s_serverName = "CustomerServer";
+    private static String s_serverHost = "localhost";
     private static int s_serverPort = 2003;
     private static String s_tcpPrefix = "group25_";
 
     public static void main(String[] args) {
         if (args.length > 0) {
-            try {
-                s_serverPort = Integer.parseInt(args[0]);
-            } catch (Exception e) {
-                System.err.println((char) 27 + "[31;1mClient exception: " + (char) 27 + "[0m1st arg must be integer for customerserver port (default 2003)");
-                e.printStackTrace();
-                System.exit(1);
-            }
+          s_serverHost = args[0];
+        }
+        if (args.length > 1) {
+          try {
+              s_serverPort = Integer.parseInt(args[1]);
+          } catch (Exception e) {
+              System.err.println((char) 27 + "[31;1mClient exception: " + (char) 27 + "[0m1st arg must be integer for customerserver port (default 2003)");
+              e.printStackTrace();
+              System.exit(1);
+          }
         }
 
-        TCPProxyObjectServer server = new TCPProxyObjectServer("localhost", s_serverPort);
+        TCPProxyObjectServer server = new TCPProxyObjectServer(s_serverHost, s_serverPort);
         TCPCustomerResourceManager customerRM = new TCPCustomerResourceManager(s_serverName);
 
         server.bind(s_tcpPrefix + s_serverName, customerRM);
diff --git a/code/Server/Server/TCP/TCPFlightResourceManager.java b/code/Server/Server/TCP/TCPFlightResourceManager.java
@@ -9,34 +9,38 @@
 public class TCPFlightResourceManager extends FlightResourceManager implements IProxyResourceManagerGetter {
     private static String s_serverName = "FlightServer";
     private static int s_serverPort = 2000;
+    private static String s_serverHost = "localhost";
     private static String s_tcpPrefix = "group25_";
     private static String s_customerServerHostname = "localhost";
     private static int s_customerServerPort = 2003;
 
     public static void main(String[] args) {
         if (args.length > 0) {
-            try {
-                s_serverPort = Integer.parseInt(args[0]);
-            } catch (Exception e) {
-                System.err.println((char) 27 + "[31;1mClient exception: " + (char) 27 + "[0m1st arg must be integer for flightserver port (default 2000)");
-                e.printStackTrace();
-                System.exit(1);
-            }
+          s_serverHost = args[0];
         }
         if (args.length > 1) {
-            s_customerServerHostname = args[1];
+          try {
+              s_serverPort = Integer.parseInt(args[1]);
+          } catch (Exception e) {
+              System.err.println((char) 27 + "[31;1mClient exception: " + (char) 27 + "[0m1st arg must be integer for carserver port (default 2001)");
+              e.printStackTrace();
+              System.exit(1);
+          }
         }
         if (args.length > 2) {
+            s_customerServerHostname = args[2];
+        }
+        if (args.length > 3) {
             try {
-                s_customerServerPort = Integer.parseInt(args[2]);
+                s_customerServerPort = Integer.parseInt(args[3]);
             } catch (Exception e) {
                 System.err.println((char) 27 + "[31;1mClient exception: " + (char) 27 + "[0m3rd arg must be integer for customer server port (default 2003)");
                 e.printStackTrace();
                 System.exit(1);
             }
         }
 
-        TCPProxyObjectServer server = new TCPProxyObjectServer("localhost", s_serverPort);
+        TCPProxyObjectServer server = new TCPProxyObjectServer(s_serverHost, s_serverPort);
         TCPFlightResourceManager flightRM = new TCPFlightResourceManager(s_serverName);
         flightRM.customerRM = (ICustomerResourceManager) flightRM.getProxyResourceManager(s_customerServerHostname,s_customerServerPort, "CustomerServer");
 
diff --git a/code/Server/Server/TCP/TCPMiddlewareResourceManager.java b/code/Server/Server/TCP/TCPMiddlewareResourceManager.java
@@ -9,6 +9,7 @@
 public class TCPMiddlewareResourceManager extends MiddlewareResourceManager implements IProxyResourceManagerGetter {
     private static String s_serverName = "MiddlewareServer";
     private static int s_serverPort = 2005;
+    private static String s_serverHost = "localhost";
     private static String s_tcpPrefix = "group25_";
     private static String s_customerServerHostname = "localhost";
     private static int s_customerServerPort = 2003;
@@ -21,64 +22,67 @@ public class TCPMiddlewareResourceManager extends MiddlewareResourceManager impl
 
     public static void main(String[] args) {
         if (args.length > 0) {
-            try {
-                s_serverPort = Integer.parseInt(args[0]);
-            } catch (Exception e) {
-                System.err.println((char) 27 + "[31;1mClient exception: " + (char) 27 + "[0m1st arg must be integer for middlewareserver port (default 2005)");
-                e.printStackTrace();
-                System.exit(1);
-            }
+          s_serverHost = args[0];
         }
         if (args.length > 1) {
-            s_customerServerHostname = args[1];
+          try {
+              s_serverPort = Integer.parseInt(args[1]);
+          } catch (Exception e) {
+              System.err.println((char) 27 + "[31;1mClient exception: " + (char) 27 + "[0m1st arg must be integer for middlewareserver port (default 2005)");
+              e.printStackTrace();
+              System.exit(1);
+          }
         }
         if (args.length > 2) {
+            s_customerServerHostname = args[2];
+        }
+        if (args.length > 3) {
             try {
-                s_customerServerPort = Integer.parseInt(args[2]);
+                s_customerServerPort = Integer.parseInt(args[3]);
             } catch (Exception e) {
                 System.err.println((char) 27 + "[31;1mClient exception: " + (char) 27 + "[0m3rd arg must be integer for customerserver port (default 2003)");
                 e.printStackTrace();
                 System.exit(1);
             }
         }
-        if (args.length > 3) {
-            s_flightServerHostname = args[3];
-        }
         if (args.length > 4) {
+            s_flightServerHostname = args[4];
+        }
+        if (args.length > 5) {
             try {
-                s_flightServerPort = Integer.parseInt(args[4]);
+                s_flightServerPort = Integer.parseInt(args[5]);
             } catch (Exception e) {
                 System.err.println((char) 27 + "[31;1mClient exception: " + (char) 27 + "[0m5th arg must be integer for flightserver port (default 2000)");
                 e.printStackTrace();
                 System.exit(1);
             }
         }
-        if (args.length > 5) {
-            s_roomServerHostname = args[5];
-        }
         if (args.length > 6) {
+            s_roomServerHostname = args[6];
+        }
+        if (args.length > 7) {
             try {
-                s_roomServerPort = Integer.parseInt(args[6]);
+                s_roomServerPort = Integer.parseInt(args[7]);
             } catch (Exception e) {
                 System.err.println((char) 27 + "[31;1mClient exception: " + (char) 27 + "[0m7th arg must be integer for roomserver port (default 2002)");
                 e.printStackTrace();
                 System.exit(1);
             }
         }
-        if (args.length > 7) {
-            s_carServerHostname = args[7];
-        }
         if (args.length > 8) {
+            s_carServerHostname = args[8];
+        }
+        if (args.length > 9) {
             try {
-                s_carServerPort = Integer.parseInt(args[8]);
+                s_carServerPort = Integer.parseInt(args[9]);
             } catch (Exception e) {
                 System.err.println((char) 27 + "[31;1mClient exception: " + (char) 27 + "[0m9th arg must be integer for carserver port (default 2001)");
                 e.printStackTrace();
                 System.exit(1);
             }
         }
 
-        TCPProxyObjectServer server = new TCPProxyObjectServer("localhost", s_serverPort);
+        TCPProxyObjectServer server = new TCPProxyObjectServer(s_serverHost, s_serverPort);
         TCPMiddlewareResourceManager middlewareRM = new TCPMiddlewareResourceManager(s_serverName);
         middlewareRM.flightRM = (IFlightResourceManager) middlewareRM.getProxyResourceManager(s_flightServerHostname,s_flightServerPort, "FlightServer");
         middlewareRM.carRM = (ICarResourceManager) middlewareRM.getProxyResourceManager(s_carServerHostname,s_carServerPort, "CarServer");
diff --git a/code/Server/Server/TCP/TCPRoomResourceManager.java b/code/Server/Server/TCP/TCPRoomResourceManager.java
diff --git a/code/Server/run_tcp_middleware.sh b/code/Server/run_tcp_middleware.sh
diff --git a/code/Server/run_tcp_server.sh b/code/Server/run_tcp_server.sh
diff --git a/code/Server/run_tcp_servers.sh b/code/Server/run_tcp_servers.sh

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,9 @@ public boolean reserve(String key, String location, int price) {`
`41`	`41`	`// NOTE: latest price overrides existing price`
`42`	`42`	`reservedItem.setPrice(price);`
`43`	`43`	`}`
	`44`	`+ System.out.println("I JUST PUT INTO HASHMAP");`
`44`	`45`	`m_reservations.put(reservedItem.getKey(), reservedItem);`
	`46`	`+ System.out.println("BSLD" + m_reservations.keySet().size());`
`45`	`47`	`return true;`
`46`	`48`	`}`
`47`	`49`	`}`
`@@ -51,9 +53,13 @@ public ReservedItem getReservedItem(String key) {`
`51`	`53`	`}`
`52`	`54`
`53`	`55`	`public String getBill() {`
	`56`	`+ // System.out.println("GEtting bill!!!!!");`
`54`	`57`	`String s = "Bill for customer " + m_ID + "\n";`
	`58`	`+ // System.out.println("CUSTOMER KEY SET LENGTH" + m_reservations.keySet());`
`55`	`59`	`for (String key : m_reservations.keySet()) {`
	`60`	`+ // System.out.println("INSIDE FOR LOOP");`
`56`	`61`	`ReservedItem item = (ReservedItem) m_reservations.get(key);`
	`62`	`+ System.out.println("ITEM KEY: " + item.getReservableItemKey());`
`57`	`63`	`s += +item.getCount() + " " + item.getReservableItemKey() + " $" + item.getPrice() + "\n";`
`58`	`64`	`}`
`59`	`65`	`return s;`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ public boolean deleteCustomer(int xid, int customerID) throws RemoteException {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`public String queryCustomerInfo(int xid, int customerID) throws RemoteException {`
	`73`	`+ System.out.println("INSIDE QUERY CUSTOMER INFO!!!!!!!!!!!!!!!");`
`73`	`74`	`Trace.info("RM::queryCustomerInfo(" + xid + ", " + customerID + ") called");`
`74`	`75`	`Customer customer = (Customer) readData(xid, Customer.getKey(customerID));`
`75`	`76`	`if (customer == null) {`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`import Server.Common.Customer;`
`4`	`4`	`import Server.TCP.IProxiable;`
	`5`	`+import Server.Interface.ICustomer;`
`5`	`6`
`6`	`7`	`import java.rmi.Remote;`
`7`	`8`	`import java.rmi.RemoteException;`
`@@ -54,6 +55,6 @@ public String getName()`
`54`	`55`	`*`
`55`	`56`	`* @return the customer`
`56`	`57`	`*/`
`57`		`- public Customer getCustomer(int xid, int customerID)`
	`58`	`+ public ICustomer getCustomer(int xid, int customerID)`
`58`	`59`	`throws RemoteException;`
`59`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public String getName() throws RemoteException {`
`122`	`122`	`*`
`123`	`123`	`* @return the customer`
`124`	`124`	`*/`
`125`		`- public Customer getCustomer(int xid, int customerID) throws RemoteException {`
	`125`	`+ public ICustomer getCustomer(int xid, int customerID) throws RemoteException {`
`126`	`126`	`ProxyMethodCallMessage message = new ProxyMethodCallMessage();`
`127`	`127`	`message.proxyObjectBoundName = this.boundName;`
`128`	`128`	`message.methodName = "getCustomer";`
`@@ -140,7 +140,7 @@ public Customer getCustomer(int xid, int customerID) throws RemoteException {`
`140`	`140`	`Trace.info("ProxyCustomerResourceManager::getCustomer(" + xid + "," + customerID + ") -> requestedValue is null");`
`141`	`141`	`throw new RemoteException("Oh no!");`
`142`	`142`	`} else {`
`143`		`- return (Customer) recvMessage.requestedValue;`
	`143`	`+ return (ICustomer) recvMessage.requestedValue;`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`