Skip to content

Commit 1f22706

Browse files
wing328wing328
authored
add sponsor message in F# giraffe generator (#9247)
1 parent 53e5986 commit 1f22706

File tree

15 files changed

+109
-82
lines changed

15 files changed

+109
-82
lines changed

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,4 +280,17 @@ public Mustache.Compiler processCompiler(Mustache.Compiler compiler) {
280280
public String toRegularExpression(String pattern) {
281281
return escapeText(pattern);
282282
}
283-
}
283+
284+
@Override
285+
public void postProcess() {
286+
System.out.println("################################################################################");
287+
System.out.println("# Thanks for using OpenAPI Generator. #");
288+
System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F #");
289+
System.out.println("# https://opencollective.com/openapi_generator/donate #");
290+
System.out.println("# #");
291+
System.out.println("# This generator's contributed by Nick Fisher (https://github.com/nmfisher) #");
292+
System.out.println("# Please support his work directly via https://paypal.me/nickfisher1984 \uD83D\uDE4F #");
293+
System.out.println("################################################################################");
294+
}
295+
296+
}

‎samples/server/petstore/fsharp-giraffe/.openapi-generator/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.1.3-SNAPSHOT
1+
5.1.1-SNAPSHOT

‎samples/server/petstore/fsharp-giraffe/OpenAPI/README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ The following models have been auto-generated from the provided OpenAPI schema:
1010
- model/TagModel.fs
1111
- model/CategoryModel.fs
1212
- model/OrderModel.fs
13-
- model/InlineObject1Model.fs
14-
- model/InlineObjectModel.fs
1513
- model/PetModel.fs
1614
- model/ApiResponseModel.fs
1715

‎samples/server/petstore/fsharp-giraffe/OpenAPI/src/OpenAPI.fsproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
<Compile Include="model/Tag.fs" />
2626
<Compile Include="model/Category.fs" />
2727
<Compile Include="model/Order.fs" />
28-
<Compile Include="model/InlineObject1.fs" />
29-
<Compile Include="model/InlineObject.fs" />
3028
<Compile Include="model/Pet.fs" />
3129
<Compile Include="model/ApiResponse.fs" />
3230
<Compile Include="api/PetApiHandlerParams.fs" />

