change RouteController's member field for server app from a pointer t…

…o a reference
nam20485 · Oct 13, 2023 · 82d1a84 · 82d1a84
1 parent 7eaa064
commit 82d1a84
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/OdbDesignLib/RouteController.cpp b/OdbDesignLib/RouteController.cpp
@@ -4,8 +4,8 @@
 
 namespace Odb::Lib
 {
-	RouteController::RouteController(IOdbServerApp* pServerApp)
-		: m_pServerApp(pServerApp)
+	RouteController::RouteController(IOdbServerApp& serverApp)
+		: m_serverApp(serverApp)
 	{
 	}
 

diff --git a/OdbDesignLib/RouteController.h b/OdbDesignLib/RouteController.h
@@ -9,14 +9,14 @@ namespace Odb::Lib
 	class ODBDESIGN_EXPORT RouteController
 	{
 	public:		
-		RouteController(IOdbServerApp* pServerApp);
+		RouteController(IOdbServerApp& serverApp);
 
 		virtual void register_routes() = 0;
 
 		typedef std::vector<std::shared_ptr<RouteController>> Vector;
 
 	protected:		
-		IOdbServerApp* m_pServerApp;
+		IOdbServerApp& m_serverApp;
 
 		typedef std::function<crow::response(const crow::request& req)> TRouteHandlerFunction;
 

diff --git a/OdbDesignServer/Controllers/HelloWorldController.cpp b/OdbDesignServer/Controllers/HelloWorldController.cpp
@@ -4,22 +4,22 @@
 
 namespace Odb::App::Server
 {
-	HelloWorldController::HelloWorldController(IOdbServerApp* pServerApp)
-		: RouteController(pServerApp)
+	HelloWorldController::HelloWorldController(IOdbServerApp& serverApp)
+		: RouteController(serverApp)
 	{
 	}
 
 	void HelloWorldController::register_routes()
 	{
 		// /helloworld
-		CROW_ROUTE(m_pServerApp->crow_app(), "/helloworld")([]() {
+		CROW_ROUTE(m_serverApp.crow_app(), "/helloworld")([]() {
 			//return "Hello world";
 			auto page = crow::mustache::load_text("helloworld.html");
 			return page;
 			});
 
 		// /hellodesign/<string>
-		CROW_ROUTE(m_pServerApp->crow_app(), "/hellodesign/<string>")([](std::string designName) {
+		CROW_ROUTE(m_serverApp.crow_app(), "/hellodesign/<string>")([](std::string designName) {
 			auto page = crow::mustache::load("helloworld.html");
 			crow::mustache::context ctx({ {"design", designName} });
 			return page.render(ctx);

diff --git a/OdbDesignServer/Controllers/HelloWorldController.h b/OdbDesignServer/Controllers/HelloWorldController.h
@@ -10,7 +10,7 @@ namespace Odb::App::Server
 	class HelloWorldController : public RouteController
 	{
 	public:
-		HelloWorldController(IOdbServerApp* pServerApp);
+		HelloWorldController(IOdbServerApp& serverApp);
 
 		void register_routes() override;
 

diff --git a/OdbDesignServer/Controllers/StepsEdaDataController.cpp b/OdbDesignServer/Controllers/StepsEdaDataController.cpp
@@ -10,8 +10,8 @@ using namespace Utils;
 
 namespace Odb::App::Server
 {
-	StepsEdaDataController::StepsEdaDataController(IOdbServerApp* pServerApp)
-		: RouteController(pServerApp)
+	StepsEdaDataController::StepsEdaDataController(IOdbServerApp& serverApp)
+		: RouteController(serverApp)
 	{
 	}
 
@@ -25,7 +25,7 @@ namespace Odb::App::Server
 		//app.route_dynamic(url)
 
 		// TODO: figure out why capture here is weird (i.e. how to capture pServerApp so it can be used in the member fxn handler)
-		CROW_ROUTE(m_pServerApp->crow_app(), "/steps/eda_data")
+		CROW_ROUTE(m_serverApp.crow_app(), "/steps/eda_data")
 			([&](const crow::request& req)
 				{
 					return this->steps_edadata_route_handler(req);
@@ -52,7 +52,7 @@ namespace Odb::App::Server
 			return crow::response(crow::status::BAD_REQUEST, "step name not specified");
 		}
 
-		auto pFileArchive = m_pServerApp->design_cache().GetFileArchive(designName);
+		auto pFileArchive = m_serverApp.design_cache().GetFileArchive(designName);
 		if (pFileArchive == nullptr)
 		{
 			std::stringstream ss;

diff --git a/OdbDesignServer/Controllers/StepsEdaDataController.h b/OdbDesignServer/Controllers/StepsEdaDataController.h
@@ -11,7 +11,7 @@ namespace Odb::App::Server
 	class StepsEdaDataController : public RouteController
 	{
 	public:
-		StepsEdaDataController(IOdbServerApp* pServerApp);
+		StepsEdaDataController(IOdbServerApp& serverApp);
 
 		void register_routes() override;		
 

diff --git a/OdbDesignServer/OdbDesignServerApp.cpp b/OdbDesignServer/OdbDesignServerApp.cpp
@@ -30,7 +30,7 @@ namespace Odb::App::Server
 
 	void OdbDesignServerApp::add_controllers()
 	{
-		m_vecControllers.push_back(std::make_shared<HelloWorldController>(this));
-		m_vecControllers.push_back(std::make_shared<StepsEdaDataController>(this));
+		m_vecControllers.push_back(std::make_shared<HelloWorldController>(*this));
+		m_vecControllers.push_back(std::make_shared<StepsEdaDataController>(*this));
 	}	
 }