Framework update

build

@@ -1 +1 @@
-5
+7

src/RESTAPI/RESTAPI_configurations_handler.h

@@ -5,8 +5,7 @@
 //	Created by Stephane Bourque on 2021-03-04.
 //	Arilia Wireless Inc.
 //
-#ifndef OWPROV_RESTAPI_CONFIGURATIONS_HANDLER_H
+#pragma once
-#define OWPROV_RESTAPI_CONFIGURATIONS_HANDLER_H
 
 #include "framework/MicroService.h"
 #include "RESTObjects/RESTAPI_ProvObjects.h"
@@ -36,5 +35,3 @@ namespace OpenWifi {
         ConfigurationDB     &DB_;
     };
 }
-
-#endif //OWPROV_RESTAPI_CONFIGURATIONS_HANDLER_H

src/RESTAPI/RESTAPI_configurations_list_handler.h

@@ -2,8 +2,7 @@
 // Created by stephane bourque on 2021-08-29.
 //
 
-#ifndef OWPROV_RESTAPI_CONFIGURATIONS_LIST_HANDLER_H
+#pragma once
-#define OWPROV_RESTAPI_CONFIGURATIONS_LIST_HANDLER_H
 
 #include "framework/MicroService.h"
 
@@ -27,5 +26,3 @@ namespace OpenWifi {
         void DoDelete() final {};
     };
 }
-
-#endif //OWPROV_RESTAPI_CONFIGURATIONS_LIST_HANDLER_H

src/RESTAPI/RESTAPI_contact_handler.h

@@ -6,8 +6,7 @@
 //	Arilia Wireless Inc.
 //
 
-#ifndef OWPROV_RESTAPI_CONTACT_HANDLER_H
+#pragma once
-#define OWPROV_RESTAPI_CONTACT_HANDLER_H
 
 #include "framework/MicroService.h"
 #include "StorageService.h"
@@ -34,5 +33,3 @@ namespace OpenWifi {
         ContactDB       &DB_;
     };
 }
-
-#endif //OWPROV_RESTAPI_CONTACT_HANDLER_H

src/RESTAPI/RESTAPI_contact_list_handler.h

@@ -2,8 +2,7 @@
 // Created by stephane bourque on 2021-08-23.
 //
 
-#ifndef OWPROV_RESTAPI_CONTACT_LIST_HANDLER_H
+#pragma once
-#define OWPROV_RESTAPI_CONTACT_LIST_HANDLER_H
 
 #include "framework/MicroService.h"
 #include "RESTObjects/RESTAPI_ProvObjects.h"
@@ -27,6 +26,3 @@ namespace OpenWifi {
         void DoDelete() final {};
     };
 }
-
-
-#endif //OWPROV_RESTAPI_CONTACT_LIST_HANDLER_H

src/RESTAPI/RESTAPI_db_helpers.h

@@ -2,8 +2,7 @@
 // Created by stephane bourque on 2021-10-18.
 //
 
-#ifndef OWPROV_RESTAPI_DB_HELPERS_H
+#pragma once
-#define OWPROV_RESTAPI_DB_HELPERS_H
 
 #include "RESTObjects/RESTAPI_ProvObjects.h"
 #include "StorageService.h"
@@ -176,5 +175,3 @@ namespace OpenWifi {
     }
 
 }
-
-#endif //OWPROV_RESTAPI_DB_HELPERS_H

src/RESTAPI/RESTAPI_entity_handler.h

@@ -6,9 +6,7 @@
 //	Arilia Wireless Inc.
 //
 
-
+#pragma once
-#ifndef OWPROV_RESTAPI_ENTITY_HANDLER_H
-#define OWPROV_RESTAPI_ENTITY_HANDLER_H
 
 #include "framework/MicroService.h"
 #include "StorageService.h"
@@ -37,5 +35,3 @@ namespace OpenWifi {
         void DoDelete() final;
     };
 }
-
-#endif //OWPROV_RESTAPI_ENTITY_HANDLER_H

src/RESTAPI/RESTAPI_entity_list_handler.h

@@ -7,8 +7,7 @@
 //
 
 
-#ifndef OWPROV_RESTAPI_ENTITY_LIST_HANDLER_H
+#pragma once
-#define OWPROV_RESTAPI_ENTITY_LIST_HANDLER_H
 
 #include "framework/MicroService.h"
 
