fix XML persistor

Author: Neil DEVAS

.gitignore

@@ -13,3 +13,6 @@ target
 *.log
 .classpath
 .project
+
+# data persistence files
+Data

src/main/java/group25/Server/RMI/RMICarResourceManager.java

@@ -28,7 +28,7 @@ public class RMICarResourceManager extends CarResourceManager {
     private static int s_customerServerPort = 2003;
 
     public RMICarResourceManager(String name) {
-        super(name, "carData1", "carData2", "carMasterRecord");
+        super(name, RMIUtils.DATA_FILE_PATH+"/carData1.xml", RMIUtils.DATA_FILE_PATH+"/carData2.xml", RMIUtils.DATA_FILE_PATH+"/carMasterRecord.xml");
     }
 
     public static void main(String args[]) {

src/main/java/group25/Server/RMI/RMICustomerResourceManager.java

@@ -27,7 +27,7 @@ public class RMICustomerResourceManager extends CustomerResourceManager {
     private static int s_serverPort = 2003;
 
     public RMICustomerResourceManager(String name) {
-        super(name, "customerData1", "customerData2", "customerMasterRecord");
+        super(name, RMIUtils.DATA_FILE_PATH+"/customerData1.xml", RMIUtils.DATA_FILE_PATH+"/customerData2.xml", RMIUtils.DATA_FILE_PATH+"/customerMasterRecord.xml");
     }
 
     public static void main(String args[]) {

src/main/java/group25/Server/RMI/RMIFlightResourceManager.java

@@ -20,7 +20,7 @@ public class RMIFlightResourceManager extends FlightResourceManager {
     private static int s_customerServerPort = 2003;
 
     public RMIFlightResourceManager(String name) {
-        super(name, "flightData1.xml", "flightData2.xml", "flightMasterRecord.xml");
+        super(name, RMIUtils.DATA_FILE_PATH+"/flightData1.xml", RMIUtils.DATA_FILE_PATH+"/flightData2.xml", RMIUtils.DATA_FILE_PATH+"/flightMasterRecord.xml");
     }
 
     public static void main(String args[]) {

src/main/java/group25/Server/RMI/RMIRoomResourceManager.java

@@ -22,7 +22,7 @@ public class RMIRoomResourceManager extends RoomResourceManager {
     private static int s_customerServerPort = 2003;
 
     public RMIRoomResourceManager(String name) {
-        super(name, "roomData1", "roomData2", "roomMasterRecord");
+        super(name, RMIUtils.DATA_FILE_PATH+"/roomData1.xml", RMIUtils.DATA_FILE_PATH+"/roomData2.xml", RMIUtils.DATA_FILE_PATH+"/roomMasterRecord.xml");
     }
 
     public static void main(String args[]) {

src/main/java/group25/Server/RMI/RMIUtils.java

@@ -15,6 +15,7 @@
 public class RMIUtils {
 
     private static final String RMI_OBJECT_NAME_PREFIX = "group25_";
+    protected static final String DATA_FILE_PATH = (System.getProperty("user.home")) + "/comp512/DistributedSystemsProject/Data";
 
     public static <T> T createRMIproxyObject(Remote objToStub, int port) {
         T retval = null;

src/main/java/group25/Utils/XMLPersistor.java

@@ -5,11 +5,12 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.HashMap;
 
 import static group25.Utils.AnsiColors.RED;
-
+import group25.Server.Common.*;
 /**
  * Contains utils for creating XStream objects, writing java objects
  * to XML files and reading them from XML files.
@@ -27,36 +28,54 @@ public XMLPersistor(Class classToWrite) {
         xstream.allowTypes(new Class[] {
                 HashMap.class,
                 String.class,
-                classToWrite
+                classToWrite,
+                Flight.class,
+                Room.class,
+                Car.class,
+                Customer.class,
         });
         this.xstream = xstream;
     }
 
-    public boolean writeObject(Object obj, String filename) {
-        String objAsXML = this.xstream.toXML(obj);
-
+    public boolean writeObject(Object obj, String filepath) {
+        FileOutputStream fos = null;
+        File dataFile = new File(filepath);
         try {
-            FileOutputStream fos = new FileOutputStream(filename);
-            fos.write("<?xml version=\"1.0\">\n".getBytes("UTF-8")); // XStream doesn't do this for you
-            fos.write(objAsXML.getBytes("UTF-8"));
+            dataFile.getParentFile().mkdir();
+            dataFile.createNewFile();
+            String objAsXML = this.xstream.toXML(obj);
+            fos = new FileOutputStream(dataFile);
+            fos.write("<?xml version=\"1.0\"?>\n".getBytes("UTF-8")); // XStream doesn't do this for you
+            byte[] bytes = objAsXML.getBytes("UTF-8");
+            fos.write(bytes);
+            System.out.println("finished writing " + bytes);
         } catch (Exception e) {
             System.out.println(RED.colorString("XMLPersistor.writeObject() exception: ")+e.getMessage());
             System.exit(1);
+        } finally {
+            if (fos != null) {
+                try {
+                    fos.close();
+                } catch(IOException e) {
+                    e.printStackTrace();
+                }
+            }
         }
 
         return true;
     }
 
-    public <T> T readObject(String filename) {
+    public <T> T readObject(String filepath) {
         String str = null;
 
         try {
-            File file = new File(filename);
+            File file = new File(filepath);
             FileInputStream fis = new FileInputStream(file);
             byte[] data = new byte[(int) file.length()];
 
             fis.read(data);
             str = new String(data, "UTF-8");
+            System.out.println(str);
         } catch (Exception e) {
             return null; // file not found
         }