pr feedback

mobile/openapi/README.md

@@ -199,8 +199,8 @@ Class | Method | HTTP request | Description
 *PeopleApi* | [**updatePeople**](doc//PeopleApi.md#updatepeople) | **PUT** /people | Update people
 *PeopleApi* | [**updatePerson**](doc//PeopleApi.md#updateperson) | **PUT** /people/{id} | Update person
 *PluginsApi* | [**getPlugin**](doc//PluginsApi.md#getplugin) | **GET** /plugins/{id} | Retrieve a plugin
+*PluginsApi* | [**getPluginTriggers**](doc//PluginsApi.md#getplugintriggers) | **GET** /plugins/triggers | List all plugin triggers
 *PluginsApi* | [**getPlugins**](doc//PluginsApi.md#getplugins) | **GET** /plugins | List all plugins
-*PluginsApi* | [**getTriggers**](doc//PluginsApi.md#gettriggers) | **GET** /plugins/triggers | List all plugin triggers
 *QueuesApi* | [**emptyQueue**](doc//QueuesApi.md#emptyqueue) | **DELETE** /queues/{name}/jobs | Empty a queue
 *QueuesApi* | [**getQueue**](doc//QueuesApi.md#getqueue) | **GET** /queues/{name} | Retrieve a queue
 *QueuesApi* | [**getQueueJobs**](doc//QueuesApi.md#getqueuejobs) | **GET** /queues/{name}/jobs | Retrieve queue jobs
@@ -466,7 +466,7 @@ Class | Method | HTTP request | Description
  - [PinCodeSetupDto](doc//PinCodeSetupDto.md)
  - [PlacesResponseDto](doc//PlacesResponseDto.md)
  - [PluginActionResponseDto](doc//PluginActionResponseDto.md)
- - [PluginContext](doc//PluginContext.md)
+ - [PluginContextType](doc//PluginContextType.md)
  - [PluginFilterResponseDto](doc//PluginFilterResponseDto.md)
  - [PluginResponseDto](doc//PluginResponseDto.md)
  - [PluginTriggerResponseDto](doc//PluginTriggerResponseDto.md)

mobile/openapi/lib/api.dart

@@ -217,7 +217,7 @@ part 'model/pin_code_reset_dto.dart';
 part 'model/pin_code_setup_dto.dart';
 part 'model/places_response_dto.dart';
 part 'model/plugin_action_response_dto.dart';
-part 'model/plugin_context.dart';
+part 'model/plugin_context_type.dart';
 part 'model/plugin_filter_response_dto.dart';
 part 'model/plugin_response_dto.dart';
 part 'model/plugin_trigger_response_dto.dart';

mobile/openapi/lib/api/plugins_api.dart

@@ -73,6 +73,57 @@ class PluginsApi {
     return null;
   }
 
+  /// List all plugin triggers
+  ///
+  /// Retrieve a list of all available plugin triggers.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  Future<Response> getPluginTriggersWithHttpInfo() async {
+    // ignore: prefer_const_declarations
+    final apiPath = r'/plugins/triggers';
+
+    // ignore: prefer_final_locals
+    Object? postBody;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>[];
+
+
+    return apiClient.invokeAPI(
+      apiPath,
+      'GET',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// List all plugin triggers
+  ///
+  /// Retrieve a list of all available plugin triggers.
+  Future<List<PluginTriggerResponseDto>?> getPluginTriggers() async {
+    final response = await getPluginTriggersWithHttpInfo();
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+    // When a remote server returns no body with a status of 204, we shall not decode it.
+    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
+    // FormatException when trying to decode an empty string.
+    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
+      final responseBody = await _decodeBodyBytes(response);
+      return (await apiClient.deserializeAsync(responseBody, 'List<PluginTriggerResponseDto>') as List)
+        .cast<PluginTriggerResponseDto>()
+        .toList(growable: false);
+
+    }
+    return null;
+  }
+
   /// List all plugins
   ///
   /// Retrieve a list of plugins available to the authenticated user.
@@ -123,55 +174,4 @@ class PluginsApi {
     }
     return null;
   }
-
-  /// List all plugin triggers
-  ///
-  /// Retrieve a list of all available plugin triggers.
-  ///
-  /// Note: This method returns the HTTP [Response].
-  Future<Response> getTriggersWithHttpInfo() async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/plugins/triggers';
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'GET',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// List all plugin triggers
-  ///
-  /// Retrieve a list of all available plugin triggers.
-  Future<List<PluginTriggerResponseDto>?> getTriggers() async {
-    final response = await getTriggersWithHttpInfo();
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-    // When a remote server returns no body with a status of 204, we shall not decode it.
-    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
-    // FormatException when trying to decode an empty string.
-    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      final responseBody = await _decodeBodyBytes(response);
-      return (await apiClient.deserializeAsync(responseBody, 'List<PluginTriggerResponseDto>') as List)
-        .cast<PluginTriggerResponseDto>()
-        .toList(growable: false);
-
-    }
-    return null;
-  }
 }

mobile/openapi/lib/api_client.dart

@@ -482,8 +482,8 @@ class ApiClient {
           return PlacesResponseDto.fromJson(value);
         case 'PluginActionResponseDto':
           return PluginActionResponseDto.fromJson(value);
-        case 'PluginContext':
-          return PluginContextTypeTransformer().decode(value);
+        case 'PluginContextType':
+          return PluginContextTypeTypeTransformer().decode(value);
         case 'PluginFilterResponseDto':
           return PluginFilterResponseDto.fromJson(value);
         case 'PluginResponseDto':

mobile/openapi/lib/api_helper.dart

@@ -127,8 +127,8 @@ String parameterToString(dynamic value) {
   if (value is Permission) {
     return PermissionTypeTransformer().encode(value).toString();
   }
-  if (value is PluginContext) {
-    return PluginContextTypeTransformer().encode(value).toString();
+  if (value is PluginContextType) {
+    return PluginContextTypeTypeTransformer().encode(value).toString();
   }
   if (value is PluginTriggerType) {
     return PluginTriggerTypeTypeTransformer().encode(value).toString();

mobile/openapi/lib/model/plugin_action_response_dto.dart

@@ -32,7 +32,7 @@ class PluginActionResponseDto {
 
   Object? schema;
 
-  List<PluginContext> supportedContexts;
+  List<PluginContextType> supportedContexts;
 
   String title;
 
@@ -90,7 +90,7 @@ class PluginActionResponseDto {
         methodName: mapValueOfType<String>(json, r'methodName')!,
         pluginId: mapValueOfType<String>(json, r'pluginId')!,
         schema: mapValueOfType<Object>(json, r'schema'),
-        supportedContexts: PluginContext.listFromJson(json[r'supportedContexts']),
+        supportedContexts: PluginContextType.listFromJson(json[r'supportedContexts']),
         title: mapValueOfType<String>(json, r'title')!,
       );
     }

mobile/openapi/lib/model/plugin_context_type.dart

@@ -11,9 +11,9 @@
 part of openapi.api;
 
 
-class PluginContext {
+class PluginContextType {
   /// Instantiate a new enum with the provided [value].
-  const PluginContext._(this.value);
+  const PluginContextType._(this.value);
 
   /// The underlying value of this enum member.
   final String value;
@@ -23,24 +23,24 @@ class PluginContext {
 
   String toJson() => value;
 
-  static const asset = PluginContext._(r'asset');
-  static const album = PluginContext._(r'album');
-  static const person = PluginContext._(r'person');
+  static const asset = PluginContextType._(r'asset');
+  static const album = PluginContextType._(r'album');
+  static const person = PluginContextType._(r'person');
 
-  /// List of all possible values in this [enum][PluginContext].
-  static const values = <PluginContext>[
+  /// List of all possible values in this [enum][PluginContextType].
+  static const values = <PluginContextType>[
     asset,
     album,
     person,
   ];
 
-  static PluginContext? fromJson(dynamic value) => PluginContextTypeTransformer().decode(value);
+  static PluginContextType? fromJson(dynamic value) => PluginContextTypeTypeTransformer().decode(value);
 
-  static List<PluginContext> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <PluginContext>[];
+  static List<PluginContextType> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <PluginContextType>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
-        final value = PluginContext.fromJson(row);
+        final value = PluginContextType.fromJson(row);
         if (value != null) {
           result.add(value);
         }
@@ -50,16 +50,16 @@ class PluginContext {
   }
 }
 
-/// Transformation class that can [encode] an instance of [PluginContext] to String,
-/// and [decode] dynamic data back to [PluginContext].
-class PluginContextTypeTransformer {
-  factory PluginContextTypeTransformer() => _instance ??= const PluginContextTypeTransformer._();
+/// Transformation class that can [encode] an instance of [PluginContextType] to String,
+/// and [decode] dynamic data back to [PluginContextType].
+class PluginContextTypeTypeTransformer {
+  factory PluginContextTypeTypeTransformer() => _instance ??= const PluginContextTypeTypeTransformer._();
 
-  const PluginContextTypeTransformer._();
+  const PluginContextTypeTypeTransformer._();
 
-  String encode(PluginContext data) => data.value;
+  String encode(PluginContextType data) => data.value;
 
-  /// Decodes a [dynamic value][data] to a PluginContext.
+  /// Decodes a [dynamic value][data] to a PluginContextType.
   ///
   /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
   /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
@@ -67,12 +67,12 @@ class PluginContextTypeTransformer {
   ///
   /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
   /// and users are still using an old app with the old code.
-  PluginContext? decode(dynamic data, {bool allowNull = true}) {
+  PluginContextType? decode(dynamic data, {bool allowNull = true}) {
     if (data != null) {
       switch (data) {
-        case r'asset': return PluginContext.asset;
-        case r'album': return PluginContext.album;
-        case r'person': return PluginContext.person;
+        case r'asset': return PluginContextType.asset;
+        case r'album': return PluginContextType.album;
+        case r'person': return PluginContextType.person;
         default:
           if (!allowNull) {
             throw ArgumentError('Unknown enum value to decode: $data');
@@ -82,7 +82,7 @@ class PluginContextTypeTransformer {
     return null;
   }
 
-  /// Singleton [PluginContextTypeTransformer] instance.
-  static PluginContextTypeTransformer? _instance;
+  /// Singleton [PluginContextTypeTypeTransformer] instance.
+  static PluginContextTypeTypeTransformer? _instance;
 }
 

mobile/openapi/lib/model/plugin_filter_response_dto.dart

@@ -32,7 +32,7 @@ class PluginFilterResponseDto {
 
   Object? schema;
 
-  List<PluginContext> supportedContexts;
+  List<PluginContextType> supportedContexts;
 
   String title;
 
@@ -90,7 +90,7 @@ class PluginFilterResponseDto {
         methodName: mapValueOfType<String>(json, r'methodName')!,
         pluginId: mapValueOfType<String>(json, r'pluginId')!,
         schema: mapValueOfType<Object>(json, r'schema'),
-        supportedContexts: PluginContext.listFromJson(json[r'supportedContexts']),
+        supportedContexts: PluginContextType.listFromJson(json[r'supportedContexts']),
         title: mapValueOfType<String>(json, r'title')!,
       );
     }

mobile/openapi/lib/model/plugin_trigger_response_dto.dart

@@ -13,44 +13,44 @@ part of openapi.api;
 class PluginTriggerResponseDto {
   /// Returns a new [PluginTriggerResponseDto] instance.
   PluginTriggerResponseDto({
-    required this.context,
+    required this.contextType,
     required this.description,
     required this.name,
-    required this.triggerType,
+    required this.type,
   });
 
-  PluginContext context;
+  PluginContextType contextType;
 
   String description;
 
   String name;
 
-  PluginTriggerType triggerType;
+  PluginTriggerType type;
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is PluginTriggerResponseDto &&
-    other.context == context &&
+    other.contextType == contextType &&
     other.description == description &&
     other.name == name &&
-    other.triggerType == triggerType;
+    other.type == type;
 
   @override
   int get hashCode =>
     // ignore: unnecessary_parenthesis
-    (context.hashCode) +
+    (contextType.hashCode) +
     (description.hashCode) +
     (name.hashCode) +
-    (triggerType.hashCode);
+    (type.hashCode);
 
   @override
-  String toString() => 'PluginTriggerResponseDto[context=$context, description=$description, name=$name, triggerType=$triggerType]';
+  String toString() => 'PluginTriggerResponseDto[contextType=$contextType, description=$description, name=$name, type=$type]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
-      json[r'context'] = this.context;
+      json[r'contextType'] = this.contextType;
       json[r'description'] = this.description;
       json[r'name'] = this.name;
-      json[r'triggerType'] = this.triggerType;
+      json[r'type'] = this.type;
     return json;
   }
 
@@ -63,10 +63,10 @@ class PluginTriggerResponseDto {
       final json = value.cast<String, dynamic>();
 
       return PluginTriggerResponseDto(
-        context: PluginContext.fromJson(json[r'context'])!,
+        contextType: PluginContextType.fromJson(json[r'contextType'])!,
         description: mapValueOfType<String>(json, r'description')!,
         name: mapValueOfType<String>(json, r'name')!,
-        triggerType: PluginTriggerType.fromJson(json[r'triggerType'])!,
+        type: PluginTriggerType.fromJson(json[r'type'])!,
       );
     }
     return null;
@@ -114,10 +114,10 @@ class PluginTriggerResponseDto {
 
   /// The list of required keys that must be present in a JSON.
   static const requiredKeys = <String>{
-    'context',
+    'contextType',
     'description',
     'name',
-    'triggerType',
+    'type',
   };
 }