From 371c2f76c2611f584b5f6116ceaf957bb89fbe8e Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 14 Nov 2018 00:28:24 +0100 Subject: [PATCH] move servers into subdir, cleanup some includes --- libnymea-core/debugreportgenerator.cpp | 1 + libnymea-core/debugserverhandler.cpp | 11 +++- libnymea-core/debugserverhandler.h | 2 +- libnymea-core/jsonrpc/jsonrpcserver.cpp | 1 - libnymea-core/libnymea-core.pro | 64 +++++++++---------- libnymea-core/nymeacore.h | 1 + libnymea-core/servermanager.cpp | 11 ++++ libnymea-core/servermanager.h | 24 ++++--- .../{ => servers}/bluetoothserver.cpp | 0 libnymea-core/{ => servers}/bluetoothserver.h | 0 libnymea-core/{ => servers}/httpreply.cpp | 0 libnymea-core/{ => servers}/httpreply.h | 0 libnymea-core/{ => servers}/httprequest.cpp | 0 libnymea-core/{ => servers}/httprequest.h | 0 libnymea-core/{ => servers}/mocktcpserver.cpp | 0 libnymea-core/{ => servers}/mocktcpserver.h | 0 .../rest/deviceclassesresource.cpp | 2 +- .../rest/deviceclassesresource.h | 2 +- .../{ => servers}/rest/devicesresource.cpp | 4 +- .../{ => servers}/rest/devicesresource.h | 2 +- .../{ => servers}/rest/logsresource.cpp | 2 +- .../{ => servers}/rest/logsresource.h | 2 +- .../{ => servers}/rest/pluginsresource.cpp | 2 +- .../{ => servers}/rest/pluginsresource.h | 2 +- .../{ => servers}/rest/restresource.cpp | 2 +- .../{ => servers}/rest/restresource.h | 4 +- .../{ => servers}/rest/restserver.cpp | 4 +- libnymea-core/{ => servers}/rest/restserver.h | 2 +- .../{ => servers}/rest/rulesresource.cpp | 2 +- .../{ => servers}/rest/rulesresource.h | 2 +- .../{ => servers}/rest/vendorsresource.cpp | 2 +- .../{ => servers}/rest/vendorsresource.h | 2 +- libnymea-core/{ => servers}/tcpserver.cpp | 0 libnymea-core/{ => servers}/tcpserver.h | 0 libnymea-core/{ => servers}/webserver.cpp | 0 libnymea-core/{ => servers}/webserver.h | 0 .../{ => servers}/websocketserver.cpp | 0 libnymea-core/{ => servers}/websocketserver.h | 0 libnymea-core/usermanager.cpp | 1 + server/main.cpp | 1 + tests/auto/actions/testactions.cpp | 10 --- .../configurations/testconfigurations.cpp | 11 +--- tests/auto/devices/testdevices.cpp | 8 --- tests/auto/events/testevents.cpp | 10 --- tests/auto/jsonrpc/testjsonrpc.cpp | 14 +--- tests/auto/logging/testlogging.cpp | 10 +-- tests/auto/nymeatestbase.cpp | 16 +---- tests/auto/nymeatestbase.h | 10 --- tests/auto/plugins/testplugins.cpp | 10 --- .../testrestdeviceclasses.cpp | 14 ---- tests/auto/restdevices/testrestdevices.cpp | 14 ---- tests/auto/restlogging/testrestlogging.cpp | 9 +-- tests/auto/restplugins/testrestplugins.cpp | 14 ---- tests/auto/restrules/testrestrules.cpp | 14 ---- tests/auto/restvendors/testrestvendors.cpp | 14 ---- tests/auto/rules/testrules.cpp | 11 +--- tests/auto/states/teststates.cpp | 10 --- tests/auto/tags/testtags.cpp | 12 +--- tests/auto/timemanager/testtimemanager.cpp | 13 +--- tests/auto/versioning/testversioning.cpp | 10 --- tests/auto/webserver/testwebserver.cpp | 13 ---- .../websocketserver/testwebsocketserver.cpp | 10 --- 62 files changed, 99 insertions(+), 313 deletions(-) rename libnymea-core/{ => servers}/bluetoothserver.cpp (100%) rename libnymea-core/{ => servers}/bluetoothserver.h (100%) rename libnymea-core/{ => servers}/httpreply.cpp (100%) rename libnymea-core/{ => servers}/httpreply.h (100%) rename libnymea-core/{ => servers}/httprequest.cpp (100%) rename libnymea-core/{ => servers}/httprequest.h (100%) rename libnymea-core/{ => servers}/mocktcpserver.cpp (100%) rename libnymea-core/{ => servers}/mocktcpserver.h (100%) rename libnymea-core/{ => servers}/rest/deviceclassesresource.cpp (99%) rename libnymea-core/{ => servers}/rest/deviceclassesresource.h (98%) rename libnymea-core/{ => servers}/rest/devicesresource.cpp (99%) rename libnymea-core/{ => servers}/rest/devicesresource.h (99%) rename libnymea-core/{ => servers}/rest/logsresource.cpp (99%) rename libnymea-core/{ => servers}/rest/logsresource.h (98%) rename libnymea-core/{ => servers}/rest/pluginsresource.cpp (99%) rename libnymea-core/{ => servers}/rest/pluginsresource.h (98%) rename libnymea-core/{ => servers}/rest/restresource.cpp (99%) rename libnymea-core/{ => servers}/rest/restresource.h (98%) rename libnymea-core/{ => servers}/rest/restserver.cpp (99%) rename libnymea-core/{ => servers}/rest/restserver.h (98%) rename libnymea-core/{ => servers}/rest/rulesresource.cpp (99%) rename libnymea-core/{ => servers}/rest/rulesresource.h (99%) rename libnymea-core/{ => servers}/rest/vendorsresource.cpp (99%) rename libnymea-core/{ => servers}/rest/vendorsresource.h (98%) rename libnymea-core/{ => servers}/tcpserver.cpp (100%) rename libnymea-core/{ => servers}/tcpserver.h (100%) rename libnymea-core/{ => servers}/webserver.cpp (100%) rename libnymea-core/{ => servers}/webserver.h (100%) rename libnymea-core/{ => servers}/websocketserver.cpp (100%) rename libnymea-core/{ => servers}/websocketserver.h (100%) diff --git a/libnymea-core/debugreportgenerator.cpp b/libnymea-core/debugreportgenerator.cpp index acc64440..b0a112eb 100644 --- a/libnymea-core/debugreportgenerator.cpp +++ b/libnymea-core/debugreportgenerator.cpp @@ -22,6 +22,7 @@ #include "loggingcategories.h" #include "nymeasettings.h" #include "nymeacore.h" +#include "nymeaconfiguration.h" #include #include diff --git a/libnymea-core/debugserverhandler.cpp b/libnymea-core/debugserverhandler.cpp index 2a350f68..d6db2f8a 100644 --- a/libnymea-core/debugserverhandler.cpp +++ b/libnymea-core/debugserverhandler.cpp @@ -19,21 +19,28 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "nymeacore.h" -#include "httpreply.h" +#include "servers/httprequest.h" +#include "servers/httpreply.h" +#include "servers/rest/restresource.h" #include "nymeasettings.h" -#include "httprequest.h" #include "loggingcategories.h" #include "debugserverhandler.h" +#include "nymeaconfiguration.h" #include "stdio.h" #include #include #include #include +#include +#include +#include +#include QtMessageHandler DebugServerHandler::s_oldLogMessageHandler = nullptr; QList DebugServerHandler::s_websocketClients; + namespace nymeaserver { DebugServerHandler::DebugServerHandler(QObject *parent) : diff --git a/libnymea-core/debugserverhandler.h b/libnymea-core/debugserverhandler.h index 92ed51a9..a42b1146 100644 --- a/libnymea-core/debugserverhandler.h +++ b/libnymea-core/debugserverhandler.h @@ -27,8 +27,8 @@ #include #include -#include "httpreply.h" #include "debugreportgenerator.h" +#include "servers/httpreply.h" namespace nymeaserver { diff --git a/libnymea-core/jsonrpc/jsonrpcserver.cpp b/libnymea-core/jsonrpc/jsonrpcserver.cpp index f7e214b5..8422c3c2 100644 --- a/libnymea-core/jsonrpc/jsonrpcserver.cpp +++ b/libnymea-core/jsonrpc/jsonrpcserver.cpp @@ -54,7 +54,6 @@ #include "eventhandler.h" #include "logginghandler.h" #include "statehandler.h" -#include "websocketserver.h" #include "configurationhandler.h" #include "networkmanagerhandler.h" #include "tagshandler.h" diff --git a/libnymea-core/libnymea-core.pro b/libnymea-core/libnymea-core.pro index a5d1b287..6a78c2b0 100644 --- a/libnymea-core/libnymea-core.pro +++ b/libnymea-core/libnymea-core.pro @@ -16,19 +16,27 @@ RESOURCES += $$top_srcdir/icons.qrc \ HEADERS += nymeacore.h \ - tcpserver.h \ - mocktcpserver.h \ ruleengine.h \ rule.h \ stateevaluator.h \ - webserver.h \ transportinterface.h \ - servermanager.h \ - httprequest.h \ - websocketserver.h \ - httpreply.h \ nymeaconfiguration.h \ - bluetoothserver.h \ + servermanager.h \ + servers/tcpserver.h \ + servers/mocktcpserver.h \ + servers/webserver.h \ + servers/httprequest.h \ + servers/httpreply.h \ + servers/bluetoothserver.h \ + servers/rest/restserver.h \ + servers/rest/restresource.h \ + servers/rest/devicesresource.h \ + servers/rest/deviceclassesresource.h \ + servers/rest/vendorsresource.h \ + servers/rest/logsresource.h \ + servers/rest/pluginsresource.h \ + servers/rest/rulesresource.h \ + servers/websocketserver.h \ jsonrpc/jsonrpcserver.h \ jsonrpc/jsonhandler.h \ jsonrpc/devicehandler.h \ @@ -45,14 +53,6 @@ HEADERS += nymeacore.h \ logging/logfilter.h \ logging/logentry.h \ logging/logvaluetool.h \ - rest/restserver.h \ - rest/restresource.h \ - rest/devicesresource.h \ - rest/deviceclassesresource.h \ - rest/vendorsresource.h \ - rest/logsresource.h \ - rest/pluginsresource.h \ - rest/rulesresource.h \ time/timedescriptor.h \ time/calendaritem.h \ time/repeatingoption.h \ @@ -100,19 +100,27 @@ HEADERS += nymeacore.h \ debugreportgenerator.h SOURCES += nymeacore.cpp \ - tcpserver.cpp \ - mocktcpserver.cpp \ ruleengine.cpp \ rule.cpp \ stateevaluator.cpp \ - webserver.cpp \ transportinterface.cpp \ - servermanager.cpp \ - httprequest.cpp \ - websocketserver.cpp \ - httpreply.cpp \ nymeaconfiguration.cpp \ - bluetoothserver.cpp \ + servermanager.cpp \ + servers/tcpserver.cpp \ + servers/mocktcpserver.cpp \ + servers/webserver.cpp \ + servers/httprequest.cpp \ + servers/httpreply.cpp \ + servers/websocketserver.cpp \ + servers/bluetoothserver.cpp \ + servers/rest/restserver.cpp \ + servers/rest/restresource.cpp \ + servers/rest/devicesresource.cpp \ + servers/rest/deviceclassesresource.cpp \ + servers/rest/vendorsresource.cpp \ + servers/rest/logsresource.cpp \ + servers/rest/pluginsresource.cpp \ + servers/rest/rulesresource.cpp \ jsonrpc/jsonrpcserver.cpp \ jsonrpc/jsonhandler.cpp \ jsonrpc/devicehandler.cpp \ @@ -128,14 +136,6 @@ SOURCES += nymeacore.cpp \ logging/logfilter.cpp \ logging/logentry.cpp \ logging/logvaluetool.cpp \ - rest/restserver.cpp \ - rest/restresource.cpp \ - rest/devicesresource.cpp \ - rest/deviceclassesresource.cpp \ - rest/vendorsresource.cpp \ - rest/logsresource.cpp \ - rest/pluginsresource.cpp \ - rest/rulesresource.cpp \ time/timedescriptor.cpp \ time/calendaritem.cpp \ time/repeatingoption.cpp \ diff --git a/libnymea-core/nymeacore.h b/libnymea-core/nymeacore.h index cc503ff8..5b0caef9 100644 --- a/libnymea-core/nymeacore.h +++ b/libnymea-core/nymeacore.h @@ -50,6 +50,7 @@ class LogEngine; class NetworkManager; class NymeaConfiguration; class TagsStorage; +class UserManager; class NymeaCore : public QObject { diff --git a/libnymea-core/servermanager.cpp b/libnymea-core/servermanager.cpp index 6b9cbd2b..56a8712a 100644 --- a/libnymea-core/servermanager.cpp +++ b/libnymea-core/servermanager.cpp @@ -37,6 +37,15 @@ #include "nymeacore.h" #include "certificategenerator.h" #include "nymeasettings.h" +#include "nymeaconfiguration.h" + +#include "jsonrpc/jsonrpcserver.h" +#include "servers/mocktcpserver.h" +#include "servers/tcpserver.h" +#include "servers/rest/restserver.h" +#include "servers/websocketserver.h" +#include "servers/webserver.h" +#include "servers/bluetoothserver.h" #include #include @@ -121,6 +130,8 @@ ServerManager::ServerManager(NymeaConfiguration *configuration, QObject *parent) m_webServers.insert(config.id, webServer); } + + connect(configuration, &NymeaConfiguration::tcpServerConfigurationChanged, this, &ServerManager::tcpServerConfigurationChanged); connect(configuration, &NymeaConfiguration::tcpServerConfigurationRemoved, this, &ServerManager::tcpServerConfigurationRemoved); connect(configuration, &NymeaConfiguration::webSocketServerConfigurationChanged, this, &ServerManager::webSocketServerConfigurationChanged); diff --git a/libnymea-core/servermanager.h b/libnymea-core/servermanager.h index 00d50d80..085cb2ad 100644 --- a/libnymea-core/servermanager.h +++ b/libnymea-core/servermanager.h @@ -24,24 +24,28 @@ #include #include "loggingcategories.h" -#include "jsonrpc/jsonrpcserver.h" -#include "rest/restserver.h" -#include "websocketserver.h" -#include "bluetoothserver.h" -#include "tcpserver.h" -#include "mocktcpserver.h" -class QSslConfiguration; -class QSslCertificate; -class QSslKey; +#include +#include + +class MockTcpServer; namespace nymeaserver { +class NymeaConfiguration; +class JsonRPCServer; +class TcpServer; +class WebSocketServer; +class WebServer; +class BluetoothServer; +class RestServer; +class MqttBroker; + class ServerManager : public QObject { Q_OBJECT public: - explicit ServerManager(NymeaConfiguration *configuration, QObject *parent = 0); + explicit ServerManager(NymeaConfiguration *configuration, QObject *parent = nullptr); // Interfaces JsonRPCServer *jsonServer() const; diff --git a/libnymea-core/bluetoothserver.cpp b/libnymea-core/servers/bluetoothserver.cpp similarity index 100% rename from libnymea-core/bluetoothserver.cpp rename to libnymea-core/servers/bluetoothserver.cpp diff --git a/libnymea-core/bluetoothserver.h b/libnymea-core/servers/bluetoothserver.h similarity index 100% rename from libnymea-core/bluetoothserver.h rename to libnymea-core/servers/bluetoothserver.h diff --git a/libnymea-core/httpreply.cpp b/libnymea-core/servers/httpreply.cpp similarity index 100% rename from libnymea-core/httpreply.cpp rename to libnymea-core/servers/httpreply.cpp diff --git a/libnymea-core/httpreply.h b/libnymea-core/servers/httpreply.h similarity index 100% rename from libnymea-core/httpreply.h rename to libnymea-core/servers/httpreply.h diff --git a/libnymea-core/httprequest.cpp b/libnymea-core/servers/httprequest.cpp similarity index 100% rename from libnymea-core/httprequest.cpp rename to libnymea-core/servers/httprequest.cpp diff --git a/libnymea-core/httprequest.h b/libnymea-core/servers/httprequest.h similarity index 100% rename from libnymea-core/httprequest.h rename to libnymea-core/servers/httprequest.h diff --git a/libnymea-core/mocktcpserver.cpp b/libnymea-core/servers/mocktcpserver.cpp similarity index 100% rename from libnymea-core/mocktcpserver.cpp rename to libnymea-core/servers/mocktcpserver.cpp diff --git a/libnymea-core/mocktcpserver.h b/libnymea-core/servers/mocktcpserver.h similarity index 100% rename from libnymea-core/mocktcpserver.h rename to libnymea-core/servers/mocktcpserver.h diff --git a/libnymea-core/rest/deviceclassesresource.cpp b/libnymea-core/servers/rest/deviceclassesresource.cpp similarity index 99% rename from libnymea-core/rest/deviceclassesresource.cpp rename to libnymea-core/servers/rest/deviceclassesresource.cpp index 54aa3963..02a0edb1 100644 --- a/libnymea-core/rest/deviceclassesresource.cpp +++ b/libnymea-core/servers/rest/deviceclassesresource.cpp @@ -36,7 +36,7 @@ */ #include "deviceclassesresource.h" -#include "httprequest.h" +#include "servers/httprequest.h" #include "nymeacore.h" #include diff --git a/libnymea-core/rest/deviceclassesresource.h b/libnymea-core/servers/rest/deviceclassesresource.h similarity index 98% rename from libnymea-core/rest/deviceclassesresource.h rename to libnymea-core/servers/rest/deviceclassesresource.h index a50e79ee..96e94338 100644 --- a/libnymea-core/rest/deviceclassesresource.h +++ b/libnymea-core/servers/rest/deviceclassesresource.h @@ -26,7 +26,7 @@ #include "jsonrpc/jsontypes.h" #include "restresource.h" -#include "httpreply.h" +#include "servers/httpreply.h" namespace nymeaserver { diff --git a/libnymea-core/rest/devicesresource.cpp b/libnymea-core/servers/rest/devicesresource.cpp similarity index 99% rename from libnymea-core/rest/devicesresource.cpp rename to libnymea-core/servers/rest/devicesresource.cpp index 916c7640..b98d2cc8 100644 --- a/libnymea-core/rest/devicesresource.cpp +++ b/libnymea-core/servers/rest/devicesresource.cpp @@ -37,8 +37,8 @@ #include "devicesresource.h" -#include "httpreply.h" -#include "httprequest.h" +#include "servers/httpreply.h" +#include "servers/httprequest.h" #include "jsonrpc/jsontypes.h" #include "nymeacore.h" diff --git a/libnymea-core/rest/devicesresource.h b/libnymea-core/servers/rest/devicesresource.h similarity index 99% rename from libnymea-core/rest/devicesresource.h rename to libnymea-core/servers/rest/devicesresource.h index 42fefa9f..6f35bb4d 100644 --- a/libnymea-core/rest/devicesresource.h +++ b/libnymea-core/servers/rest/devicesresource.h @@ -26,7 +26,7 @@ #include "jsonrpc/jsontypes.h" #include "restresource.h" -#include "httpreply.h" +#include "servers/httpreply.h" namespace nymeaserver { diff --git a/libnymea-core/rest/logsresource.cpp b/libnymea-core/servers/rest/logsresource.cpp similarity index 99% rename from libnymea-core/rest/logsresource.cpp rename to libnymea-core/servers/rest/logsresource.cpp index 0bfb4653..b4a11eeb 100644 --- a/libnymea-core/rest/logsresource.cpp +++ b/libnymea-core/servers/rest/logsresource.cpp @@ -36,7 +36,7 @@ */ #include "logsresource.h" -#include "httprequest.h" +#include "servers/httprequest.h" #include "loggingcategories.h" #include "nymeacore.h" #include "logging/logengine.h" diff --git a/libnymea-core/rest/logsresource.h b/libnymea-core/servers/rest/logsresource.h similarity index 98% rename from libnymea-core/rest/logsresource.h rename to libnymea-core/servers/rest/logsresource.h index 72dc3224..e1d0fba4 100644 --- a/libnymea-core/rest/logsresource.h +++ b/libnymea-core/servers/rest/logsresource.h @@ -26,7 +26,7 @@ #include "jsonrpc/jsontypes.h" #include "restresource.h" -#include "httpreply.h" +#include "servers/httpreply.h" namespace nymeaserver { diff --git a/libnymea-core/rest/pluginsresource.cpp b/libnymea-core/servers/rest/pluginsresource.cpp similarity index 99% rename from libnymea-core/rest/pluginsresource.cpp rename to libnymea-core/servers/rest/pluginsresource.cpp index 1e122ce5..dd0a10bd 100644 --- a/libnymea-core/rest/pluginsresource.cpp +++ b/libnymea-core/servers/rest/pluginsresource.cpp @@ -36,7 +36,7 @@ */ #include "pluginsresource.h" -#include "httprequest.h" +#include "servers/httprequest.h" #include "loggingcategories.h" #include "nymeacore.h" diff --git a/libnymea-core/rest/pluginsresource.h b/libnymea-core/servers/rest/pluginsresource.h similarity index 98% rename from libnymea-core/rest/pluginsresource.h rename to libnymea-core/servers/rest/pluginsresource.h index 31cc4dc2..bd329f34 100644 --- a/libnymea-core/rest/pluginsresource.h +++ b/libnymea-core/servers/rest/pluginsresource.h @@ -26,7 +26,7 @@ #include "jsonrpc/jsontypes.h" #include "restresource.h" -#include "httpreply.h" +#include "servers/httpreply.h" namespace nymeaserver { diff --git a/libnymea-core/rest/restresource.cpp b/libnymea-core/servers/rest/restresource.cpp similarity index 99% rename from libnymea-core/rest/restresource.cpp rename to libnymea-core/servers/rest/restresource.cpp index 834301de..ddecae98 100644 --- a/libnymea-core/rest/restresource.cpp +++ b/libnymea-core/servers/rest/restresource.cpp @@ -58,7 +58,7 @@ */ #include "restresource.h" -#include "httprequest.h" +#include "servers/httprequest.h" #include "loggingcategories.h" #include "devicemanager.h" diff --git a/libnymea-core/rest/restresource.h b/libnymea-core/servers/rest/restresource.h similarity index 98% rename from libnymea-core/rest/restresource.h rename to libnymea-core/servers/rest/restresource.h index dc559c81..8a7a2450 100644 --- a/libnymea-core/rest/restresource.h +++ b/libnymea-core/servers/rest/restresource.h @@ -24,8 +24,8 @@ #include #include -#include "httpreply.h" -#include "httprequest.h" +#include "servers/httpreply.h" +#include "servers/httprequest.h" #include "jsonrpc/jsontypes.h" class QVariant; diff --git a/libnymea-core/rest/restserver.cpp b/libnymea-core/servers/rest/restserver.cpp similarity index 99% rename from libnymea-core/rest/restserver.cpp rename to libnymea-core/servers/rest/restserver.cpp index 4428f6c1..1f5fc814 100644 --- a/libnymea-core/rest/restserver.cpp +++ b/libnymea-core/servers/rest/restserver.cpp @@ -36,8 +36,8 @@ #include "restserver.h" #include "loggingcategories.h" -#include "httprequest.h" -#include "httpreply.h" +#include "servers/httprequest.h" +#include "servers/httpreply.h" #include #include diff --git a/libnymea-core/rest/restserver.h b/libnymea-core/servers/rest/restserver.h similarity index 98% rename from libnymea-core/rest/restserver.h rename to libnymea-core/servers/rest/restserver.h index aa849430..2722e870 100644 --- a/libnymea-core/rest/restserver.h +++ b/libnymea-core/servers/rest/restserver.h @@ -23,7 +23,7 @@ #include -#include "webserver.h" +#include "servers/webserver.h" #include "jsonrpc/jsonhandler.h" #include "devicesresource.h" #include "deviceclassesresource.h" diff --git a/libnymea-core/rest/rulesresource.cpp b/libnymea-core/servers/rest/rulesresource.cpp similarity index 99% rename from libnymea-core/rest/rulesresource.cpp rename to libnymea-core/servers/rest/rulesresource.cpp index 9328cfdf..b345c9e3 100644 --- a/libnymea-core/rest/rulesresource.cpp +++ b/libnymea-core/servers/rest/rulesresource.cpp @@ -36,7 +36,7 @@ */ #include "rulesresource.h" -#include "httprequest.h" +#include "servers/httprequest.h" #include "typeutils.h" #include "loggingcategories.h" #include "nymeacore.h" diff --git a/libnymea-core/rest/rulesresource.h b/libnymea-core/servers/rest/rulesresource.h similarity index 99% rename from libnymea-core/rest/rulesresource.h rename to libnymea-core/servers/rest/rulesresource.h index 9797a129..e5c8e48b 100644 --- a/libnymea-core/rest/rulesresource.h +++ b/libnymea-core/servers/rest/rulesresource.h @@ -26,7 +26,7 @@ #include "jsonrpc/jsontypes.h" #include "restresource.h" -#include "httpreply.h" +#include "servers/httpreply.h" namespace nymeaserver { diff --git a/libnymea-core/rest/vendorsresource.cpp b/libnymea-core/servers/rest/vendorsresource.cpp similarity index 99% rename from libnymea-core/rest/vendorsresource.cpp rename to libnymea-core/servers/rest/vendorsresource.cpp index f5730d98..e8c2058f 100644 --- a/libnymea-core/rest/vendorsresource.cpp +++ b/libnymea-core/servers/rest/vendorsresource.cpp @@ -37,7 +37,7 @@ #include "vendorsresource.h" -#include "httprequest.h" +#include "servers/httprequest.h" #include "loggingcategories.h" #include "nymeacore.h" diff --git a/libnymea-core/rest/vendorsresource.h b/libnymea-core/servers/rest/vendorsresource.h similarity index 98% rename from libnymea-core/rest/vendorsresource.h rename to libnymea-core/servers/rest/vendorsresource.h index 50b94f49..80f5b752 100644 --- a/libnymea-core/rest/vendorsresource.h +++ b/libnymea-core/servers/rest/vendorsresource.h @@ -26,7 +26,7 @@ #include "jsonrpc/jsontypes.h" #include "restresource.h" -#include "httpreply.h" +#include "servers/httpreply.h" namespace nymeaserver { diff --git a/libnymea-core/tcpserver.cpp b/libnymea-core/servers/tcpserver.cpp similarity index 100% rename from libnymea-core/tcpserver.cpp rename to libnymea-core/servers/tcpserver.cpp diff --git a/libnymea-core/tcpserver.h b/libnymea-core/servers/tcpserver.h similarity index 100% rename from libnymea-core/tcpserver.h rename to libnymea-core/servers/tcpserver.h diff --git a/libnymea-core/webserver.cpp b/libnymea-core/servers/webserver.cpp similarity index 100% rename from libnymea-core/webserver.cpp rename to libnymea-core/servers/webserver.cpp diff --git a/libnymea-core/webserver.h b/libnymea-core/servers/webserver.h similarity index 100% rename from libnymea-core/webserver.h rename to libnymea-core/servers/webserver.h diff --git a/libnymea-core/websocketserver.cpp b/libnymea-core/servers/websocketserver.cpp similarity index 100% rename from libnymea-core/websocketserver.cpp rename to libnymea-core/servers/websocketserver.cpp diff --git a/libnymea-core/websocketserver.h b/libnymea-core/servers/websocketserver.h similarity index 100% rename from libnymea-core/websocketserver.h rename to libnymea-core/servers/websocketserver.h diff --git a/libnymea-core/usermanager.cpp b/libnymea-core/usermanager.cpp index cb984bb0..a8bb4d56 100644 --- a/libnymea-core/usermanager.cpp +++ b/libnymea-core/usermanager.cpp @@ -72,6 +72,7 @@ #include #include #include +#include namespace nymeaserver { diff --git a/server/main.cpp b/server/main.cpp index d6599c34..9655a7d9 100644 --- a/server/main.cpp +++ b/server/main.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include "stdio.h" #include "unistd.h" diff --git a/tests/auto/actions/testactions.cpp b/tests/auto/actions/testactions.cpp index f9b6d03d..d5d1d295 100644 --- a/tests/auto/actions/testactions.cpp +++ b/tests/auto/actions/testactions.cpp @@ -20,16 +20,6 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "nymeatestbase.h" -#include "devicemanager.h" -#include "mocktcpserver.h" - -#include -#include -#include -#include -#include -#include -#include using namespace nymeaserver; diff --git a/tests/auto/configurations/testconfigurations.cpp b/tests/auto/configurations/testconfigurations.cpp index 6100548d..e7678b9b 100644 --- a/tests/auto/configurations/testconfigurations.cpp +++ b/tests/auto/configurations/testconfigurations.cpp @@ -20,18 +20,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "nymeatestbase.h" -#include "devicemanager.h" -#include "mocktcpserver.h" #include "nymeacore.h" #include "nymeasettings.h" - -#include -#include -#include -#include -#include -#include -#include +#include "servers/mocktcpserver.h" using namespace nymeaserver; diff --git a/tests/auto/devices/testdevices.cpp b/tests/auto/devices/testdevices.cpp index e389bfcd..7c1c81da 100644 --- a/tests/auto/devices/testdevices.cpp +++ b/tests/auto/devices/testdevices.cpp @@ -21,15 +21,7 @@ #include "nymeatestbase.h" #include "nymeacore.h" -#include "devicemanager.h" #include "nymeasettings.h" -#include "plugin/deviceplugin.h" - -#include -#include -#include -#include -#include using namespace nymeaserver; diff --git a/tests/auto/events/testevents.cpp b/tests/auto/events/testevents.cpp index 669fcde4..03bafc5b 100644 --- a/tests/auto/events/testevents.cpp +++ b/tests/auto/events/testevents.cpp @@ -21,16 +21,6 @@ #include "nymeatestbase.h" #include "nymeacore.h" -#include "devicemanager.h" -#include "mocktcpserver.h" - -#include -#include -#include -#include -#include -#include -#include using namespace nymeaserver; diff --git a/tests/auto/jsonrpc/testjsonrpc.cpp b/tests/auto/jsonrpc/testjsonrpc.cpp index 449da8af..4bc529b7 100644 --- a/tests/auto/jsonrpc/testjsonrpc.cpp +++ b/tests/auto/jsonrpc/testjsonrpc.cpp @@ -20,19 +20,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "nymeatestbase.h" -#include "nymeacore.h" -#include "devicemanager.h" -#include "mocktcpserver.h" #include "../../utils/pushbuttonagent.h" - -#include -#include -#include -#include -#include -#include -#include -#include +#include "nymeacore.h" +#include "servers/mocktcpserver.h" using namespace nymeaserver; diff --git a/tests/auto/logging/testlogging.cpp b/tests/auto/logging/testlogging.cpp index e9c469fb..994db3de 100644 --- a/tests/auto/logging/testlogging.cpp +++ b/tests/auto/logging/testlogging.cpp @@ -21,17 +21,9 @@ #include "nymeatestbase.h" #include "nymeacore.h" -#include "devicemanager.h" #include "nymeasettings.h" -#include "logging/logentry.h" #include "logging/logvaluetool.h" -#include "plugin/deviceplugin.h" - -#include -#include -#include -#include -#include +#include "servers/mocktcpserver.h" using namespace nymeaserver; diff --git a/tests/auto/nymeatestbase.cpp b/tests/auto/nymeatestbase.cpp index 8bbebb5f..5d63051a 100644 --- a/tests/auto/nymeatestbase.cpp +++ b/tests/auto/nymeatestbase.cpp @@ -20,23 +20,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "nymeatestbase.h" -#include "mocktcpserver.h" #include "nymeacore.h" #include "nymeasettings.h" -#include "devicemanager.h" -#include "loggingcategories.h" -#include "logging/logengine.h" -#include "jsonrpc/jsontypes.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "servers/mocktcpserver.h" using namespace nymeaserver; diff --git a/tests/auto/nymeatestbase.h b/tests/auto/nymeatestbase.h index 1a0119aa..7d2e0363 100644 --- a/tests/auto/nymeatestbase.h +++ b/tests/auto/nymeatestbase.h @@ -22,20 +22,10 @@ #ifndef NYMEATESTBASE_H #define NYMEATESTBASE_H -#include "typeutils.h" -#include "logging/logging.h" -#include "mocktcpserver.h" -#include "devicemanager.h" -#include "ruleengine.h" #include "jsonrpc/jsontypes.h" -#include -#include -#include #include #include -#include -#include extern DeviceClassId mockDeviceClassId; extern DeviceClassId mockDeviceAutoClassId; diff --git a/tests/auto/plugins/testplugins.cpp b/tests/auto/plugins/testplugins.cpp index 5182964b..07b57102 100644 --- a/tests/auto/plugins/testplugins.cpp +++ b/tests/auto/plugins/testplugins.cpp @@ -20,16 +20,6 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "nymeatestbase.h" -#include "devicemanager.h" -#include "mocktcpserver.h" - -#include -#include -#include -#include -#include -#include -#include using namespace nymeaserver; diff --git a/tests/auto/restdeviceclasses/testrestdeviceclasses.cpp b/tests/auto/restdeviceclasses/testrestdeviceclasses.cpp index d7d57304..0cae1266 100644 --- a/tests/auto/restdeviceclasses/testrestdeviceclasses.cpp +++ b/tests/auto/restdeviceclasses/testrestdeviceclasses.cpp @@ -20,20 +20,6 @@ #include "nymeatestbase.h" #include "nymeacore.h" -#include "devicemanager.h" -#include "mocktcpserver.h" -#include "webserver.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include using namespace nymeaserver; diff --git a/tests/auto/restdevices/testrestdevices.cpp b/tests/auto/restdevices/testrestdevices.cpp index 19ec45f0..b83fa252 100644 --- a/tests/auto/restdevices/testrestdevices.cpp +++ b/tests/auto/restdevices/testrestdevices.cpp @@ -20,20 +20,6 @@ #include "nymeatestbase.h" #include "nymeacore.h" -#include "devicemanager.h" -#include "mocktcpserver.h" -#include "webserver.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include using namespace nymeaserver; diff --git a/tests/auto/restlogging/testrestlogging.cpp b/tests/auto/restlogging/testrestlogging.cpp index 6335958c..0f91bc2b 100644 --- a/tests/auto/restlogging/testrestlogging.cpp +++ b/tests/auto/restlogging/testrestlogging.cpp @@ -21,14 +21,7 @@ #include "nymeatestbase.h" #include "nymeacore.h" -#include "devicemanager.h" -#include "plugin/deviceplugin.h" - -#include -#include -#include -#include -#include +#include "servers/mocktcpserver.h" using namespace nymeaserver; diff --git a/tests/auto/restplugins/testrestplugins.cpp b/tests/auto/restplugins/testrestplugins.cpp index 947529ce..f98987d1 100644 --- a/tests/auto/restplugins/testrestplugins.cpp +++ b/tests/auto/restplugins/testrestplugins.cpp @@ -20,20 +20,6 @@ #include "nymeatestbase.h" #include "nymeacore.h" -#include "devicemanager.h" -#include "mocktcpserver.h" -#include "webserver.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include using namespace nymeaserver; diff --git a/tests/auto/restrules/testrestrules.cpp b/tests/auto/restrules/testrestrules.cpp index 85fd2030..8c62576d 100644 --- a/tests/auto/restrules/testrestrules.cpp +++ b/tests/auto/restrules/testrestrules.cpp @@ -20,20 +20,6 @@ #include "nymeatestbase.h" #include "nymeacore.h" -#include "devicemanager.h" -#include "mocktcpserver.h" -#include "webserver.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include using namespace nymeaserver; diff --git a/tests/auto/restvendors/testrestvendors.cpp b/tests/auto/restvendors/testrestvendors.cpp index 60d3051e..b5a3eca6 100644 --- a/tests/auto/restvendors/testrestvendors.cpp +++ b/tests/auto/restvendors/testrestvendors.cpp @@ -20,20 +20,6 @@ #include "nymeatestbase.h" #include "nymeacore.h" -#include "devicemanager.h" -#include "mocktcpserver.h" -#include "webserver.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include using namespace nymeaserver; diff --git a/tests/auto/rules/testrules.cpp b/tests/auto/rules/testrules.cpp index 41d38516..f760d8a6 100644 --- a/tests/auto/rules/testrules.cpp +++ b/tests/auto/rules/testrules.cpp @@ -20,17 +20,8 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "nymeatestbase.h" -#include "devicemanager.h" #include "nymeasettings.h" -#include "mocktcpserver.h" - -#include -#include -#include -#include -#include -#include -#include +#include "servers/mocktcpserver.h" using namespace nymeaserver; diff --git a/tests/auto/states/teststates.cpp b/tests/auto/states/teststates.cpp index 8931013e..1eb3c046 100644 --- a/tests/auto/states/teststates.cpp +++ b/tests/auto/states/teststates.cpp @@ -21,16 +21,6 @@ #include "nymeatestbase.h" #include "nymeacore.h" -#include "devicemanager.h" -#include "mocktcpserver.h" - -#include -#include -#include -#include -#include -#include -#include using namespace nymeaserver; diff --git a/tests/auto/tags/testtags.cpp b/tests/auto/tags/testtags.cpp index f534608e..00c13a2a 100644 --- a/tests/auto/tags/testtags.cpp +++ b/tests/auto/tags/testtags.cpp @@ -19,17 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "nymeatestbase.h" -#include "nymeacore.h" -#include "devicemanager.h" -#include "mocktcpserver.h" - -#include -#include -#include -#include -#include -#include -#include +#include "servers/mocktcpserver.h" using namespace nymeaserver; diff --git a/tests/auto/timemanager/testtimemanager.cpp b/tests/auto/timemanager/testtimemanager.cpp index 0e8dd3bd..db147ee2 100644 --- a/tests/auto/timemanager/testtimemanager.cpp +++ b/tests/auto/timemanager/testtimemanager.cpp @@ -21,18 +21,7 @@ #include "nymeatestbase.h" #include "nymeacore.h" -#include "time/timemanager.h" -#include "devicemanager.h" -#include "mocktcpserver.h" - -#include -#include -#include -#include -#include -#include -#include -#include +#include "servers/mocktcpserver.h" using namespace nymeaserver; diff --git a/tests/auto/versioning/testversioning.cpp b/tests/auto/versioning/testversioning.cpp index 0d1b3c98..0a0b0ec9 100644 --- a/tests/auto/versioning/testversioning.cpp +++ b/tests/auto/versioning/testversioning.cpp @@ -19,16 +19,6 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "nymeatestbase.h" -#include "devicemanager.h" -#include "mocktcpserver.h" - -#include -#include -#include -#include -#include -#include -#include using namespace nymeaserver; diff --git a/tests/auto/webserver/testwebserver.cpp b/tests/auto/webserver/testwebserver.cpp index a2a3f71e..1a2084da 100644 --- a/tests/auto/webserver/testwebserver.cpp +++ b/tests/auto/webserver/testwebserver.cpp @@ -20,20 +20,7 @@ #include "nymeatestbase.h" #include "nymeacore.h" -#include "devicemanager.h" -#include "mocktcpserver.h" -#include "rest/restresource.h" -#include "webserver.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include #include using namespace nymeaserver; diff --git a/tests/auto/websocketserver/testwebsocketserver.cpp b/tests/auto/websocketserver/testwebsocketserver.cpp index 65d64907..8b773185 100644 --- a/tests/auto/websocketserver/testwebsocketserver.cpp +++ b/tests/auto/websocketserver/testwebsocketserver.cpp @@ -20,16 +20,6 @@ #include "nymeatestbase.h" #include "nymeacore.h" -#include "devicemanager.h" -#include "mocktcpserver.h" -#include "webserver.h" - -#include -#include -#include -#include -#include -#include #include