Merge branch 'OpenAPITools:master' into spring-sealed-samples

Author: Mattias-Sehlstedt

README.md

@@ -1,6 +1,6 @@
 generatorName: dart-dio
 outputDir: samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/dart/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/dart/libraries/dio
 typeMappings:
   Client: "ModelClient"

bin/configs/dart-dio-petstore-client-lib-fake-json_serializable.yaml

@@ -1,6 +1,6 @@
 generatorName: dart-dio
 outputDir: samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/dart/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/dart/libraries/dio
 typeMappings:
   Client: "ModelClient"

bin/configs/dart-dio-petstore-client-lib-fake.yaml

@@ -1,6 +1,6 @@
 generatorName: dart
 outputDir: samples/openapi3/client/petstore/dart2/petstore_client_lib_fake
-inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/dart/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/dart2
 typeMappings:
   Client: "ModelClient"

bin/configs/dart-petstore-client-lib-fake.yaml

@@ -64,6 +64,7 @@ import {{invokerPackage}}.auth.OAuth;
 {{/hasOAuthMethods}}
 
 {{>generatedAnnotation}}
+
 public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
   protected Map<String, String> defaultHeaderMap = new HashMap<String, String>();
   protected Map<String, String> defaultCookieMap = new HashMap<String, String>();

modules/openapi-generator/src/main/resources/Java/ApiClient.mustache

@@ -7,6 +7,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 
 {{>generatedAnnotation}}
+
 public class Configuration {
   public static final String VERSION = "{{{artifactVersion}}}";
 

modules/openapi-generator/src/main/resources/Java/Configuration.mustache

@@ -10,6 +10,7 @@ import java.time.format.DateTimeParseException;
  * It's generated for java clients when {@code AbstractJavaCodegen#dateLibrary} specified as {@code java8}.
  */
 {{>generatedAnnotation}}
+
 public class JavaTimeFormatter {
   private DateTimeFormatter offsetDateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
 

modules/openapi-generator/src/main/resources/Java/JavaTimeFormatter.mustache

@@ -3,6 +3,7 @@
 package {{invokerPackage}};
 
 {{>generatedAnnotation}}
+
 public class Pair {
   private final String name;
   private final String value;

modules/openapi-generator/src/main/resources/Java/Pair.mustache

@@ -12,6 +12,7 @@ import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
 {{>generatedAnnotation}}
+
 public class RFC3339DateFormat extends DateFormat {
   private static final long serialVersionUID = 1L;
   private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC");

modules/openapi-generator/src/main/resources/Java/RFC3339DateFormat.mustache

@@ -18,6 +18,7 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeFeature;
 import com.fasterxml.jackson.datatype.jsr310.deser.InstantDeserializer;
 
 {{>generatedAnnotation}}
+
 public class RFC3339InstantDeserializer<T extends Temporal> extends InstantDeserializer<T> {
     private static final long serialVersionUID = 1L;
     private final static boolean DEFAULT_NORMALIZE_ZONE_ID = JavaTimeFeature.NORMALIZE_DESERIALIZED_ZONE_ID.enabledByDefault();