use std::nullopt

Author: BewareMyPower

lib/ClientConnection.cc

@@ -1703,7 +1703,7 @@ void ClientConnection::handleProducerSuccess(const proto::CommandProducerSuccess
             if (producerSuccess.has_topic_epoch()) {
                 data.topicEpoch = std::make_optional(producerSuccess.topic_epoch());
             } else {
-                data.topicEpoch = {};
+                data.topicEpoch = std::nullopt;
             }
             requestData.promise.setValue(data);
             cancelTimer(*requestData.timer);

lib/ConsumerImpl.cc

@@ -241,9 +241,8 @@ Future<Result, bool> ConsumerImpl::connectionOpened(const ClientConnectionPtr& c
 
     Lock lockForMessageId(mutexForMessageId_);
     clearReceiveQueue();
-    const auto subscribeMessageId = (subscriptionMode_ == Commands::SubscriptionModeNonDurable)
-                                        ? startMessageId_.get()
-                                        : optional<MessageId>{};
+    const auto subscribeMessageId =
+        (subscriptionMode_ == Commands::SubscriptionModeNonDurable) ? startMessageId_.get() : std::nullopt;
     lockForMessageId.unlock();
 
     unAckedMessageTrackerPtr_->clear();
@@ -1124,7 +1123,7 @@ void ConsumerImpl::clearReceiveQueue() {
         if (hasSoughtByTimestamp()) {
             // Invalidate startMessageId_ so that isPriorBatchIndex and isPriorEntryIndex checks will be
             // skipped, and hasMessageAvailableAsync won't use startMessageId_ in compare.
-            startMessageId_ = optional<MessageId>{};
+            startMessageId_ = std::nullopt;
         } else {
             startMessageId_ = seekMessageId_.get();
         }
@@ -1313,7 +1312,7 @@ void ConsumerImpl::negativeAcknowledge(const MessageId& messageId) {
     negativeAcksTracker_->add(messageId);
 }
 
-void ConsumerImpl::disconnectConsumer() { disconnectConsumer(optional<std::string>{}); }
+void ConsumerImpl::disconnectConsumer() { disconnectConsumer(std::nullopt); }
 
 void ConsumerImpl::disconnectConsumer(const optional<std::string>& assignedBrokerUrl) {
     LOG_INFO("Broker notification of Closed consumer: "

lib/HandlerBase.cc

@@ -85,7 +85,7 @@ void HandlerBase::setCnx(const ClientConnectionPtr& cnx) {
     connection_ = cnx;
 }
 
-void HandlerBase::grabCnx() { grabCnx(optional<std::string>{}); }
+void HandlerBase::grabCnx() { grabCnx(std::nullopt); }
 
 Future<Result, ClientConnectionPtr> HandlerBase::getConnection(
     const ClientImplPtr& client, const optional<std::string>& assignedBrokerUrl) {
@@ -176,7 +176,7 @@ void HandlerBase::handleDisconnection(Result result, const ClientConnectionPtr&
             break;
     }
 }
-void HandlerBase::scheduleReconnection() { scheduleReconnection(optional<std::string>{}); }
+void HandlerBase::scheduleReconnection() { scheduleReconnection(std::nullopt); }
 void HandlerBase::scheduleReconnection(const optional<std::string>& assignedBrokerUrl) {
     const auto state = state_.load();
 

lib/ProducerImpl.cc

@@ -981,7 +981,7 @@ void ProducerImpl::disconnectProducer(const optional<std::string>& assignedBroke
     scheduleReconnection(assignedBrokerUrl);
 }
 
-void ProducerImpl::disconnectProducer() { disconnectProducer(optional<std::string>{}); }
+void ProducerImpl::disconnectProducer() { disconnectProducer(std::nullopt); }
 
 void ProducerImpl::start() {
     HandlerBase::start();