Fix[BMQ]: minor plugin fix (#790)

emelialei88 · emelialei88 · commit a6885dde521a · 2025-06-25T12:08:50.000-04:00
Signed-off-by: Emelia Lei &lt;wlei29@bloomberg.net&gt;
diff --git a/src/groups/mqb/mqbauthn/mqbauthn_authenticationcontroller.cpp b/src/groups/mqb/mqbauthn/mqbauthn_authenticationcontroller.cpp
@@ -29,6 +29,7 @@
 
 // BDE
 #include <bsl_string.h>
+#include <bsl_string_view.h>
 #include <bsl_unordered_set.h>
 
 namespace BloombergLP {
@@ -122,7 +123,7 @@ void AuthenticationController::stop()
 int AuthenticationController::authenticate(
     bsl::ostream&                                   errorDescription,
     bsl::shared_ptr<mqbplug::AuthenticationResult>* result,
-    bslstl::StringRef                               mechanism,
+    bsl::string_view                                mechanism,
     const mqbplug::AuthenticationData&              input)
 {
     enum RcEnum {
diff --git a/src/groups/mqb/mqbauthn/mqbauthn_authenticationcontroller.h b/src/groups/mqb/mqbauthn/mqbauthn_authenticationcontroller.h
@@ -24,6 +24,7 @@
 // BDE
 #include <ball_log.h>
 #include <bsl_memory.h>
+#include <bsl_string_view.h>
 #include <bsl_unordered_map.h>
 #include <bslma_allocator.h>
 
@@ -42,7 +43,7 @@ class AuthenticationController {
   private:
     // PRIVATE TYPES
     typedef bslma::ManagedPtr<mqbplug::Authenticator> AuthenticatorMp;
-    typedef bsl::unordered_map<bslstl::StringRef, AuthenticatorMp>
+    typedef bsl::unordered_map<bsl::string_view, AuthenticatorMp>
         AuthenticatorMap;
 
     // DATA
@@ -99,7 +100,7 @@ class AuthenticationController {
     /// Note that the `mechanism` is case insensitive.
     int authenticate(bsl::ostream& errorDescription,
                      bsl::shared_ptr<mqbplug::AuthenticationResult>* result,
-                     bslstl::StringRef                               mechanism,
+                     bsl::string_view                                mechanism,
                      const mqbplug::AuthenticationData&              input);
 };
 
diff --git a/src/groups/mqb/mqbplug/mqbplug_authenticator.cpp b/src/groups/mqb/mqbplug/mqbplug_authenticator.cpp
@@ -18,6 +18,13 @@
 
 #include <mqbscm_version.h>
 
+// MQB
+#include <mqbcfg_messages.h>
+
+// BDE
+#include <bsl_string_view.h>
+#include <bsl_vector.h>
+
 namespace BloombergLP {
 namespace mqbplug {
 
@@ -58,7 +65,7 @@ AuthenticatorPluginFactory::~AuthenticatorPluginFactory()
 // -----------------------
 
 const mqbcfg::AuthenticatorPluginConfig*
-AuthenticatorUtil::findAuthenticatorConfig(bslstl::StringRef name)
+AuthenticatorUtil::findAuthenticatorConfig(bsl::string_view name)
 {
     const bsl::vector<mqbcfg::AuthenticatorPluginConfig>& authenticatorsCfg =
         mqbcfg::BrokerConfig::get().authentication().plugins();
diff --git a/src/groups/mqb/mqbplug/mqbplug_authenticator.h b/src/groups/mqb/mqbplug/mqbplug_authenticator.h
@@ -41,10 +41,10 @@
 #include <bdlbb_blob.h>
 #include <bsl_iostream.h>
 #include <bsl_string.h>
+#include <bsl_string_view.h>
 #include <bslma_managedptr.h>
 #include <bslma_usesbslmaallocator.h>
 #include <bslmf_nestedtraitdeclaration.h>
-#include <bslstl_stringref.h>
 
 namespace BloombergLP {
 namespace mqbplug {
@@ -63,15 +63,15 @@ class AuthenticationData BSLS_KEYWORD_FINAL {
   public:
     // CREATORS
     AuthenticationData(const bsl::vector<char>& authnPayload,
-                       bslstl::StringRef        clientIpAddress);
+                       bsl::string_view         clientIpAddress);
 
     // ACESSORS
 
     /// Return the authentication material provided by the client.
     const bsl::vector<char>& authnPayload() const;
 
     /// Return the IP Address of the client.
-    bslstl::StringRef clientIpAddress() const;
+    bsl::string_view clientIpAddress() const;
 };
 
 // ==========================
@@ -87,7 +87,7 @@ class AuthenticationResult {
     // ACCESSORS
 
     /// Return the principal.
-    virtual bslstl::StringRef principal() const = 0;
+    virtual bsl::string_view principal() const = 0;
 
     /// Return the remaining lifetime of an authenticated session.
     virtual const bsl::optional<bsls::Types::Int64>& lifetimeMs() const = 0;
@@ -108,12 +108,12 @@ class Authenticator {
     // ACESSORS
 
     /// Return the name of the plugin.
-    virtual bslstl::StringRef name() const = 0;
+    virtual bsl::string_view name() const = 0;
 
     /// Return the authentication mechanism supported by this Authenticator.
     /// Guaranteed to return a valid mechanism once the Authenticator is
     /// constructed.
-    virtual bslstl::StringRef mechanism() const = 0;
+    virtual bsl::string_view mechanism() const = 0;
 
     /// Authenticate using the data provided in the specified `input`.
     /// - Return `0` on success, and populate the specified `result` with
@@ -166,7 +166,7 @@ struct AuthenticatorUtil {
 
     /// Find authenticator config with the specified `name`
     static const mqbcfg::AuthenticatorPluginConfig*
-    findAuthenticatorConfig(bslstl::StringRef name);
+    findAuthenticatorConfig(bsl::string_view name);
 };
 
 // ============================================================================
@@ -179,7 +179,7 @@ struct AuthenticatorUtil {
 
 inline AuthenticationData::AuthenticationData(
     const bsl::vector<char>& authnPayload,
-    bslstl::StringRef        clientIpAddress)
+    bsl::string_view         clientIpAddress)
 : d_authnPayload(authnPayload)
 , d_clientIpAddress(clientIpAddress)
 {
@@ -190,7 +190,7 @@ inline const bsl::vector<char>& AuthenticationData::authnPayload() const
     return d_authnPayload;
 }
 
-inline bslstl::StringRef AuthenticationData::clientIpAddress() const
+inline bsl::string_view AuthenticationData::clientIpAddress() const
 {
     return d_clientIpAddress;
 }
diff --git a/src/groups/mqb/mqbplug/mqbplug_plugininfo.cpp b/src/groups/mqb/mqbplug/mqbplug_plugininfo.cpp
@@ -18,6 +18,7 @@
 
 #include <mqbscm_version.h>
 // BDE
+#include <bsl_string_view.h>
 #include <bslim_printer.h>
 #include <bslma_default.h>
 
@@ -30,7 +31,7 @@ namespace mqbplug {
 
 // CREATORS
 PluginInfo::PluginInfo(mqbplug::PluginType::Enum type,
-                       bslstl::StringRef         name,
+                       bsl::string_view          name,
                        bslma::Allocator*         allocator)
 : d_type(type)
 , d_name(name, allocator)
diff --git a/src/groups/mqb/mqbplug/mqbplug_plugininfo.h b/src/groups/mqb/mqbplug/mqbplug_plugininfo.h
@@ -33,10 +33,10 @@
 // BDE
 #include <bsl_memory.h>
 #include <bsl_string.h>
+#include <bsl_string_view.h>
 #include <bslma_allocator.h>
 #include <bslma_usesbslmaallocator.h>
 #include <bslmf_nestedtraitdeclaration.h>
-#include <bslstl_stringref.h>
 
 namespace BloombergLP {
 
@@ -80,7 +80,7 @@ class PluginInfo {
     /// and `name`.  Optionally specify an `allocator` used to supply
     /// memory.
     PluginInfo(mqbplug::PluginType::Enum type,
-               bslstl::StringRef         name,
+               bsl::string_view          name,
                bslma::Allocator*         allocator = 0);
 
     /// Create an instance of `PluginInfo` having the same value as
@@ -93,9 +93,9 @@ class PluginInfo {
 
     // MANIPULATORS
     PluginInfo& setType(mqbplug::PluginType::Enum value);
-    PluginInfo& setName(bslstl::StringRef value);
-    PluginInfo& setDescription(bslstl::StringRef value);
-    PluginInfo& setVersion(bslstl::StringRef value);
+    PluginInfo& setName(bsl::string_view value);
+    PluginInfo& setDescription(bsl::string_view value);
+    PluginInfo& setVersion(bsl::string_view value);
 
     /// Set the corresponding field to the specified `value` and return a
     /// reference offering modifiable access to this object.
@@ -158,19 +158,19 @@ inline PluginInfo& PluginInfo::setType(mqbplug::PluginType::Enum value)
     return *this;
 }
 
-inline PluginInfo& PluginInfo::setName(bslstl::StringRef value)
+inline PluginInfo& PluginInfo::setName(bsl::string_view value)
 {
     d_name = value;
     return *this;
 }
 
-inline PluginInfo& PluginInfo::setDescription(bslstl::StringRef value)
+inline PluginInfo& PluginInfo::setDescription(bsl::string_view value)
 {
     d_description = value;
     return *this;
 }
 
-inline PluginInfo& PluginInfo::setVersion(bslstl::StringRef value)
+inline PluginInfo& PluginInfo::setVersion(bsl::string_view value)
 {
     d_version = value;
     return *this;
diff --git a/src/groups/mqb/mqbplug/mqbplug_pluginmanager.cpp b/src/groups/mqb/mqbplug/mqbplug_pluginmanager.cpp
@@ -86,7 +86,7 @@ PluginManager::PluginManager(bslma::Allocator* allocator)
 }
 
 void PluginManager::enableRequiredPlugins(
-    const bslstl::StringRef&                pluginPath,
+    bsl::string_view                        pluginPath,
     const bslma::ManagedPtr<PluginLibrary>& pluginLibrary,
     RequiredPluginsRecord*                  requiredPlugins,
     bsl::vector<bsl::string>*               pluginsProvided,
diff --git a/src/groups/mqb/mqbplug/mqbplug_pluginmanager.h b/src/groups/mqb/mqbplug/mqbplug_pluginmanager.h
@@ -129,7 +129,7 @@ class PluginManager BSLS_CPP11_FINAL {
     ///
     /// See `PluginLibrary::loadPluginLibrary()` comments for more detail.
     void enableRequiredPlugins(
-        const bslstl::StringRef&                         pluginPath,
+        bsl::string_view                                 pluginPath,
         const bslma::ManagedPtr<mqbplug::PluginLibrary>& pluginLibrary,
         RequiredPluginsRecord*                           requiredPlugins,
         bsl::vector<bsl::string>*                        pluginsProvided,
diff --git a/src/groups/mqb/mqbplug/mqbplug_statconsumer.cpp b/src/groups/mqb/mqbplug/mqbplug_statconsumer.cpp
@@ -51,7 +51,7 @@ StatConsumerPluginFactory::~StatConsumerPluginFactory()
 // ----------------------
 
 const mqbcfg::StatPluginConfig*
-StatConsumerUtil::findConsumerConfig(bslstl::StringRef name)
+StatConsumerUtil::findConsumerConfig(bsl::string_view name)
 {
     const bsl::vector<mqbcfg::StatPluginConfig>& configs =
         mqbcfg::BrokerConfig::get().stats().plugins();
diff --git a/src/groups/mqb/mqbplug/mqbplug_statconsumer.h b/src/groups/mqb/mqbplug/mqbplug_statconsumer.h
@@ -66,9 +66,9 @@ class StatConsumer {
         StatContextsMap;
     // Map of StatContext names to StatContext
 
-    typedef bsl::function<int(const bslstl::StringRef& source,
-                              const bsl::string&       cmd,
-                              bsl::ostream&            os)>
+    typedef bsl::function<int(const bsl::string_view& source,
+                              const bsl::string&      cmd,
+                              bsl::ostream&           os)>
         CommandProcessorFn;
 
     // CREATORS
@@ -79,7 +79,7 @@ class StatConsumer {
     // ACESSORS
 
     /// Return the name of the plugin.
-    virtual bslstl::StringRef name() const = 0;
+    virtual bsl::string_view name() const = 0;
 
     /// Return true if the stats reporting is enabled, false otherwise.
     virtual bool isEnabled() const = 0;
@@ -140,7 +140,7 @@ struct StatConsumerUtil {
 
     /// Find consumer config with the specified `name`
     static const mqbcfg::StatPluginConfig*
-    findConsumerConfig(bslstl::StringRef name);
+    findConsumerConfig(bsl::string_view name);
 };
 
 }  // close package namespace
diff --git a/src/plugins/bmqauthnfail/bmqauthnfail_failauthenticator.cpp b/src/plugins/bmqauthnfail/bmqauthnfail_failauthenticator.cpp
@@ -28,6 +28,7 @@
 #include <bsl_memory.h>
 #include <bsl_optional.h>
 #include <bsl_string.h>
+#include <bsl_string_view.h>
 #include <bsla_unused.h>
 #include <bslma_allocator.h>
 #include <bslma_managedptr.h>
@@ -41,9 +42,9 @@ namespace bmqauthnfail {
 // ------------------------------
 
 FailAuthenticationResult::FailAuthenticationResult(
-    const bslstl::StringRef& principal,
-    bsls::Types::Int64       lifetimeMs,
-    bslma::Allocator*        allocator)
+    bsl::string_view   principal,
+    bsls::Types::Int64 lifetimeMs,
+    bslma::Allocator*  allocator)
 : d_principal(principal)
 , d_lifetimeMs(lifetimeMs)
 , d_allocator_p(allocator)
@@ -54,7 +55,7 @@ FailAuthenticationResult::~FailAuthenticationResult()
 {
 }
 
-bslstl::StringRef FailAuthenticationResult::principal() const
+bsl::string_view FailAuthenticationResult::principal() const
 {
     return d_principal;
 }
@@ -83,12 +84,12 @@ FailAuthenticator::~FailAuthenticator()
     stop();
 }
 
-bslstl::StringRef FailAuthenticator::name() const
+bsl::string_view FailAuthenticator::name() const
 {
     return k_NAME;
 }
 
-bslstl::StringRef FailAuthenticator::mechanism() const
+bsl::string_view FailAuthenticator::mechanism() const
 {
     return "Basic";
 }
diff --git a/src/plugins/bmqauthnfail/bmqauthnfail_failauthenticator.h b/src/plugins/bmqauthnfail/bmqauthnfail_failauthenticator.h
@@ -17,18 +17,19 @@
 #ifndef INCLUDED_AUTHNFAIL_FAILAUTHENTICATOR
 #define INCLUDED_AUTHNFAIL_FAILAUTHENTICATOR
 
-//@PURPOSE: Provide a plugin that always authenticates successfully.
+//@PURPOSE: Provide a plugin that always authenticates unsuccessfully.
 //
 //@CLASSES:
 //  bmqauthnfail::FailAuthenticator: Authenticator plugin that unconditionally
-//  accepts any authentication request.
+//  rejects any authentication request.
 //
 //@DESCRIPTION:
 //  'bmqauthnfail::FailAuthenticator' implements a dummy authenticator for
-//  testing or development purposes. It always returns success, regardless of
+//  testing or development purposes. It always returns failure, regardless of
 //  the input provided.
 
 // MQB
+#include <bslstl_stringview.h>
 #include <mqbcfg_messages.h>
 #include <mqbplug_authenticator.h>
 
@@ -64,15 +65,15 @@ class FailAuthenticationResult : public mqbplug::AuthenticationResult {
     // CREATORS
 
     /// Construct this object using the optionally specified `allocator`.
-    FailAuthenticationResult(const bslstl::StringRef& principal,
-                             bsls::Types::Int64       lifetimeMs,
-                             bslma::Allocator*        allocator);
+    FailAuthenticationResult(bsl::string_view   principal,
+                             bsls::Types::Int64 lifetimeMs,
+                             bslma::Allocator*  allocator);
 
     ~FailAuthenticationResult() BSLS_KEYWORD_OVERRIDE;
 
     // ACCESSORS
 
-    bslstl::StringRef principal() const BSLS_KEYWORD_OVERRIDE;
+    bsl::string_view principal() const BSLS_KEYWORD_OVERRIDE;
     const bsl::optional<bsls::Types::Int64>&
     lifetimeMs() const BSLS_KEYWORD_OVERRIDE;
 };
@@ -113,10 +114,10 @@ class FailAuthenticator : public mqbplug::Authenticator {
     // MANIPULATORS
 
     /// Return the name of the plugin.
-    bslstl::StringRef name() const BSLS_KEYWORD_OVERRIDE;
+    bsl::string_view name() const BSLS_KEYWORD_OVERRIDE;
 
     /// Return the authentication mechanism the Authenticator supports.
-    bslstl::StringRef mechanism() const BSLS_KEYWORD_OVERRIDE;
+    bsl::string_view mechanism() const BSLS_KEYWORD_OVERRIDE;
 
     /// Authenticate using the data provided in the specified `input`.
     /// - Return `0` on success, and populate the specified `result` with
diff --git a/src/plugins/bmqauthnpass/bmqauthnpass_passauthenticator.cpp b/src/plugins/bmqauthnpass/bmqauthnpass_passauthenticator.cpp
diff --git a/src/plugins/bmqauthnpass/bmqauthnpass_passauthenticator.h b/src/plugins/bmqauthnpass/bmqauthnpass_passauthenticator.h
diff --git a/src/plugins/bmqprometheus/bmqprometheus_prometheusstatconsumer.cpp b/src/plugins/bmqprometheus/bmqprometheus_prometheusstatconsumer.cpp
diff --git a/src/plugins/bmqprometheus/bmqprometheus_prometheusstatconsumer.h b/src/plugins/bmqprometheus/bmqprometheus_prometheusstatconsumer.h

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ PluginManager::PluginManager(bslma::Allocator* allocator)`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`void PluginManager::enableRequiredPlugins(`
`89`		`- const bslstl::StringRef& pluginPath,`
	`89`	`+ bsl::string_view pluginPath,`
`90`	`90`	`const bslma::ManagedPtr<PluginLibrary>& pluginLibrary,`
`91`	`91`	`RequiredPluginsRecord* requiredPlugins,`
`92`	`92`	`bsl::vector<bsl::string>* pluginsProvided,`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ StatConsumerPluginFactory::~StatConsumerPluginFactory()`
`51`	`51`	`// ----------------------`
`52`	`52`
`53`	`53`	`const mqbcfg::StatPluginConfig*`
`54`		`-StatConsumerUtil::findConsumerConfig(bslstl::StringRef name)`
	`54`	`+StatConsumerUtil::findConsumerConfig(bsl::string_view name)`
`55`	`55`	`{`
`56`	`56`	`const bsl::vector<mqbcfg::StatPluginConfig>& configs =`
`57`	`57`	`mqbcfg::BrokerConfig::get().stats().plugins();`