From 91da9faec364f89091d31e1ad5f2c0b58b12c37f Mon Sep 17 00:00:00 2001 From: Evan Gillogley Date: Mon, 27 Jun 2022 16:47:44 +0100 Subject: [PATCH 1/3] feat(typescript-angular): prepare build Prepare build is required in order to publish --- .../src/main/resources/typescript-angular/package.mustache | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/package.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/package.mustache index 22f7cd144d31..6e55fb330f77 100644 --- a/modules/openapi-generator/src/main/resources/typescript-angular/package.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-angular/package.mustache @@ -13,6 +13,7 @@ ], "license": "Unlicense", "scripts": { + "prepare": "npm run build", "build": "ng-packagr -p ng-package.json" }, "peerDependencies": { From 7342ddc56d1995ee0db5ad517fc9e3e2f26d1e9e Mon Sep 17 00:00:00 2001 From: William Cheng Date: Fri, 1 Aug 2025 16:18:26 +0800 Subject: [PATCH 2/3] update php laravel samples --- .../Http/Controllers/DefaultController.php | 9 +- .../Controllers/AnotherFakeController.php | 9 +- .../Http/Controllers/DefaultController.php | 9 +- .../FakeClassnameTags123Controller.php | 9 +- .../Http/Controllers/FakeController.php | 198 ++++-------------- .../Http/Controllers/PetController.php | 81 ++----- .../Http/Controllers/StoreController.php | 36 +--- .../Http/Controllers/UserController.php | 72 ++----- 8 files changed, 94 insertions(+), 329 deletions(-) diff --git a/samples/server/petstore/php-laravel-issue-21334/Http/Controllers/DefaultController.php b/samples/server/petstore/php-laravel-issue-21334/Http/Controllers/DefaultController.php index a84092ad936c..5e7777e6f921 100644 --- a/samples/server/petstore/php-laravel-issue-21334/Http/Controllers/DefaultController.php +++ b/samples/server/petstore/php-laravel-issue-21334/Http/Controllers/DefaultController.php @@ -79,13 +79,8 @@ public function getDummy(Request $request): JsonResponse $param_withRandomCase = $request->string('param_withRandomCase')->value(); - try { - $apiResult = $this->api->getDummy($paramCamelCase, $ParamPascalCase, $param_withRandomCase); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->getDummy($paramCamelCase, $ParamPascalCase, $param_withRandomCase); if ($apiResult instanceof \OpenAPI\Server\Model\NoContent200) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); diff --git a/samples/server/petstore/php-laravel/Http/Controllers/AnotherFakeController.php b/samples/server/petstore/php-laravel/Http/Controllers/AnotherFakeController.php index a824abeb16af..c9c95266069a 100644 --- a/samples/server/petstore/php-laravel/Http/Controllers/AnotherFakeController.php +++ b/samples/server/petstore/php-laravel/Http/Controllers/AnotherFakeController.php @@ -66,13 +66,8 @@ public function call123TestSpecialTags(Request $request): JsonResponse $client = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\Client::class); - try { - $apiResult = $this->api->call123TestSpecialTags($client); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->call123TestSpecialTags($client); if ($apiResult instanceof \OpenAPI\Server\Model\Client) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); diff --git a/samples/server/petstore/php-laravel/Http/Controllers/DefaultController.php b/samples/server/petstore/php-laravel/Http/Controllers/DefaultController.php index 85bb861e8b23..935abd69c438 100644 --- a/samples/server/petstore/php-laravel/Http/Controllers/DefaultController.php +++ b/samples/server/petstore/php-laravel/Http/Controllers/DefaultController.php @@ -64,13 +64,8 @@ public function fooGet(Request $request): JsonResponse return response()->json(['error' => 'Invalid input'], 400); } - try { - $apiResult = $this->api->fooGet(); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->fooGet(); if ($apiResult instanceof \OpenAPI\Server\Model\FooGetDefaultResponse) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 0); diff --git a/samples/server/petstore/php-laravel/Http/Controllers/FakeClassnameTags123Controller.php b/samples/server/petstore/php-laravel/Http/Controllers/FakeClassnameTags123Controller.php index 71bb59d19e6b..f1892d121046 100644 --- a/samples/server/petstore/php-laravel/Http/Controllers/FakeClassnameTags123Controller.php +++ b/samples/server/petstore/php-laravel/Http/Controllers/FakeClassnameTags123Controller.php @@ -66,13 +66,8 @@ public function testClassname(Request $request): JsonResponse $client = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\Client::class); - try { - $apiResult = $this->api->testClassname($client); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->testClassname($client); if ($apiResult instanceof \OpenAPI\Server\Model\Client) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); diff --git a/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php b/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php index e8577b7ee8b7..ae433d8b5ec6 100644 --- a/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php +++ b/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php @@ -64,13 +64,8 @@ public function fakeBigDecimalMap(Request $request): JsonResponse return response()->json(['error' => 'Invalid input'], 400); } - try { - $apiResult = $this->api->fakeBigDecimalMap(); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->fakeBigDecimalMap(); if ($apiResult instanceof \OpenAPI\Server\Model\FakeBigDecimalMap200Response) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -103,13 +98,8 @@ public function fakeHealthGet(Request $request): JsonResponse return response()->json(['error' => 'Invalid input'], 400); } - try { - $apiResult = $this->api->fakeHealthGet(); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->fakeHealthGet(); if ($apiResult instanceof \OpenAPI\Server\Model\HealthCheckResult) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -148,13 +138,8 @@ public function fakeHttpSignatureTest(Request $request): JsonResponse $header1 = $request->string('header1')->value(); - try { - $apiResult = $this->api->fakeHttpSignatureTest($pet, $query1, $header1); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->fakeHttpSignatureTest($pet, $query1, $header1); if ($apiResult instanceof \OpenAPI\Server\Model\NoContent200) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -189,13 +174,8 @@ public function fakeOuterBooleanSerialize(Request $request): JsonResponse $body = $request->boolean('body'); - try { - $apiResult = $this->api->fakeOuterBooleanSerialize($body); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->fakeOuterBooleanSerialize($body); if ($apiResult instanceof bool) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -230,13 +210,8 @@ public function fakeOuterCompositeSerialize(Request $request): JsonResponse $outerComposite = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\OuterComposite::class); - try { - $apiResult = $this->api->fakeOuterCompositeSerialize($outerComposite); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->fakeOuterCompositeSerialize($outerComposite); if ($apiResult instanceof \OpenAPI\Server\Model\OuterComposite) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -271,13 +246,8 @@ public function fakeOuterNumberSerialize(Request $request): JsonResponse $body = $request->float('body'); - try { - $apiResult = $this->api->fakeOuterNumberSerialize($body); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->fakeOuterNumberSerialize($body); if ($apiResult instanceof float) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -312,13 +282,8 @@ public function fakeOuterStringSerialize(Request $request): JsonResponse $body = $request->string('body')->value(); - try { - $apiResult = $this->api->fakeOuterStringSerialize($body); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->fakeOuterStringSerialize($body); if ($apiResult instanceof string) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -353,13 +318,8 @@ public function fakePropertyEnumIntegerSerialize(Request $request): JsonResponse $outerObjectWithEnumProperty = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\OuterObjectWithEnumProperty::class); - try { - $apiResult = $this->api->fakePropertyEnumIntegerSerialize($outerObjectWithEnumProperty); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->fakePropertyEnumIntegerSerialize($outerObjectWithEnumProperty); if ($apiResult instanceof \OpenAPI\Server\Model\OuterObjectWithEnumProperty) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -394,13 +354,8 @@ public function testAdditionalPropertiesReference(Request $request): JsonRespons $requestBody = $request->get('requestBody'); - try { - $apiResult = $this->api->testAdditionalPropertiesReference($requestBody); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->testAdditionalPropertiesReference($requestBody); if ($apiResult instanceof \OpenAPI\Server\Model\NoContent200) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -435,13 +390,8 @@ public function testBodyWithBinary(Request $request): JsonResponse $body = $request->file('body'); - try { - $apiResult = $this->api->testBodyWithBinary($body); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->testBodyWithBinary($body); if ($apiResult instanceof \OpenAPI\Server\Model\NoContent200) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -476,13 +426,8 @@ public function testBodyWithFileSchema(Request $request): JsonResponse $fileSchemaTestClass = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\FileSchemaTestClass::class); - try { - $apiResult = $this->api->testBodyWithFileSchema($fileSchemaTestClass); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->testBodyWithFileSchema($fileSchemaTestClass); if ($apiResult instanceof \OpenAPI\Server\Model\NoContent200) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -519,13 +464,8 @@ public function testBodyWithQueryParams(Request $request): JsonResponse $user = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\User::class); - try { - $apiResult = $this->api->testBodyWithQueryParams($query, $user); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->testBodyWithQueryParams($query, $user); if ($apiResult instanceof \OpenAPI\Server\Model\NoContent200) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -560,13 +500,8 @@ public function testClientModel(Request $request): JsonResponse $client = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\Client::class); - try { - $apiResult = $this->api->testClientModel($client); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->testClientModel($client); if ($apiResult instanceof \OpenAPI\Server\Model\Client) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -681,13 +616,8 @@ public function testEndpointParameters(Request $request): JsonResponse $callback = $request->string('callback')->value(); - try { - $apiResult = $this->api->testEndpointParameters($number, $double, $patternWithoutDelimiter, $byte, $integer, $int32, $int64, $float, $string, $binary, $date, $dateTime, $password, $callback); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->testEndpointParameters($number, $double, $patternWithoutDelimiter, $byte, $integer, $int32, $int64, $float, $string, $binary, $date, $dateTime, $password, $callback); if ($apiResult instanceof \OpenAPI\Server\Model\NoContent400) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 400); @@ -764,13 +694,8 @@ public function testEnumParameters(Request $request): JsonResponse $enumFormString = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString::class); - try { - $apiResult = $this->api->testEnumParameters($enumHeaderStringArray, $enumHeaderString, $enumQueryStringArray, $enumQueryString, $enumQueryInteger, $enumQueryDouble, $enumQueryModelArray, $enumFormStringArray, $enumFormString); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->testEnumParameters($enumHeaderStringArray, $enumHeaderString, $enumQueryStringArray, $enumQueryString, $enumQueryInteger, $enumQueryDouble, $enumQueryModelArray, $enumFormStringArray, $enumFormString); if ($apiResult instanceof \OpenAPI\Server\Model\NoContent400) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 400); @@ -840,13 +765,8 @@ public function testGroupParameters(Request $request): JsonResponse $int64Group = $request->integer('int64Group'); - try { - $apiResult = $this->api->testGroupParameters($requiredStringGroup, $requiredBooleanGroup, $requiredInt64Group, $stringGroup, $booleanGroup, $int64Group); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->testGroupParameters($requiredStringGroup, $requiredBooleanGroup, $requiredInt64Group, $stringGroup, $booleanGroup, $int64Group); if ($apiResult instanceof \OpenAPI\Server\Model\NoContent400) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 400); @@ -881,13 +801,8 @@ public function testInlineAdditionalProperties(Request $request): JsonResponse $requestBody = $request->get('requestBody'); - try { - $apiResult = $this->api->testInlineAdditionalProperties($requestBody); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->testInlineAdditionalProperties($requestBody); if ($apiResult instanceof \OpenAPI\Server\Model\NoContent200) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -922,13 +837,8 @@ public function testInlineFreeformAdditionalProperties(Request $request): JsonRe $testInlineFreeformAdditionalPropertiesRequest = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\TestInlineFreeformAdditionalPropertiesRequest::class); - try { - $apiResult = $this->api->testInlineFreeformAdditionalProperties($testInlineFreeformAdditionalPropertiesRequest); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->testInlineFreeformAdditionalProperties($testInlineFreeformAdditionalPropertiesRequest); if ($apiResult instanceof \OpenAPI\Server\Model\NoContent200) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -973,13 +883,8 @@ public function testJsonFormData(Request $request): JsonResponse $param2 = $request->string('param2')->value(); - try { - $apiResult = $this->api->testJsonFormData($param, $param2); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->testJsonFormData($param, $param2); if ($apiResult instanceof \OpenAPI\Server\Model\NoContent200) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -1014,13 +919,8 @@ public function testNullable(Request $request): JsonResponse $childWithNullable = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\ChildWithNullable::class); - try { - $apiResult = $this->api->testNullable($childWithNullable); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->testNullable($childWithNullable); if ($apiResult instanceof \OpenAPI\Server\Model\NoContent200) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -1093,13 +993,8 @@ public function testQueryParameterCollectionFormat(Request $request): JsonRespon $language = $request->get('language'); - try { - $apiResult = $this->api->testQueryParameterCollectionFormat($pipe, $ioutil, $http, $url, $context, $allowEmpty, $language); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->testQueryParameterCollectionFormat($pipe, $ioutil, $http, $url, $context, $allowEmpty, $language); if ($apiResult instanceof \OpenAPI\Server\Model\NoContent200) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -1134,13 +1029,8 @@ public function testStringMapReference(Request $request): JsonResponse $requestBody = $request->get('requestBody'); - try { - $apiResult = $this->api->testStringMapReference($requestBody); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->testStringMapReference($requestBody); if ($apiResult instanceof \OpenAPI\Server\Model\NoContent200) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); diff --git a/samples/server/petstore/php-laravel/Http/Controllers/PetController.php b/samples/server/petstore/php-laravel/Http/Controllers/PetController.php index 098346fd1e71..176f158b706f 100644 --- a/samples/server/petstore/php-laravel/Http/Controllers/PetController.php +++ b/samples/server/petstore/php-laravel/Http/Controllers/PetController.php @@ -66,13 +66,8 @@ public function addPet(Request $request): JsonResponse $pet = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\Pet::class); - try { - $apiResult = $this->api->addPet($pet); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->addPet($pet); if ($apiResult instanceof \OpenAPI\Server\Model\NoContent200) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -119,13 +114,8 @@ public function deletePet(Request $request, int $petId): JsonResponse $apiKey = $request->string('apiKey')->value(); - try { - $apiResult = $this->api->deletePet($petId, $apiKey); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->deletePet($petId, $apiKey); if ($apiResult instanceof \OpenAPI\Server\Model\NoContent200) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -168,13 +158,8 @@ public function findPetsByStatus(Request $request): JsonResponse $status = $request->get('status'); - try { - $apiResult = $this->api->findPetsByStatus($status); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->findPetsByStatus($status); if (is_array($apiResult)) { $serialized = array_map(fn ($item) => $this->serde->serialize($item, format: 'array'), $apiResult); @@ -219,13 +204,8 @@ public function findPetsByTags(Request $request): JsonResponse $tags = $request->get('tags'); - try { - $apiResult = $this->api->findPetsByTags($tags); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->findPetsByTags($tags); if (is_array($apiResult)) { $serialized = array_map(fn ($item) => $this->serde->serialize($item, format: 'array'), $apiResult); @@ -268,13 +248,8 @@ public function getPetById(Request $request, int $petId): JsonResponse } - try { - $apiResult = $this->api->getPetById($petId); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->getPetById($petId); if ($apiResult instanceof \OpenAPI\Server\Model\Pet) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -317,13 +292,8 @@ public function updatePet(Request $request): JsonResponse $pet = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\Pet::class); - try { - $apiResult = $this->api->updatePet($pet); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->updatePet($pet); if ($apiResult instanceof \OpenAPI\Server\Model\NoContent200) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -383,13 +353,8 @@ public function updatePetWithForm(Request $request, int $petId): JsonResponse $status = $request->string('status')->value(); - try { - $apiResult = $this->api->updatePetWithForm($petId, $name, $status); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->updatePetWithForm($petId, $name, $status); if ($apiResult instanceof \OpenAPI\Server\Model\NoContent200) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -441,13 +406,8 @@ public function uploadFile(Request $request, int $petId): JsonResponse $file = $request->file('file'); - try { - $apiResult = $this->api->uploadFile($petId, $additionalMetadata, $file); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->uploadFile($petId, $additionalMetadata, $file); if ($apiResult instanceof \OpenAPI\Server\Model\ApiResponse) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -496,13 +456,8 @@ public function uploadFileWithRequiredFile(Request $request, int $petId): JsonRe $additionalMetadata = $request->string('additionalMetadata')->value(); - try { - $apiResult = $this->api->uploadFileWithRequiredFile($petId, $requiredFile, $additionalMetadata); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->uploadFileWithRequiredFile($petId, $requiredFile, $additionalMetadata); if ($apiResult instanceof \OpenAPI\Server\Model\ApiResponse) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); diff --git a/samples/server/petstore/php-laravel/Http/Controllers/StoreController.php b/samples/server/petstore/php-laravel/Http/Controllers/StoreController.php index 5b8dd4d1b09e..4ec956115979 100644 --- a/samples/server/petstore/php-laravel/Http/Controllers/StoreController.php +++ b/samples/server/petstore/php-laravel/Http/Controllers/StoreController.php @@ -69,13 +69,8 @@ public function deleteOrder(Request $request, string $orderId): JsonResponse } - try { - $apiResult = $this->api->deleteOrder($orderId); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->deleteOrder($orderId); if ($apiResult instanceof \OpenAPI\Server\Model\NoContent400) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 400); @@ -112,13 +107,8 @@ public function getInventory(Request $request): JsonResponse return response()->json(['error' => 'Invalid input'], 400); } - try { - $apiResult = $this->api->getInventory(); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->getInventory(); if (is_array($apiResult)) { $serialized = array_map(fn ($item) => $this->serde->serialize($item, format: 'array'), $apiResult); @@ -159,13 +149,8 @@ public function getOrderById(Request $request, int $orderId): JsonResponse } - try { - $apiResult = $this->api->getOrderById($orderId); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->getOrderById($orderId); if ($apiResult instanceof \OpenAPI\Server\Model\Order) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -208,13 +193,8 @@ public function placeOrder(Request $request): JsonResponse $order = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\Order::class); - try { - $apiResult = $this->api->placeOrder($order); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->placeOrder($order); if ($apiResult instanceof \OpenAPI\Server\Model\Order) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); diff --git a/samples/server/petstore/php-laravel/Http/Controllers/UserController.php b/samples/server/petstore/php-laravel/Http/Controllers/UserController.php index c072354b645b..7ad1326083d6 100644 --- a/samples/server/petstore/php-laravel/Http/Controllers/UserController.php +++ b/samples/server/petstore/php-laravel/Http/Controllers/UserController.php @@ -66,13 +66,8 @@ public function createUser(Request $request): JsonResponse $user = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\User::class); - try { - $apiResult = $this->api->createUser($user); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->createUser($user); if ($apiResult instanceof \OpenAPI\Server\Model\NoContentDefault) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 0); @@ -107,13 +102,8 @@ public function createUsersWithArrayInput(Request $request): JsonResponse $user = $request->get('user'); - try { - $apiResult = $this->api->createUsersWithArrayInput($user); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->createUsersWithArrayInput($user); if ($apiResult instanceof \OpenAPI\Server\Model\NoContentDefault) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 0); @@ -148,13 +138,8 @@ public function createUsersWithListInput(Request $request): JsonResponse $user = $request->get('user'); - try { - $apiResult = $this->api->createUsersWithListInput($user); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->createUsersWithListInput($user); if ($apiResult instanceof \OpenAPI\Server\Model\NoContentDefault) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 0); @@ -192,13 +177,8 @@ public function deleteUser(Request $request, string $username): JsonResponse } - try { - $apiResult = $this->api->deleteUser($username); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->deleteUser($username); if ($apiResult instanceof \OpenAPI\Server\Model\NoContent400) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 400); @@ -240,13 +220,8 @@ public function getUserByName(Request $request, string $username): JsonResponse } - try { - $apiResult = $this->api->getUserByName($username); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->getUserByName($username); if ($apiResult instanceof \OpenAPI\Server\Model\User) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -299,13 +274,8 @@ public function loginUser(Request $request): JsonResponse $password = $request->string('password')->value(); - try { - $apiResult = $this->api->loginUser($username, $password); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->loginUser($username, $password); if ($apiResult instanceof string) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 200); @@ -342,13 +312,8 @@ public function logoutUser(Request $request): JsonResponse return response()->json(['error' => 'Invalid input'], 400); } - try { - $apiResult = $this->api->logoutUser(); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->logoutUser(); if ($apiResult instanceof \OpenAPI\Server\Model\NoContentDefault) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 0); @@ -384,13 +349,8 @@ public function updateUser(Request $request, string $username): JsonResponse $user = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\User::class); - try { - $apiResult = $this->api->updateUser($username, $user); - } catch (\Exception $exception) { - // This shouldn't happen - report($exception); - return response()->json(['error' => $exception->getMessage()], 500); - } + + $apiResult = $this->api->updateUser($username, $user); if ($apiResult instanceof \OpenAPI\Server\Model\NoContent400) { return response()->json($this->serde->serialize($apiResult, format: 'array'), 400); From 15c2a325c8c77e036a48629dc927398ea386236b Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 2 Aug 2025 13:51:43 +0800 Subject: [PATCH 3/3] update samples --- .../builds/with-npm/package.json | 1 + .../builds/with-npm/package.json | 1 + .../builds/default/package.json | 1 + .../typescript-angular-v19/builds/deep-object/package.json | 1 + .../petstore/typescript-angular-v19/builds/default/package.json | 1 + .../petstore/typescript-angular-v20/builds/default/package.json | 1 + 6 files changed, 6 insertions(+) diff --git a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/package.json b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/package.json index f5fffd2a55fe..e2851267a47d 100644 --- a/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/package.json +++ b/samples/client/petstore/typescript-angular-v12-provided-in-root/builds/with-npm/package.json @@ -13,6 +13,7 @@ ], "license": "Unlicense", "scripts": { + "prepare": "npm run build", "build": "ng-packagr -p ng-package.json" }, "peerDependencies": { diff --git a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/package.json b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/package.json index 7c3b658c06f2..9095d33c61e8 100644 --- a/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/package.json +++ b/samples/client/petstore/typescript-angular-v13-provided-in-root/builds/with-npm/package.json @@ -13,6 +13,7 @@ ], "license": "Unlicense", "scripts": { + "prepare": "npm run build", "build": "ng-packagr -p ng-package.json" }, "peerDependencies": { diff --git a/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/package.json b/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/package.json index 958b69fd631f..f3556859d47b 100644 --- a/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/package.json +++ b/samples/client/petstore/typescript-angular-v19-with-angular-dependency-params/builds/default/package.json @@ -13,6 +13,7 @@ ], "license": "Unlicense", "scripts": { + "prepare": "npm run build", "build": "ng-packagr -p ng-package.json" }, "peerDependencies": { diff --git a/samples/client/petstore/typescript-angular-v19/builds/deep-object/package.json b/samples/client/petstore/typescript-angular-v19/builds/deep-object/package.json index 71f619b0dead..b59e5d443084 100644 --- a/samples/client/petstore/typescript-angular-v19/builds/deep-object/package.json +++ b/samples/client/petstore/typescript-angular-v19/builds/deep-object/package.json @@ -13,6 +13,7 @@ ], "license": "Unlicense", "scripts": { + "prepare": "npm run build", "build": "ng-packagr -p ng-package.json" }, "peerDependencies": { diff --git a/samples/client/petstore/typescript-angular-v19/builds/default/package.json b/samples/client/petstore/typescript-angular-v19/builds/default/package.json index 24645d6e839c..4b03cb4d0f82 100644 --- a/samples/client/petstore/typescript-angular-v19/builds/default/package.json +++ b/samples/client/petstore/typescript-angular-v19/builds/default/package.json @@ -13,6 +13,7 @@ ], "license": "Unlicense", "scripts": { + "prepare": "npm run build", "build": "ng-packagr -p ng-package.json" }, "peerDependencies": { diff --git a/samples/client/petstore/typescript-angular-v20/builds/default/package.json b/samples/client/petstore/typescript-angular-v20/builds/default/package.json index 6e3130abc485..ba2967e936ec 100644 --- a/samples/client/petstore/typescript-angular-v20/builds/default/package.json +++ b/samples/client/petstore/typescript-angular-v20/builds/default/package.json @@ -13,6 +13,7 @@ ], "license": "Unlicense", "scripts": { + "prepare": "npm run build", "build": "ng-packagr -p ng-package.json" }, "peerDependencies": {