From 972de0777c36e8031ac595ca82a816cf01649ddc Mon Sep 17 00:00:00 2001
From: Lars Toenning <dev@ltoenning.de>
Date: Tue, 12 Mar 2024 15:56:48 +0100
Subject: [PATCH] refactor: Remove non-watchdog related method from WatchDog

---
 src/blackcore/db/databasereader.cpp  |  3 +--
 src/blackcore/db/networkwatchdog.cpp | 12 ------------
 src/blackcore/db/networkwatchdog.h   |  8 --------
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/blackcore/db/databasereader.cpp b/src/blackcore/db/databasereader.cpp
index 54d372a17..e5934c57f 100644
--- a/src/blackcore/db/databasereader.cpp
+++ b/src/blackcore/db/databasereader.cpp
@@ -4,7 +4,6 @@
 #include "blackcore/db/databasereader.h"
 #include "blackcore/db/infodatareader.h"
 #include "blackcore/db/databaseutils.h"
-#include "blackcore/db/networkwatchdog.h"
 #include "blackcore/webdataservices.h"
 #include "blackcore/application.h"
 #include "blackmisc/db/datastoreutility.h"
@@ -794,7 +793,7 @@ namespace BlackCore::Db
 
     bool CDatabaseReader::JsonDatastoreResponse::isLoadedFromDb() const
     {
-        return CNetworkWatchdog::isDbUrl(this->getUrl());
+        return this->getUrl().getHost() == getDbUrl().getHost();
     }
 
     void CDatabaseReader::JsonDatastoreResponse::setJsonArray(const QJsonArray &value)
diff --git a/src/blackcore/db/networkwatchdog.cpp b/src/blackcore/db/networkwatchdog.cpp
index cadcc0cb5..02a8bb8c7 100644
--- a/src/blackcore/db/networkwatchdog.cpp
+++ b/src/blackcore/db/networkwatchdog.cpp
@@ -96,12 +96,6 @@ namespace BlackCore::Db
         m_workingSharedUrl = workingUrl;
     }
 
-    bool CNetworkWatchdog::isDbUrl(const CUrl &url)
-    {
-        const QString host(url.getHost());
-        return host == dbHost();
-    }
-
     void CNetworkWatchdog::doWork()
     {
         if (!this->doWorkCheck()) { return; }
@@ -353,12 +347,6 @@ namespace BlackCore::Db
         return testUrl;
     }
 
-    QString CNetworkWatchdog::dbHost()
-    {
-        const QString host = dbTestUrl().getHost();
-        return host;
-    }
-
     CUrl CNetworkWatchdog::workingSharedUrlFromSetup()
     {
         const CUrlList urls(sApp->getGlobalSetup().getSwiftSharedUrls());
diff --git a/src/blackcore/db/networkwatchdog.h b/src/blackcore/db/networkwatchdog.h
index ec450c027..b6fe446a4 100644
--- a/src/blackcore/db/networkwatchdog.h
+++ b/src/blackcore/db/networkwatchdog.h
@@ -126,10 +126,6 @@ namespace BlackCore::Db
         //! \threadsafe
         bool isNetworkAccessibilityCheckEnabled() const { return !this->isNetworkAccessibilityCheckDisabled(); }
 
-        //! URL referring to the DB
-        //! \remark depends on BlackCore::Application::getGlobalSetup()
-        static bool isDbUrl(const BlackMisc::Network::CUrl &url);
-
         //! The URL being tested
         //! \remark depends on BlackCore::Application::getGlobalSetup()
         //! \private primarily accessible for unit tests
@@ -164,10 +160,6 @@ namespace BlackCore::Db
         //! Received reply of client service ping
         void replyPingClientService(QNetworkReply *nwReply);
 
-        //! The DB server
-        //! \remark depends on BlackCore::Application::getGlobalSetup()
-        static QString dbHost();
-
         //! Obtain working DB data file location URL
         //! \remark depends on BlackCore::Application::getGlobalSetup()
         static BlackMisc::Network::CUrl workingSharedUrlFromSetup();