diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-02-05 23:32:00 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-02-06 00:26:08 +0000 |
commit | 4c5a7cac411b30b9b4bd3ca067efcc9f3719b0ea (patch) | |
tree | 2e09c62b854357bbb1c8d433898d004e3f3995a5 /configutil/src | |
parent | b84ef936b1cedce0b99f79e03b2fe25a8db5f7c3 (diff) |
Reduce code visibility and include only what you need from config library.
Diffstat (limited to 'configutil/src')
-rw-r--r-- | configutil/src/apps/configstatus/main.cpp | 4 | ||||
-rw-r--r-- | configutil/src/apps/modelinspect/main.cpp | 4 | ||||
-rw-r--r-- | configutil/src/lib/configstatus.cpp | 4 | ||||
-rw-r--r-- | configutil/src/lib/configstatus.h | 2 | ||||
-rw-r--r-- | configutil/src/lib/modelinspect.cpp | 7 | ||||
-rw-r--r-- | configutil/src/lib/modelinspect.h | 2 | ||||
-rw-r--r-- | configutil/src/tests/config_status/config_status_test.cpp | 1 |
7 files changed, 11 insertions, 13 deletions
diff --git a/configutil/src/apps/configstatus/main.cpp b/configutil/src/apps/configstatus/main.cpp index 717c120f8e2..cd0424633d9 100644 --- a/configutil/src/apps/configstatus/main.cpp +++ b/configutil/src/apps/configstatus/main.cpp @@ -2,10 +2,10 @@ #include <vespa/defaults.h> #include <vespa/vespalib/text/stringtokenizer.h> -#include <iostream> -#include <cstdlib> #include "lib/configstatus.h" +#include <vespa/config/subscription/sourcespec.h> #include <vespa/fastos/app.h> +#include <iostream> #include <vespa/log/log.h> LOG_SETUP("vespa-config-status"); diff --git a/configutil/src/apps/modelinspect/main.cpp b/configutil/src/apps/modelinspect/main.cpp index c9fc51febb5..7053adf17fa 100644 --- a/configutil/src/apps/modelinspect/main.cpp +++ b/configutil/src/apps/modelinspect/main.cpp @@ -1,11 +1,11 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/defaults.h> -#include <iostream> -#include <cstdlib> #include "lib/modelinspect.h" #include <vespa/vespalib/text/stringtokenizer.h> +#include <vespa/config/subscription/sourcespec.h> #include <vespa/fastos/app.h> +#include <iostream> #include <vespa/log/log.h> LOG_SETUP("vespa-model-inspect"); diff --git a/configutil/src/lib/configstatus.cpp b/configutil/src/lib/configstatus.cpp index 529765dccd5..841d1604866 100644 --- a/configutil/src/lib/configstatus.cpp +++ b/configutil/src/lib/configstatus.cpp @@ -7,8 +7,8 @@ #include <vbench/http/server_spec.h> #include <vbench/http/http_client.h> #include <vespa/config/common/exceptions.h> +#include <vespa/config/subscription/configsubscriber.hpp> #include <iostream> -#include <cstdlib> using configdefinitions::tagsContain; @@ -69,7 +69,7 @@ struct ComponentTraverser : public vespalib::slime::ObjectTraverser } }; -ComponentTraverser::~ComponentTraverser() {} +ComponentTraverser::~ComponentTraverser() = default; class MyHttpHandler : public vbench::HttpResultHandler { private: diff --git a/configutil/src/lib/configstatus.h b/configutil/src/lib/configstatus.h index 9e1627af4a9..4d792748419 100644 --- a/configutil/src/lib/configstatus.h +++ b/configutil/src/lib/configstatus.h @@ -4,7 +4,7 @@ #include "hostfilter.h" #include <vespa/config-model.h> #include <vespa/vespalib/stllike/string.h> -#include <vespa/config/config.h> +#include <vespa/config/subscription/configuri.h> class ConfigStatus { diff --git a/configutil/src/lib/modelinspect.cpp b/configutil/src/lib/modelinspect.cpp index 611a41d1a84..d840a7d45ca 100644 --- a/configutil/src/lib/modelinspect.cpp +++ b/configutil/src/lib/modelinspect.cpp @@ -7,6 +7,7 @@ #include <iostream> #include <algorithm> #include <cstdlib> +#include <set> using configdefinitions::tagsContain; using configdefinitions::upcase; @@ -32,7 +33,7 @@ ModelInspect::ModelInspect(Flags flags, const config::ConfigUri uri, std::ostrea } catch (config::ConfigRuntimeException &e) { std::cerr << e.getMessage() << "\n"; } - if (_cfg.get() != NULL) { + if (_cfg) { if (_flags.verbose) std::cerr << "success!\n"; } else { std::cerr << "FATAL ERROR: failed to get model configuration.\n"; @@ -40,9 +41,7 @@ ModelInspect::ModelInspect(Flags flags, const config::ConfigUri uri, std::ostrea } } -ModelInspect::~ModelInspect() -{ -} +ModelInspect::~ModelInspect() = default; void ModelInspect::printPort(const vespalib::string &host, int port, diff --git a/configutil/src/lib/modelinspect.h b/configutil/src/lib/modelinspect.h index dae5f3f4e92..33ef94b259b 100644 --- a/configutil/src/lib/modelinspect.h +++ b/configutil/src/lib/modelinspect.h @@ -1,7 +1,7 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/config-model.h> #include <vespa/vespalib/stllike/string.h> -#include <vespa/config/config.h> +#include <vespa/config/subscription/configuri.h> class ModelInspect diff --git a/configutil/src/tests/config_status/config_status_test.cpp b/configutil/src/tests/config_status/config_status_test.cpp index 9b8b96acdb8..b6f1fd44d3f 100644 --- a/configutil/src/tests/config_status/config_status_test.cpp +++ b/configutil/src/tests/config_status/config_status_test.cpp @@ -3,7 +3,6 @@ #include <lib/configstatus.h> #include <vespa/vespalib/portal/portal.h> #include <vespa/config-model.h> -#include <vespa/config/config.h> #include <vespa/config/subscription/sourcespec.h> #include <vespa/config/common/configcontext.h> |