refactor: use tear-off instead of lambda

albertms10 · Dec 19, 2021 · 20fabb2 · 20fabb2
1 parent 27f7787
commit 20fabb2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/lib/src/model/booking/booking_manager.dart b/lib/src/model/booking/booking_manager.dart
@@ -25,12 +25,12 @@ class BookingManager with ChangeNotifier {
     required List<dynamic> bookings,
     required List<dynamic> recurringBookings,
   })  : bookings = SplayTreeSet.from(
-          bookings.map<Booking>((booking) => Booking.from(booking)),
+          bookings.cast<Map<String, dynamic>>().map<Booking>(Booking.from),
         ),
         recurringBookings = SplayTreeSet.from(
-          recurringBookings.map<RecurringBooking>(
-            (recurringBooking) => RecurringBooking.from(recurringBooking),
-          ),
+          recurringBookings
+              .cast<Map<String, dynamic>>()
+              .map<RecurringBooking>(RecurringBooking.from),
         );
 
   List<Map<String, dynamic>> bookingsToJson() =>

diff --git a/lib/src/model/cabin/cabin_elements.dart b/lib/src/model/cabin/cabin_elements.dart
@@ -24,7 +24,8 @@ class CabinElements {
 
   CabinElements.from(Map<String, dynamic> other)
       : pianos = (other[_JsonFields.pianos] as List<dynamic>)
-            .map((piano) => Piano.from(piano))
+            .cast<Map<String, dynamic>>()
+            .map(Piano.from)
             .toList(),
         lecterns = other[_JsonFields.lecterns] as int,
         chairs = other[_JsonFields.chairs] as int,

diff --git a/lib/src/model/cabin/cabin_manager.dart b/lib/src/model/cabin/cabin_manager.dart
@@ -14,7 +14,8 @@ import 'cabin.dart';
 
 Iterable<Cabin> _parseCabins(String jsonString) =>
     (json.decode(jsonString) as List<dynamic>)
-        .map<Cabin>((json) => Cabin.from(json));
+        .cast<Map<String, dynamic>>()
+        .map(Cabin.from);
 
 class CabinManager extends WritableManager<Set<Cabin>> with ChangeNotifier {
   late Set<Cabin> cabins;

diff --git a/lib/src/model/school_year/school_year.dart b/lib/src/model/school_year/school_year.dart
@@ -28,7 +28,8 @@ class SchoolYear extends DateRange {
   SchoolYear.from(Map<String, dynamic> other)
       : holidays = SplayTreeSet.from(
           (other[_JsonFields.holidays] as List<dynamic>)
-              .map<Holiday>((holiday) => Holiday.from(holiday)),
+              .cast<Map<String, dynamic>>()
+              .map<Holiday>(Holiday.from),
         ),
         super.from(other);
 

diff --git a/lib/src/model/school_year/school_year_manager.dart b/lib/src/model/school_year/school_year_manager.dart
@@ -9,7 +9,8 @@ import 'school_year.dart';
 
 Iterable<SchoolYear> _parseSchoolYears(String jsonString) =>
     (json.decode(jsonString) as List<dynamic>)
-        .map<SchoolYear>((json) => SchoolYear.from(json));
+        .cast<Map<String, dynamic>>()
+        .map(SchoolYear.from);
 
 class SchoolYearManager extends WritableManager<Set<SchoolYear>>
     with ChangeNotifier {