Merge lp:~thomas-voss/location-service/switch-to-json-c into lp:location-service/trunk

[Thomas Voß]

Switch to json-c for json parsing/generation purposes.

Switch to json-c for json parsing/generation purposes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:68
http://jenkins.qa.ubuntu.com/job/location-service-ci/218/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-amd64-ci/125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/125
        deb: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/125/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-i386-ci/125

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/218/rebuild

review: Approve (continuous-integration)

[lp:~thomas-voss/location-service/switch-to-json-c]

69. By Thomas Voß on 2014-07-15

Re-enable net-cpp based implementations with net-cpp being in main now.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:69
http://jenkins.qa.ubuntu.com/job/location-service-ci/219/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-amd64-ci/126/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/126/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-i386-ci/126/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/219/rebuild

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/location-service/switch-to-json-c]

70. By Thomas Voß on 2014-07-15

Fix include for json-c header file.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:70
http://jenkins.qa.ubuntu.com/job/location-service-ci/220/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-amd64-ci/127/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/127/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-i386-ci/127/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/220/rebuild

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/location-service/switch-to-json-c]

71. By Thomas Voß on 2014-07-15

Adjust include for json-c in test-case, too.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:71
http://jenkins.qa.ubuntu.com/job/location-service-ci/221/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-amd64-ci/128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/128
        deb: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/128/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-i386-ci/128

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/221/rebuild

review: Approve (continuous-integration)

[Manuel de la Peña (mandel)]

Looks like a simple change of lib.

review: Approve

[lp:~thomas-voss/location-service/switch-to-json-c]

72. By Thomas Voß on 2014-07-17

Remove duplicate Google logging initializer.

73. By Thomas Voß on 2014-07-17

Adjust value type for LastSeen timestamp.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-06-27 19:37:53 +0000
+++ CMakeLists.txt	2014-07-17 20:10:49 +0000
@@ -26,9 +26,9 @@
 find_package(Threads)
 pkg_check_modules(DBUS dbus-1 REQUIRED)
 pkg_check_modules(DBUS_CPP dbus-cpp REQUIRED)
-pkg_check_modules(JSON_CPP jsoncpp)
+pkg_check_modules(JSON_C json-c REQUIRED)
 # TODO(tvoss): Re-enable once net-cpp hits the archive.
-pkg_check_modules(NET_CPP net-cpp)
+pkg_check_modules(NET_CPP net-cpp REQUIRED)
 pkg_check_modules(PROCESS_CPP process-cpp REQUIRED)
 pkg_check_modules(PROPERTIES_CPP properties-cpp REQUIRED)
 #####################################################################
@@ -55,7 +55,7 @@
   ${Boost_INCLUDE_DIRS}
   ${DBUS_INCLUDE_DIRS}
   ${DBUS_CPP_INCLUDE_DIRS}
-  ${JSON_CPP_INCLUDE_DIRS}
+  ${JSON_C_INCLUDE_DIRS}
   ${NET_CPP_INCLUDE_DIRS}
   ${PROPERTIES_CPP_INCLUDE_DIRS}
   ${PROCESS_CPP_INCLUDE_DIRS}

=== modified file 'debian/control'
--- debian/control	2014-06-27 19:37:53 +0000
+++ debian/control	2014-07-17 20:10:49 +0000
@@ -18,6 +18,8 @@
                libgoogle-glog-dev,
                libgtest-dev,
                libiw-dev,
+               libjson-c-dev,
+               libnet-cpp-dev,
                libprocess-cpp-dev,
                libubuntu-platform-hardware-api-headers,
                libubuntu-platform-hardware-api-dev,

=== modified file 'src/location_service/com/ubuntu/location/CMakeLists.txt'
--- src/location_service/com/ubuntu/location/CMakeLists.txt	2014-06-27 19:37:53 +0000
+++ src/location_service/com/ubuntu/location/CMakeLists.txt	2014-07-17 20:10:49 +0000
@@ -1,6 +1,5 @@
-if (NET_CPP_FOUND AND JSONCPP_FOUND)
+if (NET_CPP_FOUND)
   add_definitions(-DCOM_UBUNTU_LOCATION_SERVICE_HAVE_NET_CPP=1)
-  add_definitions(-DCOM_UBUNTU_LOCATION_SERVICE_HAVE_JSON_CPP=1)
 
   set(ICHNAEA_REPORTER_SRCS service/ichnaea_reporter.cpp)
 endif()
