Refactoring project layout

build

@@ -1 +1 @@
-59
+60

src/framework/ALBHealthCheckServer.h

@@ -21,7 +21,7 @@
 #include "Poco/Net/HTTPRequestHandler.h"
 #include "Poco/Logger.h"
 
-#include "../Daemon.h"
+#include "Daemon.h"
 #include "SubSystemServer.h"
 
 namespace OpenWifi {

src/framework/AuthClient.cpp

@@ -9,8 +9,8 @@
 #include <utility>
 
 #include "AuthClient.h"
-#include "../RESTAPI/RESTAPI_SecurityObjects.h"
-#include "../Daemon.h"
+#include "RESTAPI/RESTAPI_SecurityObjects.h"
+#include "Daemon.h"
 #include "OpenAPIRequest.h"
 
 namespace OpenWifi {

src/framework/AuthClient.h

@@ -6,11 +6,11 @@
 #define UCENTRALGW_AUTHCLIENT_H
 
 #include "Poco/JSON/Object.h"
+#include "Poco/JWT/Signer.h"
 #include "Poco/Net/HTTPServerRequest.h"
 #include "Poco/Net/HTTPServerResponse.h"
-#include "Poco/JWT/Signer.h"
 #include "Poco/SHA2Engine.h"
-#include "../RESTAPI/RESTAPI_SecurityObjects.h"
+#include "RESTAPI/RESTAPI_SecurityObjects.h"
 #include "SubSystemServer.h"
 
 namespace OpenWifi {

src/framework/KafkaManager.cpp

@@ -9,7 +9,7 @@
 
 #include "KafkaManager.h"
 
-#include "../Daemon.h"
+#include "Daemon.h"
 #include "Utils.h"
 
 namespace OpenWifi {

src/framework/KafkaManager.h

@@ -13,7 +13,7 @@
 #include <thread>
 
 #include "SubSystemServer.h"
-#include "framework/OpenWifiTypes.h"
+#include "OpenWifiTypes.h"
 
 #include "cppkafka/cppkafka.h"
 

src/framework/Kafka_topics.h

@@ -1,7 +1,10 @@
 //
-// Created by stephane bourque on 2021-06-07.
+//	License type: BSD 3-Clause License
+//	License copy: https://github.com/Telecominfraproject/wlan-cloud-ucentralgw/blob/master/LICENSE
+//
+//	Created by Stephane Bourque on 2021-03-04.
+//	Arilia Wireless Inc.
 //
-
 #ifndef UCENTRALGW_KAFKA_TOPICS_H
 #define UCENTRALGW_KAFKA_TOPICS_H
 

src/framework/MicroService.cpp

@@ -26,7 +26,7 @@
 #include "Poco/JSON/Parser.h"
 #include "Poco/JSON/Stringifier.h"
 
-#include "ALBHealthCheckServer.h"
+#include "framework/ALBHealthCheckServer.h"
 #ifndef SMALL_BUILD
 #include "KafkaManager.h"
 #endif
@@ -36,7 +36,7 @@
 #include "Utils.h"
 
 #ifndef TIP_SECURITY_SERVICE
-#include "AuthClient.h"
+#include "framework/AuthClient.h"
 #endif
 
 namespace OpenWifi {

src/framework/OpenAPIRequest.cpp

@@ -18,7 +18,7 @@
 #include <Poco/URI.h>
 #include <Poco/Exception.h>
 #include "Utils.h"
-#include "../Daemon.h"
+#include "Daemon.h"
 
 namespace OpenWifi {
 

src/framework/RESTAPI_GenericServer.h

@@ -8,7 +8,7 @@
 #include <vector>
 #include <string>
 
-#include "../Daemon.h"
+#include "Daemon.h"
 #include "Poco/StringTokenizer.h"
 #include "Poco/Net/HTTPRequest.h"
 

src/framework/RESTAPI_errors.h

@@ -50,8 +50,10 @@ namespace OpenWifi::RESTAPI::Errors {
     static const std::string InvalidPassword{"Invalid password."};
     static const std::string PasswordRejected{"Password was rejected. This maybe an old password."};
     static const std::string InvalidIPRanges{"Invalid IP range specifications."};
+    static const std::string InvalidLOrderBy{"Invalid orderBy specification."};
     static const std::string NeedMobileNumber{"You must provide at least one validated phone number."};
     static const std::string BadMFAMethod{"MFA only supports sms or email."};
+
 }
 
 #endif //OWPROV_RESTAPI_ERRORS_H

src/framework/RESTAPI_handler.cpp

@@ -20,15 +20,15 @@
 #include "RESTAPI_errors.h"
 
 #ifdef	TIP_SECURITY_SERVICE
-#include "../AuthService.h"
+#include "AuthService.h"
 #else
-#include "AuthClient.h"
+#include "framework/AuthClient.h"
 #endif
 
 #include "RESTAPI_handler.h"
 #include "RESTAPI_protocol.h"
 #include "Utils.h"
-#include "../Daemon.h"
+#include "Daemon.h"
 
 namespace OpenWifi {
 

src/framework/RESTAPI_handler.h

@@ -24,7 +24,7 @@
 #include "Poco/CountingStream.h"
 #include "Poco/NullStream.h"
 
-#include "../RESTAPI/RESTAPI_SecurityObjects.h"
+#include "RESTAPI/RESTAPI_SecurityObjects.h"
 #include "RESTAPI_utils.h"
 #include "RESTAPI_GenericServer.h"
 

src/framework/RESTAPI_system_command.cpp

@@ -12,9 +12,9 @@
 #include "Poco/DateTime.h"
 #include "Poco/DateTimeFormat.h"
 
-#include "../Daemon.h"
-#include "RESTAPI_protocol.h"
-#include "RESTAPI_errors.h"
+#include "Daemon.h"
+#include "framework/RESTAPI_protocol.h"
+#include "framework/RESTAPI_errors.h"
 #include <thread>
 #include <chrono>
 

src/framework/RESTAPI_system_command.h

@@ -9,7 +9,7 @@
 #ifndef UCENTRALGW_RESTAPI_SYSTEM_COMMAND_H
 #define UCENTRALGW_RESTAPI_SYSTEM_COMMAND_H
 
-#include "RESTAPI_handler.h"
+#include "framework/RESTAPI_handler.h"
 
 namespace OpenWifi {
 class RESTAPI_system_command : public RESTAPIHandler {

src/framework/RESTAPI_utils.h

@@ -9,8 +9,8 @@
 #include "Poco/JSON/Object.h"
 #include "Poco/JSON/Parser.h"
 #include "Poco/Net/HTTPServerRequest.h"
-#include "OpenWifiTypes.h"
-#include "Utils.h"
+#include "framework/OpenWifiTypes.h"
+#include "framework/Utils.h"
 
 namespace OpenWifi::RESTAPI_utils {
 

src/framework/SubSystemServer.cpp

@@ -7,7 +7,7 @@
 //
 
 #include "SubSystemServer.h"
-#include "../Daemon.h"
+#include "Daemon.h"
 
 #include "Poco/Net/X509Certificate.h"
 #include "Poco/DateTimeFormatter.h"
@@ -17,7 +17,7 @@
 
 #include "openssl/ssl.h"
 
-#include "../Daemon.h"
+#include "Daemon.h"
 
 namespace OpenWifi {
 SubSystemServer::SubSystemServer(std::string Name, const std::string &LoggingPrefix,

src/framework/Utils.cpp

@@ -29,7 +29,7 @@
 #include "Poco/Net/HTTPResponse.h"
 
 #include "uCentralProtocol.h"
-#include "../Daemon.h"
+#include "Daemon.h"
 
 namespace OpenWifi::Utils {
 

src/framework/storage_setup.cpp

@@ -2,8 +2,8 @@
 // Created by stephane bourque on 2021-08-22.
 //
 
-#include "../StorageService.h"
-#include "../Daemon.h"
+#include "StorageService.h"
+#include "Daemon.h"
 
 namespace OpenWifi {