Skip to content

Commit 5550fb2

Browse files
fix: Resolve analyzer errors from DataSourceRequestor refactoring
- Add missing data_source.dart import to DataSourceRequestor - Add back _getEnvironmentIdFromHeaders method to StreamingDataSource - Remove unused imports from PollingDataSource (http, credential_type, default_config, get_environment_id) - Remove unused imports from StreamingDataSource (http) - Remove unused _credential field from PollingDataSource These fixes address all 12 analyzer issues found in CI: - 4 errors (undefined class/methods) - 8 warnings (unused imports/fields) Co-Authored-By: [email protected] <[email protected]>
1 parent 05d3c3a commit 5550fb2

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

packages/common_client/lib/src/data_sources/data_source_requestor.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import 'package:http/http.dart' as http;
33
import 'package:launchdarkly_dart_common/launchdarkly_dart_common.dart';
44
import '../config/defaults/credential_type.dart';
55
import '../config/defaults/default_config.dart';
6+
import 'data_source.dart';
67
import 'data_source_status.dart';
78
import 'get_environment_id.dart';
89

packages/common_client/lib/src/data_sources/polling_data_source.dart

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
import 'dart:async';
22
import 'dart:convert';
3-
import 'package:http/http.dart' as http;
43
import 'package:launchdarkly_dart_common/launchdarkly_dart_common.dart';
54
import 'dart:math';
65

76
import '../config/data_source_config.dart';
8-
import '../config/defaults/credential_type.dart';
9-
import '../config/defaults/default_config.dart';
107
import 'data_source.dart';
11-
import 'data_source_status.dart';
128
import 'data_source_requestor.dart';
13-
import 'get_environment_id.dart';
9+
import 'data_source_status.dart';
1410

1511
HttpClient _defaultClientFactory(HttpProperties httpProperties) {
1612
return HttpClient(httpProperties: httpProperties);
@@ -47,8 +43,6 @@ final class PollingDataSource implements DataSource {
4743

4844
final StreamController<DataSourceEvent> _eventController = StreamController();
4945

50-
late final String _credential;
51-
5246
@override
5347
Stream<DataSourceEvent> get events => _eventController.stream;
5448

packages/common_client/lib/src/data_sources/streaming_data_source.dart

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'dart:async';
22
import 'dart:convert';
33
import 'dart:math' as math;
4-
import 'package:http/http.dart' as http;
54

65
import 'package:launchdarkly_dart_common/launchdarkly_dart_common.dart';
76
import 'package:launchdarkly_event_source_client/launchdarkly_event_source_client.dart';
@@ -236,6 +235,16 @@ final class StreamingDataSource implements DataSource {
236235
await Future.delayed(Duration(milliseconds: retryDelay));
237236
}
238237

238+
String? _getEnvironmentIdFromHeaders(Map<String, String>? headers) {
239+
var environmentId = getEnvironmentId(headers);
240+
if (environmentId == null &&
241+
DefaultConfig.credentialConfig.credentialType ==
242+
CredentialType.clientSideId) {
243+
environmentId = _credential;
244+
}
245+
return environmentId;
246+
}
247+
239248
Uri _buildStreamingUri() {
240249
return _buildUri(_endpoints.streaming, _dataSourceConfig.streamingReportPath,
241250
_dataSourceConfig.streamingGetPath);

0 commit comments

Comments
 (0)