Skip to content

Commit 0c1d3a3

Browse files
committed
Code review comments:
- const methods in yaml parser - std::make_unique - exceptions
1 parent fe155fb commit 0c1d3a3

File tree

8 files changed

+274
-270
lines changed

8 files changed

+274
-270
lines changed

sdk/include/opentelemetry/sdk/configuration/document_node.h

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,26 @@ class DocumentNode
3232

3333
virtual std::string Key() const = 0;
3434

35-
virtual bool AsBoolean() = 0;
36-
virtual std::size_t AsInteger() = 0;
37-
virtual double AsDouble() = 0;
38-
virtual std::string AsString() = 0;
35+
virtual bool AsBoolean() const = 0;
36+
virtual std::size_t AsInteger() const = 0;
37+
virtual double AsDouble() const = 0;
38+
virtual std::string AsString() const = 0;
3939

40-
virtual std::unique_ptr<DocumentNode> GetRequiredChildNode(const std::string &name) = 0;
41-
virtual std::unique_ptr<DocumentNode> GetChildNode(const std::string &name) = 0;
40+
virtual std::unique_ptr<DocumentNode> GetRequiredChildNode(const std::string &name) const = 0;
41+
virtual std::unique_ptr<DocumentNode> GetChildNode(const std::string &name) const = 0;
4242

43-
virtual bool GetRequiredBoolean(const std::string &name) = 0;
44-
virtual bool GetBoolean(const std::string &name, bool default_value) = 0;
43+
virtual bool GetRequiredBoolean(const std::string &name) const = 0;
44+
virtual bool GetBoolean(const std::string &name, bool default_value) const = 0;
4545

46-
virtual std::size_t GetRequiredInteger(const std::string &name) = 0;
47-
virtual std::size_t GetInteger(const std::string &name, std::size_t default_value) = 0;
46+
virtual std::size_t GetRequiredInteger(const std::string &name) const = 0;
47+
virtual std::size_t GetInteger(const std::string &name, std::size_t default_value) const = 0;
4848

49-
virtual double GetRequiredDouble(const std::string &name) = 0;
50-
virtual double GetDouble(const std::string &name, double default_value) = 0;
49+
virtual double GetRequiredDouble(const std::string &name) const = 0;
50+
virtual double GetDouble(const std::string &name, double default_value) const = 0;
5151

52-
virtual std::string GetRequiredString(const std::string &name) = 0;
53-
virtual std::string GetString(const std::string &name, const std::string &default_value) = 0;
52+
virtual std::string GetRequiredString(const std::string &name) const = 0;
53+
virtual std::string GetString(const std::string &name,
54+
const std::string &default_value) const = 0;
5455

5556
virtual DocumentNodeConstIterator begin() const = 0;
5657
virtual DocumentNodeConstIterator end() const = 0;
@@ -62,12 +63,12 @@ class DocumentNode
6263
virtual PropertiesNodeConstIterator end_properties() const = 0;
6364

6465
protected:
65-
std::string DoSubstitution(const std::string &text);
66-
std::string DoOneSubstitution(const std::string &text);
66+
std::string DoSubstitution(const std::string &text) const;
67+
std::string DoOneSubstitution(const std::string &text) const;
6768

68-
bool BooleanFromString(const std::string &value);
69-
std::size_t IntegerFromString(const std::string &value);
70-
double DoubleFromString(const std::string &value);
69+
bool BooleanFromString(const std::string &value) const;
70+
std::size_t IntegerFromString(const std::string &value) const;
71+
double DoubleFromString(const std::string &value) const;
7172
};
7273

7374
class DocumentNodeConstIteratorImpl

sdk/include/opentelemetry/sdk/configuration/ryml_document_node.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,25 @@ class RymlDocumentNode : public DocumentNode
2929

3030
std::string Key() const override;
3131

32-
bool AsBoolean() override;
33-
std::size_t AsInteger() override;
34-
double AsDouble() override;
35-
std::string AsString() override;
32+
bool AsBoolean() const override;
33+
std::size_t AsInteger() const override;
34+
double AsDouble() const override;
35+
std::string AsString() const override;
3636

37-
std::unique_ptr<DocumentNode> GetRequiredChildNode(const std::string &name) override;
38-
std::unique_ptr<DocumentNode> GetChildNode(const std::string &name) override;
37+
std::unique_ptr<DocumentNode> GetRequiredChildNode(const std::string &name) const override;
38+
std::unique_ptr<DocumentNode> GetChildNode(const std::string &name) const override;
3939

40-
bool GetRequiredBoolean(const std::string &name) override;
41-
bool GetBoolean(const std::string &name, bool default_value) override;
40+
bool GetRequiredBoolean(const std::string &name) const override;
41+
bool GetBoolean(const std::string &name, bool default_value) const override;
4242

43-
std::size_t GetRequiredInteger(const std::string &name) override;
44-
std::size_t GetInteger(const std::string &name, std::size_t default_value) override;
43+
std::size_t GetRequiredInteger(const std::string &name) const override;
44+
std::size_t GetInteger(const std::string &name, std::size_t default_value) const override;
4545

46-
double GetRequiredDouble(const std::string &name) override;
47-
double GetDouble(const std::string &name, double default_value) override;
46+
double GetRequiredDouble(const std::string &name) const override;
47+
double GetDouble(const std::string &name, double default_value) const override;
4848

49-
std::string GetRequiredString(const std::string &name) override;
50-
std::string GetString(const std::string &name, const std::string &default_value) override;
49+
std::string GetRequiredString(const std::string &name) const override;
50+
std::string GetString(const std::string &name, const std::string &default_value) const override;
5151

5252
DocumentNodeConstIterator begin() const override;
5353
DocumentNodeConstIterator end() const override;
@@ -59,8 +59,8 @@ class RymlDocumentNode : public DocumentNode
5959
PropertiesNodeConstIterator end_properties() const override;
6060

6161
private:
62-
ryml::ConstNodeRef GetRequiredRymlChildNode(const std::string &name);
63-
ryml::ConstNodeRef GetRymlChildNode(const std::string &name);
62+
ryml::ConstNodeRef GetRequiredRymlChildNode(const std::string &name) const;
63+
ryml::ConstNodeRef GetRymlChildNode(const std::string &name) const;
6464

6565
ryml::ConstNodeRef node_;
6666
std::size_t depth_;

0 commit comments

Comments
 (0)