Revize 5cb4249a

Modified XML deserialization + commands acceptor

Server/ServerApp/Connection/ConnectionListener.cs

@@ -161 +161 @@
 			//return xml;
 
 
-			Console.WriteLine("Constructiing a response for GET request.");
+			Console.WriteLine("Constructing a response for GET request.");
 			Console.WriteLine("Request string: ");
 			Console.WriteLine(requestString);
 
@@ -172 +172 @@
 			Request requestDeserialized = null;
 			try
 			{
-				requestDeserialized = XmlCommunication.Deserialize(newRequest, requestString);
+				Console.WriteLine("Trying to deserialize xml request.");
+				requestDeserialized = XmlCommunication.Deserialize<Request>(requestString);
 			}
 			catch
 			{
@@ -184 +185 @@
 
 
 			// get the prediction from the model:
+			Console.WriteLine("Getting the prediction from the predictor.");
+			Console.WriteLine("Deserialized request is null? : " + requestDeserialized == null);
 			Response responsePrediction = predictionController.Predict(requestDeserialized);
 
 			string constructedXml = XmlCommunication.Serialize(responsePrediction);
@@ -198 +201 @@
 
 		private string ConstructPOSTResponse(string requestString)
 		{
-			Console.WriteLine("Constructiing a response for POST request.");
+			Console.WriteLine("Constructing a response for POST request.");
 			Console.WriteLine("Request string: ");
 			Console.WriteLine(requestString);
 
@@ -209 +212 @@
 			Request requestDeserialized = null;
 			try
 			{
-				requestDeserialized = XmlCommunication.Deserialize(newRequest, requestString);
+				Console.WriteLine("Trying to deserialize xml request.");
+				requestDeserialized = XmlCommunication.Deserialize<Request>(requestString);
 			}
 			catch
 			{
@@ -221 +225 @@
 
 
 			// get the prediction from the model:
+			Console.WriteLine("Getting the prediction from the predictor.");
+			Console.WriteLine("Deserialized request is null? : " + requestDeserialized == null);
 			Response responsePrediction = predictionController.Predict(requestDeserialized);
 
 
@@ -365 +371 @@
 					Request requestDeserialized = null;
 					try
 					{
-						requestDeserialized = XmlCommunication.Deserialize(newRequest, requestXML);
+						requestDeserialized = XmlCommunication.Deserialize<Request>(requestXML);
 					}
 					catch
 					{
@@ -630 +636 @@
 					Console.WriteLine(requestXML);
 
 					Request newRequest = new Request();
-					Request requestDeserialized = XmlCommunication.Deserialize(newRequest, requestXML);
+					Request requestDeserialized = XmlCommunication.Deserialize<Request>(requestXML);
 
 					ClientService newService = new ClientService();
 					newService.UniqueID = GetNextID();

Server/ServerApp/Connection/XMLProtocolHandler/XmlCommunication.cs

@@ -21 +21 @@
             }
         }
 
-        public static T Deserialize<T>(T toDeserialize, string xmlString)
+        //public static T Deserialize<T>(T toDeserialize, string xmlString)
+        //{
+        //    using (var stream = new StringReader(xmlString))
+        //    {
+        //        var xml = new XmlSerializer(toDeserialize.GetType());
+        //        T deserialized = (T)xml.Deserialize(stream);
+        //        return deserialized;
+        //    }
+        //}
+
+        public static T Deserialize<T>(string xmlString)
         {
             using (var stream = new StringReader(xmlString))
             {
-                var xml = new XmlSerializer(toDeserialize.GetType());
+                var xml = new XmlSerializer(typeof(T));
                 T deserialized = (T)xml.Deserialize(stream);
                 return deserialized;
             }
         }
+
     }
 }

Server/ServerApp/Program.cs

@@ -144 +144 @@
 			Console.WriteLine(xml);
 			try
 			{
-				Response responseDeserialized = XmlCommunication.Deserialize(response1, xml);
+				Response responseDeserialized = XmlCommunication.Deserialize<Response>(xml);
 			}
 			catch(Exception e)
 			{
@@ -158 +158 @@
 			Request request = Request.Randomize();
 			xml = XmlCommunication.Serialize(request);
 			Console.WriteLine(xml);
-			Request requestDeserialized = XmlCommunication.Deserialize(request, xml);
+			Request requestDeserialized = XmlCommunication.Deserialize<Request>(xml);
 		}
 
 

Server/ServerApp/Properties/launchSettings.json

@@ -2 +2 @@
   "profiles": {
     "ServerApp": {
       "commandName": "Project",
-      "commandLineArgs": "C:\\Users\\kalivoda\\Temp\\serverAppNetCore\\ServerAppNETCore\\ServerApp\\server_config"
+      "commandLineArgs": "C:\\Users\\elisk\\Documents\\aswi2021tri-musketyri\\Server\\ServerApp\\server_config"
     }
   }
 }

Server/ServerApp/User/CommandsAcceptor.cs

@@ -28 +28 @@
 		public void AcceptCommand()
 		{
 			while (true) {
+				Console.Write(">");
 				string command = Console.ReadLine();
-				Console.WriteLine("received admin command: " + command);
-				Command c = ParseString(command);
-				CheckCommand(c);
-				//Program.NotifyUserMessage(command);
+				if(command.Length > 0)
+				{
+					Console.WriteLine("received admin command: " + command);
+					Command c = ParseString(command);
+					CheckCommand(c);
+					//Program.NotifyUserMessage(command);
+				}
+
 			}
 		}