refactor: replace scheme getters with final fields

eclipse-thingweb · Sep 26, 2022 · d75ce47 · d75ce47
1 parent 5ab8283
commit d75ce47
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 44 deletions.
diff --git a/lib/src/definitions/security/ace_security_scheme.dart b/lib/src/definitions/security/ace_security_scheme.dart
@@ -20,7 +20,7 @@ class AceSecurityScheme extends SecurityScheme {
     this.scopes,
     this.cnonce,
     Map<String, String>? descriptions,
-  }) {
+  }) : super('ace:ACESecurityScheme') {
     this.description = description;
     this.descriptions.addAll(descriptions ?? {});
   }
@@ -29,7 +29,7 @@ class AceSecurityScheme extends SecurityScheme {
   AceSecurityScheme.fromJson(
     Map<String, dynamic> json,
     PrefixMapping prefixMapping,
-  ) {
+  ) : super('ace:ACESecurityScheme') {
     final Set<String> parsedFields = {};
 
     as = json.parseField<String>('ace:as', parsedFields);
@@ -40,9 +40,6 @@ class AceSecurityScheme extends SecurityScheme {
     parseSecurityJson(json, parsedFields, prefixMapping);
   }
 
-  @override
-  String get scheme => 'ace:ACESecurityScheme';
-
   /// URI of the authorization server.
   String? as;
 

diff --git a/lib/src/definitions/security/apikey_security_scheme.dart b/lib/src/definitions/security/apikey_security_scheme.dart
@@ -21,13 +21,14 @@ class ApiKeySecurityScheme extends SecurityScheme {
     this.name,
     String? in_,
     super.descriptions,
-  }) : in_ = in_ ?? _defaultInValue;
+  })  : in_ = in_ ?? _defaultInValue,
+        super('apikey');
 
   /// Creates a [ApiKeySecurityScheme] from a [json] object.
   ApiKeySecurityScheme.fromJson(
     Map<String, dynamic> json,
     PrefixMapping prefixMapping,
-  ) {
+  ) : super('apikey') {
     final Set<String> parsedFields = {};
 
     name = json.parseField<String>('name', parsedFields);
@@ -36,9 +37,6 @@ class ApiKeySecurityScheme extends SecurityScheme {
     parseSecurityJson(json, parsedFields, prefixMapping);
   }
 
-  @override
-  String get scheme => 'apikey';
-
   /// Name for query, header, cookie, or uri parameters.
   String? name;
 

diff --git a/lib/src/definitions/security/auto_security_scheme.dart b/lib/src/definitions/security/auto_security_scheme.dart
@@ -15,10 +15,7 @@ class AutoSecurityScheme extends SecurityScheme {
   AutoSecurityScheme.fromJson(
     Map<String, dynamic> json,
     PrefixMapping prefixMapping,
-  ) {
+  ) : super('auto') {
     parseSecurityJson(json, {}, prefixMapping);
   }
-
-  @override
-  String get scheme => 'auto';
 }
diff --git a/lib/src/definitions/security/basic_security_scheme.dart b/lib/src/definitions/security/basic_security_scheme.dart
@@ -21,13 +21,14 @@ class BasicSecurityScheme extends SecurityScheme {
     this.name,
     String? in_,
     super.descriptions,
-  }) : in_ = in_ ?? _defaultInValue;
+  })  : in_ = in_ ?? _defaultInValue,
+        super('basic');
 
   /// Creates a [BasicSecurityScheme] from a [json] object.
   BasicSecurityScheme.fromJson(
     Map<String, dynamic> json,
     PrefixMapping prefixMapping,
-  ) {
+  ) : super('basic') {
     final Set<String> parsedFields = {};
 
     name = json.parseField<String>('name', parsedFields);
@@ -36,9 +37,6 @@ class BasicSecurityScheme extends SecurityScheme {
     parseSecurityJson(json, parsedFields, prefixMapping);
   }
 
-  @override
-  String get scheme => 'basic';
-
   /// Name for query, header, cookie, or uri parameters.
   late final String? name;
 

diff --git a/lib/src/definitions/security/bearer_security_scheme.dart b/lib/src/definitions/security/bearer_security_scheme.dart
@@ -28,13 +28,14 @@ class BearerSecurityScheme extends SecurityScheme {
     super.descriptions,
   })  : in_ = in_ ?? _defaultInValue,
         alg = alg ?? _defaultAlgValue,
