Skip to content

Commit 9ce8f20

Browse files
Jadit19Jadit19
authored
Merge pull request #7 from coding-cpp/fix/2
rename message folder to messages
2 parents aec0637 + 93b2414 commit 9ce8f20

File tree

17 files changed

+87
-87
lines changed

17 files changed

+87
-87
lines changed

‎example/main.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ int main(int argc, char **argv) {
66
connection.port = 80;
77

88
mochios::Client client(connection);
9-
client.interceptors.request.use([](mochios::message::Request &request) {
9+
client.interceptors.request.use([](mochios::messages::Request &request) {
1010
logger::info("Intercepting request!");
1111
request.print();
1212
});
13-
mochios::message::Response response;
13+
mochios::messages::Response response;
1414

15-
mochios::message::Request healthRequest("/health");
15+
mochios::messages::Request healthRequest("/health");
1616
response = client.get(healthRequest);
1717
logger::success(response.body);
1818

19-
mochios::message::Request request("/about");
19+
mochios::messages::Request request("/about");
2020
response = client.get(request);
2121
logger::success(response.body.dumps(2));
2222

‎include/mochios/client/client.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,21 @@ class Client {
2121
mochios::client::Connection connection;
2222

2323
void connect();
24-
mochios::message::Response sendHelper(mochios::message::Request &request);
24+
mochios::messages::Response sendHelper(mochios::messages::Request &request);
2525

2626
public:
2727
Client(const mochios::client::Connection &connection);
2828
~Client();
2929

3030
mochios::interceptor::Interceptors interceptors;
3131

32-
mochios::message::Response get(mochios::message::Request &request);
33-
mochios::message::Response post(mochios::message::Request &request);
34-
mochios::message::Response put(mochios::message::Request &request);
35-
mochios::message::Response patch(mochios::message::Request &request);
36-
mochios::message::Response del(mochios::message::Request &request);
37-
mochios::message::Response options(mochios::message::Request &request);
38-
mochios::message::Response head(mochios::message::Request &request);
32+
mochios::messages::Response get(mochios::messages::Request &request);
33+
mochios::messages::Response post(mochios::messages::Request &request);
34+
mochios::messages::Response put(mochios::messages::Request &request);
35+
mochios::messages::Response patch(mochios::messages::Request &request);
36+
mochios::messages::Response del(mochios::messages::Request &request);
37+
mochios::messages::Response options(mochios::messages::Request &request);
38+
mochios::messages::Response head(mochios::messages::Request &request);
3939
};
4040

4141
} // namespace mochios

‎include/mochios/helpers/client.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
#include <brewtils/url.h>
99

1010
#include <mochios/enums/method.h>
11-
#include <mochios/message/request.h>
12-
#include <mochios/message/response.h>
11+
#include <mochios/messages/request.h>
12+
#include <mochios/messages/response.h>
1313

1414
namespace mochios {
1515

1616
namespace helpers {
1717

1818
std::pair<std::string, std::string>
19-
buildRequest(mochios::message::Request &request);
19+
buildRequest(mochios::messages::Request &request);
2020

21-
void buildResponse(mochios::message::Response &res,
21+
void buildResponse(mochios::messages::Response &res,
2222
std::stringstream &response);
2323

24-
mochios::message::Response send(mochios::message::Request &request,
24+
mochios::messages::Response send(mochios::messages::Request &request,
2525
const int &socket);
2626

2727
} // namespace helpers

‎include/mochios/interceptors/interceptor.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#include <functional>
44

5-
#include <mochios/message/request.h>
6-
#include <mochios/message/response.h>
5+
#include <mochios/messages/request.h>
6+
#include <mochios/messages/response.h>
77

88
namespace mochios {
99

@@ -30,8 +30,8 @@ template <typename T> class Manager {
3030
};
3131

3232
typedef struct {
33-
mochios::interceptor::Manager<mochios::message::Request> request;
34-
mochios::interceptor::Manager<mochios::message::Response> response;
33+
mochios::interceptor::Manager<mochios::messages::Request> request;
34+
mochios::interceptor::Manager<mochios::messages::Response> response;
3535
} Interceptors;
3636

3737
} // namespace interceptor

‎include/mochios/interceptors/request/user_agent.h‎

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

3-
#include <mochios/message/request.h>
3+
#include <mochios/messages/request.h>
44
#include <mochios/version.h>
55

66
namespace mochios {
@@ -9,7 +9,7 @@ namespace interceptor {
99

1010
namespace request {
1111

12-
void userAgent(mochios::message::Request &request);
12+
void userAgent(mochios::messages::Request &request);
1313

1414
} // namespace request
1515

‎include/mochios/interceptors/response/json.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
#include <json/parse.h>
44

5-
#include <mochios/message/response.h>
5+
#include <mochios/messages/response.h>
66

77
namespace mochios {
88

99
namespace interceptor {
1010

1111
namespace response {
1212

13-
void json(mochios::message::Response &response);
13+
void json(mochios::messages::Response &response);
1414

1515
} // namespace response
1616

‎include/mochios/message/message.h‎ renamed to ‎include/mochios/messages/message.h‎

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

66
namespace mochios {
77

8-
namespace message {
8+
namespace messages {
99

1010
class Message {
1111
private:
@@ -27,6 +27,6 @@ class Message {
2727
virtual void print() = 0;
2828
};
2929

30-
} // namespace message
30+
} // namespace messages
3131

3232
} // namespace mochios

‎include/mochios/message/request.h‎ renamed to ‎include/mochios/messages/request.h‎

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

33
#include <mochios/enums/method.h>
4-
#include <mochios/message/message.h>
4+
#include <mochios/messages/message.h>
55

66
namespace mochios {
77

8-
namespace message {
8+
namespace messages {
99

1010
class Request : public Message {
1111
private:
@@ -19,6 +19,6 @@ class Request : public Message {
1919
void print() override;
2020
};
2121

22-
} // namespace message
22+
} // namespace messages
2323

2424
} // namespace mochios

‎include/mochios/message/response.h‎ renamed to ‎include/mochios/messages/response.h‎

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

3-
#include <mochios/message/message.h>
3+
#include <mochios/messages/message.h>
44

55
namespace mochios {
66

7-
namespace message {
7+
namespace messages {
88

99
class Response : public Message {
1010
private:
@@ -18,6 +18,6 @@ class Response : public Message {
1818
void print() override;
1919
};
2020

21-
} // namespace message
21+
} // namespace messages
2222

2323
} // namespace mochios

‎src/client/client.cpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -31,44 +31,44 @@ mochios::Client::~Client() {
3131
return;
3232
}
3333

34-
mochios::message::Response
35-
mochios::Client::get(mochios::message::Request &request) {
34+
mochios::messages::Response
35+
mochios::Client::get(mochios::messages::Request &request) {
3636
request.method = mochios::enums::method::GET;
3737
return this->sendHelper(request);
3838
}
3939

40-
mochios::message::Response
41-
mochios::Client::post(mochios::message::Request &request) {
40+
mochios::messages::Response
41+
mochios::Client::post(mochios::messages::Request &request) {
4242
request.method = mochios::enums::method::POST;
4343
return this->sendHelper(request);
4444
}
4545

46-
mochios::message::Response
47-
mochios::Client::put(mochios::message::Request &request) {
46+
mochios::messages::Response
47+
mochios::Client::put(mochios::messages::Request &request) {
4848
request.method = mochios::enums::method::PUT;
4949
return this->sendHelper(request);
5050
}
5151

52-
mochios::message::Response
53-
mochios::Client::patch(mochios::message::Request &request) {
52+
mochios::messages::Response
53+
mochios::Client::patch(mochios::messages::Request &request) {
5454
request.method = mochios::enums::method::PATCH;
5555
return this->sendHelper(request);
5656
}
5757

58-
mochios::message::Response
59-
mochios::Client::del(mochios::message::Request &request) {
58+
mochios::messages::Response
59+
mochios::Client::del(mochios::messages::Request &request) {
6060
request.method = mochios::enums::method::DELETE;
6161
return this->sendHelper(request);
6262
}
6363

64-
mochios::message::Response
65-
mochios::Client::options(mochios::message::Request &request) {
64+
mochios::messages::Response
65+
mochios::Client::options(mochios::messages::Request &request) {
6666
request.method = mochios::enums::method::OPTIONS;
6767
return this->sendHelper(request);
6868
}
6969

70-
mochios::message::Response
71-
mochios::Client::head(mochios::message::Request &request) {
70+
mochios::messages::Response
71+
mochios::Client::head(mochios::messages::Request &request) {
7272
request.method = mochios::enums::method::HEAD;
7373
return this->sendHelper(request);
7474
}
@@ -92,19 +92,19 @@ void mochios::Client::connect() {
9292
}
9393
}
9494

95-
mochios::message::Response
96-
mochios::Client::sendHelper(mochios::message::Request &request) {
95+
mochios::messages::Response
96+
mochios::Client::sendHelper(mochios::messages::Request &request) {
9797
request.set("Host", this->connection.host);
9898
request.set("Accept", "*/*");
9999
request.set("Connection", "close");
100-
for (const std::function<void(mochios::message::Request &)>
100+
for (const std::function<void(mochios::messages::Request &)>
101101
&requestInterceptor : this->interceptors.request.interceptors) {
102102
requestInterceptor(request);
103103
}
104104
this->connect();
105-
mochios::message::Response res =
105+
mochios::messages::Response res =
106106
mochios::helpers::send(request, this->socket);
107-
for (const std::function<void(mochios::message::Response &)>
107+
for (const std::function<void(mochios::messages::Response &)>
108108
&responseInterceptor : this->interceptors.response.interceptors) {
109109
responseInterceptor(res);
110110
}

0 commit comments

Comments
 (0)