Rename Dependencies.list to Dependencies.adapter back.

Sugers3 · Jun 28, 2019 · 38fc570 · 38fc570
1 parent 7a16998
commit 38fc570
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 39 deletions.
diff --git a/example/lib/todo_list_page/page.dart b/example/lib/todo_list_page/page.dart
@@ -16,7 +16,7 @@ class ToDoListPage extends Page<PageState, Map<String, dynamic>> {
           reducer: buildReducer(),
           view: buildView,
           dependencies: Dependencies<PageState>(
-              list: NoneConn<PageState>() + ToDoListAdapter(),
+              adapter: NoneConn<PageState>() + ToDoListAdapter(),
               slots: <String, Dependent<PageState>>{
                 'report': ReportConnector() + ReportComponent()
               }),

diff --git a/lib/src/redux_adapter/adapter.dart b/lib/src/redux_adapter/adapter.dart
@@ -20,7 +20,7 @@ abstract class Adapter<T> extends Logic<T> implements AbstractAdapter<T> {
     Dependencies<T> dependencies,
     Object Function(T) key,
   })  : assert(adapter != null),
-        assert(dependencies?.list == null,
+        assert(dependencies?.adapter == null,
             'Unexpected dependencies.list for Adapter.'),
         _adapter = adapter,
         super(

diff --git a/lib/src/redux_component/dependencies.dart b/lib/src/redux_component/dependencies.dart
@@ -1,22 +1,17 @@
 import '../redux/redux.dart';
 import 'basic.dart';
-import 'dependent.dart';
 
 class Dependencies<T> {
   final Map<String, Dependent<T>> slots;
-  final Dependent<T> list;
+  final Dependent<T> adapter;
 
-  /// Use [list: NoneConn<T>() + Adapter<T>()] instead of [adapter: Adapter<T>()],
+  /// Use [adapter: NoneConn<T>() + Adapter<T>()] instead of [adapter: Adapter<T>()],
   /// Which is better reusability and consistency.
   Dependencies({
     this.slots,
-    @deprecated AbstractAdapter<T> adapter,
-    Dependent<T> list,
-  })  : assert(list == null || list.isAdapter(),
-            'The dependent must contains adapter.'),
-        assert(list == null || adapter == null,
-            'Only one style of adapter could be applied.'),
-        list = list ?? (_NoneConn<T>() + adapter);
+    this.adapter,
+  }) : assert(adapter == null || adapter.isAdapter(),
+            'The dependent must contains adapter.');
 
   Reducer<T> get reducer {
     final List<SubReducer<T>> subs = <SubReducer<T>>[];
@@ -27,23 +22,12 @@ class Dependencies<T> {
       ));
     }
 
-    if (list != null) {
-      subs.add(list.createSubReducer());
+    if (adapter != null) {
+      subs.add(adapter.createSubReducer());
     }
 
     return combineReducers(<Reducer<T>>[combineSubReducers(subs)]);
   }
 
   Dependent<T> slot(String type) => slots[type];
 }
-
-class _NoneConn<T> extends ImmutableConn<T, T> {
-  @override
-  T get(T state) => state;
-
-  @override
-  T set(T state, T subState) => subState;
-
-  Dependent<T> operator +(AbstractLogic<T> logic) =>
-      createDependent<T, T>(this, logic);
-}
diff --git a/lib/src/redux_component/logic.dart b/lib/src/redux_component/logic.dart
@@ -109,5 +109,5 @@ abstract class Logic<T> implements AbstractLogic<T> {
   Dependent<T> slot(String type) => protectedDependencies?.slot(type);
 
   @override
-  Dependent<T> adapterDep() => protectedDependencies?.list;
+  Dependent<T> adapterDep() => protectedDependencies?.adapter;
 }
