Skip to content

Commit b240d50

Browse files
Jadit19Jadit19
committed
move req res cookie to messages folder
1 parent 65be124 commit b240d50

File tree

24 files changed

+160
-130
lines changed

24 files changed

+160
-130
lines changed

‎example/main.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// that the code could be more readable ¯\_(ツ)_/¯
1212
using namespace expresso::core;
1313
using namespace expresso::enums;
14+
using namespace expresso::messages;
1415
using namespace expresso::middleware;
1516

1617
// Global variable, just for fun :)

‎include/expresso/core/router.h‎

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,23 @@ namespace core {
88

99
class Router {
1010
private:
11-
std::map<std::string, void (*)(Request &request, Response &response)> getMap;
12-
std::map<std::string, void (*)(Request &request, Response &response)> postMap;
13-
std::map<std::string, void (*)(Request &request, Response &response)> putMap;
14-
std::map<std::string, void (*)(Request &request, Response &response)>
11+
std::map<std::string, void (*)(expresso::messages::Request &request,
12+
expresso::messages::Response &response)>
13+
getMap;
14+
std::map<std::string, void (*)(expresso::messages::Request &request,
15+
expresso::messages::Response &response)>
16+
postMap;
17+
std::map<std::string, void (*)(expresso::messages::Request &request,
18+
expresso::messages::Response &response)>
19+
putMap;
20+
std::map<std::string, void (*)(expresso::messages::Request &request,
21+
expresso::messages::Response &response)>
1522
patchMap;
16-
std::map<std::string, void (*)(Request &request, Response &response)>
23+
std::map<std::string, void (*)(expresso::messages::Request &request,
24+
expresso::messages::Response &response)>
1725
deleteMap;
18-
std::map<std::string, void (*)(Request &request, Response &response)>
26+
std::map<std::string, void (*)(expresso::messages::Request &request,
27+
expresso::messages::Response &response)>
1928
optionsMap;
2029
std::map<std::string, Router *> routerMap;
2130

@@ -24,33 +33,43 @@ class Router {
2433

2534
std::vector<std::unique_ptr<expresso::middleware::Middleware>> middlewares;
2635

27-
bool handleMiddlewares(Request &request, Response &response);
28-
std::map<std::string, void (*)(Request &request, Response &response)> &
36+
bool handleMiddlewares(expresso::messages::Request &request,
37+
expresso::messages::Response &response);
38+
std::map<std::string, void (*)(expresso::messages::Request &request,
39+
expresso::messages::Response &response)> &
2940
fetchMapFromMethod(expresso::enums::method method);
3041
void addRoute(expresso::enums::method method, std::string path,
31-
void (*handler)(Request &request, Response &response));
42+
void (*handler)(expresso::messages::Request &request,
43+
expresso::messages::Response &response));
3244

3345
public:
3446
Router();
3547
~Router();
3648

3749
void get(std::string path,
38-
void (*handler)(Request &request, Response &response));
50+
void (*handler)(expresso::messages::Request &request,
51+
expresso::messages::Response &response));
3952
void post(std::string path,
40-
void (*handler)(Request &request, Response &response));
53+
void (*handler)(expresso::messages::Request &request,
54+
expresso::messages::Response &response));
4155
void put(std::string path,
42-
void (*handler)(Request &request, Response &response));
56+
void (*handler)(expresso::messages::Request &request,
57+
expresso::messages::Response &response));
4358
void patch(std::string path,
44-
void (*handler)(Request &request, Response &response));
59+
void (*handler)(expresso::messages::Request &request,
60+
expresso::messages::Response &response));
4561
void del(std::string path,
46-
void (*handler)(Request &request, Response &response));
62+
void (*handler)(expresso::messages::Request &request,
63+
expresso::messages::Response &response));
4764
void options(std::string path,
48-
void (*handler)(Request &request, Response &response));
65+
void (*handler)(expresso::messages::Request &request,
66+
expresso::messages::Response &response));
4967

