fix[dart2]: improved error reporting (OpenAPITools#1006)

ircecho · wing328 · commit 6a1e560540e1 · 2018-09-11T00:14:50.000+08:00
* fix[dart]: improved error reporting

* rebuilt dart2 petstore

* rebuilt dart2 petstore with dartfmt
diff --git a/modules/openapi-generator/src/main/resources/dart2/api_client.mustache b/modules/openapi-generator/src/main/resources/dart2/api_client.mustache
@@ -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');
diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/lib/api/pet_api.dart b/samples/client/petstore/dart2/flutter_petstore/openapi/lib/api/pet_api.dart
@@ -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;
     }
   }
@@ -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;
     }
   }
@@ -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;
     }
   }
@@ -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;
     }
   }
diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/lib/api/store_api.dart b/samples/client/petstore/dart2/flutter_petstore/openapi/lib/api/store_api.dart
@@ -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;
     }
   }
diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/lib/api/user_api.dart b/samples/client/petstore/dart2/flutter_petstore/openapi/lib/api/user_api.dart
@@ -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;
     }
   }
@@ -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;
     }
   }
@@ -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;
     }
   }
@@ -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;
     }
   }
@@ -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;
     }
   }
@@ -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;
     }
   }
diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/lib/api_client.dart b/samples/client/petstore/dart2/flutter_petstore/openapi/lib/api_client.dart
@@ -65,7 +65,7 @@ class ApiClient {
             }
           }
       }
-    } catch (e, stack) {
+    } on Exception catch (e, stack) {
       throw ApiException.withInner(
           500, 'Exception during deserialization.', e, stack);
     }
diff --git a/samples/client/petstore/dart2/openapi-browser-client/lib/api/pet_api.dart b/samples/client/petstore/dart2/openapi-browser-client/lib/api/pet_api.dart
@@ -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;
     }
   }
@@ -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;
     }
   }
@@ -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;
     }
   }
@@ -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;
     }
   }
diff --git a/samples/client/petstore/dart2/openapi-browser-client/lib/api/store_api.dart b/samples/client/petstore/dart2/openapi-browser-client/lib/api/store_api.dart
@@ -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;
     }
   }
diff --git a/samples/client/petstore/dart2/openapi-browser-client/lib/api/user_api.dart b/samples/client/petstore/dart2/openapi-browser-client/lib/api/user_api.dart
@@ -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;
     }
   }
@@ -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;
     }
   }
@@ -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;
     }
   }
@@ -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;
     }
   }
@@ -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;
     }
   }
@@ -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;
     }
   }
diff --git a/samples/client/petstore/dart2/openapi-browser-client/lib/api_client.dart b/samples/client/petstore/dart2/openapi-browser-client/lib/api_client.dart
@@ -65,7 +65,7 @@ class ApiClient {
             }
           }
       }
-    } catch (e, stack) {
+    } on Exception catch (e, stack) {
       throw ApiException.withInner(
           500, 'Exception during deserialization.', e, stack);
     }
diff --git a/samples/client/petstore/dart2/openapi/lib/api/pet_api.dart b/samples/client/petstore/dart2/openapi/lib/api/pet_api.dart
@@ -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;
     }
   }
@@ -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;
     }
   }
@@ -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;
     }
   }
@@ -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;
     }
   }
diff --git a/samples/client/petstore/dart2/openapi/lib/api/store_api.dart b/samples/client/petstore/dart2/openapi/lib/api/store_api.dart
@@ -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;
     }
   }
diff --git a/samples/client/petstore/dart2/openapi/lib/api/user_api.dart b/samples/client/petstore/dart2/openapi/lib/api/user_api.dart
@@ -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;
     }
   }
@@ -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;
     }
   }
@@ -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;
     }
   }
@@ -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;
     }
   }
@@ -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;
     }
   }
@@ -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;
     }
   }
diff --git a/samples/client/petstore/dart2/openapi/lib/api_client.dart b/samples/client/petstore/dart2/openapi/lib/api_client.dart
@@ -65,7 +65,7 @@ class ApiClient {
             }
           }
       }
-    } catch (e, stack) {
+    } on Exception catch (e, stack) {
       throw ApiException.withInner(
           500, 'Exception during deserialization.', e, stack);
     }

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ class ApiClient {`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`}`
`73`		`- } catch (e, stack) {`
	`73`	`+ } on Exception catch (e, stack) {`
`74`	`74`	`throw ApiException.withInner(500, 'Exception during deserialization.', e, stack);`
`75`	`75`	`}`
`76`	`76`	`throw ApiException(500, 'Could not find a suitable class for deserialization');`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,8 @@ class PetApi {`
`41`	`41`
`42`	`42`	`if (response.statusCode >= 400) {`
`43`	`43`	`throw new ApiException(response.statusCode, response.body);`
`44`		`- } else if (response.body != null) {} else {`
	`44`	`+ } else if (response.body != null) {`
	`45`	`+ } else {`