@@ -31,5 +30,3 @@ namespace OpenWifi {
         void DoDelete() final {};
     };
 }
-
-#endif //OWPROV_RESTAPI_ENTITY_LIST_HANDLER_H

src/RESTAPI/RESTAPI_inventory_handler.h

@@ -6,9 +6,7 @@
 //	Arilia Wireless Inc.
 //
 
-
+#pragma once
-#ifndef OWPROV_RESTAPI_INVENTORY_HANDLER_H
-#define OWPROV_RESTAPI_INVENTORY_HANDLER_H
 
 #include "framework/MicroService.h"
 #include "StorageService.h"
@@ -35,6 +33,3 @@ namespace OpenWifi {
         InventoryDB     &DB_;
     };
 }
-
-
-#endif //OWPROV_RESTAPI_INVENTORY_HANDLER_H

src/RESTAPI/RESTAPI_inventory_list_handler.h

@@ -6,9 +6,7 @@
 //	Arilia Wireless Inc.
 //
 
-
+#pragma once
-#ifndef OWPROV_RESTAPI_INVENTORY_LIST_HANDLER_H
-#define OWPROV_RESTAPI_INVENTORY_LIST_HANDLER_H
 
 #include "framework/MicroService.h"
 #include "RESTObjects/RESTAPI_ProvObjects.h"
@@ -33,6 +31,4 @@ namespace OpenWifi {
 
         void SendList(const ProvObjects::InventoryTagVec & Tags, bool SerialOnly);
     };
-}
+}
-
-#endif //OWPROV_RESTAPI_INVENTORY_LIST_HANDLER_H

src/RESTAPI/RESTAPI_location_handler.h

@@ -6,9 +6,7 @@
 //	Arilia Wireless Inc.
 //
 
-
+#pragma once
-#ifndef OWPROV_RESTAPI_LOCATION_HANDLER_H
-#define OWPROV_RESTAPI_LOCATION_HANDLER_H
 
 #include "framework/MicroService.h"
 #include "StorageService.h"
@@ -35,5 +33,3 @@ namespace OpenWifi {
         LocationDB  &DB_;
     };
 }
-
-#endif //OWPROV_RESTAPI_LOCATION_HANDLER_H

src/RESTAPI/RESTAPI_location_list_handler.h

@@ -2,8 +2,7 @@
 // Created by stephane bourque on 2021-08-23.
 //
 
-#ifndef OWPROV_RESTAPI_LOCATION_LIST_HANDLER_H
+#pragma once
-#define OWPROV_RESTAPI_LOCATION_LIST_HANDLER_H
 
 #include "framework/MicroService.h"
 
@@ -26,8 +25,3 @@ namespace OpenWifi {
         void DoDelete() final {};
     };
 }
-
-
-
-
-#endif //OWPROV_RESTAPI_LOCATION_LIST_HANDLER_H

src/RESTAPI/RESTAPI_managementPolicy_handler.h

@@ -7,9 +7,6 @@
 //
 
 
-#ifndef OWPROV_RESTAPI_MANAGEMENTPOLICY_HANDLER_H
-#define OWPROV_RESTAPI_MANAGEMENTPOLICY_HANDLER_H
-
 #include "framework/MicroService.h"
 #include "StorageService.h"
 
@@ -35,5 +32,3 @@ namespace OpenWifi {
         void DoDelete() final ;
     };
 }
-
-#endif //OWPROV_RESTAPI_MANAGEMENTPOLICY_HANDLER_H

src/RESTAPI/RESTAPI_managementPolicy_list_handler.h

@@ -2,9 +2,6 @@
 // Created by stephane bourque on 2021-08-26.
 //
 
-#ifndef OWPROV_RESTAPI_MANAGEMENTPOLICY_LIST_HANDLER_H
-#define OWPROV_RESTAPI_MANAGEMENTPOLICY_LIST_HANDLER_H
-
 #include "framework/MicroService.h"
 
 namespace OpenWifi {
@@ -26,6 +23,3 @@ namespace OpenWifi {
         void DoDelete() final {};
     };
 }
-
-
-#endif //OWPROV_RESTAPI_MANAGEMENTPOLICY_LIST_HANDLER_H

src/RESTAPI/RESTAPI_managementRole_handler.h

@@ -2,9 +2,6 @@
 // Created by stephane bourque on 2021-08-26.
 //
 
