aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-02-20 23:26:55 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2022-02-20 23:34:51 +0000
commitacbdc8385fef981a9bc5cbfb46483c54c953dc04 (patch)
tree1d9c02e4e9476510dd32131cad01940969493806 /config
parent1cfea65b9bc71b472e9dc3370b120cf428b6ece0 (diff)
Make ConfigUri constructors explicit and use same context where possible in proton.
Diffstat (limited to 'config')
-rw-r--r--config/src/vespa/config/subscription/configuri.cpp2
-rw-r--r--config/src/vespa/config/subscription/configuri.h19
2 files changed, 2 insertions, 19 deletions
diff --git a/config/src/vespa/config/subscription/configuri.cpp b/config/src/vespa/config/subscription/configuri.cpp
index edb06f8b237..07b3bd7a7e2 100644
--- a/config/src/vespa/config/subscription/configuri.cpp
+++ b/config/src/vespa/config/subscription/configuri.cpp
@@ -11,7 +11,7 @@ bool checkEmpty(const vespalib::string & configId) {
}
namespace config {
-ConfigUri::ConfigUri(const vespalib::string &configId)
+ConfigUri::ConfigUri(vespalib::stringref configId)
: _configId(legacyConfigId2ConfigId(configId)),
_context(std::make_shared<ConfigContext>(*legacyConfigId2Spec(configId))),
_empty(checkEmpty(configId))
diff --git a/config/src/vespa/config/subscription/configuri.h b/config/src/vespa/config/subscription/configuri.h
index d8472d9a637..d0743210416 100644
--- a/config/src/vespa/config/subscription/configuri.h
+++ b/config/src/vespa/config/subscription/configuri.h
@@ -17,29 +17,12 @@ class SourceSpec;
*/
class ConfigUri {
public:
- /**
- * Construct a config URI from a given config id.
- * @param configId The config id.
- */
- ConfigUri(const char * configId) : ConfigUri(vespalib::string(configId)) {}
-
- /**
- * Construct a config URI from a given config id.
- * @param configId The config id.
- */
- ConfigUri(const std::string &configId) : ConfigUri(vespalib::string(configId)) {}
-
- /**
- * Construct a config URI from a given config id.
- * @param configId The config id.
- */
- ConfigUri(vespalib::stringref configId) : ConfigUri(vespalib::string(configId)) {}
/**
* Construct a config URI from a given config id.
* @param configId The config id.
*/
- ConfigUri(const vespalib::string &configId);
+ explicit ConfigUri(vespalib::stringref configId);
/**
* Construct a config URI from a config id and a context.