Move utility::conversions::print_string and utility::conversions::scan_string. Internal utility functions should be marked internal.

Author: ras0219-msft

Release/include/cpprest/asyncrt_utils.h

@@ -177,12 +177,15 @@ namespace conversions
     /// Decode the given base64 string to a byte array
     /// </summary>
     _ASYNCRTIMP std::vector<unsigned char> __cdecl from_base64(const utility::string_t& str);
+}
 
+namespace details
+{
     template <typename Source>
-    utility::string_t print_string(const Source &val, const std::locale &loc)
+    utility::string_t print_string(const Source &val)
     {
         utility::ostringstream_t oss;
-        oss.imbue(loc);
+        oss.imbue(std::locale::classic());
         oss << val;
         if (oss.bad())
         {
@@ -191,18 +194,12 @@ namespace conversions
         return oss.str();
     }
 
-    template <typename Source>
-    utility::string_t print_string(const Source &val)
-    {
-        return print_string(val, std::locale());
-    }
-
     template <typename Target>
-    Target scan_string(const std::string &str, const std::locale &loc = std::locale())
+    Target scan_string(const std::string &str)
     {
         Target t;
         std::istringstream iss(str);
-        iss.imbue(loc);
+        iss.imbue(std::locale::classic());
         iss >> t;
         if (iss.bad() || iss.fail())
         {
@@ -212,11 +209,11 @@ namespace conversions
     }
 #if !defined(_LIBCPP_VERSION)
     template <typename Target>
-    Target scan_string(const utf16string &str, const std::locale &loc = std::locale())
+    Target scan_string(const utf16string &str)
     {
         Target t;
         utf16istringstream iss(str);
-        iss.imbue(loc);
+        iss.imbue(std::locale::classic());
         iss >> t;
         if (iss.bad() || iss.fail())
         {
@@ -226,10 +223,6 @@ namespace conversions
     }
 #endif
 
-}
-
-namespace details
-{
     /// <summary>
     /// Our own implementation of alpha numeric instead of std::isalnum to avoid
     /// taking global lock for performance reasons.

Release/include/cpprest/http_headers.h

@@ -159,11 +159,11 @@ class http_headers
     {
         if (has(name))
         {
-            m_headers[name] =  m_headers[name].append(_XPLATSTR(", ") + utility::conversions::print_string(value));
+            m_headers[name].append(_XPLATSTR(", ")).append(utility::details::print_string(value));
         }
         else
         {
-            m_headers[name] = utility::conversions::print_string(value);
+            m_headers[name] = utility::details::print_string(value);
         }
     }
 

Release/include/cpprest/oauth1.h

@@ -513,7 +513,7 @@ class oauth1_config
 
     static utility::string_t _generate_timestamp()
     {
-        return utility::conversions::print_string(utility::datetime::utc_timestamp(), std::locale::classic());
+        return utility::details::print_string(utility::datetime::utc_timestamp());
     }
 
     _ASYNCRTIMP static std::vector<unsigned char> __cdecl _hmac_sha1(const utility::string_t& key, const utility::string_t& data);

Release/include/cpprest/uri_builder.h

@@ -238,7 +238,7 @@ namespace web
         uri_builder &append_query(const utility::string_t &name, const T &value, bool do_encoding = true)
         {
             auto encodedName = name;
-            auto encodedValue = ::utility::conversions::print_string(value, std::locale::classic());
+            auto encodedValue = ::utility::details::print_string(value);
 
             if (do_encoding)
             {

Release/src/http/common/http_msg.cpp

@@ -220,7 +220,7 @@ utility::size64_t http_headers::content_length() const
 
 void http_headers::set_content_length(utility::size64_t length)
 {
-    m_headers[http::header_names::content_length] = utility::conversions::print_string(length, std::locale::classic());
+    m_headers[http::header_names::content_length] = utility::details::print_string(length);
 }
 
 namespace details {

Release/src/http/oauth/oauth2.cpp

@@ -200,7 +200,7 @@ oauth2_token oauth2_config::_parse_token_from_json(const json::value& token_json
         {
             // Handle the case of a number as a JSON "string".
             // Using streams because std::stoll isn't avaliable on Android.
-            int64_t expires = utility::conversions::scan_string<int64_t>(json_expires_in_val.as_string());
+            int64_t expires = utility::details::scan_string<int64_t>(json_expires_in_val.as_string());
             result.set_expires_in(expires);
         }
     }

Release/src/uri/uri_parser.cpp

@@ -277,7 +277,7 @@ bool inner_parse(
                 //skip the colon
                 port_begin++;
 
-                *port = utility::conversions::scan_string<int>(utility::string_t(port_begin, authority_end), std::locale::classic());
+                *port = utility::details::scan_string<int>(utility::string_t(port_begin, authority_end));
             }
             else
             {

Release/tests/functional/http/client/header_tests.cpp

@@ -391,7 +391,7 @@ TEST_FIXTURE(uri_address, overwrite_http_header)
     // Test default case of cpprestsdk setting host header as host:port
     auto& host = m_uri.host();
     int port = m_uri.port();
-    utility::string_t expected_default_header = host + U(":") + utility::conversions::print_string(port);
+    utility::string_t expected_default_header = host + U(":") + utility::details::print_string(port);
     http_request default_host_headers_request(methods::GET);
     scoped.server()->next_request().then([&](test_request *p_request) 
     {

Release/tests/functional/utils/strings.cpp

@@ -297,59 +297,58 @@ TEST(latin1_to_utf16)
     }
 }
 
-TEST(print_string_locale, "Ignore:Android", "Locale unsupported on Android")
+TEST(print_string)
+{
+    VERIFY_ARE_EQUAL(_XPLATSTR("1.5"), utility::details::print_string(1.5));
+}
+
+TEST(print_string_fr_locale, "Ignore:Android", "Locale unsupported on Android")
 {
-    std::locale changedLocale;
     try
     {
 #ifdef _WIN32
-        changedLocale = std::locale("fr-FR");
+        tests::common::utilities::locale_guard loc(std::locale("fr-FR"));
 #else
-        changedLocale = std::locale("fr_FR.UTF-8");
+        tests::common::utilities::locale_guard loc(std::locale("fr_FR.UTF-8"));
 #endif
+
+        VERIFY_ARE_EQUAL(_XPLATSTR("1.5"), utility::details::print_string(1.5));
     }
     catch (const std::exception &)
     {
         // Silently pass if locale isn't installed on machine.
         return;
     }
+}
 
-    tests::common::utilities::locale_guard loc(changedLocale);
-
-    utility::ostringstream_t oss;
-    oss << 1000;
-    VERIFY_ARE_EQUAL(oss.str(), utility::conversions::print_string(1000));
-    VERIFY_ARE_EQUAL(_XPLATSTR("1000"), utility::conversions::print_string(1000, std::locale::classic()));
+TEST(scan_string)
+{
+    VERIFY_ARE_EQUAL(1.5, utility::details::scan_string<double>("1.5"));
+#ifdef WIN32
+    VERIFY_ARE_EQUAL(1.5, utility::details::scan_string<double>(L"1.5"));
+#endif
 }
 
 TEST(scan_string_locale, "Ignore:Android", "Locale unsupported on Android")
 {
-    std::locale changedLocale;
     try
     {
 #ifdef _WIN32
-        changedLocale = std::locale("fr-FR");
+        tests::common::utilities::locale_guard loc(std::locale("fr-FR"));
 #else
-        changedLocale = std::locale("fr_FR.UTF-8");
+        tests::common::utilities::locale_guard loc(std::locale("fr_FR.UTF-8"));
+#endif
+
+        VERIFY_ARE_EQUAL(1.5, utility::details::scan_string<double>("1.5"));
+#ifdef WIN32
+        VERIFY_ARE_EQUAL(1.5, utility::details::scan_string<double>(L"1.5"));
 #endif
     }
     catch (const std::exception &)
     {
         // Silently pass if locale isn't installed on machine.
         return;
     }
-
-    VERIFY_ARE_EQUAL(_XPLATSTR("1000"), utility::conversions::scan_string<utility::string_t>(utility::string_t(_XPLATSTR("1000"))));
-    VERIFY_ARE_EQUAL(_XPLATSTR("1,000"), utility::conversions::scan_string<utility::string_t>(utility::string_t(_XPLATSTR("1,000"))));
-
-    VERIFY_ARE_EQUAL(_XPLATSTR("1000"), utility::conversions::scan_string<utility::string_t>(utility::string_t(_XPLATSTR("1000")), changedLocale));
-    VERIFY_ARE_EQUAL(_XPLATSTR("1,000"), utility::conversions::scan_string<utility::string_t>(utility::string_t(_XPLATSTR("1,000")), changedLocale));
-
-    {
-        tests::common::utilities::locale_guard loc(changedLocale);
-        VERIFY_ARE_EQUAL(_XPLATSTR("1000"), utility::conversions::scan_string<utility::string_t>(utility::string_t(_XPLATSTR("1000")), std::locale::classic()));
-        VERIFY_ARE_EQUAL(_XPLATSTR("1,000"), utility::conversions::scan_string<utility::string_t>(utility::string_t(_XPLATSTR("1,000")), std::locale::classic()));
-    }
 }
 
 }