-        format = format ?? _defaultFormatValue;
+        format = format ?? _defaultFormatValue,
+        super('bearer');
 
   /// Creates a [BearerSecurityScheme] from a [json] object.
   BearerSecurityScheme.fromJson(
     Map<String, dynamic> json,
     PrefixMapping prefixMapping,
-  ) {
+  ) : super('bearer') {
     final Set<String> parsedFields = {};
 
     name = json.parseField<String>('name', parsedFields);
@@ -47,9 +48,6 @@ class BearerSecurityScheme extends SecurityScheme {
     parseSecurityJson(json, parsedFields, prefixMapping);
   }
 
-  @override
-  String get scheme => 'bearer';
-
   /// URI of the authorization server.
   late final String? authorization;
 

diff --git a/lib/src/definitions/security/digest_security_scheme.dart b/lib/src/definitions/security/digest_security_scheme.dart
@@ -25,13 +25,14 @@ class DigestSecurityScheme extends SecurityScheme {
     this.name,
     super.descriptions,
   })  : in_ = in_ ?? _defaultInValue,
-        qop = qop ?? _defaultQoPValue;
+        qop = qop ?? _defaultQoPValue,
+        super('digest');
 
   /// Creates a [DigestSecurityScheme] from a [json] object.
   DigestSecurityScheme.fromJson(
     Map<String, dynamic> json,
     PrefixMapping prefixMapping,
-  ) {
+  ) : super('digest') {
     final Set<String> parsedFields = {};
 
     name = json.parseField<String>('name', parsedFields);
@@ -41,9 +42,6 @@ class DigestSecurityScheme extends SecurityScheme {
     parseSecurityJson(json, parsedFields, prefixMapping);
   }
 
-  @override
-  String get scheme => 'digest';
-
   /// Name for query, header, cookie, or uri parameters.
   late final String? name;
 

diff --git a/lib/src/definitions/security/no_security_scheme.dart b/lib/src/definitions/security/no_security_scheme.dart
@@ -15,10 +15,7 @@ class NoSecurityScheme extends SecurityScheme {
   NoSecurityScheme.fromJson(
     Map<String, dynamic> json,
     PrefixMapping prefixMapping,
-  ) {
+  ) : super('nosec') {
     parseSecurityJson(json, {}, prefixMapping);
   }
-
-  @override
-  String get scheme => 'nosec';
 }
diff --git a/lib/src/definitions/security/oauth2_security_scheme.dart b/lib/src/definitions/security/oauth2_security_scheme.dart
@@ -22,7 +22,7 @@ class OAuth2SecurityScheme extends SecurityScheme {
     this.refresh,
     this.token,
     Map<String, String>? descriptions,
-  }) {
+  }) : super('oauth2') {
     this.description = description;
     this.descriptions.addAll(descriptions ?? {});
   }
@@ -31,7 +31,7 @@ class OAuth2SecurityScheme extends SecurityScheme {
   OAuth2SecurityScheme.fromJson(
     Map<String, dynamic> json,
     PrefixMapping prefixMapping,
-  ) {
+  ) : super('oauth2') {
     final Set<String> parsedFields = {};
 
     authorization = json.parseField<String>('authorization', parsedFields);
@@ -42,8 +42,6 @@ class OAuth2SecurityScheme extends SecurityScheme {
 
     parseSecurityJson(json, parsedFields, prefixMapping);
   }
-  @override
-  String get scheme => 'oauth2';
 
   /// URI of the authorization server.
   ///

diff --git a/lib/src/definitions/security/psk_security_scheme.dart b/lib/src/definitions/security/psk_security_scheme.dart
@@ -18,7 +18,7 @@ class PskSecurityScheme extends SecurityScheme {
     String? description,
     String? proxy,
     Map<String, String>? descriptions,
-  }) {
+  }) : super('psk') {
     this.description = description;
     this.proxy = proxy;
     this.descriptions.addAll(descriptions ?? {});
@@ -28,17 +28,14 @@ class PskSecurityScheme extends SecurityScheme {
   PskSecurityScheme.fromJson(
     Map<String, dynamic> json,
     PrefixMapping prefixMapping,
-  ) {
+  ) : super('psk') {
     final Set<String> parsedFields = {};
 
     identity = json.parseField<String>('identity');
 
     parseSecurityJson(json, parsedFields, prefixMapping);
   }
 
-  @override
-  String get scheme => 'psk';
-
   /// Name for query, header, cookie, or uri parameters.
   String? identity;
 }
diff --git a/lib/src/definitions/security/security_scheme.dart b/lib/src/definitions/security/security_scheme.dart
@@ -21,7 +21,8 @@ import 'psk_security_scheme.dart';
 /// mechanism.
 abstract class SecurityScheme {
   /// Constructor.
-  SecurityScheme({
+  SecurityScheme(
+    this.scheme, {
     this.description,
     this.proxy,
     Map<String, String>? descriptions,
@@ -33,7 +34,7 @@ abstract class SecurityScheme {
   ///
   /// Can be one of `nosec`, `combo`, `basic`, `digest`, `bearer`, `psk`,
   /// `oauth2`, or `apikey`.
-  String get scheme;
+  final String scheme;
 
   /// The default [description] of this [SecurityScheme].
   String? description;