finished loader executor; fixed method executor bugs

client/src/main/java/com/uqac/rthoni/java_rmi/client/ClientApplication.java

@@ -45,12 +45,17 @@ public class ClientApplication {
     {
         System.out.format("Reading input file %s...\n", inputFile);
         Vector<Command> commands = readInputFile(inputFile);
-        FileOutputStream outputStream = null;
-        try {
-            outputStream = new FileOutputStream(outputFile);
-        } catch (Exception e) {
-            System.err.format("Failed to open output file %s: %s\n", outputFile, e.getMessage());
-            System.exit(3);
+        OutputStream outputStream = null;
+        if (outputFile.equals("-")) {
+            outputStream = System.out;
+        }
+        else {
+            try {
+                outputStream = new FileOutputStream(outputFile);
+            } catch (Exception e) {
+                System.err.format("Failed to open output file %s: %s\n", outputFile, e.getMessage());
+                System.exit(3);
+            }
         }
         for (Command command : commands) {
             runCommand(command, host, port, outputStream);

common/src/main/java/com/uqac/rthoni/java_rmi/common/ReflectionUtil.java

@@ -100,7 +100,7 @@ public class ReflectionUtil {
         return value;
     }
 
-    public static Class getClass(String className) throws ClassNotFoundException {
+    public static Class getClass(String className, List<ClassLoader> loaders) throws ClassNotFoundException {
         if (className.equals("boolean")) {
             return boolean.class;
         }
@@ -122,6 +122,18 @@ public class ReflectionUtil {
         if (className.equals("double")) {
             return double.class;
         }
+        for (ClassLoader classLoader : loaders) {
+            try {
+                return (Class) Class.forName(className, true, classLoader);
+            } catch (ClassNotFoundException e) {
+            }
+        }
         return Class.forName(className);
     }
+
+    public static Object newInstance(String className, List<ClassLoader> loaders)
+            throws IllegalAccessException, InstantiationException, ClassNotFoundException {
+        Class c = getClass(className, loaders);
+        return c.newInstance();
+    }
 }

server/src/main/java/com/uqac/rthoni/java_rmi/server/ServerApplication.java

@@ -11,6 +11,7 @@ import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Vector;
 
 /**
@@ -18,10 +19,12 @@ import java.util.Vector;
  */
 public class ServerApplication {
 
-    private Vector<AbstractCommandExecutor> _executors = null;
+    private Vector<AbstractCommandExecutor> _executors = new Vector<>();
 
     private HashMap<String, Object> _objects = new HashMap<>();
 
+    private Vector<ClassLoader> _loaders = new Vector<>();
+
     private String _sourceDir;
 
     private String _classDir;
@@ -56,6 +59,16 @@ public class ServerApplication {
         return _objects.get(id);
     }
 
+    public void addClassLoader(ClassLoader loader)
+    {
+        _loaders.add(loader);
+    }
+
+    public List<ClassLoader> getClassLoaders()
+    {
+        return _loaders;
+    }
+
     public String getSourceDir() {
         return _sourceDir;
     }
@@ -105,7 +118,7 @@ public class ServerApplication {
 
     public void loadExecutors() throws ClassNotFoundException
     {
-        _executors = new Vector<>();
+        _executors.clear();
         Vector<Class> classes = AbstractCommandExecutor.getAllExecutors();
         for (Class c : classes) {
             try {

server/src/main/java/com/uqac/rthoni/java_rmi/server/executors/ClassLoaderExecutor.java

@@ -23,9 +23,10 @@ public class ClassLoaderExecutor extends AbstractCommandExecutor {
 
         File root = new File(server.getClassDir(), classDir);
         URLClassLoader classLoader = URLClassLoader.newInstance(new URL[] { root.toURI().toURL() });
-        Class<?> cls = Class.forName(className, true, classLoader); // Should print "hello".
-        Object instance = cls.newInstance(); // Should print "world".
-        System.out.println(instance); // Should print "test.Test@hashcode".
+        server.addClassLoader(classLoader);
+//        Class<?> cls = Class.forName(className, true, classLoader); // Should print "hello".
+//        Object instance = cls.newInstance(); // Should print "world".
+//        System.out.println(instance); // Should print "test.Test@hashcode".
 
         return null;
     }

server/src/main/java/com/uqac/rthoni/java_rmi/server/executors/MethodExecutor.java

@@ -26,7 +26,7 @@ public class MethodExecutor extends AbstractCommandExecutor {
         List<Pair<Class, String>> argClasses = command.getArgumentAsList(2, true).stream().map(v -> {
             String[] split = v.split(":");
             try {
-                return new Pair<>(ReflectionUtil.getClass(split[0]), split[1]);
+                return new Pair<>(ReflectionUtil.getClass(split[0], server.getClassLoaders()), split[1]);
             } catch (ClassNotFoundException e) {
                 return null;
             }
@@ -34,7 +34,7 @@ public class MethodExecutor extends AbstractCommandExecutor {
         List<Object> arguments = argClasses.stream().map(p -> {
             String value = p.getValue();
             if (value.startsWith("ID(") && value.endsWith(")")) {
-                value = value.substring(3, value.length() - 2);
+                value = value.substring(3, value.length() - 1);
                 return server.getObject(value);
             }
             return ReflectionUtil.toObject(p.getKey(), value);

server/src/main/java/com/uqac/rthoni/java_rmi/server/executors/NewInstanceExecutor.java

@@ -1,6 +1,7 @@
 package com.uqac.rthoni.java_rmi.server.executors;
 
 import com.uqac.rthoni.java_rmi.common.Command;
+import com.uqac.rthoni.java_rmi.common.ReflectionUtil;
 import com.uqac.rthoni.java_rmi.server.ServerApplication;
 
 /**
@@ -16,8 +17,9 @@ public class NewInstanceExecutor extends AbstractCommandExecutor {
     public String run(Command command, ServerApplication server) throws Exception {
         String className = command.getArgument(0, false);
         String id = command.getArgument(1, false);
-        Class c = Class.forName(className);
-        Object obj = c.newInstance();
+        Object obj = ReflectionUtil.newInstance(className, server.getClassLoaders());
+//        Class c = Class.forName(className);
+//        Object obj = c.newInstance();
         server.addObject(id, obj);
         return null;
     }