loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Don't try to detect response format if method return nothing (#2073)

Browse Source
This commit is contained in:
Gocha Ossinkine 2019-02-14 15:55:40 +05:00 committed by Akihito Nakano
parent 2593d78ce6
commit 161cb88e88
4 changed files with 16 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/openapi-generator/src/main/resources/php-symfony/api_controller.mustache vendored
View File

@ -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
@ -76,6 +77,7 @@ class {{controllerName}} extends Controller
return new Response('', 406);
}
{{/returnType}}
// Handle authentication
{{#authMethods}}
// Authentication '{{name}}' required
@ -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
]
)

48
samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php
View File

@ -68,15 +68,6 @@ class PetController extends Controller
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
@ -127,12 +118,11 @@ class PetController extends Controller
}
return new Response(
$result !== null ?$this->serialize($result, $responseFormat):'',
'',
$responseCode,
array_merge(
$responseHeaders,
[
'Content-Type' => $responseFormat,
'X-OpenAPI-Message' => $message
]
)
@ -152,15 +142,6 @@ class PetController extends Controller
*/
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
@ -217,12 +198,11 @@ class PetController extends Controller
}
return new Response(
$result !== null ?$this->serialize($result, $responseFormat):'',
'',
$responseCode,
array_merge(
$responseHeaders,
[
'Content-Type' => $responseFormat,
'X-OpenAPI-Message' => $message
]
)
@ -517,15 +497,6 @@ class PetController extends Controller
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
@ -582,12 +553,11 @@ class PetController extends Controller
}
return new Response(
$result !== null ?$this->serialize($result, $responseFormat):'',
'',
$responseCode,
array_merge(
$responseHeaders,
[
'Content-Type' => $responseFormat,
'X-OpenAPI-Message' => $message
]
)
@ -607,15 +577,6 @@ class PetController extends Controller
*/
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
@ -680,12 +641,11 @@ class PetController extends Controller
}
return new Response(
$result !== null ?$this->serialize($result, $responseFormat):'',
'',
$responseCode,
array_merge(
$responseHeaders,
[
'Content-Type' => $responseFormat,
'X-OpenAPI-Message' => $message
]
)

12
samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/StoreController.php
View File

@ -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
@ -114,12 +105,11 @@ class StoreController extends Controller
}
return new Response(
$result !== null ?$this->serialize($result, $responseFormat):'',
'',
$responseCode,
array_merge(
$responseHeaders,
[
'Content-Type' => $responseFormat,
'X-OpenAPI-Message' => $message
]
)

72
samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/UserController.php
View File

@ -67,15 +67,6 @@ class UserController extends Controller
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
@ -121,12 +112,11 @@ class UserController extends Controller
}
return new Response(
$result !== null ?$this->serialize($result, $responseFormat):'',
'',
$responseCode,
array_merge(
$responseHeaders,
[
'Content-Type' => $responseFormat,
'X-OpenAPI-Message' => $message
]
)
@ -154,15 +144,6 @@ class UserController extends Controller
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
@ -210,12 +191,11 @@ class UserController extends Controller
}
return new Response(
$result !== null ?$this->serialize($result, $responseFormat):'',
'',
$responseCode,
array_merge(
$responseHeaders,
[
'Content-Type' => $responseFormat,
'X-OpenAPI-Message' => $message
]
)
@ -243,15 +223,6 @@ class UserController extends Controller
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
@ -299,12 +270,11 @@ class UserController extends Controller
}
return new Response(
$result !== null ?$this->serialize($result, $responseFormat):'',
'',
$responseCode,
array_merge(
$responseHeaders,
[
'Content-Type' => $responseFormat,
'X-OpenAPI-Message' => $message
]
)
@ -324,15 +294,6 @@ class UserController extends Controller
*/
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
@ -379,12 +340,11 @@ class UserController extends Controller
}
return new Response(
$result !== null ?$this->serialize($result, $responseFormat):'',
'',
$responseCode,
array_merge(
$responseHeaders,
[
'Content-Type' => $responseFormat,
'X-OpenAPI-Message' => $message
]
)
@ -577,15 +537,6 @@ class UserController extends Controller
*/
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
@ -615,12 +566,11 @@ class UserController extends Controller
}
return new Response(
$result !== null ?$this->serialize($result, $responseFormat):'',
'',
$responseCode,
array_merge(
$responseHeaders,
[
'Content-Type' => $responseFormat,
'X-OpenAPI-Message' => $message
]
)
@ -648,15 +598,6 @@ class UserController extends Controller
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
@ -713,12 +654,11 @@ class UserController extends Controller
}
return new Response(
$result !== null ?$this->serialize($result, $responseFormat):'',
'',
$responseCode,
array_merge(
$responseHeaders,
[
'Content-Type' => $responseFormat,
'X-OpenAPI-Message' => $message
]
)