fix null pointer exception in APISecurityRequirement with requirements

.travis.yml

@@ -1,6 +1,6 @@
 language: dart
 dart:
-  - stable
+  - beta
 
 before_script:
   - mkdir test/specs

CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## 3.0.0+6
+
+- add openIDConnect security scheme type.
+
+## 3.0.0+5
+
+- Remove forced null unwraps.
+
+## 3.0.0+3
+
+- fix header parameters, update dependency on codable.
+
+## 3.0.0+2
+
+- Rename APISchemaObject.isRequired back to required
+
+## 3.0.0
+
+- nullsafety migration
+
+## 2.0.1+1
+
+- forked version to fix v3 security requirements
+
 ## 2.0.1
 
 - Fix bug when merging APIResponse bodies

README.md

@@ -6,9 +6,9 @@ Example
 ---
 
 ```dart
-final file = new File("test/specs/kubernetes.json");
+final file = File("test/specs/kubernetes.json");
 final contents = await file.readAsString();
-final doc = new APIDocument.fromJSON(contents);
+final doc = APIDocument.fromJSON(contents);
 
 final output = JSON.encode(doc.asMap());
 ```

analysis_options.yaml

@@ -1,5 +1,6 @@
+include: package:lints/recommended.yaml
+
 analyzer:
-  strong-mode: true
 #   exclude:
 #     - path/to/excluded/files/**
 
@@ -8,8 +9,7 @@ linter:
   rules:
     - cancel_subscriptions
     - hash_and_equals
-    - iterable_contains_unrelated_type
-    - list_remove_unrelated_type
+    - collection_methods_unrelated_type
     - test_types_in_equals
     - unrelated_type_equality_checks
     - valid_regexps

lib/src/object.dart

@@ -1,7 +1,7 @@
 import 'package:meta/meta.dart';
-import 'package:codable/codable.dart';
+import 'package:codable_forked/codable.dart';
 
