Skip to content

Commit d28f0b0

Browse files
committed
Update linter rules of turms-client-dart to v3 alternatives + Polish code
1 parent 021727b commit d28f0b0

File tree

5 files changed

+13
-21
lines changed

5 files changed

+13
-21
lines changed

turms-client-dart/analysis_options.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ linter:
4444
- await_only_futures
4545
- camel_case_types
4646
- cascade_invocations
47+
- collection_methods_unrelated_type
4748
- comment_references
4849
- constant_identifier_names
4950
- control_flow_in_finally
@@ -55,13 +56,10 @@ linter:
5556
- file_names
5657
- hash_and_equals
5758
- implementation_imports
58-
- invariant_booleans
59-
- iterable_contains_unrelated_type
6059
- join_return_with_assignment
6160
- library_names
6261
- library_prefixes
6362
- lines_longer_than_80_chars
64-
- list_remove_unrelated_type
6563
- missing_whitespace_between_adjacent_strings
6664
- no_adjacent_strings_in_list
6765
- no_duplicate_case_values
@@ -80,7 +78,6 @@ linter:
8078
- prefer_const_constructors
8179
- prefer_const_declarations
8280
- prefer_contains
83-
- prefer_equal_for_default_values
8481
- prefer_expression_function_bodies
8582
- prefer_final_fields
8683
- prefer_final_in_for_each

turms-client-dart/lib/src/driver/service/connection_service.dart

+2-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import 'dart:typed_data';
55
import '../../exception/response_exception.dart';
66
import '../../model/response_status_code.dart';
77
import '../../transport/tcp_client.dart';
8-
import '../state_store.dart';
98
import 'base_service.dart';
109

1110
typedef OnConnectedListener = void Function();
@@ -93,11 +92,10 @@ class ConnectionService extends BaseService {
9392
final _MessageDecoder _decoder = _MessageDecoder();
9493

9594
ConnectionService(
96-
StateStore stateStore, String? host, int? port, int? connectTimeoutMillis)
95+
super.stateStore, String? host, int? port, int? connectTimeoutMillis)
9796
: _initialHost = host ?? '127.0.0.1',
9897
_initialPort = port ?? 11510,
99-
_initialConnectTimeoutMillis = connectTimeoutMillis ?? 30 * 1000,
100-
super(stateStore);
98+
_initialConnectTimeoutMillis = connectTimeoutMillis ?? 30 * 1000;
10199

102100
// Listeners
103101

turms-client-dart/lib/src/driver/service/heartbeat_service.dart

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import 'dart:math';
44
import '../../exception/response_exception.dart';
55
import '../../model/proto/notification/turms_notification.pb.dart';
66
import '../../model/response_status_code.dart';
7-
import '../state_store.dart';
87
import 'base_service.dart';
98

109
class HeartbeatService extends BaseService {
@@ -18,15 +17,14 @@ class HeartbeatService extends BaseService {
1817
Timer? _heartbeatTimer;
1918
final List<Completer<void>> _heartbeatCompleters = [];
2019

21-
HeartbeatService(StateStore stateStore, int? heartbeatIntervalMillis)
20+
HeartbeatService(super.stateStore, int? heartbeatIntervalMillis)
2221
: _heartbeatIntervalMillis =
2322
heartbeatIntervalMillis ?? _defaultHeartbeatIntervalMillis,
2423
_heartbeatTimerInterval = Duration(
2524
milliseconds: max(
2625
1,
2726
(heartbeatIntervalMillis ?? _defaultHeartbeatIntervalMillis) ~/
28-
10)),
29-
super(stateStore);
27+
10));
3028

3129
bool get isRunning => _heartbeatTimer?.isActive == true;
3230

turms-client-dart/lib/src/driver/service/message_service.dart

+2-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import '../../extension/int_extensions.dart';
66
import '../../model/proto/notification/turms_notification.pb.dart';
77
import '../../model/proto/request/turms_request.pb.dart';
88
import '../../model/response_status_code.dart';
9-
import '../state_store.dart';
109
import 'base_service.dart';
1110

1211
typedef NotificationListener = void Function(TurmsNotification notification);
@@ -28,9 +27,8 @@ class DriverMessageService extends BaseService {
2827
final List<NotificationListener> _notificationListeners = [];
2928
final Map<int, TurmsRequestContext> _idToRequest = {};
3029

31-
DriverMessageService(StateStore stateStore, int? requestTimeoutMillis,
32-
int? minRequestIntervalMillis)
33-
: super(stateStore) {
30+
DriverMessageService(super.stateStore, int? requestTimeoutMillis,
31+
int? minRequestIntervalMillis) {
3432
_requestTimeoutMillis =
3533
requestTimeoutMillis == null || requestTimeoutMillis <= 0
3634
? 60 * 1000

turms-client-dart/lib/src/service/storage_service.dart

+6-5
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,11 @@ class StorageService {
6868
}
6969

7070
Future<Response<Map<String, String>>> queryUserProfilePictureUploadInfo(
71-
{String? name, String? mediaType, Map<String, String>? extra}) async {
72-
return _queryResourceUploadInfo(StorageResourceType.USER_PROFILE_PICTURE,
73-
name: name, mediaType: mediaType, extra: extra);
74-
}
71+
{String? name,
72+
String? mediaType,
73+
Map<String, String>? extra}) async =>
74+
_queryResourceUploadInfo(StorageResourceType.USER_PROFILE_PICTURE,
75+
name: name, mediaType: mediaType, extra: extra);
7576

7677
Future<Response<Map<String, String>>> queryUserProfilePictureDownloadInfo(
7778
Int64 userId,
@@ -546,7 +547,7 @@ class StorageService {
546547
throw ResponseException(
547548
code: ResponseStatusCode.dataNotFound,
548549
reason:
549-
'Could not get the resource URL because the key "$urlKeyName" does not exist in the data: ${data}');
550+
'Could not get the resource URL because the key "$urlKeyName" does not exist in the data: $data');
550551
}
551552
return url;
552553
}

0 commit comments

Comments
 (0)