From 1b6af5e28d50c3a1152981537a385dfbb9a049a9 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@collabora.com>
Date: Thu, 18 Apr 2024 19:47:57 +0100
Subject: [PATCH] killpoco: remove lots of redundant JSON includes.

Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
Change-Id: I976c5b8d6763cbbf0ee5cadfa2f7335ec719fe85
---
 common/JsonUtil.hpp                   |  2 ++
 common/MessageQueue.cpp               |  4 +---
 common/Unit.cpp                       |  3 +--
 common/Util.cpp                       |  5 ++---
 kit/ChildSession.cpp                  |  2 --
 kit/Kit.cpp                           |  3 +--
 test/WopiTestServer.hpp               |  2 +-
 test/helpers.hpp                      |  4 +---
 test/httpcrashtest.cpp                |  2 --
 wsd/Auth.cpp                          |  3 +--
 wsd/ClientSession.cpp                 |  1 -
 wsd/DocumentBroker.cpp                |  1 -
 wsd/DocumentBroker.hpp                | 10 +++++++++-
 wsd/FileServer.cpp                    |  2 +-
 wsd/FileServerUtil.cpp                |  2 +-
 wsd/SenderQueue.hpp                   |  6 +-----
 wsd/Storage.cpp                       |  2 --
 wsd/Storage.hpp                       |  1 -
 wsd/wopi/StorageConnectionManager.cpp |  3 ---
 wsd/wopi/WopiProxy.cpp                |  2 --
 wsd/wopi/WopiStorage.cpp              |  2 --
 21 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/common/JsonUtil.hpp b/common/JsonUtil.hpp
index db3e2b4bf7..564812e0e6 100644
--- a/common/JsonUtil.hpp
+++ b/common/JsonUtil.hpp
@@ -20,8 +20,10 @@
 #include <string>
 #include <vector>
 
+#include <Poco/Dynamic/Var.h>
 #include <Poco/JSON/Object.h>
 #include <Poco/JSON/Parser.h>
