chore: update analysis options and remove deprecated lint package references and skipped redundant tests.

Author: gibahjoe

openapi-generator-annotations/analysis_options.yaml

@@ -1,9 +1,28 @@
-# For lint rules and documentation, see http://dart-lang.github.io/linter/lints.
-# Uncomment to specify additional rules.
-# linter:
-#   rules:
-#     - camel_case_types
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
 
-analyzer:
-#   exclude:
-#     - path/to/excluded/files/**
+# The following line activates a set of recommended lints for Dart packages,
+# designed to encourage good coding practices.
+include: package:lints/recommended.yaml
+
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:lints/recommended.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at https://dart.dev/tools/linter-rules.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/tools/analysis

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

@@ -341,8 +341,8 @@ class AWSRemoteSpecHeaderDelegate extends RemoteSpecHeaderDelegate {
 
   const AWSRemoteSpecHeaderDelegate({
     required this.bucket,
-    this.secretAccessKey = null,
-    this.accessKeyId = null,
+    this.secretAccessKey,
+    this.accessKeyId,
   }) : super();
 
   AWSRemoteSpecHeaderDelegate.fromMap(Map<String, dynamic> map)
@@ -359,7 +359,7 @@ class AWSRemoteSpecHeaderDelegate extends RemoteSpecHeaderDelegate {
     String? path,
   }) {
     if (!(path != null && path.isNotEmpty)) {
-      throw new AssertionError('The path to the OAS spec should be provided');
+      throw AssertionError('The path to the OAS spec should be provided');
     }
 
     // Use the provided credentials to the constructor, if any, otherwise
@@ -369,7 +369,7 @@ class AWSRemoteSpecHeaderDelegate extends RemoteSpecHeaderDelegate {
         secretAccessKey ?? Platform.environment['AWS_SECRET_ACCESS_KEY'];
     if ((accessKey == null || accessKey.isEmpty) ||
         (secretKey == null || secretKey.isEmpty)) {
-      throw new AssertionError(
+      throw AssertionError(
           'AWS_SECRET_KEY_ID & AWS_SECRET_ACCESS_KEY should be defined and not empty or they should be provided in the delegate constructor.');
     }
 
@@ -548,30 +548,39 @@ class AdditionalProperties {
   String toString() {
     final buffer = StringBuffer();
     buffer.writeln('AdditionalProperties(');
-    if (allowUnicodeIdentifiers != null)
+    if (allowUnicodeIdentifiers != null) {
       buffer.writeln('  allowUnicodeIdentifiers: $allowUnicodeIdentifiers,');
-    if (ensureUniqueParams != null)
+    }
+    if (ensureUniqueParams != null) {
       buffer.writeln('  ensureUniqueParams: $ensureUniqueParams,');
-    if (prependFormOrBodyParameters != null)
+    }
+    if (prependFormOrBodyParameters != null) {
       buffer.writeln(
           '  prependFormOrBodyParameters: $prependFormOrBodyParameters,');
+    }
     if (pubAuthor != null) buffer.writeln('  pubAuthor: "$pubAuthor",');
-    if (pubAuthorEmail != null)
+    if (pubAuthorEmail != null) {
       buffer.writeln('  pubAuthorEmail: "$pubAuthorEmail",');
-    if (pubDescription != null)
+    }
+    if (pubDescription != null) {
       buffer.writeln('  pubDescription: "$pubDescription",');
+    }
     if (pubHomepage != null) buffer.writeln('  pubHomepage: "$pubHomepage",');
     if (pubName != null) buffer.writeln('  pubName: "$pubName",');
     if (pubVersion != null) buffer.writeln('  pubVersion: "$pubVersion",');
-    if (sortModelPropertiesByRequiredFlag != null)
+    if (sortModelPropertiesByRequiredFlag != null) {
       buffer.writeln(
           '  sortModelPropertiesByRequiredFlag: $sortModelPropertiesByRequiredFlag,');
-    if (sortParamsByRequiredFlag != null)
+    }
+    if (sortParamsByRequiredFlag != null) {
       buffer.writeln('  sortParamsByRequiredFlag: $sortParamsByRequiredFlag,');
-    if (sourceFolder != null)
+    }
+    if (sourceFolder != null) {
       buffer.writeln('  sourceFolder: "$sourceFolder",');
-    if (useEnumExtension != null)
+    }
+    if (useEnumExtension != null) {
       buffer.writeln('  useEnumExtension: $useEnumExtension,');
+    }
     buffer.writeln('  enumUnknownDefaultCase: $enumUnknownDefaultCase,');
     buffer.writeln('  wrapper: $wrapper,');
     buffer
@@ -629,10 +638,12 @@ class InlineSchemaOptions {
   String toString() {
     final buffer = StringBuffer();
     buffer.writeln('InlineSchemaOptions(');
-    if (arrayItemSuffix != null)
+    if (arrayItemSuffix != null) {
       buffer.writeln('  arrayItemSuffix: "$arrayItemSuffix",');
-    if (mapItemSuffix != null)
+    }
+    if (mapItemSuffix != null) {
       buffer.writeln('  mapItemSuffix: "$mapItemSuffix",');
+    }
     buffer.writeln('  skipSchemaReuse: $skipSchemaReuse,');
     buffer
         .writeln('  refactorAllofInlineSchemas: $refactorAllofInlineSchemas,');
@@ -694,6 +705,7 @@ class DioProperties extends AdditionalProperties {
             map['serializationLibrary']),
         super.fromMap(map);
 
+  @override
   Map<String, dynamic> toMap() => Map.from(super.toMap())
     ..addAll({
       if (dateLibrary != null)
@@ -713,10 +725,12 @@ class DioProperties extends AdditionalProperties {
         .replaceAll(RegExp(r'AdditionalProperties\(|\)$'), '')
         .replaceAll('\n', '\n  ')); // Indent base class fields
     if (dateLibrary != null) buffer.writeln('  dateLibrary: $dateLibrary,');
-    if (nullableFields != null)
+    if (nullableFields != null) {
       buffer.writeln('  nullableFields: $nullableFields,');
-    if (serializationLibrary != null)
+    }
+    if (serializationLibrary != null) {
       buffer.writeln('  serializationLibrary: $serializationLibrary,');
+    }
     buffer.write(')');
     return buffer.toString();
   }
@@ -783,6 +797,7 @@ class DioAltProperties extends AdditionalProperties {
         pubspecDevDependencies = map['pubspecDevDependencies'],
         super.fromMap(map);
 
+  @override
   Map<String, dynamic> toMap() => Map.from(super.toMap())
     ..addAll({
       if (listAnyOf != null) 'listAnyOf': listAnyOf,
@@ -805,10 +820,12 @@ class DioAltProperties extends AdditionalProperties {
 
     // Add DioAltProperties-specific fields
     if (listAnyOf != null) buffer.writeln('  listAnyOf: $listAnyOf,');
-    if (pubspecDependencies != null)
+    if (pubspecDependencies != null) {
       buffer.writeln('  pubspecDependencies: "$pubspecDependencies",');
-    if (pubspecDevDependencies != null)
+    }
+    if (pubspecDevDependencies != null) {
       buffer.writeln('  pubspecDevDependencies: "$pubspecDevDependencies",');
+    }
 
     buffer.write(')');
     return buffer.toString();

openapi-generator-annotations/pubspec.yaml

@@ -15,3 +15,4 @@ dev_dependencies:
   test:
   source_gen_test:
   lint:
+  lints: ^6.0.0

openapi-generator-annotations/test/additional_properties_test.dart

@@ -14,15 +14,17 @@ void main() {
       expect(props.sortModelPropertiesByRequiredFlag, isTrue);
       expect(props.sortParamsByRequiredFlag, isTrue);
       // Default null props
-      [
+      for (var element in [
         props.pubVersion,
         props.pubName,
         props.pubHomepage,
         props.pubDescription,
         props.pubAuthor,
         props.pubAuthorEmail,
         props.sourceFolder
-      ].forEach((element) => expect(element, isNull));
+      ]) {
+        expect(element, isNull);
+      }
     });
     test('toMap', () {
       final props = AdditionalProperties();
@@ -37,15 +39,17 @@ void main() {
       expect(map['sortParamsByRequiredFlag'], isTrue);
 
       // Doesn't include null fields
-      [
+      for (var element in [
         'pubVersion',
         'pubName',
         'pubHomepage',
         'pubDescription',
         'pubAuthor',
         'pubAuthorEmail',
         'sourceFolder'
-      ].forEach((element) => expect(map.containsKey(element), isFalse));
+      ]) {
+        expect(map.containsKey(element), isFalse);
+      }
     });
     test('fromMap', () {
       final props = AdditionalProperties(
@@ -107,7 +111,7 @@ void main() {
       expect(props.sortModelPropertiesByRequiredFlag, isTrue);
       expect(props.sortParamsByRequiredFlag, isTrue);
       // Default null props
-      [
+      for (var element in [
         props.pubVersion,
         props.pubName,
         props.pubHomepage,
@@ -118,7 +122,9 @@ void main() {
         props.nullableFields,
         props.serializationLibrary,
         props.dateLibrary,
-      ].forEach((element) => expect(element, isNull));
+      ]) {
+        expect(element, isNull);
+      }
     });
     test('toMap', () {
       final props = DioProperties();
@@ -133,7 +139,7 @@ void main() {
       expect(map['sortParamsByRequiredFlag'], isTrue);
 
       // Doesn't include null fields
-      [
+      for (var element in [
         'pubVersion',
         'pubName',
         'pubHomepage',
@@ -144,7 +150,9 @@ void main() {
             'dateLibrary',
         'nullableFields',
         'serializationLibrary'
-      ].forEach((element) => expect(map.containsKey(element), isFalse));
+      ]) {
+        expect(map.containsKey(element), isFalse);
+      }
     });
     test('fromMap', () {
       final props = DioProperties(
@@ -215,7 +223,7 @@ void main() {
       expect(props.sortModelPropertiesByRequiredFlag, isTrue);
       expect(props.sortParamsByRequiredFlag, isTrue);
       // Default null props
-      [
+      for (var element in [
         props.pubVersion,
         props.pubName,
         props.pubHomepage,
@@ -226,7 +234,9 @@ void main() {
         props.listAnyOf,
         props.pubspecDevDependencies,
         props.pubspecDependencies
-      ].forEach((element) => expect(element, isNull));
+      ]) {
+        expect(element, isNull);
+      }
     });
     test('toMap', () {
       final props = DioAltProperties();
@@ -241,7 +251,7 @@ void main() {
       expect(map['sortParamsByRequiredFlag'], isTrue);
 
       // Doesn't include null fields
-      [
+      for (var element in [
         'pubVersion',
         'pubName',
         'pubHomepage',
@@ -254,7 +264,9 @@ void main() {
             'listAnyOf,'
             'pubspecDevDependencies,'
             'pubspecDependencies'
-      ].forEach((element) => expect(map.containsKey(element), isFalse));
+      ]) {
+        expect(map.containsKey(element), isFalse);
+      }
     });
     test('fromMap', () {
       final props = DioAltProperties(

openapi-generator-cli/analysis_options.yaml

@@ -1,14 +1,28 @@
-# Defines a default set of lint rules enforced for
-# projects at Google. For details and rationale,
-# see https://github.com/dart-lang/pedantic#enabled-lints.
-include: package:pedantic/analysis_options.yaml
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
 
-# For lint rules and documentation, see http://dart-lang.github.io/linter/lints.
-# Uncomment to specify additional rules.
-# linter:
-#   rules:
-#     - camel_case_types
+# The following line activates a set of recommended lints for Dart packages,
+# designed to encourage good coding practices.
+include: package:lints/recommended.yaml
 
-analyzer:
-#   exclude:
-#     - path/to/excluded/files/**
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:lints/recommended.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at https://dart.dev/tools/linter-rules.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/tools/analysis

openapi-generator-cli/lib/src/generate_command.dart

@@ -4,10 +4,12 @@ import 'package:openapi_generator_cli/src/models.dart';
 class GenerateCommand extends Command {
   // The [name] and [description] properties must be defined by every
   // subclass.
+  @override
   final name = "generate";
+  @override
   final description = "Record changes to the repository.";
 
-  CommitCommand() {
+  GenerateCommand() {
     // Add options based on ConfigDefaults and ConfigKeys
     argParser.addOption(ConfigKeys.openapiGeneratorVersion,
         help: 'The version of the OpenAPI generator to use.',
@@ -33,6 +35,7 @@ class GenerateCommand extends Command {
   }
 
   // [run] may also return a Future.
+  @override
   void run() {
     // [argResults] is set before [run()] is called and contains the flags/options
     // passed to this command.

openapi-generator-cli/pubspec.yaml

@@ -13,7 +13,7 @@ dependencies:
   cli_launcher: ^0.3.1
 
 dev_dependencies:
-  pedantic:
+  lints: ^6.0.0
   test:
 
 executables: