Move tests to Drone.io CI (#3754)

* move tests to drone.io * ls dir * debug * use bash * use jdk 11 image * move tests to drone.io * use maven wrapper * comment out scripts in circleci * update dart samples * remove commented tests * update dart samples
2019-08-26 00:35:51 +08:00
parent 5289262aec
commit 136c1407ac
33 changed files with 289 additions and 295 deletions
--- a/CI/.drone.yml
+++ b/CI/.drone.yml
@@ -11,10 +11,18 @@ steps:
  - (cd samples/client/petstore/dart2/openapi && pub get && pub run test)
 # test Java 11 HTTP client
 - name: java11-test
-  image: hirokimatsumoto/alpine-openjdk-11	
+  image: openjdk:11.0
  commands:
  - ./mvnw clean install
  - ./mvnw --quiet verify -Psamples.droneio
+  # test all generators with fake petstore spec (2.0, 3.0)
+  - /bin/bash bin/utils/test-fake-petstore-for-all.sh
+  # generate test scripts
+  - /bin/bash bin/tests/run-all-test
+  # generate all petstore samples (client, servers, doc)
+  - /bin/bash bin/run-all-petstore
+  # generate all petstore samples (openapi3)
+  - /bin/bash bin/openapi3/run-all-petstore
 # test ocaml petstore client
 - name: ocaml-test
  image: ocaml/opam2:4.07
--- a/CI/circle_parallel.sh
+++ b/CI/circle_parallel.sh
@@ -14,14 +14,6 @@ if [ "$NODE_INDEX" = "1" ]; then
  mvn --quiet verify -Psamples.circleci
  mvn --quiet javadoc:javadoc -Psamples.circleci

-  # generate all petstore samples (client, servers, doc)
-  ./bin/run-all-petstore
-  # generate all petstore samples (openapi3)
-  ./bin/openapi3/run-all-petstore
-  # generate test scripts
-  ./bin/tests/run-all-test
-  # test all generators with fake petstore spec (2.0, 3.0)
-  ./bin/utils/test-fake-petstore-for-all.sh
 elif [ "$NODE_INDEX" = "2" ]; then
  # run ensure-up-to-date sample script on SNAPSHOT version only
  project_version=`mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout`
@@ -29,12 +21,6 @@ elif [ "$NODE_INDEX" = "2" ]; then
    echo "Running node $NODE_INDEX to test ensure-up-to-date"
    java -version

-    # install elm-format for formatting elm code
-    npm install -g elm-format
-
-    # symlink elm-format
-    sudo ln -s /opt/circleci/.nvm/versions/node/v12.1.0/bin/elm-format /usr/local/bin/elm-format
-
    ./bin/utils/ensure-up-to-date
  fi
 #elif [ "$NODE_INDEX" = "3" ]; then
--- a/bin/meta-codegen.sh
+++ b/bin/meta-codegen.sh
@@ -22,7 +22,7 @@ executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"

 if [ ! -f "$executable" ]
 then
-  mvn -B clean package
+  ./mvnw -B clean package
 fi

 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
@@ -30,7 +30,7 @@ ags="meta -n myClientCodegen -t DOCUMENTATION -p com.my.company.codegen -o sampl

 java $JAVA_OPTS -jar $executable $ags

-mvn clean package -f samples/meta-codegen/pom.xml
+./mvnw clean package -f samples/meta-codegen/pom.xml

 ags2="generate -g myClientCodegen -i modules/openapi-generator/src/test/resources/2_0/petstore.json -o samples/meta-codegen/usage $@"

--- a/samples/client/petstore/dart/flutter_petstore/openapi/lib/model/api_response.dart
+++ b/samples/client/petstore/dart/flutter_petstore/openapi/lib/model/api_response.dart
@@ -2,11 +2,11 @@ part of openapi.api;

 class ApiResponse {
  
-    int code = null;
+  int code = null;
  
-    String type = null;
+  String type = null;
  
-    String message = null;
+  String message = null;
  ApiResponse();

  @override
@@ -16,9 +16,21 @@ class ApiResponse {

  ApiResponse.fromJson(Map<String, dynamic> json) {
    if (json == null) return;
-    code = json['code'];
-    type = json['type'];
-    message = json['message'];
+    if (json['code'] == null) {
+      code = null;
+    } else {
+      code = json['code'];
+    }
+    if (json['type'] == null) {
+      type = null;
+    } else {
+      type = json['type'];
+    }
+    if (json['message'] == null) {
+      message = null;
+    } else {
+      message = json['message'];
+    }
  }

  Map<String, dynamic> toJson() {
--- a/samples/client/petstore/dart/flutter_petstore/openapi/lib/model/category.dart
+++ b/samples/client/petstore/dart/flutter_petstore/openapi/lib/model/category.dart
@@ -2,9 +2,9 @@ part of openapi.api;

 class Category {
  
-    int id = null;
+  int id = null;
  
-    String name = null;
+  String name = null;
  Category();

  @override
@@ -14,8 +14,16 @@ class Category {

  Category.fromJson(Map<String, dynamic> json) {
    if (json == null) return;
-    id = json['id'];
-    name = json['name'];
+    if (json['id'] == null) {
+      id = null;
+    } else {
+      id = json['id'];
+    }
+    if (json['name'] == null) {
+      name = null;
+    } else {
+      name = json['name'];
+    }
  }

  Map<String, dynamic> toJson() {
--- a/samples/client/petstore/dart/flutter_petstore/openapi/lib/model/order.dart
+++ b/samples/client/petstore/dart/flutter_petstore/openapi/lib/model/order.dart
@@ -2,18 +2,18 @@ part of openapi.api;

 class Order {
  
-    int id = null;
+  int id = null;
  
-    int petId = null;
+  int petId = null;
  
-    int quantity = null;
+  int quantity = null;
  
-    DateTime shipDate = null;
+  DateTime shipDate = null;
  /* Order Status */
-    String status = null;
+  String status = null;
  //enum statusEnum {  placed,  approved,  delivered,  };{
  
-    bool complete = false;
+  bool complete = false;
  Order();

  @override
@@ -23,14 +23,36 @@ class Order {

  Order.fromJson(Map<String, dynamic> json) {
    if (json == null) return;
-    id = json['id'];
-    petId = json['petId'];
-    quantity = json['quantity'];
-    shipDate = (json['shipDate'] == null) ?
-      null :
-      DateTime.parse(json['shipDate']);
-    status = json['status'];
-    complete = json['complete'];
+    if (json['id'] == null) {
+      id = null;
+    } else {
+      id = json['id'];
+    }
+    if (json['petId'] == null) {
+      petId = null;
+    } else {
+      petId = json['petId'];
+    }
+    if (json['quantity'] == null) {
+      quantity = null;
+    } else {
+      quantity = json['quantity'];
+    }
+    if (json['shipDate'] == null) {
+      shipDate = null;
+    } else {
+      shipDate = DateTime.parse(json['shipDate']);
+    }
+    if (json['status'] == null) {
+      status = null;
+    } else {
+      status = json['status'];
+    }
+    if (json['complete'] == null) {
+      complete = null;
+    } else {
+      complete = json['complete'];
+    }
  }

  Map<String, dynamic> toJson() {
--- a/samples/client/petstore/dart/flutter_petstore/openapi/lib/model/pet.dart
+++ b/samples/client/petstore/dart/flutter_petstore/openapi/lib/model/pet.dart
@@ -2,17 +2,17 @@ part of openapi.api;

 class Pet {
  
-    int id = null;
+  int id = null;
  
-    Category category = null;
+  Category category = null;
  
-    String name = null;
+  String name = null;
  
-    List<String> photoUrls = [];
+  List<String> photoUrls = [];
  
-    List<Tag> tags = [];
+  List<Tag> tags = [];
  /* pet status in the store */
-    String status = null;
+  String status = null;
  //enum statusEnum {  available,  pending,  sold,  };{
  Pet();

@@ -23,18 +23,36 @@ class Pet {

  Pet.fromJson(Map<String, dynamic> json) {
    if (json == null) return;
-    id = json['id'];
-    category = (json['category'] == null) ?
-      null :
-      Category.fromJson(json['category']);
-    name = json['name'];
-    photoUrls = (json['photoUrls'] == null) ?
-      null :
-      (json['photoUrls'] as List).cast<String>();
-    tags = (json['tags'] == null) ?
-      null :
-      Tag.listFromJson(json['tags']);
-    status = json['status'];
+    if (json['id'] == null) {
+      id = null;
+    } else {
+      id = json['id'];
+    }
+    if (json['category'] == null) {
+      category = null;
+    } else {
+      category = new Category.fromJson(json['category']);
+    }
+    if (json['name'] == null) {
+      name = null;
+    } else {
+      name = json['name'];
+    }
+    if (json['photoUrls'] == null) {
+      photoUrls = null;
+    } else {
+      photoUrls = (json['photoUrls'] as List).map((item) => item as String).toList();
+    }
+    if (json['tags'] == null) {
+      tags = null;
+    } else {
+      tags = Tag.listFromJson(json['tags']);
+    }
+    if (json['status'] == null) {
+      status = null;
+    } else {
+      status = json['status'];
+    }
  }

  Map<String, dynamic> toJson() {
--- a/samples/client/petstore/dart/flutter_petstore/openapi/lib/model/tag.dart
+++ b/samples/client/petstore/dart/flutter_petstore/openapi/lib/model/tag.dart
@@ -2,9 +2,9 @@ part of openapi.api;

 class Tag {
  
-    int id = null;
+  int id = null;
  
-    String name = null;
+  String name = null;
  Tag();

  @override
@@ -14,8 +14,16 @@ class Tag {

  Tag.fromJson(Map<String, dynamic> json) {
    if (json == null) return;
-    id = json['id'];
-    name = json['name'];
+    if (json['id'] == null) {
+      id = null;
+    } else {
+      id = json['id'];
+    }
+    if (json['name'] == null) {
+      name = null;
+    } else {
+      name = json['name'];
+    }
  }

  Map<String, dynamic> toJson() {
--- a/samples/client/petstore/dart/flutter_petstore/openapi/lib/model/user.dart
+++ b/samples/client/petstore/dart/flutter_petstore/openapi/lib/model/user.dart
@@ -2,21 +2,21 @@ part of openapi.api;

 class User {
  
-    int id = null;
+  int id = null;
  
-    String username = null;
+  String username = null;
  
-    String firstName = null;
+  String firstName = null;
  
-    String lastName = null;
+  String lastName = null;
  
-    String email = null;
+  String email = null;
  
-    String password = null;
+  String password = null;
  
-    String phone = null;
+  String phone = null;
  /* User Status */
-    int userStatus = null;
+  int userStatus = null;
  User();

  @override
@@ -26,14 +26,46 @@ class User {

  User.fromJson(Map<String, dynamic> json) {
    if (json == null) return;
-    id = json['id'];
-    username = json['username'];
-    firstName = json['firstName'];
-    lastName = json['lastName'];
-    email = json['email'];
-    password = json['password'];
-    phone = json['phone'];
-    userStatus = json['userStatus'];
+    if (json['id'] == null) {
+      id = null;
+    } else {
+      id = json['id'];
+    }
+    if (json['username'] == null) {
+      username = null;
+    } else {
+      username = json['username'];
+    }
+    if (json['firstName'] == null) {
+      firstName = null;
+    } else {
+      firstName = json['firstName'];
+    }
+    if (json['lastName'] == null) {
+      lastName = null;
+    } else {
+      lastName = json['lastName'];
+    }
+    if (json['email'] == null) {
+      email = null;
+    } else {
+      email = json['email'];
+    }
+    if (json['password'] == null) {
+      password = null;
+    } else {
+      password = json['password'];
+    }
+    if (json['phone'] == null) {
+      phone = null;
+    } else {
+      phone = json['phone'];
+    }
+    if (json['userStatus'] == null) {
+      userStatus = null;
+    } else {
+      userStatus = json['userStatus'];
+    }
  }

  Map<String, dynamic> toJson() {
--- a/samples/client/petstore/dart/flutter_petstore/swagger/lib/model/api_response.dart
+++ b/samples/client/petstore/dart/flutter_petstore/swagger/lib/model/api_response.dart
@@ -16,21 +16,9 @@ class ApiResponse {

  ApiResponse.fromJson(Map<String, dynamic> json) {
    if (json == null) return;
-    if (json['code'] == null) {
-      code = null;
-    } else {
-          code = json['code'];
-    }
-    if (json['type'] == null) {
-      type = null;
-    } else {
-          type = json['type'];
-    }
-    if (json['message'] == null) {
-      message = null;
-    } else {
-          message = json['message'];
-    }
+    code = json['code'];
+    type = json['type'];
+    message = json['message'];
  }

  Map<String, dynamic> toJson() {
--- a/samples/client/petstore/dart/flutter_petstore/swagger/lib/model/category.dart
+++ b/samples/client/petstore/dart/flutter_petstore/swagger/lib/model/category.dart
@@ -14,16 +14,8 @@ class Category {

  Category.fromJson(Map<String, dynamic> json) {
    if (json == null) return;
-    if (json['id'] == null) {
-      id = null;
-    } else {
-          id = json['id'];
-    }
-    if (json['name'] == null) {
-      name = null;
-    } else {
-          name = json['name'];
-    }
+    id = json['id'];
+    name = json['name'];
  }

  Map<String, dynamic> toJson() {
--- a/samples/client/petstore/dart/flutter_petstore/swagger/lib/model/order.dart
+++ b/samples/client/petstore/dart/flutter_petstore/swagger/lib/model/order.dart
@@ -23,36 +23,14 @@ class Order {

  Order.fromJson(Map<String, dynamic> json) {
    if (json == null) return;
-    if (json['id'] == null) {
-      id = null;
-    } else {
-          id = json['id'];
-    }
-    if (json['petId'] == null) {
-      petId = null;
-    } else {
-          petId = json['petId'];
-    }
-    if (json['quantity'] == null) {
-      quantity = null;
-    } else {
-          quantity = json['quantity'];
-    }
-    if (json['shipDate'] == null) {
-      shipDate = null;
-    } else {
-      shipDate = DateTime.parse(json['shipDate']);
-    }
-    if (json['status'] == null) {
-      status = null;
-    } else {
-          status = json['status'];
-    }
-    if (json['complete'] == null) {
-      complete = null;
-    } else {
-          complete = json['complete'];
-    }
+    id = json['id'];
+    petId = json['petId'];
+    quantity = json['quantity'];
+    shipDate = (json['shipDate'] == null) ?
+      null :
+      DateTime.parse(json['shipDate']);
+    status = json['status'];
+    complete = json['complete'];
  }

  Map<String, dynamic> toJson() {
--- a/samples/client/petstore/dart/flutter_petstore/swagger/lib/model/pet.dart
+++ b/samples/client/petstore/dart/flutter_petstore/swagger/lib/model/pet.dart
@@ -23,36 +23,18 @@ class Pet {

  Pet.fromJson(Map<String, dynamic> json) {
    if (json == null) return;
-    if (json['id'] == null) {
-      id = null;
-    } else {
-          id = json['id'];
-    }
-    if (json['category'] == null) {
-      category = null;
-    } else {
-      category = Category.fromJson(json['category']);
-    }
-    if (json['name'] == null) {
-      name = null;
-    } else {
-          name = json['name'];
-    }
-    if (json['photoUrls'] == null) {
-      photoUrls = null;
-    } else {
-      photoUrls = (json['photoUrls'] as List).cast<String>();
-    }
-    if (json['tags'] == null) {
-      tags = null;
-    } else {
-      tags = Tag.listFromJson(json['tags']);
-    }
-    if (json['status'] == null) {
-      status = null;
-    } else {
-          status = json['status'];
-    }
+    id = json['id'];
+    category = (json['category'] == null) ?
+      null :
+      Category.fromJson(json['category']);
+    name = json['name'];
+    photoUrls = (json['photoUrls'] == null) ?
+      null :
+      (json['photoUrls'] as List).cast<String>();
+    tags = (json['tags'] == null) ?
+      null :
+      Tag.listFromJson(json['tags']);
+    status = json['status'];
  }

  Map<String, dynamic> toJson() {
--- a/samples/client/petstore/dart/flutter_petstore/swagger/lib/model/tag.dart
+++ b/samples/client/petstore/dart/flutter_petstore/swagger/lib/model/tag.dart
@@ -14,16 +14,8 @@ class Tag {

  Tag.fromJson(Map<String, dynamic> json) {
    if (json == null) return;
-    if (json['id'] == null) {
-      id = null;
-    } else {
-          id = json['id'];
-    }
-    if (json['name'] == null) {
-      name = null;
-    } else {
-          name = json['name'];
-    }
+    id = json['id'];
+    name = json['name'];
  }

  Map<String, dynamic> toJson() {
--- a/samples/client/petstore/dart/flutter_petstore/swagger/lib/model/user.dart
+++ b/samples/client/petstore/dart/flutter_petstore/swagger/lib/model/user.dart
@@ -26,46 +26,14 @@ class User {

  User.fromJson(Map<String, dynamic> json) {
    if (json == null) return;
-    if (json['id'] == null) {
-      id = null;
-    } else {
-          id = json['id'];
-    }
-    if (json['username'] == null) {
-      username = null;
-    } else {
-          username = json['username'];
-    }
-    if (json['firstName'] == null) {
-      firstName = null;
-    } else {
-          firstName = json['firstName'];
-    }
-    if (json['lastName'] == null) {
-      lastName = null;
-    } else {
-          lastName = json['lastName'];
-    }
-    if (json['email'] == null) {
-      email = null;
-    } else {
-          email = json['email'];
-    }
-    if (json['password'] == null) {
-      password = null;
-    } else {
-          password = json['password'];
-    }
-    if (json['phone'] == null) {
-      phone = null;
-    } else {
-          phone = json['phone'];
-    }
-    if (json['userStatus'] == null) {
-      userStatus = null;
-    } else {
-          userStatus = json['userStatus'];
-    }
+    id = json['id'];
+    username = json['username'];
+    firstName = json['firstName'];
+    lastName = json['lastName'];
+    email = json['email'];
+    password = json['password'];
+    phone = json['phone'];
+    userStatus = json['userStatus'];
  }

  Map<String, dynamic> toJson() {
--- a/samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/api_response.dart
+++ b/samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/api_response.dart
@@ -2,11 +2,11 @@ part of openapi.api;

 class ApiResponse {
  
-    int code = null;
+  int code = null;
  
-    String type = null;
+  String type = null;
  
-    String message = null;
+  String message = null;
  ApiResponse();

  @override
--- a/samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/category.dart
+++ b/samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/category.dart
@@ -2,9 +2,9 @@ part of openapi.api;

 class Category {
  
-    int id = null;
+  int id = null;
  
-    String name = null;
+  String name = null;
  Category();

  @override
--- a/samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/order.dart
+++ b/samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/order.dart
@@ -2,18 +2,18 @@ part of openapi.api;

 class Order {
  
-    int id = null;
+  int id = null;
  
-    int petId = null;
+  int petId = null;
  
-    int quantity = null;
+  int quantity = null;
  
-    DateTime shipDate = null;
+  DateTime shipDate = null;
  /* Order Status */
-    String status = null;
+  String status = null;
  //enum statusEnum {  placed,  approved,  delivered,  };{
  
-    bool complete = false;
+  bool complete = false;
  Order();

  @override
--- a/samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/pet.dart
+++ b/samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/pet.dart
@@ -2,17 +2,17 @@ part of openapi.api;

 class Pet {
  
-    int id = null;
+  int id = null;
  
-    Category category = null;
+  Category category = null;
  
-    String name = null;
+  String name = null;
  
-    List<String> photoUrls = [];
+  List<String> photoUrls = [];
  
-    List<Tag> tags = [];
+  List<Tag> tags = [];
  /* pet status in the store */
-    String status = null;
+  String status = null;
  //enum statusEnum {  available,  pending,  sold,  };{
  Pet();

--- a/samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/tag.dart
+++ b/samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/tag.dart
@@ -2,9 +2,9 @@ part of openapi.api;

 class Tag {
  
-    int id = null;
+  int id = null;
  
-    String name = null;
+  String name = null;
  Tag();

  @override
--- a/samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/user.dart
+++ b/samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/user.dart
@@ -2,21 +2,21 @@ part of openapi.api;

 class User {
  
-    int id = null;
+  int id = null;
  
-    String username = null;
+  String username = null;
  
-    String firstName = null;
+  String firstName = null;
  
-    String lastName = null;
+  String lastName = null;
  
-    String email = null;
+  String email = null;
  
-    String password = null;
+  String password = null;
  
-    String phone = null;
+  String phone = null;
  /* User Status */
-    int userStatus = null;
+  int userStatus = null;
  User();

  @override
--- a/samples/client/petstore/dart2/openapi-browser-client/lib/model/api_response.dart
+++ b/samples/client/petstore/dart2/openapi-browser-client/lib/model/api_response.dart
@@ -2,11 +2,11 @@ part of openapi.api;

 class ApiResponse {
  
-    int code = null;
+  int code = null;
  
-    String type = null;
+  String type = null;
  
-    String message = null;
+  String message = null;
  ApiResponse();

  @override
--- a/samples/client/petstore/dart2/openapi-browser-client/lib/model/category.dart
+++ b/samples/client/petstore/dart2/openapi-browser-client/lib/model/category.dart
@@ -2,9 +2,9 @@ part of openapi.api;

 class Category {
  
-    int id = null;
+  int id = null;
  
-    String name = null;
+  String name = null;
  Category();

  @override
--- a/samples/client/petstore/dart2/openapi-browser-client/lib/model/order.dart
+++ b/samples/client/petstore/dart2/openapi-browser-client/lib/model/order.dart
@@ -2,18 +2,18 @@ part of openapi.api;

 class Order {
  
-    int id = null;
+  int id = null;
  
-    int petId = null;
+  int petId = null;
  
-    int quantity = null;
+  int quantity = null;
  
-    DateTime shipDate = null;
+  DateTime shipDate = null;
  /* Order Status */
-    String status = null;
+  String status = null;
  //enum statusEnum {  placed,  approved,  delivered,  };{
  
-    bool complete = false;
+  bool complete = false;
  Order();

  @override
--- a/samples/client/petstore/dart2/openapi-browser-client/lib/model/pet.dart
+++ b/samples/client/petstore/dart2/openapi-browser-client/lib/model/pet.dart
@@ -2,17 +2,17 @@ part of openapi.api;

 class Pet {
  
-    int id = null;
+  int id = null;
  
-    Category category = null;
+  Category category = null;
  
-    String name = null;
+  String name = null;
  
-    List<String> photoUrls = [];
+  List<String> photoUrls = [];
  
-    List<Tag> tags = [];
+  List<Tag> tags = [];
  /* pet status in the store */
-    String status = null;
+  String status = null;
  //enum statusEnum {  available,  pending,  sold,  };{
  Pet();

--- a/samples/client/petstore/dart2/openapi-browser-client/lib/model/tag.dart
+++ b/samples/client/petstore/dart2/openapi-browser-client/lib/model/tag.dart
@@ -2,9 +2,9 @@ part of openapi.api;

 class Tag {
  
-    int id = null;
+  int id = null;
  
-    String name = null;
+  String name = null;
  Tag();

  @override
--- a/samples/client/petstore/dart2/openapi-browser-client/lib/model/user.dart
+++ b/samples/client/petstore/dart2/openapi-browser-client/lib/model/user.dart
@@ -2,21 +2,21 @@ part of openapi.api;

 class User {
  
-    int id = null;
+  int id = null;
  
-    String username = null;
+  String username = null;
  
-    String firstName = null;
+  String firstName = null;
  
-    String lastName = null;
+  String lastName = null;
  
-    String email = null;
+  String email = null;
  
-    String password = null;
+  String password = null;
  
-    String phone = null;
+  String phone = null;
  /* User Status */
-    int userStatus = null;
+  int userStatus = null;
  User();

  @override
--- a/samples/client/petstore/dart2/openapi/lib/model/api_response.dart
+++ b/samples/client/petstore/dart2/openapi/lib/model/api_response.dart
@@ -2,11 +2,11 @@ part of openapi.api;

 class ApiResponse {
  
-    int code = null;
+  int code = null;
  
-    String type = null;
+  String type = null;
  
-    String message = null;
+  String message = null;
  ApiResponse();

  @override
--- a/samples/client/petstore/dart2/openapi/lib/model/category.dart
+++ b/samples/client/petstore/dart2/openapi/lib/model/category.dart
@@ -2,9 +2,9 @@ part of openapi.api;

 class Category {
  
-    int id = null;
+  int id = null;
  
-    String name = null;
+  String name = null;
  Category();

  @override
--- a/samples/client/petstore/dart2/openapi/lib/model/order.dart
+++ b/samples/client/petstore/dart2/openapi/lib/model/order.dart
@@ -2,18 +2,18 @@ part of openapi.api;

 class Order {
  
-    int id = null;
+  int id = null;
  
-    int petId = null;
+  int petId = null;
  
-    int quantity = null;
+  int quantity = null;
  
-    DateTime shipDate = null;
+  DateTime shipDate = null;
  /* Order Status */
-    String status = null;
+  String status = null;
  //enum statusEnum {  placed,  approved,  delivered,  };{
  
-    bool complete = false;
+  bool complete = false;
  Order();

  @override
--- a/samples/client/petstore/dart2/openapi/lib/model/pet.dart
+++ b/samples/client/petstore/dart2/openapi/lib/model/pet.dart
@@ -2,17 +2,17 @@ part of openapi.api;

 class Pet {
  
-    int id = null;
+  int id = null;
  
-    Category category = null;
+  Category category = null;
  
-    String name = null;
+  String name = null;
  
-    List<String> photoUrls = [];
+  List<String> photoUrls = [];
  
-    List<Tag> tags = [];
+  List<Tag> tags = [];
  /* pet status in the store */
-    String status = null;
+  String status = null;
  //enum statusEnum {  available,  pending,  sold,  };{
  Pet();

--- a/samples/client/petstore/dart2/openapi/lib/model/tag.dart
+++ b/samples/client/petstore/dart2/openapi/lib/model/tag.dart
@@ -2,9 +2,9 @@ part of openapi.api;

 class Tag {
  
-    int id = null;
+  int id = null;
  
-    String name = null;
+  String name = null;
  Tag();

  @override
--- a/samples/client/petstore/dart2/openapi/lib/model/user.dart
+++ b/samples/client/petstore/dart2/openapi/lib/model/user.dart
@@ -2,21 +2,21 @@ part of openapi.api;

 class User {
  
-    int id = null;
+  int id = null;
  
-    String username = null;
+  String username = null;
  
-    String firstName = null;
+  String firstName = null;
  
-    String lastName = null;
+  String lastName = null;
  
-    String email = null;
+  String email = null;
  
-    String password = null;
+  String password = null;
  
-    String phone = null;
+  String phone = null;
  /* User Status */
-    int userStatus = null;
+  int userStatus = null;
  User();

  @override