Merge pull request #75 from rsocket/remove_socket_from_handler

remove RequestHandler dependency on Rsocket base class as argument.

Author: jell-o-fishi

CHANGELOG.rst

@@ -8,6 +8,7 @@ v0.4.3
 - Added on_ready callback to RSocketServer. Called when sender/receiver tasks are ready
 - Implement ReactiveX (3.0, 4.0) server side handler. Allows to define RequestHandler directly using ReactiveX
 - Added sending_done_event argument to request_channel to allow client to wait until sending to server is complete/canceled
+- Breaking Change: Removed RSocketBase class dependency from RequestHandler. It is not longer required as an argument to __init__
 
 v0.4.2
 ======

examples/server_with_fragmenting.py

@@ -98,8 +98,8 @@ async def authenticator(route: str, authentication: Authentication):
         raise Exception('Unsupported authentication')
 
 
-def handler_factory(socket):
-    return RoutingRequestHandler(socket, router, authenticator)
+def handler_factory():
+    return RoutingRequestHandler(router, authenticator)
 
 
 def handle_client(reader, writer):

examples/server_with_lease.py

@@ -20,8 +20,8 @@ async def single_request_response(payload, composite_metadata):
     return create_future(Payload(b'single_response'))
 
 
-def handler_factory(socket):
-    return RoutingRequestHandler(socket, router)
+def handler_factory():
+    return RoutingRequestHandler(router)
 
 
 def handle_client(reader, writer):

examples/server_with_routing.py

@@ -103,8 +103,8 @@ async def authenticator(route: str, authentication: Authentication):
         raise Exception('Unsupported authentication')
 
 
-def handler_factory(socket):
-    return RoutingRequestHandler(socket, router, authenticator)
+def handler_factory():
+    return RoutingRequestHandler(router, authenticator)
 
 
 def handle_client(reader, writer):

examples/test_examples.py

@@ -36,7 +36,7 @@ def test_quic_client_server(unused_tcp_port):
 
 @pytest.mark.timeout(30)
 def test_client_server_with_routing(unused_tcp_port):
-    pid = os.spawnlp(os.P_NOWAIT, 'python3', 'python3', './server_with_routing.py', str(unused_tcp_port))
+    pid = os.spawnlp(os.P_NOWAIT, 'python3', 'python3', './server_with_routing.py', '--port', str(unused_tcp_port))
 
     try:
         sleep(2)
@@ -64,7 +64,7 @@ def test_client_java_server_with_routing_and_fragmentation(unused_tcp_port):
 
 @pytest.mark.timeout(30)
 def test_rx_client_server_with_routing(unused_tcp_port):
-    pid = os.spawnlp(os.P_NOWAIT, 'python3', 'python3', './server_with_routing.py', str(unused_tcp_port))
+    pid = os.spawnlp(os.P_NOWAIT, 'python3', 'python3', './server_with_routing.py', '--port', str(unused_tcp_port))
 
     try:
         sleep(2)
@@ -136,7 +136,7 @@ def run_java_class(java_class: str, unused_tcp_port: int):
 
 
 def test_java_client_server(unused_tcp_port):
-    pid = os.spawnlp(os.P_NOWAIT, 'python3', 'python3', './server_with_routing.py', str(unused_tcp_port))
+    pid = os.spawnlp(os.P_NOWAIT, 'python3', 'python3', './server_with_routing.py', '--port', str(unused_tcp_port))
 
     try:
         sleep(2)

performance/performance_server.py

@@ -96,8 +96,8 @@ async def authenticator(route: str, authentication: Authentication):
         raise Exception('Unsupported authentication')
 
 
-def handler_factory(socket):
-    return RoutingRequestHandler(socket, router, authenticator)
+def handler_factory():
+    return RoutingRequestHandler(router, authenticator)
 
 
 def client_handler_factory(on_ready=None):

rsocket/reactivex/reactivex_handler.py

@@ -10,13 +10,9 @@
 from rsocket.logger import logger
 from rsocket.payload import Payload
 from rsocket.reactivex.reactivex_channel import ReactivexChannel
-from rsocket.rsocket import RSocket
 
 
 class ReactivexHandler:
-    def __init__(self, socket: RSocket):
-        super().__init__()
-        self.socket = socket
 
     @abstractmethod
     async def on_setup(self,

rsocket/reactivex/reactivex_handler_adapter.py

@@ -12,20 +12,18 @@
 from rsocket.reactivex.from_rsocket_publisher import RxSubscriberFromObserver
 from rsocket.reactivex.reactivex_handler import ReactivexHandler
 from rsocket.request_handler import RequestHandler
-from rsocket.rsocket import RSocket
 
 
-def reactivex_handler_factory(handler_factory: Callable[[RSocket], ReactivexHandler]):
-    def create_handler(socket: RSocket):
-        return ReactivexHandlerAdapter(handler_factory(socket), socket)
+def reactivex_handler_factory(handler_factory: Callable[[], ReactivexHandler]):
+    def create_handler():
+        return ReactivexHandlerAdapter(handler_factory())
 
     return create_handler
 
 
 class ReactivexHandlerAdapter(RequestHandler):
 
-    def __init__(self, delegate: ReactivexHandler, socket: RSocket):
-        super().__init__(socket)
+    def __init__(self, delegate: ReactivexHandler):
         self.delegate = delegate
 
     async def on_setup(self, data_encoding: bytes, metadata_encoding: bytes, payload: Payload):

rsocket/request_handler.py

@@ -15,10 +15,6 @@
 
 class RequestHandler(metaclass=ABCMeta):
 
-    def __init__(self, socket):
-        super().__init__()
-        self.socket = socket
-
     @abstractmethod
     async def on_setup(self,
                        data_encoding: bytes,

rsocket/routing/routing_request_handler.py

@@ -28,11 +28,10 @@ class RoutingRequestHandler(BaseRequestHandler):
     )
 
     def __init__(self,
-                 socket,
                  router: RequestRouter,
                  authentication_verifier: Optional[
                      Callable[[str, Authentication], Coroutine[None, None, None]]] = None):
-        super().__init__(socket)
+        super().__init__()
         self.router = router
         self.authentication_verifier = authentication_verifier
         self.data_encoding = None