release 3.1.0

gibahjoe · gibahjoe · commit 9804783716a2 · 2021-03-28T18:14:14.000+01:00
diff --git a/openapi-generator-annotations/CHANGELOG.md b/openapi-generator-annotations/CHANGELOG.md
@@ -1,4 +1,9 @@
-## 3.0.1
+## 3.1.0
+- **BREAKING CHANGES**
+- Bumped dart-ogurets (_dioAlt_) generator to 5.0 with [breaking changes](https://github.com/dart-ogurets/dart-openapi-maven#changelog)
+- Bumped official openapi generator to 5.1.0. See [change log](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.1.0)
+
+## 3.0.2
 - ###BREAKING CHANGE -> Updated generator enums to camelCase and removed old ones.
 
 ## 3.0.0-nullsafety.1
diff --git a/openapi-generator-annotations/pubspec.yaml b/openapi-generator-annotations/pubspec.yaml
@@ -1,11 +1,11 @@
 name: openapi_generator_annotations
 description: Annotation package for openapi_generator https://pub.dev/packages/openapi_generator.
-version: 3.0.1
+version: 3.1.0
 homepage: https://github.com/gibahjoe/openapi-generator-dart
 
 
 environment:
-  sdk: '>=2.12.1 <3.0.0'
+  sdk: '>=2.12.0 <3.0.0'
 
 dev_dependencies:
   pedantic: ^1.11.0
diff --git a/openapi-generator-cli/CHANGELOG.md b/openapi-generator-cli/CHANGELOG.md
@@ -1,4 +1,9 @@
-## 3.0.1
+## 3.1.0
+- **BREAKING CHANGES**
+- Bumped dart-ogurets (_dioAlt_) generator to 5.0 with [breaking changes](https://github.com/dart-ogurets/dart-openapi-maven#changelog)
+- Bumped official openapi generator to 5.1.0. See [change log](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.1.0)
+
+## 3.0.2
 - Bumped dart-ogurets generator to 4.2 with [breaking changes](https://github.com/dart-ogurets/dart-openapi-maven#changelog)
 - Bumped official openapi generator to 5.0.1. See [change log](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.0.1)
 
diff --git a/openapi-generator-cli/lib/openapi-generator.jar b/openapi-generator-cli/lib/openapi-generator.jar
diff --git a/openapi-generator-cli/pom.xml b/openapi-generator-cli/pom.xml
@@ -47,13 +47,13 @@
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>openapi-generator-cli</artifactId>
-            <version>5.0.1</version>
+            <version>5.1.0</version>
         </dependency>
         
         <dependency>
             <groupId>com.bluetrainsoftware.maven</groupId>
             <artifactId>openapi-dart-generator</artifactId>
-            <version>4.2</version>
+            <version>5.0</version>
         </dependency>        
     </dependencies>
 </project>
diff --git a/openapi-generator-cli/pubspec.yaml b/openapi-generator-cli/pubspec.yaml
@@ -1,10 +1,10 @@
 name: openapi_generator_cli
 description: A dart wrapper around openapi-generator inspired by the node implementation.
-version: 3.0.1
+version: 3.1.0
 homepage: https://github.com/gibahjoe/openapi-generator-dart
 
 environment:
-  sdk: '>=2.12.1 <3.0.0'
+  sdk: '>=2.12.0 <3.0.0'
 
 dev_dependencies:
   pedantic: ^1.11.0
diff --git a/openapi-generator/CHANGELOG.md b/openapi-generator/CHANGELOG.md
@@ -1,4 +1,9 @@
-## 3.0.1
+## 3.1.0
+- **BREAKING CHANGES**
+- Bumped dart-ogurets (_dioAlt_) generator to 5.0 with [breaking changes](https://github.com/dart-ogurets/dart-openapi-maven#changelog)
+- Bumped official openapi generator to 5.1.0. See [change log](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.1.0)
+
+## 3.0.2
 
 - Bumped dart-ogurets generator to 4.2 with [breaking changes](https://github.com/dart-ogurets/dart-openapi-maven#changelog)
 - Bumped official openapi generator to 5.0.1. See [change log](https://github.com/OpenAPITools/openapi-generator/releases/tag/v5.0.1)
diff --git a/openapi-generator/lib/src/openapi_generator_runner.dart b/openapi-generator/lib/src/openapi_generator_runner.dart
@@ -37,7 +37,7 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {
       command = '$command$separator-g$separator$generator';
 
       var outputDirectory =
-          _readFieldValueAsString(annotation, 'outputDirectory', '')!;
+          _readFieldValueAsString(annotation, 'outputDirectory', '');
       if (outputDirectory.isNotEmpty) {
         var alwaysRun = _readFieldValueAsBool(annotation, 'alwaysRun', false)!;
         var filePath = path.join(outputDirectory, 'lib/api.dart');
@@ -141,7 +141,7 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {
         }
       }
     } catch (e) {
-      print('Error generating spec ${e}');
+      print('Error generating spec $e');
       rethrow;
     }
     return '';
@@ -173,9 +173,9 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {
                   '$additionalProperties${additionalProperties.isEmpty ? '' : ','}${entry.key}=${entry.value.toStringValue()}'
             });
 
-    if (additionalProperties != null && additionalProperties.isNotEmpty) {
+    if (additionalProperties.isNotEmpty) {
       command =
-          '$command$separator--additional-properties=${additionalProperties}';
+          '$command$separator--additional-properties=$additionalProperties';
     }
     return command;
   }
@@ -226,18 +226,18 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {
   String appendTemplateDirCommandArgs(
       ConstantReader annotation, String command, String separator) {
     var templateDir =
-        _readFieldValueAsString(annotation, 'templateDirectory', '')!;
+        _readFieldValueAsString(annotation, 'templateDirectory', '');
     if (templateDir.isNotEmpty) {
-      command = '$command$separator-t$separator${templateDir}';
+      command = '$command$separator-t$separator$templateDir';
     }
     return command;
   }
 
   String appendInputFileCommandArgs(
       ConstantReader annotation, String command, String separator) {
-    var inputFile = _readFieldValueAsString(annotation, 'inputSpecFile', '')!;
+    var inputFile = _readFieldValueAsString(annotation, 'inputSpecFile', '');
     if (inputFile.isNotEmpty) {
-      command = '$command$separator-i$separator${inputFile}';
+      command = '$command$separator-i$separator$inputFile';
     }
     return command;
   }
diff --git a/openapi-generator/pubspec.yaml b/openapi-generator/pubspec.yaml
@@ -1,18 +1,18 @@
 name: openapi_generator
 description: Generator for openapi client sdk inspired by the npm implementation of openapi-generator-cli.
-version: 3.0.1
+version: 3.1.0
 homepage: https://github.com/gibahjoe/openapi-generator-dart
 
 environment:
-  sdk: '>=2.12.1 <3.0.0'
+  sdk: '>=2.12.0 <3.0.0'
 
 dependencies:
   build: '>=0.12.6 <=2.0.0'
-  source_gen: ^0.9.10+3
+  source_gen: ^1.0.0
   path: ^1.8.0
-  openapi_generator_annotations: ^3.0.1
-  analyzer: ^1.1.0
-  openapi_generator_cli: ^3.0.1
+  openapi_generator_annotations: ^3.1.0
+  analyzer: ^1.3.0
+  openapi_generator_cli: ^3.1.0
 
 dev_dependencies:
   pedantic: ^1.11.0

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {`
`37`	`37`	`command = '$command$separator-g$separator$generator';`
`38`	`38`
`39`	`39`	`var outputDirectory =`
`40`		`- _readFieldValueAsString(annotation, 'outputDirectory', '')!;`
	`40`	`+ _readFieldValueAsString(annotation, 'outputDirectory', '');`
`41`	`41`	`if (outputDirectory.isNotEmpty) {`
`42`	`42`	`var alwaysRun = _readFieldValueAsBool(annotation, 'alwaysRun', false)!;`
`43`	`43`	`var filePath = path.join(outputDirectory, 'lib/api.dart');`
`@@ -141,7 +141,7 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`	`} catch (e) {`
`144`		`- print('Error generating spec ${e}');`
	`144`	`+ print('Error generating spec $e');`
`145`	`145`	`rethrow;`
`146`	`146`	`}`
`147`	`147`	`return '';`
`@@ -173,9 +173,9 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {`
`173`	`173`	`'$additionalProperties${additionalProperties.isEmpty ? '' : ','}${entry.key}=${entry.value.toStringValue()}'`
`174`	`174`	`});`
`175`	`175`
`176`		`- if (additionalProperties != null && additionalProperties.isNotEmpty) {`
	`176`	`+ if (additionalProperties.isNotEmpty) {`
`177`	`177`	`command =`
`178`		`- '$command$separator--additional-properties=${additionalProperties}';`
	`178`	`+ '$command$separator--additional-properties=$additionalProperties';`
`179`	`179`	`}`
`180`	`180`	`return command;`
`181`	`181`	`}`
`@@ -226,18 +226,18 @@ class OpenapiGenerator extends GeneratorForAnnotation<annots.Openapi> {`
`226`	`226`	`String appendTemplateDirCommandArgs(`
`227`	`227`	`ConstantReader annotation, String command, String separator) {`
`228`	`228`	`var templateDir =`
`229`		`- _readFieldValueAsString(annotation, 'templateDirectory', '')!;`
	`229`	`+ _readFieldValueAsString(annotation, 'templateDirectory', '');`
`230`	`230`	`if (templateDir.isNotEmpty) {`
`231`		`- command = '$command$separator-t$separator${templateDir}';`
	`231`	`+ command = '$command$separator-t$separator$templateDir';`
`232`	`232`	`}`
`233`	`233`	`return command;`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`String appendInputFileCommandArgs(`
`237`	`237`	`ConstantReader annotation, String command, String separator) {`
`238`		`- var inputFile = _readFieldValueAsString(annotation, 'inputSpecFile', '')!;`
	`238`	`+ var inputFile = _readFieldValueAsString(annotation, 'inputSpecFile', '');`
`239`	`239`	`if (inputFile.isNotEmpty) {`
`240`		`- command = '$command$separator-i$separator${inputFile}';`
	`240`	`+ command = '$command$separator-i$separator$inputFile';`
`241`	`241`	`}`
`242`	`242`	`return command;`
`243`	`243`	`}`