create authenticatedchannelfactory

Signed-off-by: Emelia Lei <[email protected]>

Author: emelialei88

src/groups/bmq/bmqimp/README.md

@@ -13,13 +13,14 @@ its components directly, but rather use the accessor public APIs from 'bmqa'.
 
 Component Synopsis
 ------------------
-Component                         | Provides ...
-----------------------------------|-----------------------------------------------------------
-`bmqimp_application`              | the top level object to manipulate a session with bmqbrkr.
-`bmqimp_brokersession`            | the implementation of a session with the bmqbrkr.
-`bmqimp_event`                    | a value-semantic type representing an event.
-`bmqimp_eventqueue`               | a thread safe queue of pooled bmqimp::Event items.
-`bmqpimp_eventsstats`             | a mechanism to keep track of Events statistics.
-`bmqpimp_queue`                   | a type object to represent information about a queue.
-`bmqimp_stat`                     | utilities for stat manipulation.
-`bmqimp_connectionchannelfactory` | a channel factory that negotiates with a peer.
+Component                            | Provides ...
+-------------------------------------|-----------------------------------------------------------
+`bmqimp_application`                 | the top level object to manipulate a session with bmqbrkr.
+`bmqimp_brokersession`               | the implementation of a session with the bmqbrkr.
+`bmqimp_event`                       | a value-semantic type representing an event.
+`bmqimp_eventqueue`                  | a thread safe queue of pooled bmqimp::Event items.
+`bmqpimp_eventsstats`                | a mechanism to keep track of Events statistics.
+`bmqpimp_queue`                      | a type object to represent information about a queue.
+`bmqimp_stat`                        | utilities for stat manipulation.
+`bmqimp_authenticatedchannelfactory` | a channel factory that authenticates with a peer.
+`bmqimp_negotiatedchannelfactory`    | a channel factory that negotiates with a peer.

src/groups/bmq/bmqimp/bmqimp_application.cpp

@@ -20,7 +20,8 @@
 // BMQ
 #include <bmqex_executionpolicy.h>
 #include <bmqex_systemexecutor.h>
-#include <bmqimp_connectionchannelfactory.h>
+#include <bmqimp_authenticatedchannelfactory.h>
+#include <bmqimp_negotiatedchannelfactory.h>
 #include <bmqio_channelutil.h>
 #include <bmqio_connectoptions.h>
 #include <bmqio_status.h>
@@ -389,7 +390,7 @@ bmqt::GenericResult::Enum Application::startChannel()
         .setAttemptInterval(attemptInterval)
         .setAutoReconnect(true);
 
-    d_connectionChannelFactory.connect(
+    d_negotiatedChannelFactory.connect(
         &status,
         &d_connectHandle_mp,
         options,
@@ -603,11 +604,16 @@ Application::Application(
                                bdlf::PlaceHolders::_2),  // handle
           allocator),
       allocator)
-, d_connectionChannelFactory(
-      ConnectionChannelFactoryConfig(&d_statChannelFactory,
+, d_authenticatedChannelFactory(
+      AuthenticatedChannelFactoryConfig(&d_statChannelFactory,
+                                        sessionOptions.authnCredentialCb(),
+                                        sessionOptions.connectTimeout(),
+                                        d_blobSpPool_sp.get(),
+                                        allocator))
+, d_negotiatedChannelFactory(
+      NegotiatedChannelFactoryConfig(&d_authenticatedChannelFactory,
                                      negotiationMessage,
                                      sessionOptions.connectTimeout(),
-                                     sessionOptions.authnCredentialCb(),
                                      d_blobSpPool_sp.get(),
                                      allocator),
       allocator)
@@ -719,16 +725,8 @@ int Application::start(const bsls::TimeInterval& timeout)
                   << "::: START (SYNC) << [state: " << d_brokerSession.state()
                   << "] :::";
 
-    int rc = d_connectionChannelFactory.start();
+    int rc = d_brokerSession.start(timeout);
     if (rc != 0) {
-        BALL_LOG_ERROR << id() << "Failed to start connectionChannelFactory "
-                       << "[rc: " << rc << "]";
-        return rc;  // RETURN
-    }
-
-    rc = d_brokerSession.start(timeout);
-    if (rc != 0) {
-        d_connectionChannelFactory.stop();
         return rc;  // RETURN
     }
 
@@ -767,9 +765,6 @@ void Application::stop()
 
     // Stop the brokerSession
     d_brokerSession.stop();
-
-    // Stop the channel factories
-    d_connectionChannelFactory.stop();
 }
 
 void Application::stopAsync()
@@ -791,7 +786,7 @@ Application::createMonitor(const bsl::shared_ptr<bmqio::Channel>& channel)
 
     channel->properties().load(
         &maxMissedHeartbeats,
-        ConnectionChannelFactory::k_CHANNEL_PROPERTY_MAX_MISSED_HEARTBEATS);
+        NegotiatedChannelFactory::k_CHANNEL_PROPERTY_MAX_MISSED_HEARTBEATS);
 
     bsl::shared_ptr<bmqp::HeartbeatMonitor> monitor(
         new (d_allocator) bmqp::HeartbeatMonitor(maxMissedHeartbeats),
@@ -814,7 +809,7 @@ void Application::startHeartbeat(
 
     channel->properties().load(
         &heartbeatIntervalMs,
-        ConnectionChannelFactory::k_CHANNEL_PROPERTY_HEARTBEAT_INTERVAL_MS);
+        NegotiatedChannelFactory::k_CHANNEL_PROPERTY_HEARTBEAT_INTERVAL_MS);
 
     bsls::TimeInterval interval;
     interval.addMilliseconds(heartbeatIntervalMs);

src/groups/bmq/bmqimp/bmqimp_application.h

@@ -36,9 +36,10 @@
 
 // BMQ
 
+#include <bmqimp_authenticatedchannelfactory.h>
 #include <bmqimp_brokersession.h>
-#include <bmqimp_connectionchannelfactory.h>
 #include <bmqimp_eventqueue.h>
+#include <bmqimp_negotiatedchannelfactory.h>
 #include <bmqp_ctrlmsg_messages.h>
 #include <bmqp_heartbeatmonitor.h>
 #include <bmqt_sessionoptions.h>
@@ -134,7 +135,9 @@ class Application {
 
     bmqio::StatChannelFactory d_statChannelFactory;
 
-    ConnectionChannelFactory d_connectionChannelFactory;
+    AuthenticatedChannelFactory d_authenticatedChannelFactory;
+
+    NegotiatedChannelFactory d_negotiatedChannelFactory;
 
     ChannelFactoryOpHandleMp d_connectHandle_mp;