From ff8fa9eb15274e6dac29012865018fc9fc5aa7c6 Mon Sep 17 00:00:00 2001 From: Kingkor Roy Tirtho Date: Sun, 26 Jun 2022 15:03:23 +0600 Subject: [PATCH] removed unneeded query parameter from QueryTaskFunction --- packages/example/lib/components/basic_query.dart | 4 ++-- packages/example/lib/components/hooks/basic_hook_query.dart | 4 ++-- packages/example/lib/components/hooks/lazy_hook_query.dart | 2 +- .../lib/components/hooks/query_hook_external_data.dart | 2 +- .../lib/components/hooks/query_hook_variable_key.dart | 4 ++-- packages/example/lib/components/lazy_query.dart | 5 ++++- packages/example/lib/components/query_external_data.dart | 2 +- packages/example/lib/components/query_variable_key.dart | 4 ++-- packages/fl_query/lib/src/mutation.dart | 4 ---- packages/fl_query/lib/src/query.dart | 5 ----- 10 files changed, 15 insertions(+), 21 deletions(-) diff --git a/packages/example/lib/components/basic_query.dart b/packages/example/lib/components/basic_query.dart index 341c8f2..19d6e20 100644 --- a/packages/example/lib/components/basic_query.dart +++ b/packages/example/lib/components/basic_query.dart @@ -5,7 +5,7 @@ import 'package:flutter/material.dart'; final successJob = QueryJob( queryKey: "greetings-example", - task: (queryKey, _, __) => Future.delayed( + task: (queryKey, _) => Future.delayed( const Duration(seconds: 2), () => "The work successfully executed. Data: key=($queryKey) value=${Random.secure().nextInt(100)}", @@ -14,7 +14,7 @@ final successJob = QueryJob( final canFailJob = QueryJob( queryKey: "failure-example", - task: (queryKey, _, __) => Random().nextBool() + task: (queryKey, _) => Random().nextBool() ? Future.error("$queryKey operation failed for unknown reason") : Future.value( "Successful execution. Result: $queryKey=${Random().nextInt(100)}", diff --git a/packages/example/lib/components/hooks/basic_hook_query.dart b/packages/example/lib/components/hooks/basic_hook_query.dart index 05cf3e0..9173b1d 100644 --- a/packages/example/lib/components/hooks/basic_hook_query.dart +++ b/packages/example/lib/components/hooks/basic_hook_query.dart @@ -7,7 +7,7 @@ import 'package:flutter_hooks/flutter_hooks.dart'; final successHookJob = QueryJob( queryKey: "greetings-hook-example", - task: (queryKey, _, __) => Future.delayed( + task: (queryKey, _) => Future.delayed( const Duration(seconds: 2), () => "The work successfully executed. Data: key=($queryKey) value=${Random.secure().nextInt(100)}", @@ -16,7 +16,7 @@ final successHookJob = QueryJob( final canFailHookJob = QueryJob( queryKey: "failure-hook-example", - task: (queryKey, _, __) => Random().nextBool() + task: (queryKey, _) => Random().nextBool() ? Future.error("$queryKey operation failed for unknown reason") : Future.value( "Successful execution. Result: $queryKey=${Random().nextInt(100)}", diff --git a/packages/example/lib/components/hooks/lazy_hook_query.dart b/packages/example/lib/components/hooks/lazy_hook_query.dart index 7176e98..d5bb75e 100644 --- a/packages/example/lib/components/hooks/lazy_hook_query.dart +++ b/packages/example/lib/components/hooks/lazy_hook_query.dart @@ -6,7 +6,7 @@ import 'package:flutter_hooks/flutter_hooks.dart'; final lazyHookQueryJob = QueryJob( queryKey: "lazy-hook-query", enabled: false, - task: (queryKey, data, _) { + task: (queryKey, data) { return Future.delayed(const Duration(milliseconds: 500), () => "Result: key=$queryKey value=$data"); }, diff --git a/packages/example/lib/components/hooks/query_hook_external_data.dart b/packages/example/lib/components/hooks/query_hook_external_data.dart index b8b2a96..ed75228 100644 --- a/packages/example/lib/components/hooks/query_hook_external_data.dart +++ b/packages/example/lib/components/hooks/query_hook_external_data.dart @@ -8,7 +8,7 @@ import 'package:flutter_hooks/flutter_hooks.dart'; final queryHookExternalDataJob = QueryJob( queryKey: "query-hook-external-data", cacheTime: const Duration(seconds: 10), - task: (queryKey, data, _) { + task: (queryKey, data) { return Future.delayed(const Duration(milliseconds: 500), () => "Hello from $queryKey with $data"); }, diff --git a/packages/example/lib/components/hooks/query_hook_variable_key.dart b/packages/example/lib/components/hooks/query_hook_variable_key.dart index 0868309..41707ed 100644 --- a/packages/example/lib/components/hooks/query_hook_variable_key.dart +++ b/packages/example/lib/components/hooks/query_hook_variable_key.dart @@ -5,8 +5,8 @@ import 'package:fl_query/fl_query_hooks.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; -final queryHookVariableKeyJob = QueryJob.withVariableKey( - task: (queryKey, externalData, query) { +final queryHookVariableKeyJob = + QueryJob.withVariableKey(task: (queryKey, externalData) { return Future.delayed( const Duration(milliseconds: 500), () => "QueryKey:${queryKey.split("#").last}", diff --git a/packages/example/lib/components/lazy_query.dart b/packages/example/lib/components/lazy_query.dart index 5f64734..6027f01 100644 --- a/packages/example/lib/components/lazy_query.dart +++ b/packages/example/lib/components/lazy_query.dart @@ -4,7 +4,10 @@ import 'package:flutter/material.dart'; final lazyQueryJob = QueryJob( queryKey: "lazy-query", enabled: false, - task: (queryKey, data, _) { + task: ( + queryKey, + data, + ) { return Future.delayed(const Duration(milliseconds: 500), () => "Result: key=$queryKey value=$data"); }, diff --git a/packages/example/lib/components/query_external_data.dart b/packages/example/lib/components/query_external_data.dart index 0c3cce6..6b58090 100644 --- a/packages/example/lib/components/query_external_data.dart +++ b/packages/example/lib/components/query_external_data.dart @@ -6,7 +6,7 @@ import 'package:flutter/material.dart'; final jobWithExternalData = QueryJob( queryKey: "query-external-data", cacheTime: const Duration(seconds: 10), - task: (queryKey, data, _) { + task: (queryKey, data) { return Future.delayed(const Duration(milliseconds: 500), () => "Hello from $queryKey with $data"); }, diff --git a/packages/example/lib/components/query_variable_key.dart b/packages/example/lib/components/query_variable_key.dart index 039fba2..d454366 100644 --- a/packages/example/lib/components/query_variable_key.dart +++ b/packages/example/lib/components/query_variable_key.dart @@ -3,8 +3,8 @@ import 'dart:math'; import 'package:fl_query/fl_query.dart'; import 'package:flutter/material.dart'; -final queryVariableKeyJob = QueryJob.withVariableKey( - task: (queryKey, externalData, query) { +final queryVariableKeyJob = + QueryJob.withVariableKey(task: (queryKey, externalData) { return Future.delayed( const Duration(milliseconds: 500), () => "QueryKey:${queryKey.split("#").last}", diff --git a/packages/fl_query/lib/src/mutation.dart b/packages/fl_query/lib/src/mutation.dart index caa5e12..4652210 100644 --- a/packages/fl_query/lib/src/mutation.dart +++ b/packages/fl_query/lib/src/mutation.dart @@ -2,11 +2,7 @@ import 'dart:async'; import 'package:fl_query/src/base_operation.dart'; import 'package:fl_query/src/models/mutation_job.dart'; -import 'package:fl_query/src/models/query_job.dart'; -import 'package:fl_query/src/query.dart'; -import 'package:fl_query/src/utils.dart'; import 'package:flutter/widgets.dart'; -import 'package:collection/collection.dart'; enum MutationStatus { error, diff --git a/packages/fl_query/lib/src/query.dart b/packages/fl_query/lib/src/query.dart index b558010..c79a4ae 100644 --- a/packages/fl_query/lib/src/query.dart +++ b/packages/fl_query/lib/src/query.dart @@ -3,10 +3,8 @@ import 'dart:async'; import 'package:connectivity_plus/connectivity_plus.dart'; import 'package:fl_query/src/base_operation.dart'; import 'package:fl_query/src/models/query_job.dart'; -import 'package:fl_query/src/query_bowl.dart'; import 'package:fl_query/src/utils.dart'; import 'package:flutter/widgets.dart'; -import 'package:collection/collection.dart'; enum QueryStatus { /// in times when an error occurs @@ -30,7 +28,6 @@ enum QueryStatus { typedef QueryTaskFunction = FutureOr Function( String queryKey, Outside externalData, - Query self, ); typedef QueryListener = FutureOr Function(T); @@ -156,7 +153,6 @@ class Query extends BaseOperation { data = await task( queryKey, _externalData, - this, ); _prevUsedExternalData = _externalData; updatedAt = DateTime.now(); @@ -181,7 +177,6 @@ class Query extends BaseOperation { data = await task( queryKey, _externalData, - this, ); _prevUsedExternalData = _externalData; status = QueryStatus.success;