diff --git a/test/lib/redux_adapter/adapter_test.dart b/test/lib/redux_adapter/adapter_test.dart
@@ -17,7 +17,7 @@ void main() {
           initState: initState,
           view: pageView,
           dependencies: Dependencies<ToDoList>(
-              list: NoneConn<ToDoList>() +
+              adapter: NoneConn<ToDoList>() +
                   TestAdapter<ToDoList>(
                       adapter: toDoListAdapter,
                       reducer: toDoListReducer,
@@ -33,7 +33,7 @@ void main() {
               initState: initState,
               view: pageView,
               dependencies: Dependencies<ToDoList>(
-                  list: NoneConn<ToDoList>() +
+                  adapter: NoneConn<ToDoList>() +
                       TestAdapter<ToDoList>(
                           adapter: toDoListAdapter,
                           reducer: toDoListReducer,
@@ -77,7 +77,7 @@ void main() {
                 track.append('build', state.clone());
               }),
               dependencies: Dependencies<ToDoList>(
-                  list: NoneConn<ToDoList>() +
+                  adapter: NoneConn<ToDoList>() +
                       TestAdapter<ToDoList>(
                           adapter: toDoListAdapter,
                           reducer: instrumentReducer<ToDoList>(toDoListReducer,
@@ -163,7 +163,7 @@ void main() {
                 track.append('build', state.clone());
               }),
               dependencies: Dependencies<ToDoList>(
-                  list: NoneConn<ToDoList>() +
+                  adapter: NoneConn<ToDoList>() +
                       TestAdapter<ToDoList>(
                           adapter: toDoListAdapter,
                           reducer: instrumentReducer<ToDoList>(toDoListReducer,
@@ -240,7 +240,7 @@ void main() {
                 track.append('build', state.clone());
               }),
               dependencies: Dependencies<ToDoList>(
-                  list: NoneConn<ToDoList>() +
+                  adapter: NoneConn<ToDoList>() +
                       TestAdapter<ToDoList>(
                           adapter: toDoListAdapter,
                           reducer: instrumentReducer<ToDoList>(toDoListReducer,
@@ -317,7 +317,7 @@ void main() {
                 track.append('build', state.clone());
               }),
               dependencies: Dependencies<ToDoList>(
-                  list: NoneConn<ToDoList>() +
+                  adapter: NoneConn<ToDoList>() +
                       TestAdapter<ToDoList>(
                           adapter: toDoListAdapter,
                           reducer: instrumentReducer<ToDoList>(toDoListReducer,

diff --git a/test/lib/redux_adapter/dynamic_adapter_test.dart b/test/lib/redux_adapter/dynamic_adapter_test.dart
@@ -62,7 +62,7 @@ class ToDoComponentNoReducer extends TestComponent<Todo> {
 Dependencies<ToDoList> toDoListDependencies(final Track track,
         {bool noReducer = false}) =>
     Dependencies<ToDoList>(
-        list: NoneConn<ToDoList>() +
+        adapter: NoneConn<ToDoList>() +
             TestDynamicFlowAdapter<ToDoList>(
                 pool: <String, AbstractLogic<Todo>>{
                   'toDo': ToDoComponentInstrument(track),

diff --git a/test/lib/redux_adapter/static_flow_adapter_test.dart b/test/lib/redux_adapter/static_flow_adapter_test.dart
@@ -78,7 +78,7 @@ class Adapter3 extends ToDoAdapterInstrument {
 
 Dependencies<ToDoList> toDoListDependencies(final Track track) =>
     Dependencies<ToDoList>(
-        list: NoneConn<ToDoList>() +
+        adapter: NoneConn<ToDoList>() +
             TestStaticFlowAdapter<ToDoList>(
                 slots: [
                   ConnOp<ToDoList, Todo>(

diff --git a/test/test_widgets/lib/adapter/page.dart b/test/test_widgets/lib/adapter/page.dart
@@ -63,7 +63,7 @@ Widget createAdapterWidget(BuildContext context) {
           initState: initState,
           view: pageView,
           dependencies: Dependencies<ToDoList>(
-              list: NoneConn<ToDoList>() +
+              adapter: NoneConn<ToDoList>() +
                   TestAdapter<ToDoList>(
                       adapter: toDoListAdapter,
                       reducer: toDoListReducer,

diff --git a/test/test_widgets/lib/dynamic_flow_adapter/page.dart b/test/test_widgets/lib/dynamic_flow_adapter/page.dart
@@ -91,7 +91,7 @@ Widget createDynamicAdapterWidget(BuildContext context) {
           view: pageView,
           initState: initState,
           effect: pageEffect,
-          dependencies:
-              Dependencies<ToDoList>(list: NoneConn<ToDoList>() + testAdapter))
+          dependencies: Dependencies<ToDoList>(
+              adapter: NoneConn<ToDoList>() + testAdapter))
       .buildPage(pageInitParams);
 }
diff --git a/test/test_widgets/lib/static_flow_adapter/page.dart b/test/test_widgets/lib/static_flow_adapter/page.dart
@@ -51,7 +51,7 @@ Widget createStaticAdapterWidget(BuildContext context) {
   return TestPage<ToDoList, Map>(
           initState: initState,
           view: pageView,
-          dependencies:
-              Dependencies<ToDoList>(list: NoneConn<ToDoList>() + testAdapter))
+          dependencies: Dependencies<ToDoList>(
+              adapter: NoneConn<ToDoList>() + testAdapter))
       .buildPage(pageInitParams);
 }