rename InitialConnectionChannelFactory to ConnectionChannelFactory

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

Author: emelialei88

src/groups/bmq/bmqimp/README.md

@@ -13,13 +13,13 @@ 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_initialconnectionchannelfactory` | 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_connectionchannelfactory` | a channel factory that negotiates with a peer.

src/groups/bmq/bmqimp/bmqimp_application.cpp

@@ -20,7 +20,7 @@
 // BMQ
 #include <bmqex_executionpolicy.h>
 #include <bmqex_systemexecutor.h>
-#include <bmqimp_initialconnectionchannelfactory.h>
+#include <bmqimp_connectionchannelfactory.h>
 #include <bmqio_channelutil.h>
 #include <bmqio_connectoptions.h>
 #include <bmqio_status.h>
@@ -389,7 +389,7 @@ bmqt::GenericResult::Enum Application::startChannel()
         .setAttemptInterval(attemptInterval)
         .setAutoReconnect(true);
 
-    d_initialConnectionChannelFactory.connect(
+    d_connectionChannelFactory.connect(
         &status,
         &d_connectHandle_mp,
         options,
@@ -603,14 +603,13 @@ Application::Application(
                                bdlf::PlaceHolders::_2),  // handle
           allocator),
       allocator)
-, d_initialConnectionChannelFactory(
-      InitialConnectionChannelFactoryConfig(
-          &d_statChannelFactory,
-          negotiationMessage,
-          sessionOptions.connectTimeout(),
-          sessionOptions.credentialProvider().get(),
-          d_blobSpPool_sp.get(),
-          allocator),
+, d_connectionChannelFactory(
+      ConnectionChannelFactoryConfig(&d_statChannelFactory,
+                                     negotiationMessage,
+                                     sessionOptions.connectTimeout(),
+                                     sessionOptions.credentialProvider().get(),
+                                     d_blobSpPool_sp.get(),
+                                     allocator),
       allocator)
 , d_connectHandle_mp()
 , d_brokerSession(&d_scheduler,
@@ -720,17 +719,16 @@ int Application::start(const bsls::TimeInterval& timeout)
                   << "::: START (SYNC) << [state: " << d_brokerSession.state()
                   << "] :::";
 
-    int rc = d_initialConnectionChannelFactory.start();
+    int rc = d_connectionChannelFactory.start();
     if (rc != 0) {
-        BALL_LOG_ERROR << id()
-                       << "Failed to start initialConnectionChannelFactory "
+        BALL_LOG_ERROR << id() << "Failed to start connectionChannelFactory "
                        << "[rc: " << rc << "]";
         return rc;  // RETURN
     }
 
     rc = d_brokerSession.start(timeout);
     if (rc != 0) {
-        d_initialConnectionChannelFactory.stop();
+        d_connectionChannelFactory.stop();
         return rc;  // RETURN
     }
 
@@ -771,7 +769,7 @@ void Application::stop()
     d_brokerSession.stop();
 
     // Stop the channel factories
-    d_initialConnectionChannelFactory.stop();
+    d_connectionChannelFactory.stop();
 }
 
 void Application::stopAsync()
@@ -791,9 +789,9 @@ Application::createMonitor(const bsl::shared_ptr<bmqio::Channel>& channel)
 {
     int maxMissedHeartbeats = k_DEFAULT_MAX_MISSED_HEARTBEATS;
 
-    channel->properties().load(&maxMissedHeartbeats,
-                               InitialConnectionChannelFactory::
-                                   k_CHANNEL_PROPERTY_MAX_MISSED_HEARTBEATS);
+    channel->properties().load(
+        &maxMissedHeartbeats,
+        ConnectionChannelFactory::k_CHANNEL_PROPERTY_MAX_MISSED_HEARTBEATS);
 
     bsl::shared_ptr<bmqp::HeartbeatMonitor> monitor(
         new (d_allocator) bmqp::HeartbeatMonitor(maxMissedHeartbeats),
@@ -814,9 +812,9 @@ void Application::startHeartbeat(
 
     int heartbeatIntervalMs = k_DEFAULT_HEARTBEAT_INTERVAL_MS;
 
-    channel->properties().load(&heartbeatIntervalMs,
-                               InitialConnectionChannelFactory::
-                                   k_CHANNEL_PROPERTY_HEARTBEAT_INTERVAL_MS);
+    channel->properties().load(
+        &heartbeatIntervalMs,
+        ConnectionChannelFactory::k_CHANNEL_PROPERTY_HEARTBEAT_INTERVAL_MS);
 
     bsls::TimeInterval interval;
     interval.addMilliseconds(heartbeatIntervalMs);

src/groups/bmq/bmqimp/bmqimp_application.h

@@ -37,8 +37,8 @@
 // BMQ
 
 #include <bmqimp_brokersession.h>
+#include <bmqimp_connectionchannelfactory.h>
 #include <bmqimp_eventqueue.h>
-#include <bmqimp_initialconnectionchannelfactory.h>
 #include <bmqp_ctrlmsg_messages.h>
 #include <bmqp_heartbeatmonitor.h>
 #include <bmqt_sessionoptions.h>
@@ -134,7 +134,7 @@ class Application {
 
     bmqio::StatChannelFactory d_statChannelFactory;
 
-    InitialConnectionChannelFactory d_initialConnectionChannelFactory;
+    ConnectionChannelFactory d_connectionChannelFactory;
 
     ChannelFactoryOpHandleMp d_connectHandle_mp;
 

src/groups/bmq/bmqimp/bmqimp_brokersession.cpp

@@ -18,7 +18,7 @@
 
 #include <bmqscm_version.h>
 // BMQ
-#include <bmqimp_initialconnectionchannelfactory.h>
+#include <bmqimp_connectionchannelfactory.h>
 #include <bmqimp_queue.h>
 #include <bmqp_ackeventbuilder.h>
 #include <bmqp_ackmessageiterator.h>
@@ -407,7 +407,7 @@ void BrokerSession::SessionFsm::setStarted(
     // Temporary safety switch to control configure request.
     d_session.d_channel_sp->properties().load(
         &d_session.d_doConfigureStream,
-        InitialConnectionChannelFactory::k_CHANNEL_PROPERTY_CONFIGURE_STREAM);
+        ConnectionChannelFactory::k_CHANNEL_PROPERTY_CONFIGURE_STREAM);
 }
 
 bmqt::GenericResult::Enum
@@ -6051,7 +6051,7 @@ void BrokerSession::onOpenQueueResponse(
 
         if (d_channel_sp->properties().load(
                 &isMPsEx,
-                InitialConnectionChannelFactory::k_CHANNEL_PROPERTY_MPS_EX)) {
+                ConnectionChannelFactory::k_CHANNEL_PROPERTY_MPS_EX)) {
             BSLS_ASSERT_SAFE(isMPsEx);
             queue->setOldStyle(false);
         }