-#ifndef OWPROV_RESTAPI_MANAGEMENTROLE_HANDLER_H
-#define OWPROV_RESTAPI_MANAGEMENTROLE_HANDLER_H
-
 #include "framework/MicroService.h"
 #include "StorageService.h"
 
@@ -29,5 +26,3 @@ namespace OpenWifi {
         void DoDelete() final ;
     };
 }
-
-#endif //OWPROV_RESTAPI_MANAGEMENTROLE_HANDLER_H

src/RESTAPI/RESTAPI_managementRole_list_handler.h

@@ -1,9 +1,7 @@
 //
 // Created by stephane bourque on 2021-08-26.
 //
-
+#pragma once
-#ifndef OWPROV_RESTAPI_MANAGEMENTROLE_LIST_HANDLER_H
-#define OWPROV_RESTAPI_MANAGEMENTROLE_LIST_HANDLER_H
 
 #include "framework/MicroService.h"
 
@@ -26,5 +24,3 @@ namespace OpenWifi {
         void DoDelete() final {};
     };
 }
-
-#endif //OWPROV_RESTAPI_MANAGEMENTROLE_LIST_HANDLER_H

src/RESTAPI/RESTAPI_map_handler.h

@@ -1,9 +1,7 @@
 //
 // Created by stephane bourque on 2021-11-09.
 //
-
+#pragma once
-#ifndef OWPROV_RESTAPI_MAP_HANDLER_H
-#define OWPROV_RESTAPI_MAP_HANDLER_H
 
 #include "framework/MicroService.h"
 #include "StorageService.h"
@@ -29,6 +27,3 @@ namespace OpenWifi {
         void DoDelete() final ;
     };
 }
-
-
-#endif //OWPROV_RESTAPI_MAP_HANDLER_H

src/RESTAPI/RESTAPI_map_list_handler.h

@@ -1,9 +1,7 @@
 //
 // Created by stephane bourque on 2021-11-09.
 //
-
+#pragma once
-#ifndef OWPROV_RESTAPI_MAP_LIST_HANDLER_H
-#define OWPROV_RESTAPI_MAP_LIST_HANDLER_H
 
 #include "framework/MicroService.h"
 
@@ -26,5 +24,3 @@ namespace OpenWifi {
         void DoDelete() final {};
     };
 }
-
-#endif //OWPROV_RESTAPI_MAP_LIST_HANDLER_H

src/RESTAPI/RESTAPI_venue_handler.h

@@ -6,9 +6,7 @@
 //	Arilia Wireless Inc.
 //
 
-
+#pragma once
-#ifndef OWPROV_RESTAPI_VENUE_HANDLER_H
-#define OWPROV_RESTAPI_VENUE_HANDLER_H
 
 #include "framework/MicroService.h"
 #include "StorageService.h"
@@ -41,6 +39,3 @@ namespace OpenWifi {
         }
     };
 }
-
-
-#endif //OWPROV_RESTAPI_VENUE_HANDLER_H

src/RESTAPI/RESTAPI_venue_list_handler.h

@@ -2,9 +2,7 @@
 // Created by stephane bourque on 2021-08-23.
 //
 
-#ifndef OWPROV_RESTAPI_VENUE_LIST_HANDLER_H
+#pragma once
-#define OWPROV_RESTAPI_VENUE_LIST_HANDLER_H
-
 
 #include "framework/MicroService.h"
 
@@ -27,5 +25,3 @@ namespace OpenWifi {
         void DoDelete() final {};
     };
 }
-
-#endif //OWPROV_RESTAPI_VENUE_LIST_HANDLER_H

src/RESTAPI/RESTAPI_webSocketServer.h

@@ -2,8 +2,7 @@
 // Created by stephane bourque on 2021-08-12.
 //
 
-#ifndef UCENTRALGW_RESTAPI_WEBSOCKETSERVER_H
+#pragma once
-#define UCENTRALGW_RESTAPI_WEBSOCKETSERVER_H
 
 #include "framework/MicroService.h"
 
@@ -28,5 +27,3 @@ namespace OpenWifi {
 
 	};
 }
-
-#endif // UCENTRALGW_RESTAPI_WEBSOCKETSERVER_H

src/RESTObjects/RESTAPI_GWobjects.cpp

@@ -12,6 +12,7 @@
 #include "Daemon.h"
 #ifdef	TIP_GATEWAY_SERVICE
 #include "DeviceRegistry.h"
