Skip to content

Commit

Permalink
fix[dart2]: improved error reporting (#1006)
Browse files Browse the repository at this point in the history 
* fix[dart]: improved error reporting

* rebuilt dart2 petstore

* rebuilt dart2 petstore with dartfmt
  • Loading branch information
@wing328
ircecho authored and wing328 committed Sep 10, 2018
1 parent f80fa08 commit 6a1e560
Show file tree
Hide file tree
Showing 13 changed files with 70 additions and 37 deletions.
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/dart2/api_client.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class ApiClient {
}
}
}
} catch (e, stack) {
} on Exception catch (e, stack) {
throw ApiException.withInner(500, 'Exception during deserialization.', e, stack);
}
throw ApiException(500, 'Could not find a suitable class for deserialization');
Expand Down
12 changes: 8 additions & 4 deletions samples/client/petstore/dart2/flutter_petstore/openapi/lib/api/pet_api.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ class PetApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -85,7 +86,8 @@ class PetApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -265,7 +267,8 @@ class PetApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -319,7 +322,8 @@ class PetApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down
3 changes: 2 additions & 1 deletion samples/client/petstore/dart2/flutter_petstore/openapi/lib/api/store_api.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ class StoreApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down
18 changes: 12 additions & 6 deletions samples/client/petstore/dart2/flutter_petstore/openapi/lib/api/user_api.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ class UserApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -82,7 +83,8 @@ class UserApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -123,7 +125,8 @@ class UserApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -166,7 +169,8 @@ class UserApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -299,7 +303,8 @@ class UserApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -345,7 +350,8 @@ class UserApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/dart2/flutter_petstore/openapi/lib/api_client.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class ApiClient {
}
}
}
} catch (e, stack) {
} on Exception catch (e, stack) {
throw ApiException.withInner(
500, 'Exception during deserialization.', e, stack);
}
Expand Down
12 changes: 8 additions & 4 deletions samples/client/petstore/dart2/openapi-browser-client/lib/api/pet_api.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ class PetApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -85,7 +86,8 @@ class PetApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -265,7 +267,8 @@ class PetApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -319,7 +322,8 @@ class PetApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down
3 changes: 2 additions & 1 deletion samples/client/petstore/dart2/openapi-browser-client/lib/api/store_api.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ class StoreApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down
18 changes: 12 additions & 6 deletions samples/client/petstore/dart2/openapi-browser-client/lib/api/user_api.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ class UserApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -82,7 +83,8 @@ class UserApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -123,7 +125,8 @@ class UserApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -166,7 +169,8 @@ class UserApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -299,7 +303,8 @@ class UserApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -345,7 +350,8 @@ class UserApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/dart2/openapi-browser-client/lib/api_client.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class ApiClient {
}
}
}
} catch (e, stack) {
} on Exception catch (e, stack) {
throw ApiException.withInner(
500, 'Exception during deserialization.', e, stack);
}
Expand Down
12 changes: 8 additions & 4 deletions samples/client/petstore/dart2/openapi/lib/api/pet_api.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ class PetApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -85,7 +86,8 @@ class PetApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -265,7 +267,8 @@ class PetApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -319,7 +322,8 @@ class PetApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down
3 changes: 2 additions & 1 deletion samples/client/petstore/dart2/openapi/lib/api/store_api.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ class StoreApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down
18 changes: 12 additions & 6 deletions samples/client/petstore/dart2/openapi/lib/api/user_api.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ class UserApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -82,7 +83,8 @@ class UserApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -123,7 +125,8 @@ class UserApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -166,7 +169,8 @@ class UserApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -299,7 +303,8 @@ class UserApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down Expand Up @@ -345,7 +350,8 @@ class UserApi {

if (response.statusCode >= 400) {
throw new ApiException(response.statusCode, response.body);
} else if (response.body != null) {} else {
} else if (response.body != null) {
} else {
return;
}
}
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/dart2/openapi/lib/api_client.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class ApiClient {
}
}
}
} catch (e, stack) {
} on Exception catch (e, stack) {
throw ApiException.withInner(
500, 'Exception during deserialization.', e, stack);
}
Expand Down

0 comments on commit 6a1e560

Please sign in to comment.