+
 namespace JsonUtil
 {
 
diff --git a/common/MessageQueue.cpp b/common/MessageQueue.cpp
index 731e214767..ecfe587180 100644
--- a/common/MessageQueue.cpp
+++ b/common/MessageQueue.cpp
@@ -18,9 +18,7 @@
 #include <string_view>
 #include <iostream>
 
-#include <Poco/JSON/JSON.h>
-#include <Poco/JSON/Object.h>
-#include <Poco/JSON/Parser.h>
+#include "JsonUtil.hpp"
 
 #include "Protocol.hpp"
 #include "Log.hpp"
diff --git a/common/Unit.cpp b/common/Unit.cpp
index c3a98dcf10..0ae6c81c67 100644
--- a/common/Unit.cpp
+++ b/common/Unit.cpp
@@ -19,8 +19,7 @@
 #include <sysexits.h>
 #include <thread>
 
-#include <Poco/JSON/Object.h>
-#include <Poco/JSON/Parser.h>
+#include "JsonUtil.hpp"
 #include <Poco/Util/LayeredConfiguration.h>
 #include <Poco/Util/Application.h>
 
diff --git a/common/Util.cpp b/common/Util.cpp
index f5ee9ae6fb..cb80c494ed 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -62,14 +62,13 @@
 #include <Poco/ConsoleChannel.h>
 #include <Poco/Exception.h>
 #include <Poco/Format.h>
-#include <Poco/JSON/JSON.h>
-#include <Poco/JSON/Object.h>
-#include <Poco/JSON/Parser.h>
+
 #include <Poco/TemporaryFile.h>
 #include <Poco/Util/Application.h>
 #include <Poco/URI.h>
 
 #include "Log.hpp"
+#include "JsonUtil.hpp"
 #include "Protocol.hpp"
 #include "TraceEvent.hpp"
 
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index d0dc126d2e..51b0b2214c 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -24,8 +24,6 @@
 #define LOK_USE_UNSTABLE_API
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 
-#include <Poco/JSON/Object.h>
-#include <Poco/JSON/Parser.h>
 #include <Poco/StreamCopier.h>
 #include <Poco/URI.h>
 #include <Poco/BinaryReader.h>
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 841f1dacaf..dfb15076d8 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -57,8 +57,6 @@
 
 #include <Poco/File.h>
 #include <Poco/Exception.h>
-#include <Poco/JSON/Object.h>
-#include <Poco/JSON/Parser.h>
 #include <Poco/URI.h>
 
 #include "ChildSession.hpp"
@@ -76,6 +74,7 @@
 #include <Unit.hpp>
 #include <UserMessages.hpp>
 #include <Util.hpp>
+#include <JsonUtil.hpp>
 #include "Watermark.hpp"
 #include "RenderTiles.hpp"
 #include "KitWebSocket.hpp"
diff --git a/test/WopiTestServer.hpp b/test/WopiTestServer.hpp
index 326db29ca9..004b764564 100644
--- a/test/WopiTestServer.hpp
+++ b/test/WopiTestServer.hpp
@@ -21,7 +21,7 @@
 #include "StringVector.hpp"
 #include "lokassert.hpp"
 
-#include <Poco/JSON/Object.h>
+#include <JsonUtil.hpp>
 #include <Poco/URI.h>
 #include <Poco/Util/LayeredConfiguration.h>
 
diff --git a/test/helpers.hpp b/test/helpers.hpp
index bfea48d1e8..333c63055d 100644
--- a/test/helpers.hpp
+++ b/test/helpers.hpp
@@ -23,9 +23,7 @@
 #include <wsd/TileDesc.hpp>
 
 #include <Poco/BinaryReader.h>
-#include <Poco/Dynamic/Var.h>
-#include <Poco/JSON/JSON.h>
-#include <Poco/JSON/Parser.h>
+#include <JsonUtil.hpp>
 #include <Poco/Net/HTTPClientSession.h>
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/Net/HTTPResponse.h>
diff --git a/test/httpcrashtest.cpp b/test/httpcrashtest.cpp
index 649ecad314..a8a6417d36 100644
--- a/test/httpcrashtest.cpp
+++ b/test/httpcrashtest.cpp
@@ -19,8 +19,6 @@
 #include <cstring>
 
 #include <Poco/Dynamic/Var.h>
-#include <Poco/JSON/JSON.h>
-#include <Poco/JSON/Parser.h>
 #include <Poco/Net/AcceptCertificateHandler.h>
 #include <Poco/Net/HTTPResponse.h>
 #include <Poco/Net/InvalidCertificateHandler.h>
diff --git a/wsd/Auth.cpp b/wsd/Auth.cpp
index 41c408c781..cb855aa058 100644
--- a/wsd/Auth.cpp
+++ b/wsd/Auth.cpp
@@ -21,8 +21,6 @@
 #include <Poco/Crypto/RSADigestEngine.h>
 #include <Poco/Crypto/RSAKey.h>
 #include <Poco/Dynamic/Var.h>
-#include <Poco/JSON/Object.h>
-#include <Poco/JSON/Parser.h>
 #include <Poco/LineEndingConverter.h>
 #include <Poco/Net/HTTPClientSession.h>
 #include <Poco/Net/HTTPRequest.h>
@@ -31,6 +29,7 @@
 #include <Poco/URI.h>
 
 #include <Log.hpp>
+#include <JsonUtil.hpp>
 #include <Util.hpp>
 #include <Protocol.hpp>
 #include "COOLWSD.hpp"
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index c04d4fa9cc..11cf8776db 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -24,7 +24,6 @@
 #include <Poco/Net/HTTPResponse.h>
 #include <Poco/StreamCopier.h>
 #include <Poco/URI.h>
-#include <Poco/JSON/Object.h>
 
 #include "DocumentBroker.hpp"
 #include "COOLWSD.hpp"
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 0b67852609..2fceaaa951 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -26,7 +26,6 @@
 
 #include <Poco/DigestStream.h>
 #include <Poco/Exception.h>
-#include <Poco/JSON/Object.h>
 #include <Poco/Path.h>
 #include <Poco/SHA1Engine.h>
 #include <Poco/StreamCopier.h>
diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp
index f3272f5633..d4934ca28c 100644
--- a/wsd/DocumentBroker.hpp
+++ b/wsd/DocumentBroker.hpp
@@ -21,6 +21,7 @@
 #include <string>
 #include <utility>
 
+#include <Poco/SharedPtr.h>
 #include <Poco/URI.h>
 
 #include "Log.hpp"
@@ -48,6 +49,13 @@ struct LockContext;
 class TileCache;
 class Message;
 
+namespace Poco {
+    namespace JSON {
+        class Object;
+    };
+};
+
+
 class UrpHandler : public SimpleSocketHandler
 {
 public:
@@ -366,7 +374,7 @@ public:
     /// Handle the save response from Core and upload to storage as necessary.
     /// Also notifies clients of the result.
     void handleSaveResponse(const std::shared_ptr<ClientSession>& session,
-                            const Poco::JSON::Object::Ptr& json);
+                            const Poco::SharedPtr<Poco::JSON::Object>& json);
 
     /// Check if uploading is needed, and start uploading.
     /// The current state of uploading must be introspected separately.
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 74a288c9e2..ffb737ccd8 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -26,6 +26,7 @@
 #include <Log.hpp>
 #include <Protocol.hpp>
 #include <Util.hpp>
+#include <JsonUtil.hpp>
 #include <common/ConfigUtil.hpp>
 #include <common/LangUtil.hpp>
 #if !MOBILEAPP
@@ -38,7 +39,6 @@
 #include <Poco/DateTimeFormatter.h>
 #include <Poco/Exception.h>
 #include <Poco/FileStream.h>
-#include <Poco/JSON/Object.h>
 #include <Poco/MemoryStream.h>
 #include <Poco/Net/HTMLForm.h>
 #include <Poco/Net/HTTPBasicCredentials.h>
diff --git a/wsd/FileServerUtil.cpp b/wsd/FileServerUtil.cpp
index 970b27c8f1..648413e7c4 100644
--- a/wsd/FileServerUtil.cpp
+++ b/wsd/FileServerUtil.cpp
@@ -14,7 +14,7 @@
 #include "FileServer.hpp"
 #include "StringVector.hpp"
 
-#include <Poco/JSON/Object.h>
+#include <JsonUtil.hpp>
 
 #include <cctype>
 
diff --git a/wsd/SenderQueue.hpp b/wsd/SenderQueue.hpp
index e448a68e30..384eeb5bd8 100644
--- a/wsd/SenderQueue.hpp
+++ b/wsd/SenderQueue.hpp
@@ -14,11 +14,7 @@
 #include "common/SigUtil.hpp"
 #include "Log.hpp"
 #include "TileDesc.hpp"
-
-#include <Poco/Dynamic/Var.h>
-#include <Poco/JSON/JSON.h>
-#include <Poco/JSON/Object.h>
-#include <Poco/JSON/Parser.h>
+#include "JsonUtil.hpp"
 
 #include <deque>
 #include <mutex>
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index d9cbd44db8..acb44053b7 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -17,8 +17,6 @@
 #include <string>
 
 #include <Poco/Exception.h>
-#include <Poco/JSON/Object.h>
-#include <Poco/JSON/Parser.h>
 
 #if !MOBILEAPP
 
diff --git a/wsd/Storage.hpp b/wsd/Storage.hpp
index e19da73112..517af716e1 100644
--- a/wsd/Storage.hpp
+++ b/wsd/Storage.hpp
@@ -19,7 +19,6 @@
 
 #include <Poco/URI.h>
 #include <Poco/Util/Application.h>
-#include <Poco/JSON/Object.h>
 
 #include "HttpRequest.hpp"
 #include "COOLWSD.hpp"
diff --git a/wsd/wopi/StorageConnectionManager.cpp b/wsd/wopi/StorageConnectionManager.cpp
index c9e587a326..b7449c42f5 100644
--- a/wsd/wopi/StorageConnectionManager.cpp
+++ b/wsd/wopi/StorageConnectionManager.cpp
@@ -48,9 +48,6 @@
 #endif
 
 #include <Poco/Exception.h>
-#include <Poco/JSON/Object.h>
-#include <Poco/JSON/Parser.h>
-#include <Poco/StreamCopier.h>
 #include <Poco/URI.h>
 
 #include <iconv.h>
diff --git a/wsd/wopi/WopiProxy.cpp b/wsd/wopi/WopiProxy.cpp
index 4788856a0e..9df822c61c 100644
--- a/wsd/wopi/WopiProxy.cpp
+++ b/wsd/wopi/WopiProxy.cpp
@@ -24,8 +24,6 @@
 #include <wopi/StorageConnectionManager.hpp>
 #include <wopi/WopiStorage.hpp>
 
-#include <Poco/JSON/Object.h>
-
 void WopiProxy::handleRequest([[maybe_unused]] const std::shared_ptr<TerminatingPoll>& poll,
                               SocketDisposition& disposition)
 {
diff --git a/wsd/wopi/WopiStorage.cpp b/wsd/wopi/WopiStorage.cpp
index 2e98dce911..66492697f1 100644
--- a/wsd/wopi/WopiStorage.cpp
+++ b/wsd/wopi/WopiStorage.cpp
@@ -29,8 +29,6 @@
 #include <common/TraceEvent.hpp>
 
 #include <Poco/Exception.h>
-#include <Poco/JSON/Object.h>
-#include <Poco/JSON/Parser.h>
 #include <Poco/Net/AcceptCertificateHandler.h>
 #include <Poco/Net/Context.h>
 #include <Poco/Net/DNS.h>