injection parser moved to socketlabs client

Author: PraneethChandraThota

socketlabs/injectionapi/core/retryhandler.py

@@ -30,13 +30,7 @@ def __init__(self, http_client: HttpRequest, settings: RetrySettings):
     def send(self, body):
 
         if self.__retry_settings.maximum_number_of_retries == 0:
-
-            response = self.__http_client.send_request(body)
-            data = response.read().decode("utf-8")
-            response_code = response.status
-            result = InjectionResponseParser.parse(data, response_code)
-            
-            return result
+            return self.__http_client.send_request(body)
 
         while True:
             wait_interval = self.__retry_settings.get_next_wait_interval(self.attempts)
@@ -47,12 +41,8 @@ def send(self, body):
 
                 if response.status in self.ErrorStatusCodes:
                     raise HTTPException("HttpStatusCode: {0}. Response contains server error.".format(response.status))
-                
-                data = response.read().decode("utf-8")
-                response_code = response.status
-                result = InjectionResponseParser.parse(data, response_code)
 
-                return result
+                return response
 
             except socket.timeout:
 
@@ -83,11 +73,7 @@ def on_success(response):
                 self.send_async(request, on_success_callback, on_error_callback)
 
             else:
-
-                data = response.read().decode("utf-8")
-                response_code = response.status
-                result = InjectionResponseParser.parse(data, response_code)
-                on_success_callback(result)
+                on_success_callback(response)
 
         def on_error(exception):
 

socketlabs/injectionapi/socketlabsclient.py

@@ -5,6 +5,7 @@
 from .core.httpendpoint import HttpEndpoint
 from .core.httprequest import HttpRequest
 from .core.injectionrequestfactory import InjectionRequestFactory
+from .core.injectionresponseparser import InjectionResponseParser
 from .core.sendvalidator import SendValidator
 from .core.retryhandler import RetryHandler
 from .retrysettings import RetrySettings
@@ -143,7 +144,10 @@ def __send_bulk_message(self, message: BulkMessage):
 
         request = self.__build_http_request()
         retry_handler = RetryHandler(request, RetrySettings(self.number_of_retries))
-        result = retry_handler.send(body)
+        response = retry_handler.send(body)
+        data = response.read().decode("utf-8")
+        response_code = response.status
+        result = InjectionResponseParser.parse(data, response_code)
         return result
 
     def send_async(self, message: BasicMessage, on_success, on_error):
@@ -182,7 +186,14 @@ def __send_basic_message_async(self, message: BasicMessage, on_success, on_error
 
         request = self.__build_http_request()
         retry_handler = RetryHandler(request, RetrySettings(self.number_of_retries))
-        retry_handler.send_async(body, on_success, on_error)
+        def on_sucess_callback(response):
+            data = response.read().decode("utf-8")
+            response_code = response.status
+            result = InjectionResponseParser.parse(data, response_code)
+            on_success(result)
+        def on_error_callback(exception):
+            on_error(exception)
+        retry_handler.send_async(body, on_sucess_callback, on_error_callback)
 
     def __send_bulk_message_async(self, message: BulkMessage, on_success, on_error):
         """