Merge branch 'main' of https://github.com/abdo643-HULK/DIS-Exercies

� Conflicts: � EX2/rmi/client/src/main/java/ClientMain.java
abdo643-HULK · Dec 22, 2021 · d577a6a · d577a6a
2 parents 1528455 + 3a95391
commit d577a6a
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 27 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,6 +17,7 @@ build
 .idea/**/tasks.xml
 .idea/**/compiler.xml
 .idea/compiler.xml
+.idea/misc.xml
 .idea/dictionaries
 .idea/checkstyleidea-libs
 

diff --git a/EX2/.gitignore b/EX2/.gitignore
@@ -17,6 +17,7 @@ build
 .idea/**/tasks.xml
 .idea/**/compiler.xml
 .idea/compiler.xml
+.idea/misc.xml
 .idea/dictionaries
 .idea/checkstyleidea-libs
 

diff --git a/EX2/.idea/misc.xml b/EX2/.idea/misc.xml
diff --git a/EX2/interfaces/src/main/java/EnvData.java b/EX2/interfaces/src/main/java/EnvData.java
@@ -1,4 +1,7 @@
-public class EnvData {
+import java.io.Serializable;
+import java.util.Arrays;
+
+public class EnvData implements Serializable {
 	final String mTimestamp;
 	final String mSensor;
 	final int[] mValues;
@@ -8,4 +11,13 @@ public class EnvData {
 		mSensor = _sensor;
 		mValues = _values;
 	}
+
+	@Override
+	public String toString() {
+		return "EnvData{"
+				+ "mTimestamp='" + mTimestamp + '\''
+				+ ", mSensor='" + mSensor + '\''
+				+ ", mValues=" + Arrays.toString(mValues)
+				+ '}';
+	}
 }
diff --git a/EX2/rmi/client/src/main/java/ClientMain.java b/EX2/rmi/client/src/main/java/ClientMain.java
@@ -34,16 +34,17 @@ public static void main(String[] _args) {
 				} while (inputMenu < 1 || inputMenu > 4);
 
 				switch (inputMenu) {
-					case 1 -> envStub.requestEnvironmentDataTypes();
-					case 2 -> envStub.requestEnvironmentData("air");
-					case 3 -> envStub.requestAll();
+					case 1 -> System.out.println(envStub.requestEnvironmentDataTypes());
+					case 2 -> System.out.println(envStub.requestEnvironmentData("air"));
+					case 3 -> System.out.println(envStub.requestAll());
 					default -> exit = true;
 				}
 			}
 
+
+
 		} catch (Exception _e) {
 			_e.printStackTrace();
 		}
-
 	}
 }
diff --git a/EX2/rmi/server/src/main/kotlin/Main.kt b/EX2/rmi/server/src/main/kotlin/Main.kt
@@ -1,9 +1,4 @@
-import java.rmi.registry.LocateRegistry
-import java.rmi.registry.Registry
-
 fun main(_args: Array<String>) {
-    val server = Server()
-    val reg = LocateRegistry.createRegistry(Registry.REGISTRY_PORT)
-    reg.bind("EnvService", server)
+    ServiceMgmt()
     println("Server is waiting for queries ...")
 }
diff --git a/EX2/rmi/server/src/main/kotlin/ServiceMgmt.kt b/EX2/rmi/server/src/main/kotlin/ServiceMgmt.kt
@@ -1,13 +1,23 @@
+import java.lang.Exception
+import java.rmi.NotBoundException
+import java.rmi.RemoteException
 import java.rmi.registry.LocateRegistry
 import java.rmi.registry.Registry
+import java.rmi.server.RemoteObject
+import java.rmi.server.UnicastRemoteObject
 
 const val ENV_SERVICE = "EnvService"
 
 class ServiceMgmt {
+    private val registry = LocateRegistry.createRegistry(Registry.REGISTRY_PORT)
     private val mServer by lazy { Server() }
 
     init {
-        startMenu()
+        try {
+            startMenu()
+        } catch (_e: RemoteException) {
+            System.err.println("ERROR CREATING REGISTRY: $_e")
+        }
     }
 
     private fun startMenu() {
@@ -27,21 +37,40 @@ class ServiceMgmt {
             when (inputMenu) {
                 1u -> startRmi()
                 2u -> stopRmi()
-                3u -> quit()
+                3u -> return quit()
             }
         }
     }
 
     private fun startRmi() {
-        val reg = LocateRegistry.createRegistry(Registry.REGISTRY_PORT)
-        reg.bind(ENV_SERVICE, mServer)
+        try {
+            registry.rebind(ENV_SERVICE, mServer)
+            println("RMI SERVICE STARTED")
+        } catch (_e: RemoteException) {
+            System.err.println("ERROR STARTING SERVER: $_e")
+        }
     }
 
     private fun stopRmi() {
-
+        try {
+            registry.unbind(ENV_SERVICE)
+            UnicastRemoteObject.unexportObject(mServer, true)
+            println("RMI SERVICE STOPPED")
+        } catch (_e: Exception) {
+            when (_e) {
+                is RemoteException, is NotBoundException -> {
+                    println("SERVER ALREADY STOPPED")
+                }
+            }
+        }
     }
 
     private fun quit() {
-
+        stopRmi()
+        try {
+            UnicastRemoteObject.unexportObject(registry, true)
+        } catch (_e: Exception) {
+            System.err.println("ERROR QUITTING SERVICE MGMT: $_e")
+        }
     }
 }