diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/README.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/README.mustache
index 98cd7112caa2..bed436a556b8 100644
--- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/README.mustache
+++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/README.mustache
@@ -74,7 +74,7 @@ try {
     {{#returnType}}
     print(response);
     {{/returnType}}
-} catch on DioException (e) {
+} on DioException catch (e) {
     print("Exception when calling {{classname}}->{{operationId}}: $e\n");
 }
 {{/-first}}{{/operation}}{{/operations}}{{/-first}}{{/apis}}{{/apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/api_doc.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/api_doc.mustache
index 10292c430463..06c2118ad417 100644
--- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/api_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/api_doc.mustache
@@ -55,7 +55,7 @@ try {
     {{#returnType}}
     print(response);
     {{/returnType}}
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling {{classname}}->{{operationId}}: $e\n');
 }
 ```
diff --git a/samples/openapi3/client/petstore/dart-dio/binary_response/README.md b/samples/openapi3/client/petstore/dart-dio/binary_response/README.md
index f97c6ab2075d..c420c89e32bc 100644
--- a/samples/openapi3/client/petstore/dart-dio/binary_response/README.md
+++ b/samples/openapi3/client/petstore/dart-dio/binary_response/README.md
@@ -53,7 +53,7 @@ final api = Openapi().getDefaultApi();
 try {
     final response = await api.binaryResponse();
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print("Exception when calling DefaultApi->binaryResponse: $e\n");
 }
 
diff --git a/samples/openapi3/client/petstore/dart-dio/binary_response/doc/DefaultApi.md b/samples/openapi3/client/petstore/dart-dio/binary_response/doc/DefaultApi.md
index 3286dd380c85..d71016849dc7 100644
--- a/samples/openapi3/client/petstore/dart-dio/binary_response/doc/DefaultApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/binary_response/doc/DefaultApi.md
@@ -26,7 +26,7 @@ final api = Openapi().getDefaultApi();
 try {
     final response = api.binaryResponse();
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling DefaultApi->binaryResponse: $e\n');
 }
 ```
diff --git a/samples/openapi3/client/petstore/dart-dio/oneof/README.md b/samples/openapi3/client/petstore/dart-dio/oneof/README.md
index 4410e018df24..b49da621ab17 100644
--- a/samples/openapi3/client/petstore/dart-dio/oneof/README.md
+++ b/samples/openapi3/client/petstore/dart-dio/oneof/README.md
@@ -52,7 +52,7 @@ final api = Openapi().getDefaultApi();
 try {
     final response = await api.rootGet();
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print("Exception when calling DefaultApi->rootGet: $e\n");
 }
 
diff --git a/samples/openapi3/client/petstore/dart-dio/oneof/doc/DefaultApi.md b/samples/openapi3/client/petstore/dart-dio/oneof/doc/DefaultApi.md
index b010661371f9..ca9032adcb54 100644
--- a/samples/openapi3/client/petstore/dart-dio/oneof/doc/DefaultApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/oneof/doc/DefaultApi.md
@@ -26,7 +26,7 @@ final api = Openapi().getDefaultApi();
 try {
     final response = api.rootGet();
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling DefaultApi->rootGet: $e\n');
 }
 ```
diff --git a/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/README.md b/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/README.md
index 35237d3e914c..5b61435ffb08 100644
--- a/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/README.md
+++ b/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/README.md
@@ -54,7 +54,7 @@ final BarCreate barCreate = ; // BarCreate |
 try {
     final response = await api.createBar(barCreate);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print("Exception when calling BarApi->createBar: $e\n");
 }
 
diff --git a/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/doc/BarApi.md b/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/doc/BarApi.md
index a6f23c00210c..f0bea7890493 100644
--- a/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/doc/BarApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/doc/BarApi.md
@@ -27,7 +27,7 @@ final BarCreate barCreate = ; // BarCreate |
 try {
     final response = api.createBar(barCreate);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling BarApi->createBar: $e\n');
 }
 ```
diff --git a/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/doc/FooApi.md b/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/doc/FooApi.md
index ff844803f061..cac33ccf4af0 100644
--- a/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/doc/FooApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/doc/FooApi.md
@@ -28,7 +28,7 @@ final Foo foo = ; // Foo | The Foo to be created
 try {
     final response = api.createFoo(foo);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FooApi->createFoo: $e\n');
 }
 ```
@@ -68,7 +68,7 @@ final api = Openapi().getFooApi();
 try {
     final response = api.getAllFoos();
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FooApi->getAllFoos: $e\n');
 }
 ```
diff --git a/samples/openapi3/client/petstore/dart-dio/oneof_primitive/README.md b/samples/openapi3/client/petstore/dart-dio/oneof_primitive/README.md
index e774dbd1615a..5136aaef2bf6 100644
--- a/samples/openapi3/client/petstore/dart-dio/oneof_primitive/README.md
+++ b/samples/openapi3/client/petstore/dart-dio/oneof_primitive/README.md
@@ -52,7 +52,7 @@ final api = Openapi().getDefaultApi();
 try {
     final response = await api.list();
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print("Exception when calling DefaultApi->list: $e\n");
 }
 
diff --git a/samples/openapi3/client/petstore/dart-dio/oneof_primitive/doc/DefaultApi.md b/samples/openapi3/client/petstore/dart-dio/oneof_primitive/doc/DefaultApi.md
index c4077a67727b..c756a79da784 100644
--- a/samples/openapi3/client/petstore/dart-dio/oneof_primitive/doc/DefaultApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/oneof_primitive/doc/DefaultApi.md
@@ -26,7 +26,7 @@ final api = Openapi().getDefaultApi();
 try {
     final response = api.list();
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling DefaultApi->list: $e\n');
 }
 ```
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/README.md b/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/README.md
index 3071afaa3208..b3e7b53a00d4 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/README.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/README.md
@@ -54,7 +54,7 @@ final Pet pet = ; // Pet | Pet object that needs to be added to the store
 try {
     final response = await api.addPet(pet);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print("Exception when calling PetApi->addPet: $e\n");
 }
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/doc/PetApi.md b/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/doc/PetApi.md
index 65b361e2f8c5..b24b65b1f614 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/doc/PetApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/doc/PetApi.md
@@ -38,7 +38,7 @@ final Pet pet = ; // Pet | Pet object that needs to be added to the store
 try {
     final response = api.addPet(pet);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->addPet: $e\n');
 }
 ```
@@ -83,7 +83,7 @@ final String apiKey = apiKey_example; // String |
 
 try {
     api.deletePet(petId, apiKey);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->deletePet: $e\n');
 }
 ```
@@ -129,7 +129,7 @@ final BuiltList<String> status = ; // BuiltList<String> | Status values that nee
 try {
     final response = api.findPetsByStatus(status);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->findPetsByStatus: $e\n');
 }
 ```
@@ -174,7 +174,7 @@ final BuiltList<String> tags = ; // BuiltList<String> | Tags to filter by
 try {
     final response = api.findPetsByTags(tags);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->findPetsByTags: $e\n');
 }
 ```
@@ -221,7 +221,7 @@ final int petId = 789; // int | ID of pet to return
 try {
     final response = api.getPetById(petId);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->getPetById: $e\n');
 }
 ```
@@ -266,7 +266,7 @@ final Pet pet = ; // Pet | Pet object that needs to be added to the store
 try {
     final response = api.updatePet(pet);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->updatePet: $e\n');
 }
 ```
@@ -312,7 +312,7 @@ final String status = status_example; // String | Updated status of the pet
 
 try {
     api.updatePetWithForm(petId, name, status);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->updatePetWithForm: $e\n');
 }
 ```
@@ -361,7 +361,7 @@ final MultipartFile file = BINARY_DATA_HERE; // MultipartFile | file to upload
 try {
     final response = api.uploadFile(petId, additionalMetadata, file);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->uploadFile: $e\n');
 }
 ```
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/doc/StoreApi.md b/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/doc/StoreApi.md
index f9d2725aaecf..10955b78f536 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/doc/StoreApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/doc/StoreApi.md
@@ -31,7 +31,7 @@ final String orderId = orderId_example; // String | ID of the order that needs t
 
 try {
     api.deleteOrder(orderId);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling StoreApi->deleteOrder: $e\n');
 }
 ```
@@ -77,7 +77,7 @@ final api = Openapi().getStoreApi();
 try {
     final response = api.getInventory();
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling StoreApi->getInventory: $e\n');
 }
 ```
@@ -117,7 +117,7 @@ final int orderId = 789; // int | ID of pet that needs to be fetched
 try {
     final response = api.getOrderById(orderId);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling StoreApi->getOrderById: $e\n');
 }
 ```
@@ -160,7 +160,7 @@ final Order order = ; // Order | order placed for purchasing the pet
 try {
     final response = api.placeOrder(order);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling StoreApi->placeOrder: $e\n');
 }
 ```
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/doc/UserApi.md b/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/doc/UserApi.md
index 9882bc5e6a3e..d91d8ada2f24 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/doc/UserApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore-timemachine/doc/UserApi.md
@@ -39,7 +39,7 @@ final User user = ; // User | Created user object
 
 try {
     api.createUser(user);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->createUser: $e\n');
 }
 ```
@@ -85,7 +85,7 @@ final BuiltList<User> user = ; // BuiltList<User> | List of user object
 
 try {
     api.createUsersWithArrayInput(user);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->createUsersWithArrayInput: $e\n');
 }
 ```
@@ -131,7 +131,7 @@ final BuiltList<User> user = ; // BuiltList<User> | List of user object
 
 try {
     api.createUsersWithListInput(user);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->createUsersWithListInput: $e\n');
 }
 ```
@@ -177,7 +177,7 @@ final String username = username_example; // String | The name that needs to be
 
 try {
     api.deleteUser(username);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->deleteUser: $e\n');
 }
 ```
@@ -220,7 +220,7 @@ final String username = username_example; // String | The name that needs to be
 try {
     final response = api.getUserByName(username);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->getUserByName: $e\n');
 }
 ```
@@ -264,7 +264,7 @@ final String password = password_example; // String | The password for login in
 try {
     final response = api.loginUser(username, password);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->loginUser: $e\n');
 }
 ```
@@ -310,7 +310,7 @@ final api = Openapi().getUserApi();
 
 try {
     api.logoutUser();
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->logoutUser: $e\n');
 }
 ```
@@ -354,7 +354,7 @@ final User user = ; // User | Updated user object
 
 try {
     api.updateUser(username, user);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->updateUser: $e\n');
 }
 ```
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/README.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/README.md
index 0dad2944a75f..b499c87f29bd 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/README.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/README.md
@@ -54,7 +54,7 @@ final ModelClient modelClient = ; // ModelClient | client model
 try {
     final response = await api.call123testSpecialTags(modelClient);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print("Exception when calling AnotherFakeApi->call123testSpecialTags: $e\n");
 }
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/AnotherFakeApi.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/AnotherFakeApi.md
index 36a94e6bb703..b5978fb879fa 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/AnotherFakeApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/AnotherFakeApi.md
@@ -29,7 +29,7 @@ final ModelClient modelClient = ; // ModelClient | client model
 try {
     final response = api.call123testSpecialTags(modelClient);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling AnotherFakeApi->call123testSpecialTags: $e\n');
 }
 ```
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/DefaultApi.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/DefaultApi.md
index 6abd2b44f9c4..46a87f48f16c 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/DefaultApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/DefaultApi.md
@@ -26,7 +26,7 @@ final api = Openapi().getDefaultApi();
 try {
     final response = api.fooGet();
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling DefaultApi->fooGet: $e\n');
 }
 ```
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/FakeApi.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/FakeApi.md
index 30e02efce1bd..a438ec165818 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/FakeApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/FakeApi.md
@@ -50,7 +50,7 @@ final api = Openapi().getFakeApi();
 try {
     final response = api.fakeBigDecimalMap();
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->fakeBigDecimalMap: $e\n');
 }
 ```
@@ -87,7 +87,7 @@ final api = Openapi().getFakeApi();
 try {
     final response = api.fakeDuplicateInlineEnum();
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->fakeDuplicateInlineEnum: $e\n');
 }
 ```
@@ -124,7 +124,7 @@ final api = Openapi().getFakeApi();
 try {
     final response = api.fakeHealthGet();
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->fakeHealthGet: $e\n');
 }
 ```
@@ -163,7 +163,7 @@ final String header1 = header1_example; // String | header parameter
 
 try {
     api.fakeHttpSignatureTest(pet, query1, header1);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->fakeHttpSignatureTest: $e\n');
 }
 ```
@@ -208,7 +208,7 @@ final bool body = true; // bool | Input boolean as post body
 try {
     final response = api.fakeOuterBooleanSerialize(body);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->fakeOuterBooleanSerialize: $e\n');
 }
 ```
@@ -251,7 +251,7 @@ final OuterComposite outerComposite = ; // OuterComposite | Input composite as p
 try {
     final response = api.fakeOuterCompositeSerialize(outerComposite);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->fakeOuterCompositeSerialize: $e\n');
 }
 ```
@@ -294,7 +294,7 @@ final num body = 8.14; // num | Input number as post body
 try {
     final response = api.fakeOuterNumberSerialize(body);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->fakeOuterNumberSerialize: $e\n');
 }
 ```
@@ -337,7 +337,7 @@ final String body = body_example; // String | Input string as post body
 try {
     final response = api.fakeOuterStringSerialize(body);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->fakeOuterStringSerialize: $e\n');
 }
 ```
@@ -380,7 +380,7 @@ final OuterObjectWithEnumProperty outerObjectWithEnumProperty = ; // OuterObject
 try {
     final response = api.fakePropertyEnumIntegerSerialize(outerObjectWithEnumProperty);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->fakePropertyEnumIntegerSerialize: $e\n');
 }
 ```
@@ -422,7 +422,7 @@ final Map<String, Object> requestBody = Object; // Map<String, Object> | request
 
 try {
     api.testAdditionalPropertiesReference(requestBody);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testAdditionalPropertiesReference: $e\n');
 }
 ```
@@ -464,7 +464,7 @@ final MultipartFile body = BINARY_DATA_HERE; // MultipartFile | image to upload
 
 try {
     api.testBodyWithBinary(body);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testBodyWithBinary: $e\n');
 }
 ```
@@ -506,7 +506,7 @@ final FileSchemaTestClass fileSchemaTestClass = ; // FileSchemaTestClass |
 
 try {
     api.testBodyWithFileSchema(fileSchemaTestClass);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testBodyWithFileSchema: $e\n');
 }
 ```
@@ -547,7 +547,7 @@ final User user = ; // User |
 
 try {
     api.testBodyWithQueryParams(query, user);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testBodyWithQueryParams: $e\n');
 }
 ```
@@ -591,7 +591,7 @@ final ModelClient modelClient = ; // ModelClient | client model
 try {
     final response = api.testClientModel(modelClient);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testClientModel: $e\n');
 }
 ```
@@ -649,7 +649,7 @@ final String callback = callback_example; // String | None
 
 try {
     api.testEndpointParameters(number, double_, patternWithoutDelimiter, byte, integer, int32, int64, float, string, binary, date, dateTime, password, callback);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testEndpointParameters: $e\n');
 }
 ```
@@ -712,7 +712,7 @@ final String enumFormString = enumFormString_example; // String | Form parameter
 
 try {
     api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testEnumParameters: $e\n');
 }
 ```
@@ -767,7 +767,7 @@ final int int64Group = 789; // int | Integer in group parameters
 
 try {
     api.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testGroupParameters: $e\n');
 }
 ```
@@ -814,7 +814,7 @@ final Map<String, String> requestBody = ; // Map<String, String> | request body
 
 try {
     api.testInlineAdditionalProperties(requestBody);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testInlineAdditionalProperties: $e\n');
 }
 ```
@@ -856,7 +856,7 @@ final TestInlineFreeformAdditionalPropertiesRequest testInlineFreeformAdditional
 
 try {
     api.testInlineFreeformAdditionalProperties(testInlineFreeformAdditionalPropertiesRequest);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testInlineFreeformAdditionalProperties: $e\n');
 }
 ```
@@ -899,7 +899,7 @@ final String param2 = param2_example; // String | field2
 
 try {
     api.testJsonFormData(param, param2);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testJsonFormData: $e\n');
 }
 ```
@@ -942,7 +942,7 @@ final ChildWithNullable childWithNullable = ; // ChildWithNullable | request bod
 
 try {
     api.testNullable(childWithNullable);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testNullable: $e\n');
 }
 ```
@@ -990,7 +990,7 @@ final Map<String, String> language = ; // Map<String, String> |
 
 try {
     api.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context, allowEmpty, language);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testQueryParameterCollectionFormat: $e\n');
 }
 ```
@@ -1038,7 +1038,7 @@ final Map<String, String> requestBody = ; // Map<String, String> | request body
 
 try {
     api.testStringMapReference(requestBody);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testStringMapReference: $e\n');
 }
 ```
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/FakeClassnameTags123Api.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/FakeClassnameTags123Api.md
index 645aebf399f0..87c8def9e932 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/FakeClassnameTags123Api.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/FakeClassnameTags123Api.md
@@ -33,7 +33,7 @@ final ModelClient modelClient = ; // ModelClient | client model
 try {
     final response = api.testClassname(modelClient);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeClassnameTags123Api->testClassname: $e\n');
 }
 ```
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/PetApi.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/PetApi.md
index 5fc7fbd2657f..97a7e0e803c1 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/PetApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/PetApi.md
@@ -38,7 +38,7 @@ final Pet pet = ; // Pet | Pet object that needs to be added to the store
 
 try {
     api.addPet(pet);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->addPet: $e\n');
 }
 ```
@@ -83,7 +83,7 @@ final String apiKey = apiKey_example; // String |
 
 try {
     api.deletePet(petId, apiKey);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->deletePet: $e\n');
 }
 ```
@@ -129,7 +129,7 @@ final List<String> status = ; // List<String> | Status values that need to be co
 try {
     final response = api.findPetsByStatus(status);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->findPetsByStatus: $e\n');
 }
 ```
@@ -174,7 +174,7 @@ final Set<String> tags = ; // Set<String> | Tags to filter by
 try {
     final response = api.findPetsByTags(tags);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->findPetsByTags: $e\n');
 }
 ```
@@ -221,7 +221,7 @@ final int petId = 789; // int | ID of pet to return
 try {
     final response = api.getPetById(petId);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->getPetById: $e\n');
 }
 ```
@@ -265,7 +265,7 @@ final Pet pet = ; // Pet | Pet object that needs to be added to the store
 
 try {
     api.updatePet(pet);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->updatePet: $e\n');
 }
 ```
@@ -311,7 +311,7 @@ final String status = status_example; // String | Updated status of the pet
 
 try {
     api.updatePetWithForm(petId, name, status);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->updatePetWithForm: $e\n');
 }
 ```
@@ -360,7 +360,7 @@ final MultipartFile file = BINARY_DATA_HERE; // MultipartFile | file to upload
 try {
     final response = api.uploadFile(petId, additionalMetadata, file);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->uploadFile: $e\n');
 }
 ```
@@ -409,7 +409,7 @@ final String additionalMetadata = additionalMetadata_example; // String | Additi
 try {
     final response = api.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->uploadFileWithRequiredFile: $e\n');
 }
 ```
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/StoreApi.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/StoreApi.md
index 42028947229f..10a750c4cbf0 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/StoreApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/StoreApi.md
@@ -31,7 +31,7 @@ final String orderId = orderId_example; // String | ID of the order that needs t
 
 try {
     api.deleteOrder(orderId);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling StoreApi->deleteOrder: $e\n');
 }
 ```
@@ -77,7 +77,7 @@ final api = Openapi().getStoreApi();
 try {
     final response = api.getInventory();
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling StoreApi->getInventory: $e\n');
 }
 ```
@@ -117,7 +117,7 @@ final int orderId = 789; // int | ID of pet that needs to be fetched
 try {
     final response = api.getOrderById(orderId);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling StoreApi->getOrderById: $e\n');
 }
 ```
@@ -160,7 +160,7 @@ final Order order = ; // Order | order placed for purchasing the pet
 try {
     final response = api.placeOrder(order);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling StoreApi->placeOrder: $e\n');
 }
 ```
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/UserApi.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/UserApi.md
index 49b79d76b8a1..aa8c7cf96c81 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/UserApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/UserApi.md
@@ -35,7 +35,7 @@ final User user = ; // User | Created user object
 
 try {
     api.createUser(user);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->createUser: $e\n');
 }
 ```
@@ -77,7 +77,7 @@ final List<User> user = ; // List<User> | List of user object
 
 try {
     api.createUsersWithArrayInput(user);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->createUsersWithArrayInput: $e\n');
 }
 ```
@@ -119,7 +119,7 @@ final List<User> user = ; // List<User> | List of user object
 
 try {
     api.createUsersWithListInput(user);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->createUsersWithListInput: $e\n');
 }
 ```
@@ -161,7 +161,7 @@ final String username = username_example; // String | The name that needs to be
 
 try {
     api.deleteUser(username);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->deleteUser: $e\n');
 }
 ```
@@ -204,7 +204,7 @@ final String username = username_example; // String | The name that needs to be
 try {
     final response = api.getUserByName(username);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->getUserByName: $e\n');
 }
 ```
@@ -248,7 +248,7 @@ final String password = password_example; // String | The password for login in
 try {
     final response = api.loginUser(username, password);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->loginUser: $e\n');
 }
 ```
@@ -290,7 +290,7 @@ final api = Openapi().getUserApi();
 
 try {
     api.logoutUser();
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->logoutUser: $e\n');
 }
 ```
@@ -330,7 +330,7 @@ final User user = ; // User | Updated user object
 
 try {
     api.updateUser(username, user);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->updateUser: $e\n');
 }
 ```
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/README.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/README.md
index 419bbc3d4671..f0e9be32b97e 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/README.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/README.md
@@ -53,7 +53,7 @@ final ModelClient modelClient = ; // ModelClient | client model
 try {
     final response = await api.call123testSpecialTags(modelClient);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print("Exception when calling AnotherFakeApi->call123testSpecialTags: $e\n");
 }
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/AnotherFakeApi.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/AnotherFakeApi.md
index 36a94e6bb703..b5978fb879fa 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/AnotherFakeApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/AnotherFakeApi.md
@@ -29,7 +29,7 @@ final ModelClient modelClient = ; // ModelClient | client model
 try {
     final response = api.call123testSpecialTags(modelClient);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling AnotherFakeApi->call123testSpecialTags: $e\n');
 }
 ```
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/DefaultApi.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/DefaultApi.md
index 6abd2b44f9c4..46a87f48f16c 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/DefaultApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/DefaultApi.md
@@ -26,7 +26,7 @@ final api = Openapi().getDefaultApi();
 try {
     final response = api.fooGet();
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling DefaultApi->fooGet: $e\n');
 }
 ```
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/FakeApi.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/FakeApi.md
index 18c1276934d0..b458ce09db28 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/FakeApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/FakeApi.md
@@ -50,7 +50,7 @@ final api = Openapi().getFakeApi();
 try {
     final response = api.fakeBigDecimalMap();
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->fakeBigDecimalMap: $e\n');
 }
 ```
@@ -87,7 +87,7 @@ final api = Openapi().getFakeApi();
 try {
     final response = api.fakeDuplicateInlineEnum();
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->fakeDuplicateInlineEnum: $e\n');
 }
 ```
@@ -124,7 +124,7 @@ final api = Openapi().getFakeApi();
 try {
     final response = api.fakeHealthGet();
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->fakeHealthGet: $e\n');
 }
 ```
@@ -163,7 +163,7 @@ final String header1 = header1_example; // String | header parameter
 
 try {
     api.fakeHttpSignatureTest(pet, query1, header1);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->fakeHttpSignatureTest: $e\n');
 }
 ```
@@ -208,7 +208,7 @@ final bool body = true; // bool | Input boolean as post body
 try {
     final response = api.fakeOuterBooleanSerialize(body);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->fakeOuterBooleanSerialize: $e\n');
 }
 ```
@@ -251,7 +251,7 @@ final OuterComposite outerComposite = ; // OuterComposite | Input composite as p
 try {
     final response = api.fakeOuterCompositeSerialize(outerComposite);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->fakeOuterCompositeSerialize: $e\n');
 }
 ```
@@ -294,7 +294,7 @@ final num body = 8.14; // num | Input number as post body
 try {
     final response = api.fakeOuterNumberSerialize(body);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->fakeOuterNumberSerialize: $e\n');
 }
 ```
@@ -337,7 +337,7 @@ final String body = body_example; // String | Input string as post body
 try {
     final response = api.fakeOuterStringSerialize(body);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->fakeOuterStringSerialize: $e\n');
 }
 ```
@@ -380,7 +380,7 @@ final OuterObjectWithEnumProperty outerObjectWithEnumProperty = ; // OuterObject
 try {
     final response = api.fakePropertyEnumIntegerSerialize(outerObjectWithEnumProperty);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->fakePropertyEnumIntegerSerialize: $e\n');
 }
 ```
@@ -422,7 +422,7 @@ final BuiltMap<String, JsonObject> requestBody = Object; // BuiltMap<String, Jso
 
 try {
     api.testAdditionalPropertiesReference(requestBody);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testAdditionalPropertiesReference: $e\n');
 }
 ```
@@ -464,7 +464,7 @@ final MultipartFile body = BINARY_DATA_HERE; // MultipartFile | image to upload
 
 try {
     api.testBodyWithBinary(body);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testBodyWithBinary: $e\n');
 }
 ```
@@ -506,7 +506,7 @@ final FileSchemaTestClass fileSchemaTestClass = ; // FileSchemaTestClass |
 
 try {
     api.testBodyWithFileSchema(fileSchemaTestClass);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testBodyWithFileSchema: $e\n');
 }
 ```
@@ -547,7 +547,7 @@ final User user = ; // User |
 
 try {
     api.testBodyWithQueryParams(query, user);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testBodyWithQueryParams: $e\n');
 }
 ```
@@ -591,7 +591,7 @@ final ModelClient modelClient = ; // ModelClient | client model
 try {
     final response = api.testClientModel(modelClient);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testClientModel: $e\n');
 }
 ```
@@ -649,7 +649,7 @@ final String callback = callback_example; // String | None
 
 try {
     api.testEndpointParameters(number, double_, patternWithoutDelimiter, byte, integer, int32, int64, float, string, binary, date, dateTime, password, callback);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testEndpointParameters: $e\n');
 }
 ```
@@ -712,7 +712,7 @@ final String enumFormString = enumFormString_example; // String | Form parameter
 
 try {
     api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testEnumParameters: $e\n');
 }
 ```
@@ -767,7 +767,7 @@ final int int64Group = 789; // int | Integer in group parameters
 
 try {
     api.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testGroupParameters: $e\n');
 }
 ```
@@ -814,7 +814,7 @@ final BuiltMap<String, String> requestBody = ; // BuiltMap<String, String> | req
 
 try {
     api.testInlineAdditionalProperties(requestBody);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testInlineAdditionalProperties: $e\n');
 }
 ```
@@ -856,7 +856,7 @@ final TestInlineFreeformAdditionalPropertiesRequest testInlineFreeformAdditional
 
 try {
     api.testInlineFreeformAdditionalProperties(testInlineFreeformAdditionalPropertiesRequest);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testInlineFreeformAdditionalProperties: $e\n');
 }
 ```
@@ -899,7 +899,7 @@ final String param2 = param2_example; // String | field2
 
 try {
     api.testJsonFormData(param, param2);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testJsonFormData: $e\n');
 }
 ```
@@ -942,7 +942,7 @@ final ChildWithNullable childWithNullable = ; // ChildWithNullable | request bod
 
 try {
     api.testNullable(childWithNullable);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testNullable: $e\n');
 }
 ```
@@ -990,7 +990,7 @@ final BuiltMap<String, String> language = ; // BuiltMap<String, String> |
 
 try {
     api.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context, allowEmpty, language);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testQueryParameterCollectionFormat: $e\n');
 }
 ```
@@ -1038,7 +1038,7 @@ final BuiltMap<String, String> requestBody = ; // BuiltMap<String, String> | req
 
 try {
     api.testStringMapReference(requestBody);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeApi->testStringMapReference: $e\n');
 }
 ```
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/FakeClassnameTags123Api.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/FakeClassnameTags123Api.md
index 645aebf399f0..87c8def9e932 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/FakeClassnameTags123Api.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/FakeClassnameTags123Api.md
@@ -33,7 +33,7 @@ final ModelClient modelClient = ; // ModelClient | client model
 try {
     final response = api.testClassname(modelClient);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling FakeClassnameTags123Api->testClassname: $e\n');
 }
 ```
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/PetApi.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/PetApi.md
index 2b7766eb60d4..5df6b435f6e8 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/PetApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/PetApi.md
@@ -38,7 +38,7 @@ final Pet pet = ; // Pet | Pet object that needs to be added to the store
 
 try {
     api.addPet(pet);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->addPet: $e\n');
 }
 ```
@@ -83,7 +83,7 @@ final String apiKey = apiKey_example; // String |
 
 try {
     api.deletePet(petId, apiKey);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->deletePet: $e\n');
 }
 ```
@@ -129,7 +129,7 @@ final BuiltList<String> status = ; // BuiltList<String> | Status values that nee
 try {
     final response = api.findPetsByStatus(status);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->findPetsByStatus: $e\n');
 }
 ```
@@ -174,7 +174,7 @@ final BuiltSet<String> tags = ; // BuiltSet<String> | Tags to filter by
 try {
     final response = api.findPetsByTags(tags);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->findPetsByTags: $e\n');
 }
 ```
@@ -221,7 +221,7 @@ final int petId = 789; // int | ID of pet to return
 try {
     final response = api.getPetById(petId);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->getPetById: $e\n');
 }
 ```
@@ -265,7 +265,7 @@ final Pet pet = ; // Pet | Pet object that needs to be added to the store
 
 try {
     api.updatePet(pet);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->updatePet: $e\n');
 }
 ```
@@ -311,7 +311,7 @@ final String status = status_example; // String | Updated status of the pet
 
 try {
     api.updatePetWithForm(petId, name, status);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->updatePetWithForm: $e\n');
 }
 ```
@@ -360,7 +360,7 @@ final MultipartFile file = BINARY_DATA_HERE; // MultipartFile | file to upload
 try {
     final response = api.uploadFile(petId, additionalMetadata, file);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->uploadFile: $e\n');
 }
 ```
@@ -409,7 +409,7 @@ final String additionalMetadata = additionalMetadata_example; // String | Additi
 try {
     final response = api.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling PetApi->uploadFileWithRequiredFile: $e\n');
 }
 ```
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/StoreApi.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/StoreApi.md
index 3616fd734377..ee38d8b275b6 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/StoreApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/StoreApi.md
@@ -31,7 +31,7 @@ final String orderId = orderId_example; // String | ID of the order that needs t
 
 try {
     api.deleteOrder(orderId);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling StoreApi->deleteOrder: $e\n');
 }
 ```
@@ -77,7 +77,7 @@ final api = Openapi().getStoreApi();
 try {
     final response = api.getInventory();
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling StoreApi->getInventory: $e\n');
 }
 ```
@@ -117,7 +117,7 @@ final int orderId = 789; // int | ID of pet that needs to be fetched
 try {
     final response = api.getOrderById(orderId);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling StoreApi->getOrderById: $e\n');
 }
 ```
@@ -160,7 +160,7 @@ final Order order = ; // Order | order placed for purchasing the pet
 try {
     final response = api.placeOrder(order);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling StoreApi->placeOrder: $e\n');
 }
 ```
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/UserApi.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/UserApi.md
index 571896708968..a5f532770cd1 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/UserApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/UserApi.md
@@ -35,7 +35,7 @@ final User user = ; // User | Created user object
 
 try {
     api.createUser(user);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->createUser: $e\n');
 }
 ```
@@ -77,7 +77,7 @@ final BuiltList<User> user = ; // BuiltList<User> | List of user object
 
 try {
     api.createUsersWithArrayInput(user);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->createUsersWithArrayInput: $e\n');
 }
 ```
@@ -119,7 +119,7 @@ final BuiltList<User> user = ; // BuiltList<User> | List of user object
 
 try {
     api.createUsersWithListInput(user);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->createUsersWithListInput: $e\n');
 }
 ```
@@ -161,7 +161,7 @@ final String username = username_example; // String | The name that needs to be
 
 try {
     api.deleteUser(username);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->deleteUser: $e\n');
 }
 ```
@@ -204,7 +204,7 @@ final String username = username_example; // String | The name that needs to be
 try {
     final response = api.getUserByName(username);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->getUserByName: $e\n');
 }
 ```
@@ -248,7 +248,7 @@ final String password = password_example; // String | The password for login in
 try {
     final response = api.loginUser(username, password);
     print(response);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->loginUser: $e\n');
 }
 ```
@@ -290,7 +290,7 @@ final api = Openapi().getUserApi();
 
 try {
     api.logoutUser();
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->logoutUser: $e\n');
 }
 ```
@@ -330,7 +330,7 @@ final User user = ; // User | Updated user object
 
 try {
     api.updateUser(username, user);
-} catch on DioException (e) {
+} on DioException catch (e) {
     print('Exception when calling UserApi->updateUser: $e\n');
 }
 ```