@@ -98,7 +97,7 @@
   ${Boost_LIBRARIES}
   ${DBUS_LIBRARIES}
   ${DBUS_CPP_LDFLAGS}
-  ${JSON_CPP_LDFLAGS}
+  ${JSON_C_LDFLAGS}
   ${NET_CPP_LDFLAGS}
   ${GLog_LIBRARY}
   ${GFlags_LIBRARY}
@@ -175,4 +174,3 @@
   TARGETS ubuntu-location-serviced-cli
   DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
-

=== modified file 'src/location_service/com/ubuntu/location/connectivity/nm.h'
--- src/location_service/com/ubuntu/location/connectivity/nm.h	2014-06-27 19:42:21 +0000
+++ src/location_service/com/ubuntu/location/connectivity/nm.h	2014-07-17 20:10:49 +0000
@@ -68,7 +68,7 @@
             }
 
             typedef AccessPoint Interface;
-            typedef std::uint32_t ValueType;
+            typedef std::int32_t ValueType;
             static const bool readable = true;
             static const bool writable = false;
         };

=== modified file 'src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.cpp'
--- src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.cpp	2014-06-27 19:37:53 +0000
+++ src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.cpp	2014-07-17 20:10:49 +0000
@@ -30,8 +30,6 @@
 
 #include <com/ubuntu/location/connectivity/manager.h>
 
-#include <ubuntu/hardware/gps.h>
-
 #include <boost/property_tree/ini_parser.hpp>
 
 #include <random>

=== modified file 'src/location_service/com/ubuntu/location/service/ichnaea_reporter.cpp'
--- src/location_service/com/ubuntu/location/service/ichnaea_reporter.cpp	2014-06-16 11:06:10 +0000
+++ src/location_service/com/ubuntu/location/service/ichnaea_reporter.cpp	2014-07-17 20:10:49 +0000
@@ -16,6 +16,8 @@
  * Authored by: Thomas Voß <[e-mail]>
  */
 
+#include <json.h>
+
 #include <com/ubuntu/location/service/ichnaea_reporter.h>
 
 #include <com/ubuntu/location/logging.h>
@@ -26,11 +28,176 @@
 #include <core/net/http/response.h>
 #include <core/net/http/status.h>
 
-#include <json/json.h>
-
 #include <thread>
 
