Checkpoint

Author: Bret Ambrose

eventstream_rpc/include/aws/eventstreamrpc/EventStreamClient.h

@@ -139,6 +139,23 @@ namespace Aws
             Crt::Allocator *m_allocator;
         };
 
+        enum EventStreamRpcStatusCode
+        {
+          EVENT_STREAM_RPC_SUCCESS = 0,
+          EVENT_STREAM_RPC_NULL_PARAMETER,
+          EVENT_STREAM_RPC_UNINITIALIZED,
+          EVENT_STREAM_RPC_ALLOCATION_ERROR,
+          EVENT_STREAM_RPC_CONNECTION_SETUP_FAILED,
+          EVENT_STREAM_RPC_CONNECTION_ACCESS_DENIED,
+          EVENT_STREAM_RPC_CONNECTION_ALREADY_ESTABLISHED,
+          EVENT_STREAM_RPC_CONNECTION_CLOSED,
+          EVENT_STREAM_RPC_CONTINUATION_CLOSED,
+          EVENT_STREAM_RPC_UNKNOWN_PROTOCOL_MESSAGE,
+          EVENT_STREAM_RPC_UNMAPPED_DATA,
+          EVENT_STREAM_RPC_UNSUPPORTED_CONTENT_TYPE,
+          EVENT_STREAM_RPC_CRT_ERROR
+        };
+
         /**
          * Configuration structure holding all configurations relating to eventstream RPC connection establishment
          */
@@ -184,6 +201,8 @@ namespace Aws
                 m_connectRequestCallback = connectRequestCallback;
             }
 
+            EventStreamRpcStatusCode Validate() const noexcept;
+
           protected:
             Crt::Optional<Crt::String> m_hostName;
             Crt::Optional<uint32_t> m_port;
@@ -194,23 +213,6 @@ namespace Aws
             OnMessageFlushCallback m_connectRequestCallback;
         };
 
-        enum EventStreamRpcStatusCode
-        {
-            EVENT_STREAM_RPC_SUCCESS = 0,
-            EVENT_STREAM_RPC_NULL_PARAMETER,
-            EVENT_STREAM_RPC_UNINITIALIZED,
-            EVENT_STREAM_RPC_ALLOCATION_ERROR,
-            EVENT_STREAM_RPC_CONNECTION_SETUP_FAILED,
-            EVENT_STREAM_RPC_CONNECTION_ACCESS_DENIED,
-            EVENT_STREAM_RPC_CONNECTION_ALREADY_ESTABLISHED,
-            EVENT_STREAM_RPC_CONNECTION_CLOSED,
-            EVENT_STREAM_RPC_CONTINUATION_CLOSED,
-            EVENT_STREAM_RPC_UNKNOWN_PROTOCOL_MESSAGE,
-            EVENT_STREAM_RPC_UNMAPPED_DATA,
-            EVENT_STREAM_RPC_UNSUPPORTED_CONTENT_TYPE,
-            EVENT_STREAM_RPC_CRT_ERROR
-        };
-
         struct AWS_EVENTSTREAMRPC_API RpcError
         {
             explicit operator bool() const noexcept { return baseStatus == EVENT_STREAM_RPC_SUCCESS; }
@@ -268,20 +270,18 @@ namespace Aws
         {
           public:
 
-            explicit ClientConnection(Crt::Allocator *allocator = Crt::g_allocator) noexcept;
+            explicit ClientConnection(Crt::Allocator *allocator, aws_client_bootstrap *bootstrap) noexcept;
             ~ClientConnection() noexcept;
 
             /**
              * Initiates a new outgoing event-stream-rpc connection.
              * @param connectionOptions Connection options.
              * @param connectionLifecycleHandler Handler to process connection lifecycle events.
-             * @param clientBootstrap ClientBootstrap object to run the connection on.
              * @return Future that will be resolved when connection either succeeds or fails.
              */
             std::future<RpcError> Connect(
                 const ConnectionConfig &connectionOptions,
-                ConnectionLifecycleHandler *connectionLifecycleHandler,
-                Crt::Io::ClientBootstrap &clientBootstrap) noexcept;
+                ConnectionLifecycleHandler *connectionLifecycleHandler) noexcept;
 
             /**
              * Create a new stream.
@@ -302,12 +302,6 @@ namespace Aws
              */
             bool IsOpen() const noexcept;
 
-            /**
-            * Returns the C connection object, if it exists.
-            * @return the C connection object, if it exists.
-            */
-            struct aws_event_stream_rpc_client_connection *GetUnderlyingHandle() const noexcept;
-
           private:
 
             std::shared_ptr<ClientConnectionImpl> m_impl;