From 48c832331095a1a0f448f779917f802e9d22ac86 Mon Sep 17 00:00:00 2001 From: Nikhil Yogendra Murali <25237515+nikhilym@users.noreply.github.com> Date: Thu, 30 May 2019 10:33:11 -0700 Subject: [PATCH] Fix response interceptor keyword argument (#92) Fixes #91. --- ask-sdk-runtime/ask_sdk_runtime/dispatch.py | 4 ++-- .../dispatch_components/request_components.py | 6 +++--- ask-sdk-runtime/tests/unit/test_dispatch.py | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ask-sdk-runtime/ask_sdk_runtime/dispatch.py b/ask-sdk-runtime/ask_sdk_runtime/dispatch.py index 855f563..3fbf63f 100644 --- a/ask-sdk-runtime/ask_sdk_runtime/dispatch.py +++ b/ask-sdk-runtime/ask_sdk_runtime/dispatch.py @@ -119,7 +119,7 @@ def dispatch(self, handler_input): for response_interceptor in self.response_interceptors: response_interceptor.process( - handler_input=handler_input, dispatch_output=output) + handler_input=handler_input, response=output) return output except Exception as e: @@ -186,6 +186,6 @@ def __dispatch_request(self, handler_input): request_handler_chain.response_interceptors) for response_interceptor in local_response_interceptors: response_interceptor.process( - handler_input=handler_input, dispatch_output=output) + handler_input=handler_input, response=output) return output diff --git a/ask-sdk-runtime/ask_sdk_runtime/dispatch_components/request_components.py b/ask-sdk-runtime/ask_sdk_runtime/dispatch_components/request_components.py index 96da21b..d74b53f 100644 --- a/ask-sdk-runtime/ask_sdk_runtime/dispatch_components/request_components.py +++ b/ask-sdk-runtime/ask_sdk_runtime/dispatch_components/request_components.py @@ -97,16 +97,16 @@ class AbstractResponseInterceptor(object): __metaclass__ = ABCMeta @abstractmethod - def process(self, handler_input, dispatch_output): + def process(self, handler_input, response): # type: (Input, Output) -> None """Process the input and the output after the Handler is run. :param handler_input: Generic input passed to the dispatcher. :type handler_input: Input - :param dispatch_output: Execution result of the Handler on + :param response: Execution result of the Handler on dispatch input. - :type dispatch_output: Union[None, Output] + :type response: Union[None, Output] :rtype: None """ raise NotImplementedError diff --git a/ask-sdk-runtime/tests/unit/test_dispatch.py b/ask-sdk-runtime/tests/unit/test_dispatch.py index 825c645..a7a52a1 100644 --- a/ask-sdk-runtime/tests/unit/test_dispatch.py +++ b/ask-sdk-runtime/tests/unit/test_dispatch.py @@ -301,14 +301,14 @@ def test_handler_input_successful_local_response_interceptors_execution(self): test_interceptor_1.process.assert_called_once_with( handler_input=self.valid_handler_input, - dispatch_output=test_response_before_interceptor), ( + response=test_response_before_interceptor), ( "Dispatcher dispatch method didn't process local response " "interceptors after calling request handler " "handle") test_interceptor_2.process.assert_called_once_with( handler_input=self.valid_handler_input, - dispatch_output=test_response_from_interceptor_1), ( + response=test_response_from_interceptor_1), ( "Dispatcher dispatch method didn't process local response " "interceptors after calling request handler " "handle") @@ -350,13 +350,13 @@ def test_handler_input_successful_global_response_interceptors_execution(self): test_interceptor_1.process.assert_called_once_with( handler_input=self.valid_handler_input, - dispatch_output=test_response_before_interceptor), ( + response=test_response_before_interceptor), ( "Dispatcher dispatch method didn't process global request " "interceptors after calling dispatch request") test_interceptor_2.process.assert_called_once_with( handler_input=self.valid_handler_input, - dispatch_output=test_response_from_interceptor_1), ( + response=test_response_from_interceptor_1), ( "Dispatcher dispatch method didn't process global request " "interceptors after calling dispatch request")