Skip to content

Fix default response #6625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 12, 2020
Merged

Fix default response #6625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c3fe225
fix isDefault in response
wing328 Jun 11, 2020
9107b70
fix response
wing328 Jun 11, 2020
285bed2
update samples
wing328 Jun 11, 2020
757f5ab
fix scala akka template
wing328 Jun 11, 2020
0d0e059
fix elm template
wing328 Jun 11, 2020
a2d9c92
remove commented code
wing328 Jun 11, 2020
5f102c5
remove eof
wing328 Jun 11, 2020
c7fd374
update elm samples
wing328 Jun 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3613,12 +3613,12 @@ public CodegenOperation fromOperation(String path,
op.uniqueItems = true;
imports.add(typeMapping.get(r.containerType));
}
r.isDefault = response == methodResponse;

op.responses.add(r);
if (Boolean.TRUE.equals(r.isBinary) && Boolean.TRUE.equals(r.isDefault)) {
if (Boolean.TRUE.equals(r.isBinary) && Boolean.TRUE.equals(r.is2xx) && Boolean.FALSE.equals(op.isResponseBinary)) {
op.isResponseBinary = Boolean.TRUE;
}
if (Boolean.TRUE.equals(r.isFile) && Boolean.TRUE.equals(r.isDefault)) {
if (Boolean.TRUE.equals(r.isFile) && Boolean.TRUE.equals(r.is2xx) && Boolean.FALSE.equals(op.isResponseFile)) {
op.isResponseFile = Boolean.TRUE;
}
}
Expand Down Expand Up @@ -3847,6 +3847,7 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) {

if ("default".equals(responseCode) || "defaultResponse".equals(responseCode)) {
r.code = "0";
r.isDefault = true;
} else {
r.code = responseCode;
switch (r.code.charAt(0)) {
Expand Down
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/elm/fieldDecoder.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
{{#isBoolean}}Json.Decode.bool{{/isBoolean}}
{{#isUuid}}Uuid.decoder{{/isUuid}}
{{^isDateTime}}{{^isDate}}{{^isByteArray}}{{^isBinary}}{{^isString}}{{^isNumeric}}{{^isBoolean}}{{^isUuid}}
{{#isDefault}}Api.Data.{{/isDefault}}{{#lambda.camelcase}}{{#isEnum}}{{classname}}{{enumName}}{{/isEnum}}{{^isEnum}}{{dataType}}{{/isEnum}}{{/lambda.camelcase}}Decoder
{{#is2xx}}Api.Data.{{/is2xx}}{{#is3xx}}Api.Data.{{/is3xx}}{{#lambda.camelcase}}{{#isEnum}}{{classname}}{{enumName}}{{/isEnum}}{{^isEnum}}{{dataType}}{{/isEnum}}{{/lambda.camelcase}}Decoder
{{/isUuid}}{{/isBoolean}}{{/isNumeric}}{{/isString}}{{/isBinary}}{{/isByteArray}}{{/isDate}}{{/isDateTime}}
{{/lambda.removeWhitespace}}
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/elm/operation.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import Uuid exposing (Uuid){{/includeUuid}}
{-| {{{notes}}}
-}
{{/notes}}
{{operationId}} : {{#allParams}}{{^required}}Maybe {{/required}}{{#isListContainer}}List {{/isListContainer}}{{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{#isModel}}Api.Data.{{/isModel}}{{dataType}}{{/datatypeWithEnum}} -> {{/allParams}}{{#authMethods}}{{#isBasicBearer}}String -> {{/isBasicBearer}}{{/authMethods}}Api.Request {{^responses}}(){{/responses}}{{#responses}}{{#isDefault}}{{^dataType}}(){{/dataType}}{{#isMapContainer}}(Dict.Dict String {{/isMapContainer}}{{#isListContainer}}(List {{/isListContainer}}{{^primitiveType}}{{^isUuid}}Api.Data.{{/isUuid}}{{/primitiveType}}{{#items}}{{#isModel}}Api.Data.{{/isModel}}{{/items}}{{dataType}}{{#isListContainer}}){{/isListContainer}}{{#isMapContainer}}){{/isMapContainer}}{{/isDefault}}{{/responses}}
{{operationId}} : {{#allParams}}{{^required}}Maybe {{/required}}{{#isListContainer}}List {{/isListContainer}}{{#datatypeWithEnum}}{{.}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{#isModel}}Api.Data.{{/isModel}}{{dataType}}{{/datatypeWithEnum}} -> {{/allParams}}{{#authMethods}}{{#isBasicBearer}}String -> {{/isBasicBearer}}{{/authMethods}}Api.Request {{^responses}}(){{/responses}}{{#responses}}{{#is2xx}}{{^dataType}}(){{/dataType}}{{#isMapContainer}}(Dict.Dict String {{/isMapContainer}}{{#isListContainer}}(List {{/isListContainer}}{{^primitiveType}}{{^isUuid}}Api.Data.{{/isUuid}}{{/primitiveType}}{{#items}}{{#isModel}}Api.Data.{{/isModel}}{{/items}}{{dataType}}{{#isListContainer}}){{/isListContainer}}{{#isMapContainer}}){{/isMapContainer}}{{/is2xx}}{{/responses}}
{{operationId}}{{#allParams}} {{>paramName}}{{/allParams}}{{#authMethods}}{{#isBasicBearer}} auth_token{{/isBasicBearer}}{{/authMethods}} =
Api.request
"{{httpMethod}}"
Expand All @@ -42,6 +42,6 @@ import Uuid exposing (Uuid){{/includeUuid}}
[{{#queryParams}} ( "{{baseName}}", {{#required}}Just <| {{/required}}{{^required}}Maybe.map {{/required}}{{>paramToString}} {{>paramName}} ){{#-last}} {{/-last}}{{^-last}},{{/-last}}{{/queryParams}}]
[{{#headerParams}} ( "{{baseName}}", {{#required}}Just <| {{/required}}{{^required}}Maybe.map {{/required}}{{>paramToString}} {{>paramName}} ){{#-last}} {{/-last}}{{^-last}},{{/-last}}{{/headerParams}}]
{{#bodyParam}}({{#required}}Just ({{/required}}{{^required}}Maybe.map {{/required}}{{#isModel}}Api.Data.{{/isModel}}{{>recordFieldValueEncoder}} {{>paramName}}{{#required}}){{/required}}){{/bodyParam}}{{^bodyParam}}Nothing{{/bodyParam}}
{{^responses}}(Json.Decode.succeed ()){{/responses}}{{#responses}}{{#isDefault}}{{^dataType}}(Json.Decode.succeed ()){{/dataType}}{{#dataType}}{{>recordFieldValueDecoder}}{{/dataType}}{{/isDefault}}{{/responses}}{{#authMethods}}{{#isBasicBearer}}
{{^responses}}(Json.Decode.succeed ()){{/responses}}{{#responses}}{{#is2xx}}{{^dataType}}(Json.Decode.succeed ()){{/dataType}}{{#dataType}}{{>recordFieldValueDecoder}}{{/dataType}}{{/is2xx}}{{/responses}}{{#authMethods}}{{#isBasicBearer}}
|> Api.withBearerToken auth_token{{/isBasicBearer}}{{/authMethods}}
{{/operation}}{{/operations}}
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/scala-akka-client/responseState.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{#isDefault}}Success{{/isDefault}}{{^isDefault}}Error{{/isDefault}}
{{#is2xx}}Success{{/is2xx}}{{#is3xx}}Success{{/is3xx}}{{#is4xx}}Error{{/is4xx}}{{#is5xx}}Error{{/is5xx}}{{#isDefault}}Error{{/isDefault}}
8 changes: 4 additions & 4 deletions samples/client/petstore/scala-akka/src/main/scala/org/openapitools/client/api/UserApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class UserApi(baseUrl: String) {
ApiRequest[Unit](ApiMethods.POST, baseUrl, "/user", "application/json")
.withApiKey(apiKey, "AUTH_KEY", COOKIE)
.withBody(user)
.withDefaultSuccessResponse[Unit]
.withDefaultErrorResponse[Unit]


/**
Expand All @@ -54,7 +54,7 @@ class UserApi(baseUrl: String) {
ApiRequest[Unit](ApiMethods.POST, baseUrl, "/user/createWithArray", "application/json")
.withApiKey(apiKey, "AUTH_KEY", COOKIE)
.withBody(user)
.withDefaultSuccessResponse[Unit]
.withDefaultErrorResponse[Unit]


/**
Expand All @@ -70,7 +70,7 @@ class UserApi(baseUrl: String) {
ApiRequest[Unit](ApiMethods.POST, baseUrl, "/user/createWithList", "application/json")
.withApiKey(apiKey, "AUTH_KEY", COOKIE)
.withBody(user)
.withDefaultSuccessResponse[Unit]
.withDefaultErrorResponse[Unit]


/**
Expand Down Expand Up @@ -144,7 +144,7 @@ class UserApi(baseUrl: String) {
def logoutUser()(implicit apiKey: ApiKeyValue): ApiRequest[Unit] =
ApiRequest[Unit](ApiMethods.GET, baseUrl, "/user/logout", "application/json")
.withApiKey(apiKey, "AUTH_KEY", COOKIE)
.withDefaultSuccessResponse[Unit]
.withDefaultErrorResponse[Unit]


/**
Expand Down
8 changes: 4 additions & 4 deletions samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ public function findPetsByStatusAction(Request $request)
$result = $handler->findPetsByStatus($status, $responseCode, $responseHeaders);

// Find default response message
$message = 'successful operation';
$message = '';

// Find a more specific message, if available
switch ($responseCode) {
Expand Down Expand Up @@ -363,7 +363,7 @@ public function findPetsByTagsAction(Request $request)
$result = $handler->findPetsByTags($tags, $responseCode, $responseHeaders);

// Find default response message
$message = 'successful operation';
$message = '';

// Find a more specific message, if available
switch ($responseCode) {
Expand Down Expand Up @@ -448,7 +448,7 @@ public function getPetByIdAction(Request $request, $petId)
$result = $handler->getPetById($petId, $responseCode, $responseHeaders);

// Find default response message
$message = 'successful operation';
$message = '';

// Find a more specific message, if available
switch ($responseCode) {
Expand Down Expand Up @@ -727,7 +727,7 @@ public function uploadFileAction(Request $request, $petId)
$result = $handler->uploadFile($petId, $additionalMetadata, $file, $responseCode, $responseHeaders);

// Find default response message
$message = 'successful operation';
$message = '';

// Find a more specific message, if available
switch ($responseCode) {
Expand Down
6 changes: 3 additions & 3 deletions samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/StoreController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ public function getInventoryAction(Request $request)
$result = $handler->getInventory($responseCode, $responseHeaders);

// Find default response message
$message = 'successful operation';
$message = '';

// Find a more specific message, if available
switch ($responseCode) {
Expand Down Expand Up @@ -241,7 +241,7 @@ public function getOrderByIdAction(Request $request, $orderId)
$result = $handler->getOrderById($orderId, $responseCode, $responseHeaders);

// Find default response message
$message = 'successful operation';
$message = '';

// Find a more specific message, if available
switch ($responseCode) {
Expand Down Expand Up @@ -334,7 +334,7 @@ public function placeOrderAction(Request $request)
$result = $handler->placeOrder($body, $responseCode, $responseHeaders);

// Find default response message
$message = 'successful operation';
$message = '';

// Find a more specific message, if available
switch ($responseCode) {
Expand Down
4 changes: 2 additions & 2 deletions samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/UserController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ public function getUserByNameAction(Request $request, $username)
$result = $handler->getUserByName($username, $responseCode, $responseHeaders);

// Find default response message
$message = 'successful operation';
$message = '';

// Find a more specific message, if available
switch ($responseCode) {
Expand Down Expand Up @@ -499,7 +499,7 @@ public function loginUserAction(Request $request)
$result = $handler->loginUser($username, $password, $responseCode, $responseHeaders);

// Find default response message
$message = 'successful operation';
$message = '';

// Find a more specific message, if available
switch ($responseCode) {
Expand Down