‎samples/server/petstore/fsharp-giraffe/OpenAPI/src/api/PetApiHandler.fs‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ module PetApiHandler =
2929
let serviceArgs = { bodyParams=bodyParams } : AddPetArgs
3030
let result = PetApiService.AddPet ctx serviceArgs
3131
return! (match result with
32+
| AddPetStatusCode200 resolved ->
33+
setStatusCode 200 >=> json resolved.content
3234
| AddPetStatusCode405 resolved ->
33-
setStatusCode 405 >=> text resolved.content
35+
setStatusCode 405 >=> text resolved.content
3436
) next ctx
3537
}
3638
//#endregion
@@ -50,7 +52,7 @@ module PetApiHandler =
5052
let result = PetApiService.DeletePet ctx serviceArgs
5153
return! (match result with
5254
| DeletePetStatusCode400 resolved ->
53-
setStatusCode 400 >=> text resolved.content
55+
setStatusCode 400 >=> text resolved.content
5456
) next ctx
5557
}
5658
//#endregion
@@ -67,10 +69,10 @@ module PetApiHandler =
6769
let serviceArgs = { queryParams=queryParams; } : FindPetsByStatusArgs
6870
let result = PetApiService.FindPetsByStatus ctx serviceArgs
6971
return! (match result with
70-
| FindPetsByStatusDefaultStatusCode resolved ->
71-
setStatusCode 200 >=> json resolved.content
72+
| FindPetsByStatusStatusCode200 resolved ->
73+
setStatusCode 200 >=> json resolved.content
7274
| FindPetsByStatusStatusCode400 resolved ->
73-
setStatusCode 400 >=> text resolved.content
75+
setStatusCode 400 >=> text resolved.content
7476
) next ctx
7577
}
7678
//#endregion
@@ -87,10 +89,10 @@ module PetApiHandler =
8789
let serviceArgs = { queryParams=queryParams; } : FindPetsByTagsArgs
8890
let result = PetApiService.FindPetsByTags ctx serviceArgs
8991
return! (match result with
90-
| FindPetsByTagsDefaultStatusCode resolved ->
91-
setStatusCode 200 >=> json resolved.content
92+
| FindPetsByTagsStatusCode200 resolved ->
93+
setStatusCode 200 >=> json resolved.content
9294
| FindPetsByTagsStatusCode400 resolved ->
93-
setStatusCode 400 >=> text resolved.content
95+
setStatusCode 400 >=> text resolved.content
9496
) next ctx
9597
}
9698
//#endregion
@@ -106,12 +108,12 @@ module PetApiHandler =
106108
let serviceArgs = { pathParams=pathParams; } : GetPetByIdArgs
107109
let result = PetApiService.GetPetById ctx serviceArgs
108110
return! (match result with
109-
| GetPetByIdDefaultStatusCode resolved ->
110-
setStatusCode 200 >=> json resolved.content
111+
| GetPetByIdStatusCode200 resolved ->
112+
setStatusCode 200 >=> json resolved.content
111113
| GetPetByIdStatusCode400 resolved ->
112-
setStatusCode 400 >=> text resolved.content
114+
setStatusCode 400 >=> text resolved.content
113115
| GetPetByIdStatusCode404 resolved ->
114-
setStatusCode 404 >=> text resolved.content
116+
setStatusCode 404 >=> text resolved.content
115117
) next ctx
116118
}
117119
//#endregion
@@ -129,12 +131,14 @@ module PetApiHandler =
129131
let serviceArgs = { bodyParams=bodyParams } : UpdatePetArgs
130132
let result = PetApiService.UpdatePet ctx serviceArgs
131133
return! (match result with
134+
| UpdatePetStatusCode200 resolved ->
135+
setStatusCode 200 >=> json resolved.content
132136
| UpdatePetStatusCode400 resolved ->
133-
setStatusCode 400 >=> text resolved.content
137+
setStatusCode 400 >=> text resolved.content
134138
| UpdatePetStatusCode404 resolved ->
135-
setStatusCode 404 >=> text resolved.content
139+
setStatusCode 404 >=> text resolved.content
136140
| UpdatePetStatusCode405 resolved ->
137-
setStatusCode 405 >=> text resolved.content
141+
setStatusCode 405 >=> text resolved.content
138142
) next ctx
139143
}
140144
//#endregion
@@ -152,7 +156,7 @@ module PetApiHandler =
152156
let result = PetApiService.UpdatePetWithForm ctx serviceArgs
153157
return! (match result with
154158
| UpdatePetWithFormStatusCode405 resolved ->
155-
setStatusCode 405 >=> text resolved.content
159+
setStatusCode 405 >=> text resolved.content
156160
) next ctx
157161
}
158162
//#endregion
@@ -169,8 +173,8 @@ module PetApiHandler =
169173
let serviceArgs = { formParams=formParams; pathParams=pathParams; } : UploadFileArgs
170174
let result = PetApiService.UploadFile ctx serviceArgs
171175
return! (match result with
172-
| UploadFileDefaultStatusCode resolved ->
173-
setStatusCode 200 >=> json resolved.content
176+
| UploadFileStatusCode200 resolved ->
177+
setStatusCode 200 >=> json resolved.content
174178
) next ctx
175179
}
176180
//#endregion

‎samples/server/petstore/fsharp-giraffe/OpenAPI/src/api/PetApiHandlerParams.fs‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,16 @@ module PetApiHandlerParams =
1414
//#endregion
1515

1616

17+
type AddPetStatusCode200Response = {
18+
content:Pet;
19+
20+
}
21+
1722
type AddPetStatusCode405Response = {
1823
content:string;
1924

2025
}
21-
type AddPetResult = AddPetStatusCode405 of AddPetStatusCode405Response
26+
type AddPetResult = AddPetStatusCode200 of AddPetStatusCode200Response|AddPetStatusCode405 of AddPetStatusCode405Response
2227

