Merge branch 'dev-nullsafety'

# Conflicts:
#	README.md
#	openapi-generator-annotations/CHANGELOG.md
#	openapi-generator-annotations/pubspec.yaml
#	openapi-generator-cli/CHANGELOG.md
#	openapi-generator-cli/lib/openapi-generator.jar
#	openapi-generator-cli/pubspec.yaml
#	openapi-generator/CHANGELOG.md
#	openapi-generator/lib/src/openapi_generator_runner.dart
#	openapi-generator/pubspec.yaml

Author: gibahjoe

openapi-generator-annotations/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.0.0-nullsafety.1
+
+- Bumped generator version to 5.0.0. This has some breaking changes. [Click here](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.0.0) to view changes
+- bumped null safety
 ## 2.2.0
 
 - Added support for flutter wrappers
@@ -7,6 +11,10 @@
 
 - Bumped generator version to 5.0.0. This has some breaking changes. [Click here](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.0.0) to view changes
 
+## 2.0.0-nullsafety.0
+
+- Added null safety
+
 ## 1.1.4
 
 - Updated dart_2 api to version 3.10

openapi-generator-annotations/lib/src/openapi_generator_annotations_base.dart

@@ -6,12 +6,12 @@ class Openapi {
   /// Additional properties to pass to the compiler (CSV)
   ///
   /// --additional-properties
-  final AdditionalProperties additionalProperties;
+  final AdditionalProperties? additionalProperties;
 
   /// The package of the api. defaults to lib.api
   ///
   /// --api-package
-  final String apiPackage;
+  final String? apiPackage;
 
   /// relative path or url to spec file
   ///
@@ -21,7 +21,7 @@ class Openapi {
   /// folder containing the template files
   ///
   /// -t
-  final String templateDirectory;
+  final String? templateDirectory;
 
   /// Generator to use (dart|dart2-api|dart-jaguar|dart-dio)
   ///
@@ -31,45 +31,45 @@ class Openapi {
   ///  Where to write the generated files (current dir by default)
   ///
   ///  -o, --output
-  final String outputDirectory;
+  final String? outputDirectory;
 
   ///  Specifies if the existing files should be overwritten during the generation
   ///
   ///  -s, --skip-overwrite
-  final bool overwriteExistingFiles;
+  final bool? overwriteExistingFiles;
 
   /// Skips the default behavior of validating an input specification.
   ///
   /// --skip-validate-spec
-  final bool skipSpecValidation;
+  final bool? skipSpecValidation;
 
   /// Add reserver words mappings as reservedWord=replacement format.
   /// It is supported by the dart2-api and dart-dio generator.
   ///
   /// --reserved-words-mappings
-  final Map<String, String> reservedWordsMappings;
+  final Map<String, String>? reservedWordsMappings;
 
   /// Tells openapi-generator to always run during the build process
   /// if set to false (the default), openapi-generator will skip processing if the [outputDirectory] already exists
-  final bool alwaysRun;
+  final bool? alwaysRun;
 
   /// if set to true, flutter pub get will be run on the [outputDirectory] after the code has been generated.
   /// Defaults to true for backwards compatibility
-  final bool fetchDependencies;
+  final bool? fetchDependencies;
 
   ///if set to true, source gen will be run on the output of openapi-generator
   ///Defaults to true
-  final bool runSourceGenOnOutput;
+  final bool? runSourceGenOnOutput;
 
-  final Map<String, String> typeMappings;
+  final Map<String, String>? typeMappings;
 
   const Openapi(
       {this.additionalProperties,
       this.overwriteExistingFiles,
       this.skipSpecValidation = false,
-      this.inputSpecFile,
+      required this.inputSpecFile,
       this.templateDirectory,
-      this.generatorName,
+      required this.generatorName,
       this.outputDirectory,
       this.typeMappings,
       this.reservedWordsMappings,
@@ -81,43 +81,43 @@ class Openapi {
 
 class AdditionalProperties {
   ///  toggles whether unicode identifiers are allowed in names or not, default is false
-  final bool allowUnicodeIdentifiers;
+  final bool? allowUnicodeIdentifiers;
 
   /// Whether to ensure parameter names are unique in an operation (rename parameters that are not).
-  final bool ensureUniqueParams;
+  final bool? ensureUniqueParams;
 
   /// Add form or body parameters to the beginning of the parameter list.
-  final bool prependFormOrBodyParameters;
+  final bool? prependFormOrBodyParameters;
 
   ///	Author name in generated pubspec
-  final String pubAuthor;
+  final String? pubAuthor;
 
   /// 	Email address of the author in generated pubspec
-  final String pubAuthorEmail;
+  final String? pubAuthorEmail;
 
   ///	Description in generated pubspec
-  final String pubDescription;
+  final String? pubDescription;
 
   ///	Homepage in generated pubspec
-  final String pubHomepage;
+  final String? pubHomepage;
 
   ///	Name in generated pubspec
-  final String pubName;
+  final String? pubName;
 
   /// Version in generated pubspec
-  final String pubVersion;
+  final String? pubVersion;
 
   /// Sort model properties to place required parameters before optional parameters.
-  final bool sortModelPropertiesByRequiredFlag;
+  final bool? sortModelPropertiesByRequiredFlag;
 
   /// Sort method arguments to place required parameters before optional parameters.
-  final bool sortParamsByRequiredFlag;
+  final bool? sortParamsByRequiredFlag;
 
   /// Source folder for generated code
-  final String sourceFolder;
+  final String? sourceFolder;
 
   /// Allow the 'x-enum-values' extension for enums
-  final bool useEnumExtension;
+  final bool? useEnumExtension;
 
   /// Flutter wrapper to use (none|flutterw|fvm)
   final Wrapper wrapper;
@@ -157,27 +157,27 @@ class AdditionalProperties {
 
 class JaguarProperties extends AdditionalProperties {
   /// Choose serialization format JSON or PROTO is supported
-  final SerializationFormat serialization;
+  final SerializationFormat? serialization;
 
   /// Is the null fields should be in the JSON payload
-  final bool nullableFields;
+  final bool? nullableFields;
 
   const JaguarProperties(
       {this.serialization,
       this.nullableFields,
       bool allowUnicodeIdentifiers = false,
       bool ensureUniqueParams = true,
       bool prependFormOrBodyParameters = false,
-      String pubAuthor,
-      String pubAuthorEmail,
-      String pubDescription,
-      String pubHomepage,
-      String pubName,
-      String pubVersion,
+      String? pubAuthor,
+      String? pubAuthorEmail,
+      String? pubDescription,
+      String? pubHomepage,
+      String? pubName,
+      String? pubVersion,
       bool sortModelPropertiesByRequiredFlag = true,
       bool sortParamsByRequiredFlag = true,
       bool useEnumExtension = true,
-      String sourceFolder})
+      String? sourceFolder})
       : super(
             allowUnicodeIdentifiers: allowUnicodeIdentifiers,
             ensureUniqueParams: ensureUniqueParams,
@@ -197,27 +197,27 @@ class JaguarProperties extends AdditionalProperties {
 
 class DioProperties extends AdditionalProperties {
   /// Choose serialization format JSON or PROTO is supported
-  final DioDateLibrary dateLibrary;
+  final DioDateLibrary? dateLibrary;
 
   /// Is the null fields should be in the JSON payload
-  final bool nullableFields;
+  final bool? nullableFields;
 
   const DioProperties(
       {this.dateLibrary,
       this.nullableFields,
       bool allowUnicodeIdentifiers = false,
       bool ensureUniqueParams = true,
       bool prependFormOrBodyParameters = false,
-      String pubAuthor,
-      String pubAuthorEmail,
-      String pubDescription,
-      String pubHomepage,
-      String pubName,
-      String pubVersion,
+      String? pubAuthor,
+      String? pubAuthorEmail,
+      String? pubDescription,
+      String? pubHomepage,
+      String? pubName,
+      String? pubVersion,
       bool sortModelPropertiesByRequiredFlag = true,
       bool sortParamsByRequiredFlag = true,
       bool useEnumExtension = true,
-      String sourceFolder})
+      String? sourceFolder})
       : super(
             allowUnicodeIdentifiers: allowUnicodeIdentifiers,
             ensureUniqueParams: ensureUniqueParams,

openapi-generator-annotations/pubspec.yaml

@@ -5,8 +5,8 @@ homepage: https://github.com/gibahjoe/openapi-generator-dart
 
 
 environment:
-  sdk: '>=2.7.0 <3.0.0'
+  sdk: '>=2.12.0-133.2.beta <3.0.0'
 
 dev_dependencies:
-  pedantic: ^1.9.2
-  test: ^1.15.7
+  pedantic: ^1.10.0-nullsafety.3
+  test: ^1.16.0-nullsafety.13

openapi-generator-cli/CHANGELOG.md

@@ -1,11 +1,18 @@
 ## 2.2.0
 
 - Bumped dart-ogurets generator to 4.1 with [breaking changes](https://github.com/dart-ogurets/dart-openapi-maven#changelog)
+## 3.0.0-nullsafety.1
+
+- Bumped null safety version
 
 ## 2.0.0
 
 - Bumped generator version to 5.0.0. This has some breaking changes. [Click here](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.0.0) to view changes
 
+## 2.0.0-nullsafety.0
+
+- Added null safety
+
 ## 1.1.4
 
 - Updated dart_2 api to version 3.10

openapi-generator-cli/bin/main.dart

@@ -6,7 +6,7 @@ void main(List<String> arguments) async {
   exitCode = 0; // presume success
 
   var binPath = (await Isolate.resolvePackageUri(
-          Uri.parse('package:openapi_generator_cli/openapi-generator.jar')))
+          Uri.parse('package:openapi_generator_cli/openapi-generator.jar')))!
       .toFilePath(windows: Platform.isWindows);
   var JAVA_OPTS = Platform.environment['JAVA_OPTS'] ?? '';
 

openapi-generator-cli/pubspec.yaml

@@ -4,11 +4,11 @@ version: 2.2.0
 homepage: https://github.com/gibahjoe/openapi-generator-dart
 
 environment:
-  sdk: '>=2.7.0 <3.0.0'
+  sdk: '>=2.12.0-133.2.beta <3.0.0'
 
 dev_dependencies:
-  pedantic: ^1.9.2
-  test: ^1.15.7
+  pedantic: ^1.10.0-nullsafety.3
+  test: ^1.16.0-nullsafety.13
 
 executables:
   openapi-generator: main

openapi-generator/CHANGELOG.md

@@ -2,11 +2,19 @@
 
 - Added support for flutter wrappers
 - Bumped dart-ogurets generator to 4.1 with [breaking changes](https://github.com/dart-ogurets/dart-openapi-maven#changelog)
+## 3.0.0-nullsafety.1
+
+- Bumped generator version to 5.0.0. This has some breaking changes. [Click here](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.0.0) to view changes
+- bumped null safety
 
 ## 2.0.0
 
 - Bumped generator version to 5.0.0. This has some breaking changes. [Click here](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.0.0) to view changes
 
+## 2.0.0-nullsafety.0
+
+- Migrated to null safety
+
 ## 1.1.4
 
 - Updated dart_2 api to version 3.10