+#include "CapabilitiesCache.h"
 #endif
 
 #include "RESTAPI_GWobjects.h"
@@ -26,7 +27,7 @@ namespace OpenWifi::GWObjects {
 	void Device::to_json(Poco::JSON::Object &Obj) const {
 		field_to_json(Obj,"serialNumber", SerialNumber);
 #ifdef TIP_GATEWAY_SERVICE
-		field_to_json(Obj,"deviceType", Daemon::instance()->IdentifyDevice(Compatible));
+		field_to_json(Obj,"deviceType", CapabilitiesCache::instance()->Get(Compatible));
 #endif
 		field_to_json(Obj,"macAddress", MACAddress);
 		field_to_json(Obj,"manufacturer", Manufacturer);

src/RESTObjects/RESTAPI_GWobjects.h

@@ -6,8 +6,7 @@
 //	Arilia Wireless Inc.
 //
 
-#ifndef UCENTRAL_RESTAPI_OBJECTS_H
+#pragma once
-#define UCENTRAL_RESTAPI_OBJECTS_H
 
 #include "Poco/JSON/Object.h"
 #include "RESTAPI_SecurityObjects.h"
@@ -111,7 +110,7 @@ namespace OpenWifi::GWObjects {
 	struct DefaultConfiguration {
 		std::string Name;
 		std::string Configuration;
-		std::string Models;
+		Types::StringVec Models;
 		std::string Description;
 		uint64_t 	Created;
 		uint64_t 	LastModified;
@@ -191,5 +190,3 @@ namespace OpenWifi::GWObjects {
 		void to_json(Poco::JSON::Object &Obj) const;
 	};
 }
-
-#endif //UCENTRAL_RESTAPI_OBJECTS_H

src/RESTObjects/RESTAPI_ProvObjects.h

@@ -6,9 +6,7 @@
 //	Arilia Wireless Inc.
 //
 
-
+#pragma once
-#ifndef OWPROV_RESTAPI_PROVOBJECTS_H
-#define OWPROV_RESTAPI_PROVOBJECTS_H
 
 #include <string>
 #include "RESTAPI_SecurityObjects.h"
@@ -380,6 +378,3 @@ namespace OpenWifi::ProvObjects {
     bool UpdateObjectInfo(const Poco::JSON::Object::Ptr &O, const SecurityObjects::UserInfo &U, ObjectInfo &I);
     bool CreateObjectInfo(const Poco::JSON::Object::Ptr &O, const SecurityObjects::UserInfo &U, ObjectInfo &I);
 };
-
-
-#endif //OWPROV_RESTAPI_PROVOBJECTS_H

src/storage/storage_configurations.h

@@ -6,10 +6,7 @@
 //	Arilia Wireless Inc.
 //
 
-
+#pragma once
-#ifndef OWPROV_STORAGE_CONFIGURATIONS_H
-#define OWPROV_STORAGE_CONFIGURATIONS_H
-
 
 #include "framework/orm.h"
 #include "RESTObjects/RESTAPI_ProvObjects.h"
@@ -40,6 +37,3 @@ namespace OpenWifi {
     private:
     };
 }
-
-
-#endif //OWPROV_STORAGE_CONFIGURATIONS_H

src/storage/storage_contact.h

@@ -6,9 +6,7 @@
 //	Arilia Wireless Inc.
 //
 
-
+#pragma once
-#ifndef OWPROV_STORAGE_CONTACT_H
-#define OWPROV_STORAGE_CONTACT_H
 
 #include "framework/orm.h"
 #include "RESTObjects/RESTAPI_ProvObjects.h"
@@ -45,6 +43,3 @@ namespace OpenWifi {
         private:
     };
 }
-
-
-#endif //OWPROV_STORAGE_CONTACT_H

src/storage/storage_entity.h

@@ -6,9 +6,7 @@
 //	Arilia Wireless Inc.
 //
 
-
+#pragma once
-#ifndef OWPROV_STORAGE_ENTITY_H
-#define OWPROV_STORAGE_ENTITY_H
 
 #include "framework/orm.h"
 #include "RESTObjects/RESTAPI_ProvObjects.h"
@@ -53,6 +51,3 @@ namespace OpenWifi {
         bool RootExists_=false;
     };
 }
-
-
-#endif //OWPROV_STORAGE_ENTITY_H

