TFS Sync

Author: ras0219-msft

Release/include/cpprest/json.h

@@ -75,18 +75,6 @@ namespace web { namespace json
         /// </summary>
         enum value_type { Number, Boolean, String, Object, Array, Null };
 
-        /// <summary>
-        /// Typedef for the standard container holding fields. This is used when constructing an
-        /// object from existing objects.
-        /// </summary>
-        typedef std::vector<std::pair<utility::string_t,json::value>> field_map;
-
-        /// <summary>
-        /// Typedef for the standard container holding array elements. This is used when constructing an
-        /// array from existing objects.
-        /// </summary>
-        typedef std::vector<json::value> array_vector;
-
         /// <summary>
         /// Constructor creating a null value
         /// </summary>
@@ -215,11 +203,11 @@ namespace web { namespace json
         static _ASYNCRTIMP json::value __cdecl object();
 
         /// <summary>
-        /// Creates an object value from a map of field/values
+        /// Creates an object value from a collection of field/values
         /// </summary>
-        /// <param name="fields">A map of field names associated with JSON values</param>
+        /// <param name="fields">Field names associated with JSON values</param>
         /// <returns>A non-empty JSON object value</returns>
-        static _ASYNCRTIMP json::value __cdecl object(json::value::field_map fields);
+        static _ASYNCRTIMP json::value __cdecl object(std::vector<std::pair<::utility::string_t, value>> fields);
 
         /// <summary>
         /// Creates an empty JSON array
@@ -237,9 +225,9 @@ namespace web { namespace json
         /// <summary>
         /// Creates a JSON array
         /// </summary>
-        /// <param name="elements">A vector of JSON values, </param>
+        /// <param name="elements">A vector of JSON values</param>
         /// <returns>A JSON array value</returns>
-        static _ASYNCRTIMP json::value __cdecl array(array_vector elements);
+        static _ASYNCRTIMP json::value __cdecl array(std::vector<value> elements);
 
         /// <summary>
         /// Accesses the type of JSON value the current value instance is
@@ -724,7 +712,7 @@ namespace web { namespace json
 
     private:
         object() : m_elements(), m_sorted(false) { }
-        object(json::value::field_map elements) : m_elements(std::move(elements)), m_sorted(false) { }
+        object(storage_type elements) : m_elements(std::move(elements)), m_sorted(false) { }
         object(const object& obj); // non copyable
         object& operator=(const object& obj) // non copyable
         {
@@ -1360,7 +1348,7 @@ namespace web { namespace json
             {
             }
 
-            _Object(json::value::field_map fields) : m_object(std::move(fields)) { }
+            _Object(object::storage_type fields) : m_object(std::move(fields)) { }
 
             _ASYNCRTIMP _Object(const _Object& other);
 

Release/src/json/json.cpp

@@ -200,7 +200,7 @@ web::json::value web::json::value::object()
             );
 }
 
-web::json::value web::json::value::object(web::json::value::field_map fields)
+web::json::value web::json::value::object(std::vector<std::pair<::utility::string_t, value>> fields)
 {
     std::unique_ptr<details::_Value> ptr = utility::details::make_unique<details::_Object>(std::move(fields));
     return web::json::value(std::move(ptr)
@@ -230,7 +230,7 @@ web::json::value web::json::value::array(size_t size)
             );
 }
 
-web::json::value web::json::value::array(json::value::array_vector elements)
+web::json::value web::json::value::array(std::vector<value> elements)
 {
     std::unique_ptr<details::_Value> ptr = utility::details::make_unique<details::_Array>(std::move(elements));
     return web::json::value(std::move(ptr)

Release/tests/Functional/json/construction_tests.cpp

@@ -205,8 +205,8 @@ TEST(factory_overloads)
 
 TEST(object_construction)
 {
-    // Factory which takes a map.
-    json::value::field_map f;
+    // Factory which takes a vector.
+    std::vector<std::pair<string_t, json::value>> f;
     f.push_back(std::make_pair(U("abc"), json::value(true)));
     f.push_back(std::make_pair(U("xyz"), json::value(44)));
     json::value obj = json::value::object(f);
@@ -246,7 +246,7 @@ TEST(object_construction)
 TEST(array_construction)
 {
     // Constructor which takes a vector.
-    json::value::array_vector e;
+    std::vector<json::value> e;
     e.push_back(json::value(false));
     e.push_back(json::value::string(U("hehe")));
     json::value arr = json::value::array(e);

Release/tests/Functional/json/iterator_tests.cpp

@@ -278,7 +278,7 @@ TEST(std_algorithms)
         json::value v_array = json::value::parse(U("[44, true, false]"));
         auto _where = 
             std::find_if(std::begin(v_array.as_array()), std::end(v_array.as_array()),
-            [&](json::value::array_vector::iterator::value_type value)
+            [&](json::array::iterator::value_type value)
             {
                 return value.is_boolean();
             });
@@ -290,10 +290,10 @@ TEST(std_algorithms)
     {
         // copy_if
         json::value v_array = json::value::parse(U("[44, true, false]"));
-        std::vector<json::value::array_vector::iterator::value_type> v_target(v_array.size());
+        std::vector<json::array::iterator::value_type> v_target(v_array.size());
         auto _where = 
             std::copy_if(std::begin(v_array.as_array()), std::end(v_array.as_array()), std::begin(v_target),
-            [&](json::value::array_vector::iterator::value_type value)
+            [&](json::array::iterator::value_type value)
             {
                 return value.is_boolean();
             });
@@ -306,7 +306,7 @@ TEST(std_algorithms)
         std::vector<json::value> v_target(v_array.size());
         auto _where = 
             std::transform(std::begin(v_array.as_array()), std::end(v_array.as_array()), std::begin(v_target),
-            [&](json::value::array_vector::iterator::value_type) -> json::value
+            [&](json::array::iterator::value_type) -> json::value
             {
                 return json::value::number(17);
             });