From a34e5e51d8c0e2a0c8b6224db806dfe20d0319ce Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Wed, 10 Oct 2018 20:57:29 -0400
Subject: telemetry_json: Remove unnecessary includes

Removes unused includes. Also rectifies a missing <chrono> include.
---
 src/web_service/telemetry_json.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/web_service/telemetry_json.h')

diff --git a/src/web_service/telemetry_json.h b/src/web_service/telemetry_json.h
index 0fe6f9a3e..72627a416 100644
--- a/src/web_service/telemetry_json.h
+++ b/src/web_service/telemetry_json.h
@@ -5,10 +5,10 @@
 #pragma once
 
 #include <array>
+#include <chrono>
 #include <string>
 #include <json.hpp>
 #include "common/telemetry.h"
-#include "common/web_result.h"
 
 namespace WebService {
 
-- 
cgit v1.2.3


From 881bb2295d40c50a401cd05fff8eeb822ec577e9 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Wed, 10 Oct 2018 20:59:25 -0400
Subject: telemetry_json: Take std::string parameters by value

Taking them by const reference isn't advisable here, because it means
the std::move calls were doing nothing and we were always copying the
std::string instances.
---
 src/web_service/telemetry_json.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/web_service/telemetry_json.h')

diff --git a/src/web_service/telemetry_json.h b/src/web_service/telemetry_json.h
index 72627a416..92ead9856 100644
--- a/src/web_service/telemetry_json.h
+++ b/src/web_service/telemetry_json.h
@@ -18,7 +18,7 @@ namespace WebService {
  */
 class TelemetryJson : public Telemetry::VisitorInterface {
 public:
-    TelemetryJson(const std::string& host, const std::string& username, const std::string& token);
+    TelemetryJson(std::string host, std::string username, std::string token);
     ~TelemetryJson();
 
     void Visit(const Telemetry::Field<bool>& field) override;
-- 
cgit v1.2.3


From c422f146eefc49c23b39753c2bc6f2243bb3b808 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Wed, 10 Oct 2018 21:00:39 -0400
Subject: telemetry_json: Add missing override specifier to the destructor of
 TelemetryJson

---
 src/web_service/telemetry_json.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/web_service/telemetry_json.h')

diff --git a/src/web_service/telemetry_json.h b/src/web_service/telemetry_json.h
index 92ead9856..9a2aaa2c8 100644
--- a/src/web_service/telemetry_json.h
+++ b/src/web_service/telemetry_json.h
@@ -19,7 +19,7 @@ namespace WebService {
 class TelemetryJson : public Telemetry::VisitorInterface {
 public:
     TelemetryJson(std::string host, std::string username, std::string token);
-    ~TelemetryJson();
+    ~TelemetryJson() override;
 
     void Visit(const Telemetry::Field<bool>& field) override;
     void Visit(const Telemetry::Field<double>& field) override;
-- 
cgit v1.2.3


From a7725d354cf118b2299ed197d4b88ff48ebc1341 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Wed, 10 Oct 2018 21:04:19 -0400
Subject: telemetry_json: Use the PImpl idiom to avoid unnecessary dependency
 exposure

Users of the web_service library shouldn't need to care about an
external library like json.h. However, given it's exposed in our
interface, this requires that other libraries publicly link in the JSON
library. We can do better.

By using the PImpl idiom, we can hide this dependency in the cpp file
and remove the need to link that library in altogether.
---
 src/web_service/telemetry_json.h | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'src/web_service/telemetry_json.h')

diff --git a/src/web_service/telemetry_json.h b/src/web_service/telemetry_json.h
index 9a2aaa2c8..93371414a 100644
--- a/src/web_service/telemetry_json.h
+++ b/src/web_service/telemetry_json.h
@@ -4,10 +4,8 @@
 
 #pragma once
 
-#include <array>
 #include <chrono>
 #include <string>
-#include <json.hpp>
 #include "common/telemetry.h"
 
 namespace WebService {
@@ -39,20 +37,8 @@ public:
     void Complete() override;
 
 private:
-    nlohmann::json& TopSection() {
-        return sections[static_cast<u8>(Telemetry::FieldType::None)];
-    }
-
-    template <class T>
-    void Serialize(Telemetry::FieldType type, const std::string& name, T value);
-
-    void SerializeSection(Telemetry::FieldType type, const std::string& name);
-
-    nlohmann::json output;
-    std::array<nlohmann::json, 7> sections;
-    std::string host;
-    std::string username;
-    std::string token;
+    struct Impl;
+    std::unique_ptr<Impl> impl;
 };
 
 } // namespace WebService
-- 
cgit v1.2.3