Merge pull request #11 from aemino/dart2_compat

Dart 2 compatibility
mongo-dart · Jun 30, 2018 · f54ee03 · f54ee03
2 parents 297d206 + 3a2cbfa
commit f54ee03
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/lib/src/modifier_builder.dart b/lib/src/modifier_builder.dart
@@ -5,14 +5,14 @@ ModifierBuilder get modify => new ModifierBuilder();
 
 class ModifierBuilder{
 
-  Map map = {};
+  Map<String, dynamic> map = {};
 
   toString() => "ModifierBuilder($map)";
 
   void _updateOperation(String operator, String fieldName, value) {
-    Map opMap = map[operator];
+    Map<String, dynamic> opMap = map[operator];
     if (opMap == null) {
-      opMap = {};
+      opMap = <String, dynamic>{};
       map[operator] = opMap;
     }
     opMap[fieldName] = value;

diff --git a/lib/src/selector_builder.dart b/lib/src/selector_builder.dart
@@ -5,24 +5,24 @@ SelectorBuilder get where => new SelectorBuilder();
 class SelectorBuilder {
   static final RegExp objectIdRegexp =
       new RegExp(".ObjectId...([0-9a-f]{24})....");
-  Map map = {};
+  Map<String, dynamic> map = {};
   bool _isQuerySet = false;
-  Map get _query {
+  Map<String, dynamic> get _query {
     if (!_isQuerySet) {
-      map['\$query'] = {};
+      map['\$query'] = <String, dynamic>{};
       _isQuerySet = true;
     }
     return map['\$query'];
   }
 
   int paramSkip = 0;
   int paramLimit = 0;
-  Map paramFields;
+  Map<String, dynamic> paramFields;
 
   String toString() => "SelectorBuilder($map)";
 
   _addExpression(String fieldName, value) {
-    Map exprMap = {};
+    Map<String, dynamic> exprMap = {};
     exprMap[fieldName] = value;
     if (_query.isEmpty) {
       _query[fieldName] = value;
@@ -31,7 +31,7 @@ class SelectorBuilder {
     }
   }
 
-  _addExpressionMap(Map expr) {
+  _addExpressionMap(Map<String, dynamic> expr) {
     if (_query.containsKey('\$and')) {
       List expressions = _query['\$and'];
       expressions.add(expr);
@@ -44,14 +44,14 @@ class SelectorBuilder {
 
   void _ensureParamFields() {
     if (paramFields == null) {
-      paramFields = {};
+      paramFields = <String, dynamic>{};
     }
   }
 
   void _ensureOrderBy() {
     _query;
     if (!map.containsKey("orderby")) {
-      map["orderby"] = new LinkedHashMap();
+      map["orderby"] = <String, dynamic>{};
     }
   }
 
@@ -136,7 +136,7 @@ class SelectorBuilder {
 
   SelectorBuilder inRange(String fieldName, min, max,
       {bool minInclude: true, bool maxInclude: false}) {
-    Map rangeMap = {};
+    Map<String, dynamic> rangeMap = {};
     if (minInclude) {
       rangeMap["\$gte"] = min;
     } else {
@@ -163,14 +163,14 @@ class SelectorBuilder {
 
   SelectorBuilder sortByMetaTextScore(String fieldName) {
     _ensureOrderBy();
-    map["orderby"][fieldName] = {'\$meta': "textScore"};
+    map["orderby"][fieldName] = <String, dynamic>{'\$meta': "textScore"};
     return this;
   }
 
   SelectorBuilder hint(String fieldName, {bool descending: false}) {
     _query;
     if (!map.containsKey("\$hint")) {
-      map["\$hint"] = new LinkedHashMap();
+      map["\$hint"] = <String, dynamic>{};
     }
     int order = 1;
     if (descending) {
@@ -254,7 +254,7 @@ class SelectorBuilder {
     return this;
   }
 
-  SelectorBuilder raw(Map rawSelector) {
+  SelectorBuilder raw(Map<String, dynamic> rawSelector) {
     map = rawSelector;
     return this;
   }