5068
void use(std::string path, Router *router);
5169
void use(std::unique_ptr<expresso::middleware::Middleware> middleware);
5270

53-
void handleRequest(Request &request, Response &response);
71+
void handleRequest(expresso::messages::Request &request,
72+
expresso::messages::Response &response);
5473
};
5574

5675
} // namespace core

‎include/expresso/core/server.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class Server : public Router {
2525
void acceptConnections();
2626
void handleConnection(int clientSocket);
2727

28-
expresso::core::Request makeRequest(std::string &request) noexcept(false);
28+
expresso::messages::Request makeRequest(std::string &request) noexcept(false);
2929
nexus::pool threadPool;
3030

3131
public:

include/expresso/core/cookie.h renamed to include/expresso/messages/cookie.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace expresso {
88

9-
namespace core {
9+
namespace messages {
1010

1111
class Cookie {
1212
public:
@@ -28,6 +28,6 @@ class Cookie {
2828
std::string serialize();
2929
};
3030

31-
} // namespace core
31+
} // namespace messages
3232

3333
} // namespace expresso

include/expresso/core/request.h renamed to include/expresso/messages/request.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#pragma once
22

3-
#include <expresso/core/response.h>
3+
#include <expresso/messages/response.h>
44

55
namespace expresso {
66

7-
namespace core {
7+
namespace messages {
88

99
class Request {
1010
private:
@@ -31,11 +31,11 @@ class Request {
3131
std::map<std::string, std::string> params;
3232
std::map<std::string, std::string> queries;
3333

34-
expresso::core::Response *res;
34+
expresso::messages::Response *res;
3535

3636
void print();
3737
};
3838

39-
} // namespace core
39+
} // namespace messages
4040

4141
} // namespace expresso

include/expresso/core/response.h renamed to include/expresso/messages/response.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
#include <json/object.h>
1010
#include <zippuccino/zipper.h>
1111

12-
#include <expresso/core/cookie.h>
1312
#include <expresso/enums/method.h>
1413
#include <expresso/enums/status_code.h>
14+
#include <expresso/messages/cookie.h>
1515

1616
namespace expresso {
1717

18-
namespace core {
18+
namespace messages {
1919

2020
class Response {
2121
private:
@@ -54,6 +54,6 @@ class Response {
5454
void print();
5555
};
5656

57-
} // namespace core
57+
} // namespace messages
5858

5959
} // namespace expresso

‎include/expresso/middleware/cacher.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ class Cacher : public Middleware {
1717
Cacher(uint32_t maxAge = 3600, bool isPrivate = false);
1818
~Cacher();
1919

20-
bool use(expresso::core::Request &req,
21-
expresso::core::Response &res) override;
20+
bool use(expresso::messages::Request &req,
21+
expresso::messages::Response &res) override;
2222
};
2323

2424
} // namespace middleware

‎include/expresso/middleware/cookie_parser.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ class CookieParser : public Middleware {
1212
CookieParser();
1313
~CookieParser();
1414

15-
bool use(expresso::core::Request &req,
16-
expresso::core::Response &res) override;
15+
bool use(expresso::messages::Request &req,
16+
expresso::messages::Response &res) override;
1717
};
1818

1919
} // namespace middleware

‎include/expresso/middleware/cors.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ class Cors : public Middleware {
2727
void allowHeader(std::string header);
2828
void allowCredentials(bool credentials);
2929

30-
bool use(expresso::core::Request &req,
31-
expresso::core::Response &res) override;
30+
bool use(expresso::messages::Request &req,
31+
expresso::messages::Response &res) override;
3232
};
3333

3434
} // namespace middleware

‎include/expresso/middleware/date.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ class Date : public Middleware {
1212
Date();
1313
~Date();
1414

15-
bool use(expresso::core::Request &req,
16-
expresso::core::Response &res) override;
15+
bool use(expresso::messages::Request &req,
16+
expresso::messages::Response &res) override;
1717
};
1818

1919
} // namespace middleware

0 commit comments

Comments
 (0)