server working

client/client_Udp/ClientProxy.java

@@ -22,12 +22,12 @@ public ClientProxy( String host, int portNumber ) {
 			client = new ClientUDP(host, portNumber);
 			count = 1;
 
-//			this.convert("USD", "BRL", (float) 5.068 );
-//			this.currencyExists( "CAD" );
+			this.convert("USD", "BRL", (float) 5.068 );
+			this.currencyExists( "CAD" );
 //			this.currencysAvailable();
-//			this.getWheaterTemperature("Mountain View");
-//		 	this.getWheaterClouds("Mountain View");
-//			this.getWheaterWind("Mountain View");
+			this.getWheaterTemperature("Mountain View");
+			this.getWheaterClouds("Mountain View");
+			this.getWheaterWind("Mountain View");
 
 		}catch( Exception e ) {
 			System.out.println("ClientProxy error: " + e.getMessage());

server/Dispatcher.py

@@ -25,6 +25,7 @@ def invoke(self, message: Message) -> json:
                 response = sk_cc.currency_exists(message.get_arguments())
                 message.set_message_type(1)
                 message.set_arguments(response)
+
             elif message.get_method_name() == 'currencies_available':
                 response = sk_cc.currencies_available()
                 message.set_message_type(1)
@@ -35,11 +36,12 @@ def invoke(self, message: Message) -> json:
                 response = sk_wt.get_weather_clouds(message.get_arguments())
                 message.set_message_type(1)
                 message.set_arguments(response)
+
             elif message.get_method_name() == 'get_weather_temperature':
                 response = sk_wt.get_weather_temperature(message.get_arguments())
                 message.set_message_type(1)
                 message.set_arguments(response)
-                message.set_message_type(1)
+
             elif message.get_method_name() == 'get_weather_wind':
                 response = sk_wt.get_weather_wind(message.get_arguments())
                 message.set_message_type(1)

server/skeletons/CurrencyConverter.py

@@ -14,7 +14,6 @@ def convert(self, args: list):
         result = result.replace('{', '')
         result = result.replace('}', '')
         result = result.replace("'", '')
-        print(result)
         response = list()
         response.append(result)
         return response
@@ -38,7 +37,6 @@ def currencies_available(self):
         for i, currency in enumerate(result):
             string = 'currency:' + currency
             response.append(string)
-        print(response)
         return response
 
 

server/skeletons/Weather.py

@@ -4,7 +4,6 @@
 
 class Weather:
     def get_weather_temperature(self, args: list):
-
         params = get_params(args)
         city = params['city']
         self.tempoUser = ServiceWeather.WeatherCity(city)
@@ -21,8 +20,7 @@ def get_weather_temperature(self, args: list):
         response.append(result)
         return response
 
-    def get_weather_clouds(self , args: list):
-
+    def get_weather_clouds(self, args: list):
         params = get_params(args)
         city = params['city']
         self.tempoUser = ServiceWeather.WeatherCity(city)
@@ -40,7 +38,6 @@ def get_weather_clouds(self , args: list):
         return response
 
     def get_weather_wind(self, args: list):
-
         params = get_params(args)
         city = params['city']
         self.tempoUser = ServiceWeather.WeatherCity(city)
@@ -58,11 +55,11 @@ def get_weather_wind(self, args: list):
         response.append(result)
         return response
 
-#pega o nome da cidade e coloca em params
+
+# pega o nome da cidade e coloca em params
 def get_params(args: list):
     params = {}
     for i in args:
         param, value = i.split(':')
         params[param] = value
     return params
-