Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore/move queued item #4085

Closed
wants to merge 3 commits into from
Closed

Chore/move queued item #4085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81b8bf8
moving queued_item_store
khatruong2009 Nov 2, 2023
0467d6c
Remove unused test file and related imports
khatruong2009 Nov 7, 2023
b73504d
chore: moved test and added appPathProvider
khatruong2009 Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...gging_cloudwatch/amplify_logging_cloudwatch/lib/src/amplify_cloudwatch_logger_plugin.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:amplify_logging_cloudwatch/src/amplify_log_stream_name_provider.dart';
import 'package:amplify_logging_cloudwatch/src/path_provider/flutter_path_provider.dart';
import 'package:amplify_logging_cloudwatch/src/queued_item_store/dart_queued_item_store.dart';
import 'package:aws_logging_cloudwatch/aws_logging_cloudwatch.dart';
import 'package:aws_logging_cloudwatch/src/queued_item_store/dart_queued_item_store.dart';

/// {@macro aws_logging_cloudwatch.cloudwatch_logger_plugin}
class AmplifyCloudWatchLoggerPlugin extends CloudWatchLoggerPlugin {
Expand Down
0 ...ed_item_store/dart_queued_item_store.dart → ...ed_item_store/dart_queued_item_store.dart
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...em_store/dart_queued_item_store.stub.dart → ...em_store/dart_queued_item_store.stub.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import 'dart:async';

import 'package:aws_common/aws_common.dart';
import 'package:amplify_core/amplify_core.dart';
// ignore: implementation_imports
import 'package:aws_logging_cloudwatch/src/queued_item_store/queued_item_store.dart';
import 'package:meta/meta.dart';
Expand All @@ -14,7 +14,7 @@ import 'package:meta/meta.dart';
class DartQueuedItemStore implements QueuedItemStore, Closeable {
/// {@macro amplify_logging_cloudwatch.dart_queued_item_store}
// ignore: avoid_unused_constructor_parameters
DartQueuedItemStore(String? storagePath) {
DartQueuedItemStore(AppPathProvider appPathProvider) {
throw UnimplementedError('constructor has not been implemented.');
}

Expand Down
14 changes: 4 additions & 10 deletions ...item_store/dart_queued_item_store.vm.dart → ...item_store/dart_queued_item_store.vm.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,17 @@

import 'dart:async';

import 'package:amplify_logging_cloudwatch/src/queued_item_store/drift/drift_queued_item_store.dart';
import 'package:aws_common/aws_common.dart';
import 'package:amplify_core/amplify_core.dart';
import 'package:aws_logging_cloudwatch/src/queued_item_store/drift/drift_queued_item_store.dart';
// ignore: implementation_imports
import 'package:aws_logging_cloudwatch/src/queued_item_store/queued_item_store.dart';
import 'package:meta/meta.dart';
import 'package:path_provider/path_provider.dart';

/// {@macro amplify_logging_cloudwatch.dart_queued_item_store}
class DartQueuedItemStore implements QueuedItemStore, Closeable {
/// {@macro amplify_logging_cloudwatch.dart_queued_item_store}
factory DartQueuedItemStore(String? storagePath) {
final FutureOr<String> path;
if (storagePath == null) {
path = getApplicationSupportDirectory().then((value) => value.path);
} else {
path = storagePath;
}
factory DartQueuedItemStore(AppPathProvider pathProvider) {
final FutureOr<String> path = pathProvider.getApplicationSupportPath();
final database = DriftQueuedItemStore(path);
return DartQueuedItemStore._(database);
}
Expand Down
4 changes: 2 additions & 2 deletions ...tem_store/dart_queued_item_store.web.dart → ...tem_store/dart_queued_item_store.web.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import 'dart:async';

import 'package:amplify_core/amplify_core.dart';
import 'package:amplify_logging_cloudwatch/src/queued_item_store/index_db/indexed_db_adapter.dart';
import 'package:aws_logging_cloudwatch/src/queued_item_store/in_memory_queued_item_store.dart';
import 'package:aws_logging_cloudwatch/src/queued_item_store/index_db/indexed_db_adapter.dart';
import 'package:aws_logging_cloudwatch/src/queued_item_store/queued_item_store.dart';
import 'package:meta/meta.dart';

Expand All @@ -17,7 +17,7 @@ class DartQueuedItemStore
implements QueuedItemStore, Closeable {
/// {@macro amplify_logging_cloudwatch.index_db_queued_item_store}
// ignore: avoid_unused_constructor_parameters
DartQueuedItemStore(String? storagePath);
DartQueuedItemStore(AppPathProvider appPathProvider);

late final Future<QueuedItemStore> _database = () async {
if (await IndexedDbAdapter.checkIsIndexedDBSupported()) {
Expand Down
0 ..._store/drift/drift_queued_item_store.dart → ..._store/drift/drift_queued_item_store.dart
View file
Open in desktop
File renamed without changes.
0 ...tore/drift/drift_queued_item_store.g.dart → ...tore/drift/drift_queued_item_store.g.dart
View file
Open in desktop
File renamed without changes.
0 ...em_store/index_db/indexed_db_adapter.dart → ...em_store/index_db/indexed_db_adapter.dart
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions packages/logging_cloudwatch/aws_logging_cloudwatch/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,13 @@ environment:

dependencies:
amplify_core: ">=1.4.0 <1.5.0"
amplify_db_common_dart: ">=0.3.0+1 <0.4.0"
aws_common: ">=0.6.0 <0.7.0"
aws_signature_v4: ">=0.5.0 <0.6.0"
built_collection: ^5.1.1
built_value: ">=8.6.0 <8.7.0"
collection: ^1.15.0
drift: ">=2.11.0 <2.12.0"
fixnum: ^1.1.0
intl: ">=0.18.0 <1.0.0"
json_annotation: ">=4.8.1 <4.9.0"
Expand Down
18 changes: 16 additions & 2 deletions ...oudwatch/test/queued_item_store_test.dart → ...ore/in_memory_queued_item_store_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,30 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

import 'package:amplify_logging_cloudwatch/src/queued_item_store/dart_queued_item_store.dart';
import 'package:amplify_core/src/types/app_path_provider/app_path_provider.dart';
import 'package:aws_logging_cloudwatch/src/queued_item_store/dart_queued_item_store.dart';
import 'package:aws_logging_cloudwatch/src/queued_item_store/queued_item_store.dart';
import 'package:test/test.dart';

class MyPathProvider implements AppPathProvider {
@override
Future<String> getApplicationSupportPath() {
return Future.value('/tmp');
}

@override
Future<String> getTemporaryPath() {
return Future.value('/tmp');
}
}

void main() {
late DartQueuedItemStore db;

group('DartQueuedItemStore ', () {
setUpAll(() {
db = DartQueuedItemStore('/tmp');
final pathProvider = MyPathProvider();
db = DartQueuedItemStore(pathProvider);
});

tearDownAll(() async {
Expand Down
Loading