Skip to content

Commit 1a0c268

Browse files
KraustKraust
committed
Added github workflow & changed to OA3 Petstore.
1 parent 8769aeb commit 1a0c268

11 files changed

Lines changed: 87 additions & 57 deletions

File tree

‎.github/workflows/samples-cpp-oatpp-server.yaml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Samples cpp oat++ server
2+
3+
on:
4+
push:
5+
branches:
6+
- "samples/server/petstore/cpp-oatpp/**"
7+
pull_request:
8+
paths:
9+
- "samples/server/petstore/cpp-oatpp/**"
10+
11+
env:
12+
GRADLE_VERSION: 6.9
13+
14+
jobs:
15+
build:
16+
name: Build cpp qt client
17+
strategy:
18+
matrix:
19+
sample:
20+
- samples/server/petstore/cpp-oatpp
21+
os:
22+
- ubuntu-latest
23+
- macOS-latest
24+
- windows-latest
25+
runs-on: ${{ matrix.os }}
26+
steps:
27+
- uses: actions/checkout@v4
28+
- name: Build
29+
working-directory: ${{ matrix.sample }}
30+
run: cmake -B build && cmake --build build --verbose

‎bin/configs/cpp-oatpp-server-cpp-oatpp.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
generatorName: cpp-oatpp-server
22
outputDir: samples/server/petstore/cpp-oatpp
3-
inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
3+
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
44
templateDir: modules/openapi-generator/src/main/resources/cpp-oatpp-server
55
additionalProperties:
66
addExternalLibs: "true"