src/storage/storage_inventory.h

@@ -6,9 +6,7 @@
 //	Arilia Wireless Inc.
 //
 
-
+#pragma once
-#ifndef OWPROV_STORAGE_INVENTORY_H
-#define OWPROV_STORAGE_INVENTORY_H
 
 #include "framework/orm.h"
 #include "RESTObjects/RESTAPI_ProvObjects.h"
@@ -51,5 +49,3 @@ namespace OpenWifi {
         private:
     };
 }
-
-#endif //OWPROV_STORAGE_INVENTORY_H

src/storage/storage_jobs.h

@@ -2,8 +2,7 @@
 // Created by stephane bourque on 2021-10-28.
 //
 
-#ifndef OWPROV_STORAGE_JOBS_H
+#pragma once
-#define OWPROV_STORAGE_JOBS_H
 
 #include "framework/orm.h"
 #include "JobController.h"
@@ -38,6 +37,3 @@ namespace OpenWifi {
     private:
     };
 }
-
-
-#endif //OWPROV_STORAGE_JOBS_H

src/storage/storage_location.h

@@ -6,9 +6,7 @@
 //	Arilia Wireless Inc.
 //
 
-
+#pragma once
-#ifndef OWPROV_STORAGE_LOCATION_H
-#define OWPROV_STORAGE_LOCATION_H
 
 #include "framework/orm.h"
 #include "RESTObjects/RESTAPI_ProvObjects.h"
@@ -43,6 +41,3 @@ namespace OpenWifi {
     private:
     };
 }
-
-
-#endif //OWPROV_STORAGE_LOCATION_H

src/storage/storage_management_roles.h

@@ -6,9 +6,7 @@
 //	Arilia Wireless Inc.
 //
 
-
+#pragma once
-#ifndef OWPROV_STORAGE_MANAGEMENT_ROLES_H
-#define OWPROV_STORAGE_MANAGEMENT_ROLES_H
 
 #include "framework/orm.h"
 #include "RESTObjects/RESTAPI_ProvObjects.h"
@@ -34,6 +32,3 @@ namespace OpenWifi {
         private:
     };
 }
-
-
-#endif //OWPROV_STORAGE_MANAGEMENT_ROLES_H

src/storage/storage_maps.h

@@ -2,8 +2,7 @@
 // Created by stephane bourque on 2021-11-09.
 //
 
-#ifndef OWPROV_STORAGE_MAPS_H
+#pragma once
-#define OWPROV_STORAGE_MAPS_H
 
 #include "framework/orm.h"
 #include "RESTObjects/RESTAPI_ProvObjects.h"
@@ -30,6 +29,3 @@ namespace OpenWifi {
     private:
     };
 }
-
-
-#endif //OWPROV_STORAGE_MAPS_H

src/storage/storage_policies.h

@@ -6,9 +6,7 @@
 //	Arilia Wireless Inc.
 //
 
-
+#pragma once
-#ifndef OWPROV_STORAGE_POLICIES_H
-#define OWPROV_STORAGE_POLICIES_H
 
 #include "framework/orm.h"
 #include "RESTObjects/RESTAPI_ProvObjects.h"
@@ -33,6 +31,3 @@ namespace OpenWifi {
     private:
     };
 }
-
-
-#endif //OWPROV_STORAGE_POLICIES_H

src/storage/storage_tags.h

@@ -2,8 +2,7 @@
 // Created by stephane bourque on 2021-10-02.
 //
 
-#ifndef OWPROV_STORAGE_TAGS_H
+#pragma once
-#define OWPROV_STORAGE_TAGS_H
 
 #include "framework/orm.h"
 #include "framework/OpenWifiTypes.h"
@@ -45,5 +44,3 @@ namespace OpenWifi {
         private:
     };
 }
-
-#endif //OWPROV_STORAGE_TAGS_H

src/storage/storage_venue.h

@@ -6,9 +6,7 @@
 //	Arilia Wireless Inc.
 //
 
-
+#pragma once
-#ifndef OWPROV_STORAGE_VENUE_H
-#define OWPROV_STORAGE_VENUE_H
 
 #include "framework/orm.h"
 #include "RESTObjects/RESTAPI_ProvObjects.h"
@@ -44,7 +42,3 @@ namespace OpenWifi {
     private:
     };
 }
-
-
-
-#endif //OWPROV_STORAGE_VENUE_H