-namespace json = Json;
+namespace json
+{
+Object Object::parse_from_string(const std::string& s)
+{
+    return Object{json_tokener_parse(s.c_str())};
+}
+
+Object Object::create_array()
+{
+    return Object{json_object_new_array()};
+}
+
+Object Object::create_object()
+{
+    return Object{json_object_new_object()};
+}
+
+Object::Object(json_object* object) : object(object)
+{
+}
+
+Object::Object(const Object& rhs) : object(json_object_get(rhs.object))
+{
+}
+
+Object::~Object()
+{
+    json_object_put(object);
+}
+
+Object& Object::operator=(const Object& rhs)
+{
+    json_object_put(object);
+    object = json_object_get(rhs.object);
+
+    return *this;
+}
+
+std::string Object::to_plain_string()
+{
+    return std::string
+    {
+        json_object_to_json_string_ext(object, JSON_C_TO_STRING_PLAIN)
+    };
+}
+
+Object Object::get(const std::string& name) const
+{
+    json_object* result{nullptr};
+
+    json_object_object_get_ex(object, name.c_str(), &result);
+
+    if (not result) throw std::out_of_range
+    {
+        name.c_str()
+    };
+
+    return Object{result};
+}
+
+namespace
+{
+template<json_type type> void throw_if_type_mismatch(json_object* object)
+{
+    if (not json_object_is_type(object, type)) throw std::logic_error
+    {
+        "Type mismatch."
+    };
+}
+}
+// Attempts to resolve the object to a boolean value.
+// Throws std::logic_error in case of type mismatches.
+bool Object::to_bool() const
+{
+    throw_if_type_mismatch<json_type_boolean>(object);
+    return json_object_get_boolean(object);
+}
+
+std::int32_t Object::to_int32() const
+{
+    throw_if_type_mismatch<json_type_int>(object);
+    return json_object_get_int(object);
+}
+
+std::int64_t Object::to_int64() const
+{
+    throw_if_type_mismatch<json_type_int>(object);
+    return json_object_get_int64(object);
+}
+
+double Object::to_double() const
+{
+    throw_if_type_mismatch<json_type_double>(object);
+    return json_object_get_double(object);
+}
+
+std::string Object::to_string() const
+{
+    throw_if_type_mismatch<json_type_string>(object);
+    return std::string{json_object_get_string(object)};
+}
+
+void Object::put_array(const std::string& name, Object array)
+{
+    json_object_object_add(object, name.c_str(), json_object_get(array.object));
+}
+
+void Object::put_object(const std::string& name, Object other)
+{
+    json_object_object_add(object, name.c_str(), json_object_get(other.object));
+}
+
+void Object::put_boolean(const std::string& name, bool value)
+{
+    json_object_object_add(object, name.c_str(), json_object_new_boolean(value));
+}
+
+void Object::put_int32(const std::string& name, std::int32_t value)
+{
+    json_object_object_add(object, name.c_str(), json_object_new_int(value));
+}
+
+void Object::put_int64(const std::string& name, std::int64_t value)
+{
+    json_object_object_add(object, name.c_str(), json_object_new_int64(value));
+}
+
+void Object::put_double(const std::string& name, double value)
+{
+    json_object_object_add(object, name.c_str(), json_object_new_double(value));
+}
+
+void Object::put_string(const std::string& name, const std::string& value)
+{
+    json_object_object_add(object, name.c_str(), json_object_new_string_len(value.c_str(), value.size()));
+}
+
+std::size_t Object::array_size() const
+{
+    throw_if_type_mismatch<json_type_array>(object);
+    return json_object_array_length(object);
+}
+
+void Object::append(Object other)
+{
+    throw_if_type_mismatch<json_type_array>(object);
+    json_object_array_add(object, json_object_get(other.object));
+}
+
+void Object::put_object_for_index(std::size_t index, Object other)
+{
+    throw_if_type_mismatch<json_type_array>(object);
+    json_object_array_put_idx(object, index, json_object_get(other.object));
+}
+
+// Queries the object at index 'index'.
+// Throws std::logic_error if the object does not represent an array.
+// Throws std::out_of_range if the index exceeds the bounds of the array.
+Object Object::get_object_for_index(std::size_t index)
+{
+    throw_if_type_mismatch<json_type_array>(object);
+    return Object
+    {
+        json_object_get(json_object_array_get_idx(object, index))
+    };
+}
+}
+
 namespace location = com::ubuntu::location;
 
 location::service::ichnaea::Reporter::Reporter(
@@ -79,35 +246,45 @@
         const std::vector<location::connectivity::WirelessNetwork::Ptr>& wifis,
         const std::vector<location::connectivity::RadioCell::Ptr>& cells)
 {
-    json::Value submit;
-    json::Value item;
+    json::Object submit = json::Object::create_object();
+    json::Object items = json::Object::create_array();
+    json::Object item = json::Object::create_object();
 
-    item[Json::radio] = "gsm"; // We currently only support gsm radio types.
-    item[Json::lat] = update.value.latitude.value.value();
-    item[Json::lon] = update.value.longitude.value.value();
+    item.put_string(Json::radio, "gsm"); // We currently only support gsm radio types.
+    item.put_double(Json::lat, update.value.latitude.value.value());
+    item.put_double(Json::lon, update.value.longitude.value.value());
 
     if (update.value.accuracy.horizontal)
-        item[Json::accuracy] = (*update.value.accuracy.horizontal).value();
+        item.put_double(Json::accuracy, (*update.value.accuracy.horizontal).value());
     if (update.value.altitude)
-        item[Json::altitude] = (*update.value.altitude).value.value();
+        item.put_double(Json::altitude, (*update.value.altitude).value.value());
     if (update.value.accuracy.vertical)
-        item[Json::altitude_accuracy] = (*update.value.accuracy.vertical).value();
+        item.put_double(Json::altitude_accuracy, (*update.value.accuracy.vertical).value());
 
     if (!wifis.empty())
-        ichnaea::Reporter::convert_wifis_to_json(wifis, item[Json::wifi]);
+    {
+        json::Object w = json::Object::create_array();
+        ichnaea::Reporter::convert_wifis_to_json(wifis, w);
+        item.put_array(Json::wifi, w);
+    }
 
     if (!cells.empty())
-        ichnaea::Reporter::convert_cells_to_json(cells, item[Json::cell]);
-
-    submit[Json::items].append(item);
-
-    json::FastWriter writer;
-
-    VLOG(10) << "Submitting: " << writer.write(submit);
+    {
+        json::Object c = json::Object::create_array();
+        ichnaea::Reporter::convert_cells_to_json(cells, c);
+        item.put_array(Json::cell, c);
+    }
+
+    items.append(item);
+    submit.put_array(Json::items, items);
+
+    auto string_representation = submit.to_plain_string();
+
+    VLOG(10) << "Submitting: " << string_representation;
 
     auto request = http_client->post(
                 submit_request_config,
-                writer.write(submit),
+                string_representation,
                 core::net::http::ContentType::json);
 
     request->async_execute(
@@ -127,7 +304,7 @@
 
 void location::service::ichnaea::Reporter::convert_wifis_to_json(
         const std::vector<location::connectivity::WirelessNetwork::Ptr>& wifis,
-        json::Value& destination)
+        json::Object& destination)
 {
     for (const auto& wifi : wifis)
     {
@@ -135,11 +312,11 @@
         if (wifi->ssid().get().find("_nomap") != std::string::npos)
             continue;
 
-        json::Value w;
-        w[Json::Wifi::key] = wifi->bssid().get();
+        json::Object w = json::Object::create_object();
+        w.put_string(Json::Wifi::key, wifi->bssid().get());
 
         if (wifi->frequency().get().is_valid())
-            w[Json::Wifi::frequency] = static_cast<int>(wifi->frequency().get());
+            w.put_int32(Json::Wifi::frequency, static_cast<int>(wifi->frequency().get()));
 
         // We have a relative signal strength percentage in the wifi record.
         // TODO(tvoss): Check how that could be translated to RSSI.
@@ -151,70 +328,70 @@
 
 void location::service::ichnaea::Reporter::convert_cells_to_json(
         const std::vector<location::connectivity::RadioCell::Ptr>& cells,
-        json::Value& destination)
+        json::Object& destination)
 {
     for (const auto& cell : cells)
     {
-        json::Value c;
+        json::Object c = json::Object::create_object();
 
         switch (cell->type())
         {
         case connectivity::RadioCell::Type::gsm:
         {
-            c[Json::Cell::radio] = "gsm";
+            c.put_string(Json::Cell::radio, "gsm");
 
             const auto& details = cell->gsm();
 
             if (details.mobile_country_code.is_valid())
-                c[Json::Cell::mcc] = details.mobile_country_code.get();
+                c.put_int32(Json::Cell::mcc, details.mobile_country_code.get());
             if (details.mobile_network_code.is_valid())
-                c[Json::Cell::mnc] = details.mobile_network_code.get();
+                c.put_int32(Json::Cell::mnc, details.mobile_network_code.get());
             if (details.location_area_code.is_valid())
-                c[Json::Cell::lac] = details.location_area_code.get();
+                c.put_int32(Json::Cell::lac, details.location_area_code.get());
             if (details.id.is_valid())
-                c[Json::Cell::cid] = details.id.get();
+                c.put_int32(Json::Cell::cid, details.id.get());
             if  (details.strength.is_valid())
-                c[Json::Cell::asu] = details.strength.get();
+                c.put_int32(Json::Cell::asu, details.strength.get());
 
             break;
         }
         case connectivity::RadioCell::Type::umts:
         {
-            c[Json::Cell::radio] = "umts";
+            c.put_string(Json::Cell::radio, "umts");
 
             const auto& details = cell->umts();
 
             if (details.mobile_country_code.is_valid())
-                c[Json::Cell::mcc] = details.mobile_country_code.get();
+                c.put_int32(Json::Cell::mcc, details.mobile_country_code.get());
             if (details.mobile_network_code.is_valid())
-                c[Json::Cell::mnc] = details.mobile_network_code.get();
+                c.put_int32(Json::Cell::mnc, details.mobile_network_code.get());
             if (details.location_area_code.is_valid())
-                c[Json::Cell::lac] = details.location_area_code.get();
+                c.put_int32(Json::Cell::lac, details.location_area_code.get());
             if (details.id.is_valid())
-                c[Json::Cell::cid] = details.id.get();
+                c.put_int32(Json::Cell::cid, details.id.get());
             if  (details.strength.is_valid())
-                c[Json::Cell::asu] = details.strength.get();
+                c.put_int32(Json::Cell::asu, details.strength.get());
 
             break;
         }
         case connectivity::RadioCell::Type::lte:
         {
-            c[Json::Cell::radio] = "lte";
+            c.put_string(Json::Cell::radio, "lte");
 
             const auto& details = cell->lte();
 
             if (details.mobile_country_code.is_valid())
-                c[Json::Cell::mcc] = details.mobile_country_code.get();
+                c.put_int32(Json::Cell::mcc, details.mobile_country_code.get());
             if (details.mobile_network_code.is_valid())
-                c[Json::Cell::mnc] = details.mobile_network_code.get();
+                c.put_int32(Json::Cell::mnc, details.mobile_network_code.get());
             if (details.tracking_area_code.is_valid())
-                c[Json::Cell::lac] = details.tracking_area_code.get();
+                c.put_int32(Json::Cell::lac, details.tracking_area_code.get());
             if (details.id.is_valid())
-                c[Json::Cell::cid] = details.id.get();
+                c.put_int32(Json::Cell::cid, details.id.get());
             if (details.physical_id.is_valid())
-                c[Json::Cell::psc] = details.physical_id.get();
+                c.put_int32(Json::Cell::psc, details.physical_id.get());
             if  (details.strength.is_valid())
-                c[Json::Cell::asu] = details.strength.get();
+                c.put_int32(Json::Cell::asu, details.strength.get());
             break;
         }
         default:

=== modified file 'src/location_service/com/ubuntu/location/service/ichnaea_reporter.h'
--- src/location_service/com/ubuntu/location/service/ichnaea_reporter.h	2014-06-17 08:06:08 +0000
+++ src/location_service/com/ubuntu/location/service/ichnaea_reporter.h	2014-07-17 20:10:49 +0000
@@ -26,11 +26,95 @@
 #include <core/net/http/response.h>
 #include <core/net/http/status.h>
 
-#include <json/json.h>
-
 #include <thread>
 
-namespace json = Json;
+// Forward declare the opaque json_object handle from json-c here.
+struct json_object;
+
+// We are wrapping libjson-c and introduce a generic Object type for that purpose.
+namespace json
+{
+// For internal purposes only
+class Object
+{
+public:
+    // Parses a new object from the given string.
+    // Throws std::runtime_error in case of parsing errors.
+    static Object parse_from_string(const std::string& s);
+    // Creates a new object of type array.
+    static Object create_array();
+    // Creates a new object of type object.
+    static Object create_object();
+
+    // Shallow copy, only increments reference count.
+    Object(const Object& rhs);
+    // Decrements the reference count of the object.
+    ~Object();
+
+    // Shallow copy, decrements reference count of this object,
+    // increments reference count of object contained in rhs.
+    Object& operator=(const Object& rhs);
+
+    // Encodes this object instance as a valid JSON string without any
+    // unneccessary whitespace
+    std::string to_plain_string();
+
+    // Resolves the object with the given name.
+    // Throws std::out_of_range if no object with the given name is known.
+    Object get(const std::string& name) const;
+
+    // Attempts to resolve the object to a boolean value.
+    // Throws std::logic_error in case of type mismatches.
+    bool to_bool() const;
+    // Attempts to resolve the object to an integer value of 32bit width.
+    // Throws std::logic_error in case of type mismatches.
+    std::int32_t to_int32() const;
+    // Attempts to resolve the object to an integer value of 64bit width.
+    // Throws std::logic_error in case of type mismatches.
+    std::int64_t to_int64() const;
+    // Attempts to resolve the object to a floating point value.
+    // Throws std::logic_error in case of type mismatches.
+    double to_double() const;
+    // Attempts to resolve the object to a string value.
+    // Throws std::logic_error in case of type mismatches.
+    std::string to_string() const;
+
+    // Adds the given array under the given name to this object instance.
+    void put_array(const std::string& name, Object array);
+    // Adds the given object under the given name to this object instance.
+    void put_object(const std::string& name, Object other);
+    // Adds the given boolean under the given name to this object instance.
+    void put_boolean(const std::string& name, bool value);
+    // Adds the given integer under the given name to this object instance.
+    void put_int32(const std::string& name, std::int32_t value);
+    // Adds the given integer under the given name to this object instance.
+    void put_int64(const std::string& name, std::int64_t value);
+    // Adds the given floating point value under the given name to this object instance.
+    void put_double(const std::string& name, double value);
+    // Adds the given string value under the given name to this object instance.
+    void put_string(const std::string& name, const std::string& value);
+
+    // Only valid for array objects
+    // Returns the size of the array, throws std::logic_error if the object
+    // does not represent an array.
+    std::size_t array_size() const;
+    // Appends an object to the end of the array, throws std::logic_error if
+    // the object does not represent an array.
+    void append(Object other);
+    // Replaces the object at index 'index' with the given instance.
+    // Throws std::logic_error if the object does not represent an array.
+    // Throws std::out_of_range if the index exceeds the bounds of the array.
+    void put_object_for_index(std::size_t index, Object other);
+    // Queries the object at index 'index'.
+    // Throws std::logic_error if the object does not represent an array.
+    // Throws std::out_of_range if the index exceeds the bounds of the array.
+    Object get_object_for_index(std::size_t index);
+
+private:
+    Object(json_object* object);
+    json_object* object;
+};
+}
 
 namespace com{namespace ubuntu{namespace location{namespace service
 {
@@ -132,15 +216,17 @@
             const std::vector<connectivity::WirelessNetwork::Ptr>& wifis,
             const std::vector<connectivity::RadioCell::Ptr>& cells) override;
 
+
+
     /** @brief Encodes a collection of wifis into the Mozilla loation service JSON dialect. */
     static void convert_wifis_to_json(
             const std::vector<connectivity::WirelessNetwork::Ptr>& wifis,
-            json::Value& destination);
+            json::Object& destination);
 
     /** @brief Encodes a collection of radio cells into the Mozilla loation service JSON dialect. */
     static void convert_cells_to_json(
             const std::vector<connectivity::RadioCell::Ptr>& cells,
-            json::Value& destination);
+            json::Object& destination);
 
     /** @brief The http request configuration for submissions to the mozilla location service. */
     core::net::http::Request::Configuration submit_request_config;

=== modified file 'src/location_service/com/ubuntu/location/service/stub.cpp'
--- src/location_service/com/ubuntu/location/service/stub.cpp	2014-06-27 07:20:19 +0000
+++ src/location_service/com/ubuntu/location/service/stub.cpp	2014-07-17 20:10:49 +0000
@@ -39,8 +39,6 @@
           is_online(object->get_property<culs::Interface::Properties::IsOnline>()),
           visible_space_vehicles(object->get_property<culs::Interface::Properties::VisibleSpaceVehicles>())
     {
-        FLAGS_logtostderr = true;
-        google::InitGoogleLogging("com.ubuntu.location");
     }
 
     dbus::Bus::Ptr bus;

=== modified file 'symbols.map'
--- symbols.map	2014-05-19 11:41:27 +0000
+++ symbols.map	2014-07-17 20:10:49 +0000
@@ -8,6 +8,7 @@
         virtual?thunk?to?com::ubuntu::location::*;
         vtable?for?com::ubuntu::location::*;
 	std::hash*;
+        json::*;
     };
 local:
     extern "C++" {

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-06-27 19:37:53 +0000
+++ tests/CMakeLists.txt	2014-07-17 20:10:49 +0000
@@ -15,6 +15,10 @@
 
 # Build mongoose as static library to leverage in location reporter testing
 add_library(mongoose mongoose.c)
+# Explicitly select c99 when compiling mongoose
+set_target_properties(
+    mongoose
+    PROPERTIES COMPILE_FLAGS "-std=c99")
 
 # Build with system gmock and embedded gtest
 set (GMOCK_INCLUDE_DIR "/usr/include/gmock/include" CACHE PATH "gmock source include directory")
@@ -74,7 +78,7 @@
 LOCATION_SERVICE_ADD_TEST(engine_test engine_test.cpp)
 LOCATION_SERVICE_ADD_TEST(harvester_test harvester_test.cpp)
 
-if (NET_CPP_FOUND AND JSONCPP_FOUND)
+if (NET_CPP_FOUND)
   LOCATION_SERVICE_ADD_TEST(ichnaea_reporter_test ichnaea_reporter_test.cpp)
 endif()
 

=== modified file 'tests/gps_provider_test.cpp'
--- tests/gps_provider_test.cpp	2014-06-27 20:00:35 +0000
+++ tests/gps_provider_test.cpp	2014-07-17 20:10:49 +0000
@@ -18,8 +18,7 @@
 #include <com/ubuntu/location/providers/gps/provider.h>
 #include <com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.h>
 
-//TODO(tvoss) Reenable
-//#include <com/ubuntu/location/providers/gps/net_cpp_gps_xtra_downloader.h>
+#include <com/ubuntu/location/providers/gps/net_cpp_gps_xtra_downloader.h>
 
 #include <com/ubuntu/location/logging.h>
 #include <com/ubuntu/location/service/program_options.h>
@@ -305,8 +304,6 @@
     hal.space_vehicle_updates_(svs);
 }
 
-// TODO(tvoss): Reenable
-/*
 TEST(GpsXtraDownloader, throws_for_missing_xtra_hosts)
 {
     gps::android::NetCppGpsXtraDownloader downloader;
@@ -322,7 +319,7 @@
     testing::web::server::Configuration configuration
     {
         5000,
-        [&cps](mg_connection* conn)
+        [](mg_connection* conn)
         {
             static char data[data_size];
             for (int i = 0; i < data_size; i++)
@@ -335,10 +332,10 @@
                 header[conn->http_headers[i].name].insert(conn->http_headers[i].value);
             }
 
-            EXPECT_TRUE(header.at("ACCEPT").count("") == 1);
-            EXPECT_TRUE(header.at("ACCEPT").count("application/vnd.wap.mms-message") == 1);
-            EXPECT_TRUE(header.at("ACCEPT").count("application/vnd.wap.sic") == 1);
-            EXPECT_TRUE(header.at("X-WAP-PROFILE")
+            EXPECT_TRUE(header.at("Accept").count("*/*") == 1);
+            EXPECT_TRUE(header.at("Accept").count("application/vnd.wap.mms-message") == 1);
+            EXPECT_TRUE(header.at("Accept").count("application/vnd.wap.sic") == 1);
+            EXPECT_TRUE(header.at("X-Wap-Profile")
                         .count(gps::android::GpsXtraDownloader::x_wap_profile_value) == 1);
 
             mg_send_status(conn, 200);
@@ -354,6 +351,7 @@
 
     cps.wait_for_signal_ready_for(std::chrono::seconds{2});
 
+    std::this_thread::sleep_for(std::chrono::milliseconds{500});
     gps::android::GpsXtraDownloader::Configuration config;
     config.xtra_hosts.push_back("http://127.0.0.1:5000");
 
@@ -399,7 +397,6 @@
     gps::android::NetCppGpsXtraDownloader downloader;
     EXPECT_ANY_THROW(downloader.download_xtra_data(download_config));
 }
-*/
 
 /*****************************************************************
  *                                                               *
@@ -425,9 +422,7 @@
 // and wifi/cell data to Mozilla location service instances. Please note that we feed to the mozilla location service
 // in the general case.
 #include <com/ubuntu/location/service/harvester.h>
-
-// TODO(tvoss): Enable reporting to the Mozilla location service.
-// #include <com/ubuntu/location/service/ichnaea_reporter.h>
+#include <com/ubuntu/location/service/ichnaea_reporter.h>
 
 namespace
 {
@@ -563,21 +558,21 @@
         options.parse_from_environment()
     };
     // The Ichnaea instance and its configuration.
-    //location::service::ichnaea::Reporter::Configuration reporter_configuration
-    //{
-    //    options.value_for_key<std::string>(ichnaea_host),
-    //    options.value_for_key<std::string>(ichnaea_api_key),
-    //    options.value_for_key<std::string>(ichnaea_nickname)
-    //};
-    //std::shared_ptr<location::service::ichnaea::Reporter> reporter
-    //{
-    //    new location::service::ichnaea::Reporter{reporter_configuration}
-    //};
+    location::service::ichnaea::Reporter::Configuration reporter_configuration
+    {
+        options.value_for_key<std::string>(ichnaea_host),
+        options.value_for_key<std::string>(ichnaea_api_key),
+        options.value_for_key<std::string>(ichnaea_nickname)
+    };
+    std::shared_ptr<location::service::ichnaea::Reporter> reporter
+    {
+        new location::service::ichnaea::Reporter{reporter_configuration}
+    };
     // The harvester instance and its configuration.
     location::service::Harvester::Configuration harvester_configuration
     {
         location::connectivity::platform_default_manager(),
-        location::service::Harvester::Reporter::Ptr{new NullReporter{}}
+        reporter
     };
     location::service::Harvester harvester
     {

=== modified file 'tests/ichnaea_reporter_test.cpp'
--- tests/ichnaea_reporter_test.cpp	2014-06-23 10:39:05 +0000
+++ tests/ichnaea_reporter_test.cpp	2014-07-17 20:10:49 +0000
@@ -26,14 +26,13 @@
 #include <core/testing/cross_process_sync.h>
 #include <core/testing/fork_and_run.h>
 
-#include <json/json.h>
+#include <json.h>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
 #include <condition_variable>
 
-namespace json = Json;
 namespace location = com::ubuntu::location;
 
 namespace
@@ -175,40 +174,37 @@
 
             using namespace location::service::ichnaea;
 
-            json::Reader reader;
-            json::Value result;
-
-            EXPECT_TRUE(reader.parse(conn->content, result));
-
-            auto items = result[Reporter::Json::items];
-            EXPECT_EQ(1u, items.size());
-
-            auto item = items[0];
-            EXPECT_EQ("gsm", item[Reporter::Json::radio].asString());
+            json::Object object = json::Object::parse_from_string(conn->content);
+
+            auto items = object.get(Reporter::Json::items);
+            EXPECT_EQ(1u, items.array_size());
+
+            auto item = items.get_object_for_index(0);
+            EXPECT_EQ("gsm", item.get(Reporter::Json::radio).to_string());
 
             EXPECT_DOUBLE_EQ(
                         reference_position_update.value.latitude.value.value(),
-                        item[Reporter::Json::lat].asDouble());
+                        item.get(Reporter::Json::lat).to_double());
             EXPECT_DOUBLE_EQ(
                         reference_position_update.value.longitude.value.value(),
-                        item[Reporter::Json::lon].asDouble());
-
-            auto wifis = item[Reporter::Json::wifi];
-            EXPECT_EQ(1u, wifis.size());
-
-            auto wifi = wifis[0];
-            EXPECT_EQ(ref_bssid.get(), wifi[Reporter::Json::Wifi::key].asString());
-            EXPECT_EQ(ref_frequency->get(), wifi[Reporter::Json::Wifi::frequency].asInt());
-
-            auto cells = item[Reporter::Json::cell];
-            EXPECT_EQ(1u, cells.size());
-
-            auto cell = cells[0];
-            EXPECT_EQ(ref_cell->gsm().mobile_country_code.get(), cell[Reporter::Json::Cell::mcc].asInt());
-            EXPECT_EQ(ref_cell->gsm().mobile_network_code.get(), cell[Reporter::Json::Cell::mnc].asInt());
-            EXPECT_EQ(ref_cell->gsm().location_area_code.get(), cell[Reporter::Json::Cell::lac].asInt());
-            EXPECT_EQ(ref_cell->gsm().id.get(), cell[Reporter::Json::Cell::cid].asInt());
-            EXPECT_EQ(ref_cell->gsm().strength.get(), cell[Reporter::Json::Cell::asu].asInt());
+                        item.get(Reporter::Json::lon).to_double());
+
+            auto wifis = item.get(Reporter::Json::wifi);
+            EXPECT_EQ(1u, wifis.array_size());
+
+            auto wifi = wifis.get_object_for_index(0);
+            EXPECT_EQ(ref_bssid.get(), wifi.get(Reporter::Json::Wifi::key).to_string());
+            EXPECT_EQ(ref_frequency->get(), wifi.get(Reporter::Json::Wifi::frequency).to_int32());
+
+            auto cells = item.get(Reporter::Json::cell);
+            EXPECT_EQ(1u, cells.array_size());
+
+            auto cell = cells.get_object_for_index(0);
+            EXPECT_EQ(ref_cell->gsm().mobile_country_code.get(), cell.get(Reporter::Json::Cell::mcc).to_int32());
+            EXPECT_EQ(ref_cell->gsm().mobile_network_code.get(), cell.get(Reporter::Json::Cell::mnc).to_int32());
+            EXPECT_EQ(ref_cell->gsm().location_area_code.get(), cell.get(Reporter::Json::Cell::lac).to_int32());
+            EXPECT_EQ(ref_cell->gsm().id.get(), cell.get(Reporter::Json::Cell::cid).to_int32());
+            EXPECT_EQ(ref_cell->gsm().strength.get(), cell.get(Reporter::Json::Cell::asu).to_int32());
 
             mg_send_status(conn, static_cast<int>(submit::success));
             return MG_TRUE;