Stream creation API tweaks

awslabs · Sep 18, 2024 · 3d55010 · 3d55010
1 parent 0e53bfa
commit 3d55010
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/include/aws/iot/MqttRequestResponseClient.h b/include/aws/iot/MqttRequestResponseClient.h
@@ -170,6 +170,13 @@ namespace Aws
                 Aws::Crt::ByteCursor subscriptionTopicFilter;
 
                 SubscriptionStatusEventHandler subscriptionStatusEventHandler;
+            };
+
+            struct AWS_CRT_CPP_API StreamingOperationOptionsInternal
+            {
+                Aws::Crt::ByteCursor subscriptionTopicFilter;
+
+                SubscriptionStatusEventHandler subscriptionStatusEventHandler;
 
                 IncomingPublishEventHandler incomingPublishEventHandler;
             };
@@ -213,7 +220,7 @@ namespace Aws
                     const aws_mqtt_request_operation_options &requestOptions,
                     UnmodeledResultHandler &&resultHandler) = 0;
 
-                virtual std::shared_ptr<IStreamingOperation> createStream(const StreamingOperationOptions &options) = 0;
+                virtual std::shared_ptr<IStreamingOperation> createStream(const StreamingOperationOptionsInternal &options) = 0;
 
                 static IMqttRequestResponseClient *newFrom5(
                     const Aws::Crt::Mqtt5::Mqtt5Client &protocolClient,

diff --git a/source/iot/MqttRequestResponseClient.cpp b/source/iot/MqttRequestResponseClient.cpp
@@ -77,7 +77,7 @@ namespace Aws
               public:
                 StreamingOperationImpl(
                     struct aws_mqtt_rr_client_operation *stream,
-                    const StreamingOperationOptions &options,
+                    const StreamingOperationOptionsInternal &options,
                     struct aws_event_loop *protocolLoop);
                 virtual ~StreamingOperationImpl();
 
@@ -93,7 +93,7 @@ namespace Aws
                 static void onTerminatedCallback(void *user_data);
 
               private:
-                StreamingOperationOptions m_config;
+                StreamingOperationOptionsInternal m_config;
 
                 struct aws_mqtt_rr_client_operation *m_stream;
 
@@ -113,7 +113,7 @@ namespace Aws
 
             StreamingOperationImpl::StreamingOperationImpl(
                 struct aws_mqtt_rr_client_operation *stream,
-                const StreamingOperationOptions &options,
+                const StreamingOperationOptionsInternal &options,
                 struct aws_event_loop *protocolLoop)
                 : m_config(options), m_stream(stream), m_protocolLoop(protocolLoop), m_lock(),
                   m_closed(false)
@@ -152,11 +152,11 @@ namespace Aws
                     {
                         m_closed = true;
                         toRelease = m_stream;
-                        m_stream = NULL;
+                        m_stream = nullptr;
                     }
                 }
 
-                if (toRelease)
+                if (nullptr != toRelease)
                 {
                     aws_mqtt_rr_client_operation_release(toRelease);
                 }
@@ -217,7 +217,7 @@ namespace Aws
               public:
                 static std::shared_ptr<IStreamingOperation> create(
                     Aws::Crt::Allocator *allocator,
-                    const StreamingOperationOptions &options,
+                    const StreamingOperationOptionsInternal &options,
                     struct aws_mqtt_request_response_client *client);
 
                 StreamingOperation(const std::shared_ptr<StreamingOperationImpl> &impl);
@@ -235,7 +235,7 @@ namespace Aws
 
             std::shared_ptr<IStreamingOperation> StreamingOperation::create(
                 Aws::Crt::Allocator *allocator,
-                const StreamingOperationOptions &options,
+                const StreamingOperationOptionsInternal &options,
                 struct aws_mqtt_request_response_client *client)
             {
                 StreamingOperationImplHandle *implHandle = Aws::Crt::New<StreamingOperationImplHandle>(allocator);
@@ -334,7 +334,7 @@ namespace Aws
                     const aws_mqtt_request_operation_options &requestOptions,
                     UnmodeledResultHandler &&resultHandler) noexcept;
 
-                std::shared_ptr<IStreamingOperation> createStream(const StreamingOperationOptions &options);
+                std::shared_ptr<IStreamingOperation> createStream(const StreamingOperationOptionsInternal &options);
 
                 Aws::Crt::Allocator *getAllocator() const { return m_allocator; }
 
@@ -387,7 +387,7 @@ namespace Aws
             }
 
             std::shared_ptr<IStreamingOperation> MqttRequestResponseClientImpl::createStream(
-                const StreamingOperationOptions &options)
+                const StreamingOperationOptionsInternal &options)
             {
                 return StreamingOperation::create(m_allocator, options, m_client);
             }
@@ -411,7 +411,7 @@ namespace Aws
                     const aws_mqtt_request_operation_options &requestOptions,
                     UnmodeledResultHandler &&resultHandler);
 
-                std::shared_ptr<IStreamingOperation> createStream(const StreamingOperationOptions &options);
+                std::shared_ptr<IStreamingOperation> createStream(const StreamingOperationOptionsInternal &options);
 
               private:
                 MqttRequestResponseClientImpl *m_impl;
@@ -483,7 +483,7 @@ namespace Aws
             }
 
             std::shared_ptr<IStreamingOperation> MqttRequestResponseClient::createStream(
-                const StreamingOperationOptions &options)
+                const StreamingOperationOptionsInternal &options)
             {
                 return m_impl->createStream(options);
             }