‎samples/server/petstore/cpp-oatpp/api/PetApi.hpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ class PetApi : public oatpp::web::server::api::ApiController {
4747
///
4848
/// </remarks>
4949
/// <param name="request">HTTP Request</param>
50-
/// <param name="body">Pet object that needs to be added to the store</param>
51-
virtual std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> add_pet(const std::shared_ptr<IncomingRequest> &request, const oatpp::Object<org::openapitools::server::model::Pet> &body) = 0;
50+
/// <param name="pet">Pet object that needs to be added to the store</param>
51+
virtual std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> add_pet(const std::shared_ptr<IncomingRequest> &request, const oatpp::Object<org::openapitools::server::model::Pet> &pet) = 0;
5252

53-
ENDPOINT("POST", "/pet", add_pet_handler, REQUEST(std::shared_ptr<IncomingRequest>, request), BODY_DTO(oatpp::Object<org::openapitools::server::model::Pet>, body)) {
54-
return add_pet(request, body);
53+
ENDPOINT("POST", "/pet", add_pet_handler, REQUEST(std::shared_ptr<IncomingRequest>, request), BODY_DTO(oatpp::Object<org::openapitools::server::model::Pet>, pet)) {
54+
return add_pet(request, pet);
5555
}
5656
/// <summary>
5757
/// Deletes a pet
@@ -113,11 +113,11 @@ class PetApi : public oatpp::web::server::api::ApiController {
113113
///
114114
/// </remarks>
115115
/// <param name="request">HTTP Request</param>
116-
/// <param name="body">Pet object that needs to be added to the store</param>
117-
virtual std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> update_pet(const std::shared_ptr<IncomingRequest> &request, const oatpp::Object<org::openapitools::server::model::Pet> &body) = 0;
116+
/// <param name="pet">Pet object that needs to be added to the store</param>
117+
virtual std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> update_pet(const std::shared_ptr<IncomingRequest> &request, const oatpp::Object<org::openapitools::server::model::Pet> &pet) = 0;
118118

119-
ENDPOINT("PUT", "/pet", update_pet_handler, REQUEST(std::shared_ptr<IncomingRequest>, request), BODY_DTO(oatpp::Object<org::openapitools::server::model::Pet>, body)) {
120-
return update_pet(request, body);
119+
ENDPOINT("PUT", "/pet", update_pet_handler, REQUEST(std::shared_ptr<IncomingRequest>, request), BODY_DTO(oatpp::Object<org::openapitools::server::model::Pet>, pet)) {
120+
return update_pet(request, pet);
121121
}
122122
/// <summary>
123123
/// Updates a pet in the store with form data

‎samples/server/petstore/cpp-oatpp/api/StoreApi.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ class StoreApi : public oatpp::web::server::api::ApiController {
8484
///
8585
/// </remarks>
8686
/// <param name="request">HTTP Request</param>
87-
/// <param name="body">order placed for purchasing the pet</param>
88-
virtual std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> place_order(const std::shared_ptr<IncomingRequest> &request, const oatpp::Object<org::openapitools::server::model::Order> &body) = 0;
87+
/// <param name="order">order placed for purchasing the pet</param>
88+
virtual std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> place_order(const std::shared_ptr<IncomingRequest> &request, const oatpp::Object<org::openapitools::server::model::Order> &order) = 0;
8989

90-
ENDPOINT("POST", "/store/order", place_order_handler, REQUEST(std::shared_ptr<IncomingRequest>, request), BODY_DTO(oatpp::Object<org::openapitools::server::model::Order>, body)) {
91-
return place_order(request, body);
90+
ENDPOINT("POST", "/store/order", place_order_handler, REQUEST(std::shared_ptr<IncomingRequest>, request), BODY_DTO(oatpp::Object<org::openapitools::server::model::Order>, order)) {
91+
return place_order(request, order);
9292
}
9393
};
9494

‎samples/server/petstore/cpp-oatpp/api/UserApi.hpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ class UserApi : public oatpp::web::server::api::ApiController {
4646
/// This can only be done by the logged in user.
4747
/// </remarks>
4848
/// <param name="request">HTTP Request</param>
49-
/// <param name="body">Created user object</param>
50-
virtual std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> create_user(const std::shared_ptr<IncomingRequest> &request, const oatpp::Object<org::openapitools::server::model::User> &body) = 0;
49+
/// <param name="user">Created user object</param>
50+
virtual std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> create_user(const std::shared_ptr<IncomingRequest> &request, const oatpp::Object<org::openapitools::server::model::User> &user) = 0;
5151

52-
ENDPOINT("POST", "/user", create_user_handler, REQUEST(std::shared_ptr<IncomingRequest>, request), BODY_DTO(oatpp::Object<org::openapitools::server::model::User>, body)) {
53-
return create_user(request, body);
52+
ENDPOINT("POST", "/user", create_user_handler, REQUEST(std::shared_ptr<IncomingRequest>, request), BODY_DTO(oatpp::Object<org::openapitools::server::model::User>, user)) {
53+
return create_user(request, user);
5454
}
5555
/// <summary>
5656
/// Creates list of users with given input array
@@ -59,11 +59,11 @@ class UserApi : public oatpp::web::server::api::ApiController {
5959
///
6060
/// </remarks>
6161
/// <param name="request">HTTP Request</param>
62-
/// <param name="body">List of user object</param>
63-
virtual std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> create_users_with_array_input(const std::shared_ptr<IncomingRequest> &request, const oatpp::Vector<oatpp::Object<org::openapitools::server::model::User>> &body) = 0;
62+
/// <param name="user">List of user object</param>
63+
virtual std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> create_users_with_array_input(const std::shared_ptr<IncomingRequest> &request, const oatpp::Vector<oatpp::Object<org::openapitools::server::model::User>> &user) = 0;
6464

65-
ENDPOINT("POST", "/user/createWithArray", create_users_with_array_input_handler, REQUEST(std::shared_ptr<IncomingRequest>, request), BODY_DTO(oatpp::Vector<oatpp::Object<org::openapitools::server::model::User>>, body)) {
66-
return create_users_with_array_input(request, body);
65+
ENDPOINT("POST", "/user/createWithArray", create_users_with_array_input_handler, REQUEST(std::shared_ptr<IncomingRequest>, request), BODY_DTO(oatpp::Vector<oatpp::Object<org::openapitools::server::model::User>>, user)) {
66+
return create_users_with_array_input(request, user);
6767
}
6868
/// <summary>
6969
/// Creates list of users with given input array
@@ -72,11 +72,11 @@ class UserApi : public oatpp::web::server::api::ApiController {
7272
///
7373
/// </remarks>
7474
/// <param name="request">HTTP Request</param>
75-
/// <param name="body">List of user object</param>
76-
virtual std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> create_users_with_list_input(const std::shared_ptr<IncomingRequest> &request, const oatpp::Vector<oatpp::Object<org::openapitools::server::model::User>> &body) = 0;
75+
/// <param name="user">List of user object</param>
76+
virtual std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> create_users_with_list_input(const std::shared_ptr<IncomingRequest> &request, const oatpp::Vector<oatpp::Object<org::openapitools::server::model::User>> &user) = 0;
7777

78-
ENDPOINT("POST", "/user/createWithList", create_users_with_list_input_handler, REQUEST(std::shared_ptr<IncomingRequest>, request), BODY_DTO(oatpp::Vector<oatpp::Object<org::openapitools::server::model::User>>, body)) {
79-
return create_users_with_list_input(request, body);
78+
ENDPOINT("POST", "/user/createWithList", create_users_with_list_input_handler, REQUEST(std::shared_ptr<IncomingRequest>, request), BODY_DTO(oatpp::Vector<oatpp::Object<org::openapitools::server::model::User>>, user)) {
79+
return create_users_with_list_input(request, user);
8080
}
8181
/// <summary>
8282
/// Delete user
@@ -138,11 +138,11 @@ class UserApi : public oatpp::web::server::api::ApiController {
138138
/// </remarks>
139139
/// <param name="request">HTTP Request</param>
140140
/// <param name="username">name that need to be deleted</param>
141-
/// <param name="body">Updated user object</param>
142-
virtual std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> update_user(const std::shared_ptr<IncomingRequest> &request, const oatpp::String &username, const oatpp::Object<org::openapitools::server::model::User> &body) = 0;
141+
/// <param name="user">Updated user object</param>
142+
virtual std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> update_user(const std::shared_ptr<IncomingRequest> &request, const oatpp::String &username, const oatpp::Object<org::openapitools::server::model::User> &user) = 0;
143143

144-
ENDPOINT("PUT", "/user/{username}", update_user_handler, REQUEST(std::shared_ptr<IncomingRequest>, request), PATH(oatpp::String, username), BODY_DTO(oatpp::Object<org::openapitools::server::model::User>, body)) {
145-
return update_user(request, username, body);
144+
ENDPOINT("PUT", "/user/{username}", update_user_handler, REQUEST(std::shared_ptr<IncomingRequest>, request), PATH(oatpp::String, username), BODY_DTO(oatpp::Object<org::openapitools::server::model::User>, user)) {
145+
return update_user(request, username, user);
146146
}
147147
};
148148

‎samples/server/petstore/cpp-oatpp/impl/PetApiController.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ namespace openapitools {
1717
namespace server {
1818
namespace api {
1919

20-
std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> PetApiController::add_pet(const std::shared_ptr<IncomingRequest> &request, const oatpp::Object<org::openapitools::server::model::Pet> &body) {
20+
std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> PetApiController::add_pet(const std::shared_ptr<IncomingRequest> &request, const oatpp::Object<org::openapitools::server::model::Pet> &pet) {
2121
(void)request;
2222

2323

24-
(void)body;
24+
(void)pet;
2525

2626
return createResponse(Status::CODE_501, "TODO: Implement API Handler");
2727
}
@@ -61,11 +61,11 @@ std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> PetApiController
6161

6262
return createResponse(Status::CODE_501, "TODO: Implement API Handler");
6363
}
64-
std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> PetApiController::update_pet(const std::shared_ptr<IncomingRequest> &request, const oatpp::Object<org::openapitools::server::model::Pet> &body) {
64+
std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> PetApiController::update_pet(const std::shared_ptr<IncomingRequest> &request, const oatpp::Object<org::openapitools::server::model::Pet> &pet) {
6565
(void)request;
6666

6767

68-
(void)body;
68+
(void)pet;
6969

7070
return createResponse(Status::CODE_501, "TODO: Implement API Handler");
7171
}

‎samples/server/petstore/cpp-oatpp/impl/PetApiController.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ class PetApiController : public PetApi {
3939
///
4040
/// </remarks>
4141
/// <param name="request">HTTP Request</param>
42-
/// <param name="body">Pet object that needs to be added to the store</param>
43-
virtual std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> add_pet(const std::shared_ptr<IncomingRequest> &request, const oatpp::Object<org::openapitools::server::model::Pet> &body);
42+
/// <param name="pet">Pet object that needs to be added to the store</param>
43+
virtual std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> add_pet(const std::shared_ptr<IncomingRequest> &request, const oatpp::Object<org::openapitools::server::model::Pet> &pet);
4444
/// <summary>
4545
/// Deletes a pet
4646
/// </summary>
@@ -85,8 +85,8 @@ class PetApiController : public PetApi {
8585
///
8686
/// </remarks>
8787
/// <param name="request">HTTP Request</param>
88-
/// <param name="body">Pet object that needs to be added to the store</param>
89-
virtual std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> update_pet(const std::shared_ptr<IncomingRequest> &request, const oatpp::Object<org::openapitools::server::model::Pet> &body);
88+
/// <param name="pet">Pet object that needs to be added to the store</param>
89+
virtual std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> update_pet(const std::shared_ptr<IncomingRequest> &request, const oatpp::Object<org::openapitools::server::model::Pet> &pet);
9090
/// <summary>
9191
/// Updates a pet in the store with form data
9292
/// </summary>

‎samples/server/petstore/cpp-oatpp/impl/StoreApiController.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> StoreApiControll
3737

3838
return createResponse(Status::CODE_501, "TODO: Implement API Handler");
3939
}
40-
std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> StoreApiController::place_order(const std::shared_ptr<IncomingRequest> &request, const oatpp::Object<org::openapitools::server::model::Order> &body) {
40+
std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> StoreApiController::place_order(const std::shared_ptr<IncomingRequest> &request, const oatpp::Object<org::openapitools::server::model::Order> &order) {
4141
(void)request;
4242

4343

44-
(void)body;
44+
(void)order;
4545

4646
return createResponse(Status::CODE_501, "TODO: Implement API Handler");
4747
}

‎samples/server/petstore/cpp-oatpp/impl/StoreApiController.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ class StoreApiController : public StoreApi {
6464
///
6565
/// </remarks>
6666
/// <param name="request">HTTP Request</param>
67-
/// <param name="body">order placed for purchasing the pet</param>
68-
virtual std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> place_order(const std::shared_ptr<IncomingRequest> &request, const oatpp::Object<org::openapitools::server::model::Order> &body);
67+
/// <param name="order">order placed for purchasing the pet</param>
68+
virtual std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> place_order(const std::shared_ptr<IncomingRequest> &request, const oatpp::Object<org::openapitools::server::model::Order> &order);
6969
};
7070

7171
} // namespace org::openapitools::server::api

‎samples/server/petstore/cpp-oatpp/impl/UserApiController.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,27 @@ namespace openapitools {
1717
namespace server {
1818
namespace api {
1919

20-
std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> UserApiController::create_user(const std::shared_ptr<IncomingRequest> &request, const oatpp::Object<org::openapitools::server::model::User> &body) {
20+
std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> UserApiController::create_user(const std::shared_ptr<IncomingRequest> &request, const oatpp::Object<org::openapitools::server::model::User> &user) {
2121
(void)request;
2222

2323

24-
(void)body;
24+
(void)user;
2525

2626
return createResponse(Status::CODE_501, "TODO: Implement API Handler");
2727
}
28-
std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> UserApiController::create_users_with_array_input(const std::shared_ptr<IncomingRequest> &request, const oatpp::Vector<oatpp::Object<org::openapitools::server::model::User>> &body) {
28+
std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> UserApiController::create_users_with_array_input(const std::shared_ptr<IncomingRequest> &request, const oatpp::Vector<oatpp::Object<org::openapitools::server::model::User>> &user) {
2929
(void)request;
3030

3131

32-
(void)body;
32+
(void)user;
3333

3434
return createResponse(Status::CODE_501, "TODO: Implement API Handler");
3535
}
36-
std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> UserApiController::create_users_with_list_input(const std::shared_ptr<IncomingRequest> &request, const oatpp::Vector<oatpp::Object<org::openapitools::server::model::User>> &body) {
36+
std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> UserApiController::create_users_with_list_input(const std::shared_ptr<IncomingRequest> &request, const oatpp::Vector<oatpp::Object<org::openapitools::server::model::User>> &user) {
3737
(void)request;
3838

3939

40-
(void)body;
40+
(void)user;
4141

4242
return createResponse(Status::CODE_501, "TODO: Implement API Handler");
4343
}
@@ -73,15 +73,15 @@ std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> UserApiControlle
7373
(void)request;
7474
return createResponse(Status::CODE_501, "TODO: Implement API Handler");
7575
}
76-
std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> UserApiController::update_user(const std::shared_ptr<IncomingRequest> &request, const oatpp::String &username, const oatpp::Object<org::openapitools::server::model::User> &body) {
76+
std::shared_ptr<oatpp::web::protocol::http::outgoing::Response> UserApiController::update_user(const std::shared_ptr<IncomingRequest> &request, const oatpp::String &username, const oatpp::Object<org::openapitools::server::model::User> &user) {
7777
(void)request;
7878
(void)username;
7979

8080

8181

8282

8383

84-
(void)body;
84+
(void)user;
8585

8686
return createResponse(Status::CODE_501, "TODO: Implement API Handler");
8787
}

0 commit comments

Comments
 (0)