Skip to content

Commit 51f6e61

Browse files
Victoria-Casasampere-BeeTheDataVictoria-Casasampere-BeeTheData
committed
Fix capture group syntax
1 parent ff8e3cd commit 51f6e61

File tree

5 files changed

+34
-37
lines changed
  • modules/openapi-generator/src/main/java/org/openapitools/codegen/languages
  • samples/server/petstore/rust-axum/output
    • apikey-auths/src/server
    • openapi-v3/src/server
    • petstore-with-fake-endpoints-models-for-testing/src/server
    • petstore/src/server

5 files changed

+34
-37
lines changed

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustAxumServerCodegen.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -427,10 +427,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
427427
String axumPath = op.path;
428428
for (CodegenParameter param : op.pathParams) {
429429
// Replace {baseName} with {paramName} for format string
430-
String paramSearch = "{" + param.baseName + "}";
431-
String paramReplace = ":" + param.paramName;
432-
433-
axumPath = axumPath.replace(paramSearch, paramReplace);
430+
axumPath = axumPath.replace(param.baseName, param.paramName);
434431
}
435432
pathMethodOpMap
436433
.computeIfAbsent(axumPath, (key) -> new ArrayList<>())

‎samples/server/petstore/rust-axum/output/apikey-auths/src/server/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ where
3434
get(get_payment_methods::<I, A, E, C>),
3535
)
3636
.route(
37-
"/v71/paymentMethods/:id",
37+
"/v71/paymentMethods/{id}",
3838
get(get_payment_method_by_id::<I, A, E, C>),
3939
)
4040
.route("/v71/payments", post(post_make_payment::<I, A, E, C>))