`45`	`46`	`return;`
`46`	`47`	`}`
`47`	`48`	`}`
`@@ -85,7 +86,8 @@ class PetApi {`
`85`	`86`
`86`	`87`	`if (response.statusCode >= 400) {`
`87`	`88`	`throw new ApiException(response.statusCode, response.body);`
`88`		`- } else if (response.body != null) {} else {`
	`89`	`+ } else if (response.body != null) {`
	`90`	`+ } else {`
`89`	`91`	`return;`
`90`	`92`	`}`
`91`	`93`	`}`
`@@ -265,7 +267,8 @@ class PetApi {`
`265`	`267`
`266`	`268`	`if (response.statusCode >= 400) {`
`267`	`269`	`throw new ApiException(response.statusCode, response.body);`
`268`		`- } else if (response.body != null) {} else {`
	`270`	`+ } else if (response.body != null) {`
	`271`	`+ } else {`
`269`	`272`	`return;`
`270`	`273`	`}`
`271`	`274`	`}`
`@@ -319,7 +322,8 @@ class PetApi {`
`319`	`322`
`320`	`323`	`if (response.statusCode >= 400) {`
`321`	`324`	`throw new ApiException(response.statusCode, response.body);`
`322`		`- } else if (response.body != null) {} else {`
	`325`	`+ } else if (response.body != null) {`
	`326`	`+ } else {`
`323`	`327`	`return;`
`324`	`328`	`}`
`325`	`329`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,8 @@ class StoreApi {`
`43`	`43`
`44`	`44`	`if (response.statusCode >= 400) {`
`45`	`45`	`throw new ApiException(response.statusCode, response.body);`
`46`		`- } else if (response.body != null) {} else {`
	`46`	`+ } else if (response.body != null) {`
	`47`	`+ } else {`
`47`	`48`	`return;`
`48`	`49`	`}`
`49`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,8 @@ class UserApi {`
`41`	`41`
`42`	`42`	`if (response.statusCode >= 400) {`
`43`	`43`	`throw new ApiException(response.statusCode, response.body);`
`44`		`- } else if (response.body != null) {} else {`
	`44`	`+ } else if (response.body != null) {`
	`45`	`+ } else {`
`45`	`46`	`return;`
`46`	`47`	`}`
`47`	`48`	`}`
`@@ -82,7 +83,8 @@ class UserApi {`
`82`	`83`
`83`	`84`	`if (response.statusCode >= 400) {`
`84`	`85`	`throw new ApiException(response.statusCode, response.body);`
`85`		`- } else if (response.body != null) {} else {`
	`86`	`+ } else if (response.body != null) {`
	`87`	`+ } else {`
`86`	`88`	`return;`
`87`	`89`	`}`
`88`	`90`	`}`
`@@ -123,7 +125,8 @@ class UserApi {`
`123`	`125`
`124`	`126`	`if (response.statusCode >= 400) {`
`125`	`127`	`throw new ApiException(response.statusCode, response.body);`
`126`		`- } else if (response.body != null) {} else {`
	`128`	`+ } else if (response.body != null) {`
	`129`	`+ } else {`
`127`	`130`	`return;`
`128`	`131`	`}`
`129`	`132`	`}`
`@@ -166,7 +169,8 @@ class UserApi {`
`166`	`169`
`167`	`170`	`if (response.statusCode >= 400) {`
`168`	`171`	`throw new ApiException(response.statusCode, response.body);`
`169`		`- } else if (response.body != null) {} else {`
	`172`	`+ } else if (response.body != null) {`
	`173`	`+ } else {`
`170`	`174`	`return;`
`171`	`175`	`}`
`172`	`176`	`}`
`@@ -299,7 +303,8 @@ class UserApi {`
`299`	`303`
`300`	`304`	`if (response.statusCode >= 400) {`
`301`	`305`	`throw new ApiException(response.statusCode, response.body);`
`302`		`- } else if (response.body != null) {} else {`
	`306`	`+ } else if (response.body != null) {`
	`307`	`+ } else {`
`303`	`308`	`return;`
`304`	`309`	`}`
`305`	`310`	`}`
`@@ -345,7 +350,8 @@ class UserApi {`
`345`	`350`
`346`	`351`	`if (response.statusCode >= 400) {`
`347`	`352`	`throw new ApiException(response.statusCode, response.body);`
`348`		`- } else if (response.body != null) {} else {`
	`353`	`+ } else if (response.body != null) {`
	`354`	`+ } else {`
`349`	`355`	`return;`
`350`	`356`	`}`
`351`	`357`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ class ApiClient {`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`}`
`68`		`- } catch (e, stack) {`
	`68`	`+ } on Exception catch (e, stack) {`
`69`	`69`	`throw ApiException.withInner(`
`70`	`70`	`500, 'Exception during deserialization.', e, stack);`
`71`	`71`	`}`