Skip to content

Commit

Permalink
Don't try to detect response format if method return nothing (OpenAPI…
Browse files Browse the repository at this point in the history 
…Tools#2073)
  • Loading branch information
@ossinkine @ackintosh
ossinkine authored and ackintosh committed Feb 14, 2019
1 parent 1f0c003 commit 50629cb
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 122 deletions.
6 changes: 5 additions & 1 deletion modules/openapi-generator/src/main/resources/php-symfony/api_controller.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ class {{controllerName}} extends Controller
}
{{/bodyParams}}
{{#returnType}}
// Figure out what data format to return to the client
$produces = [{{#produces}}'{{{mediaType}}}'{{#hasMore}}, {{/hasMore}}{{/produces}}];
// Figure out what the client accepts
Expand All @@ -76,6 +77,7 @@ class {{controllerName}} extends Controller
return new Response('', 406);
}

{{/returnType}}
// Handle authentication
{{#authMethods}}
// Authentication '{{name}}' required
Expand Down Expand Up @@ -185,12 +187,14 @@ class {{controllerName}} extends Controller
}

return new Response(
$result !== null ?$this->serialize($result, $responseFormat):'',
{{#returnType}}$result !== null ?$this->serialize($result, $responseFormat):''{{/returnType}}{{^returnType}}''{{/returnType}},
$responseCode,
array_merge(
$responseHeaders,
[
{{#returnType}}
'Content-Type' => $responseFormat,
{{/returnType}}
'X-OpenAPI-Message' => $message
]
)
Expand Down
48 changes: 4 additions & 44 deletions samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,6 @@ public function addPetAction(Request $request)
return new Response('', 415);
}

// Figure out what data format to return to the client
$produces = [];
// Figure out what the client accepts
$clientAccepts = $request->headers->has('Accept')?$request->headers->get('Accept'):'*/*';
$responseFormat = $this->getOutputFormat($clientAccepts, $produces);
if ($responseFormat === null) {
return new Response('', 406);
}

// Handle authentication
// Authentication 'petstore_auth' required
// Oauth required
Expand Down Expand Up @@ -127,12 +118,11 @@ public function addPetAction(Request $request)
}

return new Response(
$result !== null ?$this->serialize($result, $responseFormat):'',
'',
$responseCode,
array_merge(
$responseHeaders,
[
'Content-Type' => $responseFormat,
'X-OpenAPI-Message' => $message
]
)
Expand All @@ -152,15 +142,6 @@ public function addPetAction(Request $request)
*/
public function deletePetAction(Request $request, $petId)
{
// Figure out what data format to return to the client
$produces = [];
// Figure out what the client accepts
$clientAccepts = $request->headers->has('Accept')?$request->headers->get('Accept'):'*/*';
$responseFormat = $this->getOutputFormat($clientAccepts, $produces);
if ($responseFormat === null) {
return new Response('', 406);
}

// Handle authentication
// Authentication 'petstore_auth' required
// Oauth required
Expand Down Expand Up @@ -217,12 +198,11 @@ public function deletePetAction(Request $request, $petId)
}

return new Response(
$result !== null ?$this->serialize($result, $responseFormat):'',
'',
$responseCode,
array_merge(
$responseHeaders,
[
'Content-Type' => $responseFormat,
'X-OpenAPI-Message' => $message
]
)
Expand Down Expand Up @@ -517,15 +497,6 @@ public function updatePetAction(Request $request)
return new Response('', 415);
}

// Figure out what data format to return to the client
$produces = [];
// Figure out what the client accepts
$clientAccepts = $request->headers->has('Accept')?$request->headers->get('Accept'):'*/*';
$responseFormat = $this->getOutputFormat($clientAccepts, $produces);
if ($responseFormat === null) {
return new Response('', 406);
}

// Handle authentication
// Authentication 'petstore_auth' required
// Oauth required
Expand Down Expand Up @@ -582,12 +553,11 @@ public function updatePetAction(Request $request)
}

return new Response(
$result !== null ?$this->serialize($result, $responseFormat):'',
'',
$responseCode,
array_merge(
$responseHeaders,
[
'Content-Type' => $responseFormat,
'X-OpenAPI-Message' => $message
]
)
Expand All @@ -607,15 +577,6 @@ public function updatePetAction(Request $request)
*/
public function updatePetWithFormAction(Request $request, $petId)
{
// Figure out what data format to return to the client
$produces = [];
// Figure out what the client accepts
$clientAccepts = $request->headers->has('Accept')?$request->headers->get('Accept'):'*/*';
$responseFormat = $this->getOutputFormat($clientAccepts, $produces);
if ($responseFormat === null) {
return new Response('', 406);
}

// Handle authentication
// Authentication 'petstore_auth' required
// Oauth required
Expand Down Expand Up @@ -680,12 +641,11 @@ public function updatePetWithFormAction(Request $request, $petId)
}

return new Response(
$result !== null ?$this->serialize($result, $responseFormat):'',
'',
$responseCode,
array_merge(
$responseHeaders,
[
'Content-Type' => $responseFormat,
'X-OpenAPI-Message' => $message
]
)
Expand Down
12 changes: 1 addition & 11 deletions samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/StoreController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,6 @@ class StoreController extends Controller
*/
public function deleteOrderAction(Request $request, $orderId)
{
// Figure out what data format to return to the client
$produces = [];
// Figure out what the client accepts
$clientAccepts = $request->headers->has('Accept')?$request->headers->get('Accept'):'*/*';
$responseFormat = $this->getOutputFormat($clientAccepts, $produces);
if ($responseFormat === null) {
return new Response('', 406);
}

// Handle authentication

// Read out all input parameter values into variables
Expand Down Expand Up @@ -114,12 +105,11 @@ public function deleteOrderAction(Request $request, $orderId)
}

return new Response(
$result !== null ?$this->serialize($result, $responseFormat):'',
'',
$responseCode,
array_merge(
$responseHeaders,
[
'Content-Type' => $responseFormat,
'X-OpenAPI-Message' => $message
]
)
Expand Down
72 changes: 6 additions & 66 deletions samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/UserController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,6 @@ public function createUserAction(Request $request)
return new Response('', 415);
}

// Figure out what data format to return to the client
$produces = [];
// Figure out what the client accepts
$clientAccepts = $request->headers->has('Accept')?$request->headers->get('Accept'):'*/*';
$responseFormat = $this->getOutputFormat($clientAccepts, $produces);
if ($responseFormat === null) {
return new Response('', 406);
}

// Handle authentication

// Read out all input parameter values into variables
Expand Down Expand Up @@ -121,12 +112,11 @@ public function createUserAction(Request $request)
}

return new Response(
$result !== null ?$this->serialize($result, $responseFormat):'',
'',
$responseCode,
array_merge(
$responseHeaders,
[
'Content-Type' => $responseFormat,
'X-OpenAPI-Message' => $message
]
)
Expand Down Expand Up @@ -154,15 +144,6 @@ public function createUsersWithArrayInputAction(Request $request)
return new Response('', 415);
}

// Figure out what data format to return to the client
$produces = [];
// Figure out what the client accepts
$clientAccepts = $request->headers->has('Accept')?$request->headers->get('Accept'):'*/*';
$responseFormat = $this->getOutputFormat($clientAccepts, $produces);
if ($responseFormat === null) {
return new Response('', 406);
}

// Handle authentication

// Read out all input parameter values into variables
Expand Down Expand Up @@ -210,12 +191,11 @@ public function createUsersWithArrayInputAction(Request $request)
}

return new Response(
$result !== null ?$this->serialize($result, $responseFormat):'',
'',
$responseCode,
array_merge(
$responseHeaders,
[
'Content-Type' => $responseFormat,
'X-OpenAPI-Message' => $message
]
)
Expand Down Expand Up @@ -243,15 +223,6 @@ public function createUsersWithListInputAction(Request $request)
return new Response('', 415);
}

// Figure out what data format to return to the client
$produces = [];
// Figure out what the client accepts
$clientAccepts = $request->headers->has('Accept')?$request->headers->get('Accept'):'*/*';
$responseFormat = $this->getOutputFormat($clientAccepts, $produces);
if ($responseFormat === null) {
return new Response('', 406);
}

// Handle authentication

// Read out all input parameter values into variables
Expand Down Expand Up @@ -299,12 +270,11 @@ public function createUsersWithListInputAction(Request $request)
}

return new Response(
$result !== null ?$this->serialize($result, $responseFormat):'',
'',
$responseCode,
array_merge(
$responseHeaders,
[
'Content-Type' => $responseFormat,
'X-OpenAPI-Message' => $message
]
)
Expand All @@ -324,15 +294,6 @@ public function createUsersWithListInputAction(Request $request)
*/
public function deleteUserAction(Request $request, $username)
{
// Figure out what data format to return to the client
$produces = [];
// Figure out what the client accepts
$clientAccepts = $request->headers->has('Accept')?$request->headers->get('Accept'):'*/*';
$responseFormat = $this->getOutputFormat($clientAccepts, $produces);
if ($responseFormat === null) {
return new Response('', 406);
}

// Handle authentication

// Read out all input parameter values into variables
Expand Down Expand Up @@ -379,12 +340,11 @@ public function deleteUserAction(Request $request, $username)
}

return new Response(
$result !== null ?$this->serialize($result, $responseFormat):'',
'',
$responseCode,
array_merge(
$responseHeaders,
[
'Content-Type' => $responseFormat,
'X-OpenAPI-Message' => $message
]
)
Expand Down Expand Up @@ -577,15 +537,6 @@ public function loginUserAction(Request $request)
*/
public function logoutUserAction(Request $request)
{
// Figure out what data format to return to the client
$produces = [];
// Figure out what the client accepts
$clientAccepts = $request->headers->has('Accept')?$request->headers->get('Accept'):'*/*';
$responseFormat = $this->getOutputFormat($clientAccepts, $produces);
if ($responseFormat === null) {
return new Response('', 406);
}

// Handle authentication

// Read out all input parameter values into variables
Expand Down Expand Up @@ -615,12 +566,11 @@ public function logoutUserAction(Request $request)
}

return new Response(
$result !== null ?$this->serialize($result, $responseFormat):'',
'',
$responseCode,
array_merge(
$responseHeaders,
[
'Content-Type' => $responseFormat,
'X-OpenAPI-Message' => $message
]
)
Expand Down Expand Up @@ -648,15 +598,6 @@ public function updateUserAction(Request $request, $username)
return new Response('', 415);
}

// Figure out what data format to return to the client
$produces = [];
// Figure out what the client accepts
$clientAccepts = $request->headers->has('Accept')?$request->headers->get('Accept'):'*/*';
$responseFormat = $this->getOutputFormat($clientAccepts, $produces);
if ($responseFormat === null) {
return new Response('', 406);
}

// Handle authentication

// Read out all input parameter values into variables
Expand Down Expand Up @@ -713,12 +654,11 @@ public function updateUserAction(Request $request, $username)
}

return new Response(
$result !== null ?$this->serialize($result, $responseFormat):'',
'',
$responseCode,
array_merge(
$responseHeaders,
[
'Content-Type' => $responseFormat,
'X-OpenAPI-Message' => $message
]
)
Expand Down

0 comments on commit 50629cb

Please sign in to comment.