‎samples/server/petstore/rust-axum/output/openapi-v3/src/server/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ where
3535
.route("/complex-query-param",
3636
get(complex_query_param_get::<I, A, E>)
3737
)
38-
.route("/enum_in_path/:path_param",
38+
.route("/enum_in_path/{path_param}",
3939
get(enum_in_path_path_param_get::<I, A, E>)
4040
)
4141
.route("/form-test",
@@ -56,7 +56,7 @@ where
5656
.route("/multiget",
5757
get(multiget_get::<I, A, E>)
5858
)
59-
.route("/multiple-path-params-with-very-long-path-to-test-formatting/:path_param_a/:path_param_b",
59+
.route("/multiple-path-params-with-very-long-path-to-test-formatting/{path_param_a}/{path_param_b}",
6060
get(multiple_path_params_with_very_long_path_to_test_formatting_path_param_a_path_param_b_get::<I, A, E>)
6161
)
6262
.route("/multiple_auth_scheme",
@@ -83,7 +83,7 @@ where
8383
.route("/repos",
8484
post(create_repo::<I, A, E>)
8585
)
86-
.route("/repos/:repo_id",
86+
.route("/repos/{repo_id}",
8787
get(get_repo_info::<I, A, E>).get(get_repo_info::<I, A, E>)
8888
)
8989
.route("/required_octet_stream",

‎samples/server/petstore/rust-axum/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ where
4747
put(test_body_with_query_params::<I, A, E, C>),
4848
)
4949
.route(
50-
"/v2/fake/hyphenParam/:hyphen_param",
50+
"/v2/fake/hyphenParam/{hyphen_param}",
5151
get(hyphen_param::<I, A, E, C>),
5252
)
5353
.route(
@@ -88,33 +88,27 @@ where
8888
post(add_pet::<I, A, E, C>).put(update_pet::<I, A, E, C>),
8989
)
9090
.route(
91-
"/v2/pet/:pet_id",
91+
"/v2/pet/findByStatus",
92+
get(find_pets_by_status::<I, A, E, C>),
93+
)
94+
.route("/v2/pet/findByTags", get(find_pets_by_tags::<I, A, E, C>))
95+
.route(
96+
"/v2/pet/{pet_id}",
9297
delete(delete_pet::<I, A, E, C>)
9398
.get(get_pet_by_id::<I, A, E, C>)
9499
.post(update_pet_with_form::<I, A, E, C>),
95100
)
96101
.route(
97-
"/v2/pet/:pet_id/uploadImage",
102+
"/v2/pet/{pet_id}/uploadImage",
98103
post(upload_file::<I, A, E, C>),
99104
)
100-
.route(
101-
"/v2/pet/findByStatus",
102-
get(find_pets_by_status::<I, A, E, C>),
103-
)
104-
.route("/v2/pet/findByTags", get(find_pets_by_tags::<I, A, E, C>))
105105
.route("/v2/store/inventory", get(get_inventory::<I, A, E, C>))
106106
.route("/v2/store/order", post(place_order::<I, A, E, C>))
107107
.route(
108-
"/v2/store/order/:order_id",
108+
"/v2/store/order/{order_id}",
109109
delete(delete_order::<I, A, E, C>).get(get_order_by_id::<I, A, E, C>),
110110
)
111111
.route("/v2/user", post(create_user::<I, A, E>))
112-
.route(
113-
"/v2/user/:username",
114-
delete(delete_user::<I, A, E>)
115-
.get(get_user_by_name::<I, A, E>)
116-
.put(update_user::<I, A, E>),
117-
)
118112
.route(
119113
"/v2/user/createWithArray",
120114
post(create_users_with_array_input::<I, A, E>),
@@ -125,6 +119,12 @@ where
125119
)
126120
.route("/v2/user/login", get(login_user::<I, A, E>))
127121
.route("/v2/user/logout", get(logout_user::<I, A, E>))
122+
.route(
123+
"/v2/user/{username}",
124+
delete(delete_user::<I, A, E>)
125+
.get(get_user_by_name::<I, A, E>)
126+
.put(update_user::<I, A, E>),
127+
)
128128
.with_state(api_impl)
129129
}
130130

‎samples/server/petstore/rust-axum/output/petstore/src/server/mod.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,33 +33,27 @@ where
3333
post(add_pet::<I, A, E, C>).put(update_pet::<I, A, E, C>),
3434
)
3535
.route(
36-
"/v2/pet/:pet_id",
36+
"/v2/pet/findByStatus",
37+
get(find_pets_by_status::<I, A, E, C>),
38+
)
39+
.route("/v2/pet/findByTags", get(find_pets_by_tags::<I, A, E, C>))
40+
.route(
41+
"/v2/pet/{pet_id}",
3742
delete(delete_pet::<I, A, E, C>)
3843
.get(get_pet_by_id::<I, A, E, C>)
3944
.post(update_pet_with_form::<I, A, E, C>),
4045
)
4146
.route(
42-
"/v2/pet/:pet_id/uploadImage",
47+
"/v2/pet/{pet_id}/uploadImage",
4348
post(upload_file::<I, A, E, C>),
4449
)
45-
.route(
46-
"/v2/pet/findByStatus",
47-
get(find_pets_by_status::<I, A, E, C>),
48-
)
49-
.route("/v2/pet/findByTags", get(find_pets_by_tags::<I, A, E, C>))
5050
.route("/v2/store/inventory", get(get_inventory::<I, A, E, C>))
5151
.route("/v2/store/order", post(place_order::<I, A, E, C>))
5252
.route(
53-
"/v2/store/order/:order_id",
53+
"/v2/store/order/{order_id}",
5454
delete(delete_order::<I, A, E, C>).get(get_order_by_id::<I, A, E, C>),
5555
)
5656
.route("/v2/user", post(create_user::<I, A, E, C>))
57-
.route(
58-
"/v2/user/:username",
59-
delete(delete_user::<I, A, E, C>)
60-
.get(get_user_by_name::<I, A, E, C>)
61-
.put(update_user::<I, A, E, C>),
62-
)
6357
.route(
6458
"/v2/user/createWithArray",
6559
post(create_users_with_array_input::<I, A, E, C>),
@@ -70,6 +64,12 @@ where
7064
)
7165
.route("/v2/user/login", get(login_user::<I, A, E, C>))
7266
.route("/v2/user/logout", get(logout_user::<I, A, E, C>))
67+
.route(
68+
"/v2/user/{username}",
69+
delete(delete_user::<I, A, E, C>)
70+
.get(get_user_by_name::<I, A, E, C>)
71+
.put(update_user::<I, A, E, C>),
72+
)
7373
.with_state(api_impl)
7474
}
7575

0 commit comments

Comments
 (0)