2328
type AddPetArgs = {
2429
bodyParams:AddPetBodyParams
@@ -58,7 +63,7 @@ module PetApiHandlerParams =
5863
//#endregion
5964

6065

61-
type FindPetsByStatusDefaultStatusCodeResponse = {
66+
type FindPetsByStatusStatusCode200Response = {
6267
content:Pet[];
6368

6469
}
@@ -67,7 +72,7 @@ module PetApiHandlerParams =
6772
content:string;
6873

6974
}
70-
type FindPetsByStatusResult = FindPetsByStatusDefaultStatusCode of FindPetsByStatusDefaultStatusCodeResponse|FindPetsByStatusStatusCode400 of FindPetsByStatusStatusCode400Response
75+
type FindPetsByStatusResult = FindPetsByStatusStatusCode200 of FindPetsByStatusStatusCode200Response|FindPetsByStatusStatusCode400 of FindPetsByStatusStatusCode400Response
7176

7277
type FindPetsByStatusArgs = {
7378
queryParams:Result<FindPetsByStatusQueryParams,string>;
@@ -82,7 +87,7 @@ module PetApiHandlerParams =
8287
//#endregion
8388

8489

85-
type FindPetsByTagsDefaultStatusCodeResponse = {
90+
type FindPetsByTagsStatusCode200Response = {
8691
content:Pet[];
8792

8893
}
@@ -91,7 +96,7 @@ module PetApiHandlerParams =
9196
content:string;
9297

9398
}
94-
type FindPetsByTagsResult = FindPetsByTagsDefaultStatusCode of FindPetsByTagsDefaultStatusCodeResponse|FindPetsByTagsStatusCode400 of FindPetsByTagsStatusCode400Response
99+
type FindPetsByTagsResult = FindPetsByTagsStatusCode200 of FindPetsByTagsStatusCode200Response|FindPetsByTagsStatusCode400 of FindPetsByTagsStatusCode400Response
95100

96101
type FindPetsByTagsArgs = {
97102
queryParams:Result<FindPetsByTagsQueryParams,string>;
@@ -104,7 +109,7 @@ module PetApiHandlerParams =
104109
//#endregion
105110

106111

107-
type GetPetByIdDefaultStatusCodeResponse = {
112+
type GetPetByIdStatusCode200Response = {
108113
content:Pet;
109114

110115
}
@@ -118,7 +123,7 @@ module PetApiHandlerParams =
118123
content:string;
119124

120125
}
121-
type GetPetByIdResult = GetPetByIdDefaultStatusCode of GetPetByIdDefaultStatusCodeResponse|GetPetByIdStatusCode400 of GetPetByIdStatusCode400Response|GetPetByIdStatusCode404 of GetPetByIdStatusCode404Response
126+
type GetPetByIdResult = GetPetByIdStatusCode200 of GetPetByIdStatusCode200Response|GetPetByIdStatusCode400 of GetPetByIdStatusCode400Response|GetPetByIdStatusCode404 of GetPetByIdStatusCode404Response
122127

123128
type GetPetByIdArgs = {
124129
pathParams:GetPetByIdPathParams;
@@ -130,6 +135,11 @@ module PetApiHandlerParams =
130135
//#endregion
131136

132137

138+
type UpdatePetStatusCode200Response = {
139+
content:Pet;
140+
141+
}
142+
133143
type UpdatePetStatusCode400Response = {
134144
content:string;
135145

@@ -144,7 +154,7 @@ module PetApiHandlerParams =
144154
content:string;
145155

146156
}
147-
type UpdatePetResult = UpdatePetStatusCode400 of UpdatePetStatusCode400Response|UpdatePetStatusCode404 of UpdatePetStatusCode404Response|UpdatePetStatusCode405 of UpdatePetStatusCode405Response
157+
type UpdatePetResult = UpdatePetStatusCode200 of UpdatePetStatusCode200Response|UpdatePetStatusCode400 of UpdatePetStatusCode400Response|UpdatePetStatusCode404 of UpdatePetStatusCode404Response|UpdatePetStatusCode405 of UpdatePetStatusCode405Response
148158

149159
type UpdatePetArgs = {
150160
bodyParams:UpdatePetBodyParams
@@ -197,11 +207,11 @@ module PetApiHandlerParams =
197207
//#endregion
198208

199209

200-
type UploadFileDefaultStatusCodeResponse = {
210+
type UploadFileStatusCode200Response = {
201211
content:ApiResponse;
202212

203213
}
204-
type UploadFileResult = UploadFileDefaultStatusCode of UploadFileDefaultStatusCodeResponse
214+
type UploadFileResult = UploadFileStatusCode200 of UploadFileStatusCode200Response
205215

206216
type UploadFileArgs = {
207217
pathParams:UploadFilePathParams;

‎samples/server/petstore/fsharp-giraffe/OpenAPI/src/api/StoreApiHandler.fs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ module StoreApiHandler =
2828
let result = StoreApiService.DeleteOrder ctx serviceArgs
2929
return! (match result with
3030
| DeleteOrderStatusCode400 resolved ->
31-
setStatusCode 400 >=> text resolved.content
31+
setStatusCode 400 >=> text resolved.content
3232
| DeleteOrderStatusCode404 resolved ->
33-
setStatusCode 404 >=> text resolved.content
33+
setStatusCode 404 >=> text resolved.content
3434
) next ctx
3535
}
3636
//#endregion
@@ -45,8 +45,8 @@ module StoreApiHandler =
4545
task {
4646
let result = StoreApiService.GetInventory ctx
4747
return! (match result with
48-
| GetInventoryDefaultStatusCode resolved ->
49-
setStatusCode 200 >=> json resolved.content
48+
| GetInventoryStatusCode200 resolved ->
49+
setStatusCode 200 >=> json resolved.content
5050
) next ctx
5151
}
5252
//#endregion
@@ -62,12 +62,12 @@ module StoreApiHandler =
6262
let serviceArgs = { pathParams=pathParams; } : GetOrderByIdArgs
6363
let result = StoreApiService.GetOrderById ctx serviceArgs
6464
return! (match result with
65-
| GetOrderByIdDefaultStatusCode resolved ->
66-
setStatusCode 200 >=> json resolved.content
65+
| GetOrderByIdStatusCode200 resolved ->
66+
setStatusCode 200 >=> json resolved.content
6767
| GetOrderByIdStatusCode400 resolved ->
68-
setStatusCode 400 >=> text resolved.content
68+
setStatusCode 400 >=> text resolved.content
6969
| GetOrderByIdStatusCode404 resolved ->
70-
setStatusCode 404 >=> text resolved.content
70+
setStatusCode 404 >=> text resolved.content
7171
) next ctx
7272
}
7373
//#endregion
@@ -85,10 +85,10 @@ module StoreApiHandler =
8585
let serviceArgs = { bodyParams=bodyParams } : PlaceOrderArgs
8686
let result = StoreApiService.PlaceOrder ctx serviceArgs
8787
return! (match result with
88-
| PlaceOrderDefaultStatusCode resolved ->
89-
setStatusCode 200 >=> json resolved.content
88+
| PlaceOrderStatusCode200 resolved ->
89+
setStatusCode 200 >=> json resolved.content
9090
| PlaceOrderStatusCode400 resolved ->
91-
setStatusCode 400 >=> text resolved.content
91+
setStatusCode 400 >=> text resolved.content
9292
) next ctx
9393
}
9494
//#endregion

‎samples/server/petstore/fsharp-giraffe/OpenAPI/src/api/StoreApiHandlerParams.fs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ module StoreApiHandlerParams =
3131
}
3232

3333

34-
type GetInventoryDefaultStatusCodeResponse = {
34+
type GetInventoryStatusCode200Response = {
3535
content:IDictionary<string, int>;
3636

3737
}
38-
type GetInventoryResult = GetInventoryDefaultStatusCode of GetInventoryDefaultStatusCodeResponse
38+
type GetInventoryResult = GetInventoryStatusCode200 of GetInventoryStatusCode200Response
3939

4040
//#region Path parameters
4141
[<CLIMutable>]
@@ -45,7 +45,7 @@ module StoreApiHandlerParams =
4545
//#endregion
4646

4747

48-
type GetOrderByIdDefaultStatusCodeResponse = {
48+
type GetOrderByIdStatusCode200Response = {
4949
content:Order;
5050

5151
}
@@ -59,7 +59,7 @@ module StoreApiHandlerParams =
5959
content:string;
6060

6161
}
62-
type GetOrderByIdResult = GetOrderByIdDefaultStatusCode of GetOrderByIdDefaultStatusCodeResponse|GetOrderByIdStatusCode400 of GetOrderByIdStatusCode400Response|GetOrderByIdStatusCode404 of GetOrderByIdStatusCode404Response
62+
type GetOrderByIdResult = GetOrderByIdStatusCode200 of GetOrderByIdStatusCode200Response|GetOrderByIdStatusCode400 of GetOrderByIdStatusCode400Response|GetOrderByIdStatusCode404 of GetOrderByIdStatusCode404Response
6363

6464
type GetOrderByIdArgs = {
6565
pathParams:GetOrderByIdPathParams;
@@ -71,7 +71,7 @@ module StoreApiHandlerParams =
7171
//#endregion
7272

7373

74-
type PlaceOrderDefaultStatusCodeResponse = {
74+
type PlaceOrderStatusCode200Response = {
7575
content:Order;
7676

7777
}
@@ -80,7 +80,7 @@ module StoreApiHandlerParams =
8080
content:string;
8181

8282
}
83-
type PlaceOrderResult = PlaceOrderDefaultStatusCode of PlaceOrderDefaultStatusCodeResponse|PlaceOrderStatusCode400 of PlaceOrderStatusCode400Response
83+
type PlaceOrderResult = PlaceOrderStatusCode200 of PlaceOrderStatusCode200Response|PlaceOrderStatusCode400 of PlaceOrderStatusCode400Response
8484

8585
type PlaceOrderArgs = {
8686
bodyParams:PlaceOrderBodyParams

0 commit comments

Comments
 (0)