merge ReactiveSocket interface with StandardReactiveSocket class

Summary:
- Removes ReactiveSocket.h (interface)
- Renames StandardReactiveSocket to ReactiveSocket
- Removes inheritance and overrides from newly named ReactiveSocket
- Updates files to use new names and source files

Reviewed By: lehecka

Differential Revision: D4939547

fbshipit-source-id: 3bd1274172dbcfa970f85e57db1d8e0ae7d3d600

Author: Scott Ragan

CMakeLists.txt

@@ -170,15 +170,14 @@ add_library(
   src/NullRequestHandler.h
   src/Payload.cpp
   src/Payload.h
-  src/ReactiveSocket.h
   src/ReactiveStreamsCompat.h
   src/RequestHandler.h
   src/ResumeCache.cpp
   src/ResumeCache.h
   src/ServerConnectionAcceptor.cpp
   src/ServerConnectionAcceptor.h
-  src/StandardReactiveSocket.cpp
-  src/StandardReactiveSocket.h
+  src/ReactiveSocket.cpp
+  src/ReactiveSocket.h
   src/Stats.cpp
   src/Stats.h
   src/StreamsFactory.cpp
@@ -259,8 +258,8 @@ add_executable(
         test/tcp/TcpClient.cpp
         test/simple/PrintSubscriber.cpp
         test/simple/PrintSubscriber.h
-        src/StandardReactiveSocket.cpp
-        src/StandardReactiveSocket.h
+        src/ReactiveSocket.cpp
+        src/ReactiveSocket.h
         test/simple/StatsPrinter.cpp
         test/simple/StatsPrinter.h)
 
@@ -338,8 +337,8 @@ add_executable(
         test/resume/TcpResumeClient.cpp
         test/simple/PrintSubscriber.cpp
         test/simple/PrintSubscriber.h
-        src/StandardReactiveSocket.cpp
-        src/StandardReactiveSocket.h
+        src/ReactiveSocket.cpp
+        src/ReactiveSocket.h
         test/simple/StatsPrinter.cpp
         test/simple/StatsPrinter.h)
 

examples/conditional-request-handling/JsonRequestHandler.h

@@ -6,7 +6,7 @@
 #include "src/NullRequestHandler.h"
 #include "src/Payload.h"
 #include "src/ReactiveStreamsCompat.h"
-#include "src/StandardReactiveSocket.h"
+#include "src/ReactiveSocket.h"
 #include "src/SubscriptionBase.h"
 
 class JsonRequestHandler : public reactivesocket::DefaultRequestHandler {

examples/conditional-request-handling/TextRequestHandler.h

@@ -6,7 +6,7 @@
 #include "src/NullRequestHandler.h"
 #include "src/Payload.h"
 #include "src/ReactiveStreamsCompat.h"
-#include "src/StandardReactiveSocket.h"
+#include "src/ReactiveSocket.h"
 #include "src/SubscriptionBase.h"
 
 class TextRequestHandler : public reactivesocket::DefaultRequestHandler {

examples/stream-hello-world/HelloStreamRequestHandler.h

@@ -6,7 +6,7 @@
 #include "src/NullRequestHandler.h"
 #include "src/Payload.h"
 #include "src/ReactiveStreamsCompat.h"
-#include "src/StandardReactiveSocket.h"
+#include "src/ReactiveSocket.h"
 #include "src/SubscriptionBase.h"
 
 class HelloStreamRequestHandler : public reactivesocket::DefaultRequestHandler {

experimental/rsocket-src/RSocketClient.cpp

@@ -3,7 +3,7 @@
 #include "rsocket/RSocketClient.h"
 #include "rsocket/RSocketRequester.h"
 #include "src/NullRequestHandler.h"
-#include "src/StandardReactiveSocket.h"
+#include "src/ReactiveSocket.h"
 #include "src/folly/FollyKeepaliveTimer.h"
 
 using namespace reactivesocket;
@@ -26,7 +26,7 @@ Future<std::shared_ptr<RSocketRequester>> RSocketClient::connect() {
       EventBase& eventBase) {
     LOG(INFO) << "RSocketClient => onConnect received DuplexConnection";
 
-    auto r = StandardReactiveSocket::fromClientConnection(
+    auto r = ReactiveSocket::fromClientConnection(
         eventBase,
         std::move(framedConnection),
         // TODO need to optionally allow this being passed in for a duplex

experimental/rsocket-src/RSocketRequester.cpp

@@ -12,7 +12,7 @@ using namespace folly;
 namespace rsocket {
 
 std::shared_ptr<RSocketRequester> RSocketRequester::create(
-    std::unique_ptr<StandardReactiveSocket> srs,
+    std::unique_ptr<ReactiveSocket> srs,
     EventBase& eventBase) {
   auto customDeleter = [&eventBase](RSocketRequester* pRequester) {
     eventBase.runImmediatelyOrRunInEventBaseThreadAndWait([&pRequester] {
@@ -27,9 +27,9 @@ std::shared_ptr<RSocketRequester> RSocketRequester::create(
 }
 
 RSocketRequester::RSocketRequester(
-    std::unique_ptr<StandardReactiveSocket> srs,
+    std::unique_ptr<ReactiveSocket> srs,
     EventBase& eventBase)
-    : standardReactiveSocket_(std::move(srs)), eventBase_(eventBase) {}
+    : reactiveSocket_(std::move(srs)), eventBase_(eventBase) {}
 
 RSocketRequester::~RSocketRequester() {
   LOG(INFO) << "RSocketRequester => destroy";
@@ -38,23 +38,23 @@ RSocketRequester::~RSocketRequester() {
 std::shared_ptr<Subscriber<Payload>> RSocketRequester::requestChannel(
     std::shared_ptr<Subscriber<Payload>> responseSink) {
   // TODO need to runInEventBaseThread like other request methods
-  return standardReactiveSocket_->requestChannel(std::move(responseSink));
+  return reactiveSocket_->requestChannel(std::move(responseSink));
 }
 
 void RSocketRequester::requestStream(
     Payload request,
     std::shared_ptr<Subscriber<Payload>> responseSink) {
   eventBase_.runInEventBaseThread(
       [ this, request = std::move(request), responseSink ]() mutable {
-        standardReactiveSocket_->requestStream(
+        reactiveSocket_->requestStream(
             std::move(request), std::move(responseSink));
       });
 }
 
 std::shared_ptr<yarpl::flowable::Flowable<reactivesocket::Payload>>
 RSocketRequester::requestStream(reactivesocket::Payload request) {
   auto& eb = eventBase_;
-  auto srs = standardReactiveSocket_;
+  auto srs = reactiveSocket_;
   return yarpl::flowable::Flowable<reactivesocket::Payload>::create(
       [&eb, request = std::move(request), srs = std::move(srs) ](
           auto uptr_subscriber) mutable {
@@ -73,22 +73,22 @@ void RSocketRequester::requestResponse(
     std::shared_ptr<Subscriber<Payload>> responseSink) {
   eventBase_.runInEventBaseThread(
       [ this, request = std::move(request), responseSink ]() mutable {
-        standardReactiveSocket_->requestResponse(
+        reactiveSocket_->requestResponse(
             std::move(request), std::move(responseSink));
       });
 }
 
 void RSocketRequester::requestFireAndForget(Payload request) {
   eventBase_.runInEventBaseThread(
       [ this, request = std::move(request) ]() mutable {
-        standardReactiveSocket_->requestFireAndForget(std::move(request));
+        reactiveSocket_->requestFireAndForget(std::move(request));
       });
 }
 
 void RSocketRequester::metadataPush(std::unique_ptr<folly::IOBuf> metadata) {
   eventBase_.runInEventBaseThread(
       [ this, metadata = std::move(metadata) ]() mutable {
-        standardReactiveSocket_->metadataPush(std::move(metadata));
+        reactiveSocket_->metadataPush(std::move(metadata));
       });
 }
 }

experimental/rsocket-src/RSocketServer.cpp

@@ -103,7 +103,7 @@ void RSocketServer::start(OnAccept onAccept) {
         }
         LOG(INFO) << "RSocketServer => received request handler";
 
-        auto rs = StandardReactiveSocket::disconnectedServer(
+        auto rs = ReactiveSocket::disconnectedServer(
             // we know this callback is on a specific EventBase
             executor_,
             std::move(requestHandler),

experimental/rsocket/ConnectionResumeRequest.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "src/StandardReactiveSocket.h"
+#include "src/ReactiveSocket.h"
 
 namespace rsocket {
 

experimental/rsocket/ConnectionSetupRequest.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "src/StandardReactiveSocket.h"
+#include "src/ReactiveSocket.h"
 
 namespace rsocket {
 

experimental/rsocket/RSocketClient.h

@@ -5,7 +5,7 @@
 #include <folly/futures/Future.h>
 #include "rsocket/ConnectionFactory.h"
 #include "rsocket/RSocketRequester.h"
-#include "src/StandardReactiveSocket.h"
+#include "src/ReactiveSocket.h"
 
 namespace rsocket {