-export 'package:codable/codable.dart';
+export 'package:codable_forked/codable.dart';
 
 class APIObject extends Coding {
   Map<String, dynamic> extensions = {};
@@ -19,14 +19,17 @@ class APIObject extends Coding {
 
   @mustCallSuper
   void encode(KeyedArchive object) {
-    final invalidKeys = extensions.keys.where((key) => !key.startsWith("x-")).map((key) => "'$key'").toList();
+    final invalidKeys = extensions.keys
+        .where((key) => !key.startsWith("x-"))
+        .map((key) => "'$key'")
+        .toList();
     if (invalidKeys.length > 0) {
-      throw new ArgumentError(
+      throw ArgumentError(
           "extension keys must start with 'x-'. The following keys are invalid: ${invalidKeys.join(", ")}");
     }
 
     extensions.forEach((key, value) {
       object.encode(key, value);
     });
   }
-}
+}

lib/src/v2/document.dart

@@ -1,11 +1,11 @@
-import 'package:codable/cast.dart' as cast;
-import 'package:open_api/src/object.dart';
-import 'package:open_api/src/v2/metadata.dart';
-import 'package:open_api/src/v2/parameter.dart';
-import 'package:open_api/src/v2/path.dart';
-import 'package:open_api/src/v2/response.dart';
-import 'package:open_api/src/v2/schema.dart';
-import 'package:open_api/src/v2/security.dart';
+import 'package:codable_forked/cast.dart' as cast;
+import 'package:open_api_forked/src/object.dart';
+import 'package:open_api_forked/src/v2/metadata.dart';
+import 'package:open_api_forked/src/v2/parameter.dart';
+import 'package:open_api_forked/src/v2/path.dart';
+import 'package:open_api_forked/src/v2/response.dart';
+import 'package:open_api_forked/src/v2/schema.dart';
+import 'package:open_api_forked/src/v2/security.dart';
 
 /// Represents an OpenAPI 2.0 specification.
 class APIDocument extends APIObject {
@@ -18,21 +18,21 @@ class APIDocument extends APIObject {
   }
 
   String version = "2.0";
-  APIInfo info = new APIInfo();
-  String host;
-  String basePath;
+  APIInfo? info = APIInfo();
+  String? host;
+  String? basePath;
 
-  List<APITag> tags = [];
-  List<String> schemes = [];
-  List<String> consumes = [];
-  List<String> produces = [];
-  List<Map<String, List<String>>> security = [];
+  List<APITag?>? tags = [];
+  List<String>? schemes = [];
+  List<String>? consumes = [];
+  List<String>? produces = [];
+  List<Map<String, List<String?>>?> security = [];
 
-  Map<String, APIPath> paths = {};
-  Map<String, APIResponse> responses = {};
-  Map<String, APIParameter> parameters = {};
-  Map<String, APISchemaObject> definitions = {};
-  Map<String, APISecurityScheme> securityDefinitions = {};
+  Map<String, APIPath?>? paths = {};
+  Map<String, APIResponse?>? responses = {};
+  Map<String, APIParameter?>? parameters = {};
+  Map<String, APISchemaObject?>? definitions = {};
+  Map<String, APISecurityScheme?>? securityDefinitions = {};
 
   Map<String, dynamic> asMap() {
     return KeyedArchive.archive(this, allowReferences: true);
@@ -57,13 +57,15 @@ class APIDocument extends APIObject {
     produces = object["produces"];
     security = object["security"];
 
-    info = object.decodeObject("info", () => new APIInfo());
-    tags = object.decodeObjects("tags", () => new APITag());
-    paths = object.decodeObjectMap("paths", () => new APIPath());
-    responses = object.decodeObjectMap("responses", () => new APIResponse());
-    parameters = object.decodeObjectMap("parameters", () => new APIParameter());
-    definitions = object.decodeObjectMap("definitions", () => new APISchemaObject());
-    securityDefinitions = object.decodeObjectMap("securityDefinitions", () => new APISecurityScheme());
+    info = object.decodeObject("info", () => APIInfo());
+    tags = object.decodeObjects("tags", () => APITag());
+    paths = object.decodeObjectMap("paths", () => APIPath());
+    responses = object.decodeObjectMap("responses", () => APIResponse());
+    parameters = object.decodeObjectMap("parameters", () => APIParameter());
+    definitions =
+        object.decodeObjectMap("definitions", () => APISchemaObject());
+    securityDefinitions = object.decodeObjectMap(
+        "securityDefinitions", () => APISecurityScheme());
   }
 
   void encode(KeyedArchive object) {

lib/src/v2/header.dart

@@ -1,19 +1,19 @@
-import 'package:codable/codable.dart';
-import 'package:open_api/src/v2/property.dart';
-import 'package:open_api/src/v2/types.dart';
+import 'package:codable_forked/codable.dart';
+import 'package:open_api_forked/src/v2/property.dart';
+import 'package:open_api_forked/src/v2/types.dart';
 
 /// Represents a header in the OpenAPI specification.
 class APIHeader extends APIProperty {
   APIHeader();
 
-  String description;
-  APIProperty items;
+  String? description;
+  APIProperty? items;
 
   void decode(KeyedArchive json) {
     super.decode(json);
     description = json.decode("description");
     if (type == APIType.array) {
-      items = json.decodeObject("items", () => new APIProperty());
+      items = json.decodeObject("items", () => APIProperty());
     }
   }
 

lib/src/v2/metadata.dart

@@ -1,25 +1,25 @@
-import 'package:open_api/src/object.dart';
+import 'package:open_api_forked/src/object.dart';
 
 /// Represents a metadata for an API in the OpenAPI specification.
 class APIInfo extends APIObject {
   /// Creates empty metadata for specification.
   APIInfo();
 
   String title = "API";
-  String description = "Description";
-  String version = "1.0";
-  String termsOfServiceURL = "";
-  APIContact contact = new APIContact();
-  APILicense license = new APILicense();
+  String? description = "Description";
+  String? version = "1.0";
+  String? termsOfServiceURL = "";
+  APIContact? contact = APIContact();
+  APILicense? license = APILicense();
 
   void decode(KeyedArchive object) {
     super.decode(object);
 
     title = object.decode("title");
     description = object.decode("description");
     termsOfServiceURL = object.decode("termsOfService");
-    contact = object.decodeObject("contact", () => new APIContact());
-    license = object.decodeObject("license", () => new APILicense());
+    contact = object.decodeObject("contact", () => APIContact());
+    license = object.decodeObject("license", () => APILicense());
     version = object.decode("version");
   }
 
@@ -92,8 +92,8 @@ class APITag extends APIObject {
     description = object.decode("description");
   }
 
-  String name;
-  String description;
+  String? name;
+  String? description;
 
   void encode(KeyedArchive object) {
     super.encode(object);

lib/src/v2/operation.dart

@@ -1,7 +1,7 @@
-import 'package:codable/cast.dart' as cast;
-import 'package:open_api/src/object.dart';
-import 'package:open_api/src/v2/parameter.dart';
-import 'package:open_api/src/v2/response.dart';
+import 'package:codable_forked/cast.dart' as cast;
+import 'package:open_api_forked/src/object.dart';
+import 'package:open_api_forked/src/v2/parameter.dart';
+import 'package:open_api_forked/src/v2/response.dart';
 
 /// Represents a HTTP operation (a path/method pair) in the OpenAPI specification.
 class APIOperation extends APIObject {
@@ -16,18 +16,18 @@ class APIOperation extends APIObject {
         "security": cast.List(cast.Map(cast.String, cast.List(cast.String))),
       };
 
-  String summary = "";
-  String description = "";
-  String id;
+  String? summary = "";
+  String? description = "";
+  String? id;
   bool deprecated = false;
 
-  List<String> tags = [];
-  List<String> schemes = [];
-  List<String> consumes = [];
-  List<String> produces = [];
-  List<APIParameter> parameters = [];
-  List<Map<String, List<String>>> security = [];
-  Map<String, APIResponse> responses = {};
+  List<String?>? tags = [];
+  List<String?>? schemes = [];
+  List<String?>? consumes = [];
+  List<String?>? produces = [];
+  List<APIParameter?>? parameters = [];
+  List<Map<String, List<String>>?>? security = [];
+  Map<String, APIResponse?>? responses = {};
 
   void decode(KeyedArchive object) {
     super.decode(object);
@@ -39,8 +39,8 @@ class APIOperation extends APIObject {
     consumes = object.decode("consumes");
     produces = object.decode("produces");
     deprecated = object.decode("deprecated") ?? false;
-    parameters = object.decodeObjects("parameters", () => new APIParameter());
-    responses = object.decodeObjectMap("responses", () => new APIResponse());
+    parameters = object.decodeObjects("parameters", () => APIParameter());
+    responses = object.decodeObjectMap("responses", () => APIResponse());
     schemes = object.decode("schemes");
     security = object.decode("security");
   }