Skip to content

Adding has_<type>_field utility to json value #551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 2, 2017
Merged

Adding has_<type>_field utility to json value #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cffa77
Adding has_<type>_field utility to json value
deeringc Oct 1, 2017
0446dd9
Fixing formatting
deeringc Oct 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions Release/include/cpprest/json.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,55 @@ namespace json
/// <returns>True if the field exists, false otherwise.</returns>
bool has_field(const utility::string_t &key) const;

/// <summary>
/// Tests for the presence of a number field
/// </summary>
/// <param name="key">The name of the field</param>
/// <returns>True if the field exists, false otherwise.</returns>
_ASYNCRTIMP bool has_number_field(const utility::string_t &key) const;

/// <summary>
/// Tests for the presence of an integer field
/// </summary>
/// <param name="key">The name of the field</param>
/// <returns>True if the field exists, false otherwise.</returns>
_ASYNCRTIMP bool has_integer_field(const utility::string_t &key) const;

/// <summary>
/// Tests for the presence of a double field
/// </summary>
/// <param name="key">The name of the field</param>
/// <returns>True if the field exists, false otherwise.</returns>
_ASYNCRTIMP bool has_double_field(const utility::string_t &key) const;

/// <summary>
/// Tests for the presence of a boolean field
/// </summary>
/// <param name="key">The name of the field</param>
/// <returns>True if the field exists, false otherwise.</returns>
_ASYNCRTIMP bool has_boolean_field(const utility::string_t &key) const;

/// <summary>
/// Tests for the presence of a string field
/// </summary>
/// <param name="key">The name of the field</param>
/// <returns>True if the field exists, false otherwise.</returns>
_ASYNCRTIMP bool has_string_field(const utility::string_t &key) const;

/// <summary>
/// Tests for the presence of an array field
/// </summary>
/// <param name="key">The name of the field</param>
/// <returns>True if the field exists, false otherwise.</returns>
_ASYNCRTIMP bool has_array_field(const utility::string_t &key) const;

/// <summary>
/// Tests for the presence of an object field
/// </summary>
/// <param name="key">The name of the field</param>
/// <returns>True if the field exists, false otherwise.</returns>
_ASYNCRTIMP bool has_object_field(const utility::string_t &key) const;

/// <summary>
/// Accesses a field of a JSON object.
/// </summary>
Expand Down
35 changes: 35 additions & 0 deletions Release/src/json/json.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,41 @@ bool web::json::details::_Object::has_field(const utility::string_t &key) const
return m_object.find(key) != m_object.end();
}

bool web::json::value::has_number_field(const utility::string_t &key) const
{
return has_field(key) && at(key).is_number();
}

bool web::json::value::has_integer_field(const utility::string_t &key) const
{
return has_field(key) && at(key).is_integer();
}

bool web::json::value::has_double_field(const utility::string_t &key) const
{
return has_field(key) && at(key).is_double();
}

bool web::json::value::has_boolean_field(const utility::string_t &key) const
{
return has_field(key) && at(key).is_boolean();
}

bool web::json::value::has_string_field(const utility::string_t &key) const
{
return has_field(key) && at(key).is_string();
}

bool web::json::value::has_array_field(const utility::string_t &key) const
{
return has_field(key) && at(key).is_array();
}

bool web::json::value::has_object_field(const utility::string_t &key) const
{
return has_field(key) && at(key).is_object();
}

utility::string_t json::value::to_string() const
{
#ifndef _WIN32
Expand Down
55 changes: 54 additions & 1 deletion Release/tests/functional/json/to_as_and_operators_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,11 +312,64 @@ TEST(negative_get_element_array)

TEST(has_field_object)
{


json::value v1;

v1[U("a")] = json::value::number(1);
v1[U("b")] = json::value::boolean(true);
v1[U("c")] = json::value::string(U("a string"));
v1[U("d")] = json::value::array({});
json::value sub_field;
sub_field[U("x")] = json::value::number(1);
v1[U("e")] = sub_field;

VERIFY_IS_TRUE(v1.has_field(U("a")));
VERIFY_IS_FALSE(v1.has_field(U("b")));
VERIFY_IS_TRUE(v1.has_field(U("b")));
VERIFY_IS_TRUE(v1.has_field(U("c")));
VERIFY_IS_TRUE(v1.has_field(U("d")));
VERIFY_IS_TRUE(v1.has_field(U("e")));
VERIFY_IS_FALSE(v1.has_field(U("f")));

VERIFY_IS_TRUE(v1.has_number_field(U("a")));
VERIFY_IS_TRUE(v1.has_integer_field(U("a")));
VERIFY_IS_FALSE(v1.has_double_field(U("a")));
VERIFY_IS_FALSE(v1.has_boolean_field(U("a")));
VERIFY_IS_FALSE(v1.has_string_field(U("a")));
VERIFY_IS_FALSE(v1.has_array_field(U("a")));
VERIFY_IS_FALSE(v1.has_object_field(U("a")));

VERIFY_IS_TRUE(v1.has_boolean_field(U("b")));
VERIFY_IS_FALSE(v1.has_number_field(U("b")));
VERIFY_IS_FALSE(v1.has_integer_field(U("b")));
VERIFY_IS_FALSE(v1.has_double_field(U("b")));
VERIFY_IS_FALSE(v1.has_string_field(U("b")));
VERIFY_IS_FALSE(v1.has_array_field(U("b")));
VERIFY_IS_FALSE(v1.has_object_field(U("b")));

VERIFY_IS_TRUE(v1.has_string_field(U("c")));
VERIFY_IS_FALSE(v1.has_boolean_field(U("c")));
VERIFY_IS_FALSE(v1.has_number_field(U("c")));
VERIFY_IS_FALSE(v1.has_integer_field(U("c")));
VERIFY_IS_FALSE(v1.has_double_field(U("c")));
VERIFY_IS_FALSE(v1.has_array_field(U("c")));
VERIFY_IS_FALSE(v1.has_object_field(U("c")));

VERIFY_IS_TRUE(v1.has_array_field(U("d")));
VERIFY_IS_FALSE(v1.has_string_field(U("d")));
VERIFY_IS_FALSE(v1.has_boolean_field(U("d")));
VERIFY_IS_FALSE(v1.has_number_field(U("d")));
VERIFY_IS_FALSE(v1.has_integer_field(U("d")));
VERIFY_IS_FALSE(v1.has_double_field(U("d")));
VERIFY_IS_FALSE(v1.has_object_field(U("d")));

VERIFY_IS_TRUE(v1.has_object_field(U("e")));
VERIFY_IS_FALSE(v1.has_array_field(U("e")));
VERIFY_IS_FALSE(v1.has_string_field(U("e")));
VERIFY_IS_FALSE(v1.has_boolean_field(U("e")));
VERIFY_IS_FALSE(v1.has_number_field(U("e")));
VERIFY_IS_FALSE(v1.has_integer_field(U("e")));
VERIFY_IS_FALSE(v1.has_double_field(U("e")));

json::value v2;

Expand Down