refactor: fix analyzer code style warnings (#734)

Author: fischerscode

.github/workflows/ci.yml

@@ -121,7 +121,7 @@ jobs:
         working-directory: packages/dart
         run: |
           dart pub global activate coverage
-          dart pub global run coverage:format_coverage -i coverage/test -o coverage/lcov.info --lcov --packages=.packages --report-on=lib
+          dart pub global run coverage:format_coverage -i coverage/test -o coverage/lcov.info --lcov --packages=.dart_tool/package_config.json --report-on=lib
       - name: Upload code coverage
         uses: codecov/codecov-action@v2
         # Needs to be adapted to collect the coverage at all platforms if platform specific code is added.

packages/dart/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [3.1.1](https://github.com/parse-community/Parse-SDK-Flutter/compare/V3.1.0...dart-3.1.1)
+
+### Refactor
+
+* fix analyzer code style warnings ([#733](https://github.com/parse-community/Parse-SDK-Flutter/issues/733))
+
 # [3.1.0](https://github.com/parse-community/Parse-SDK-Flutter/compare/V3.0.0...V3.1.0) (2021-06-28)
 
 ### Bug Fixes

packages/dart/lib/src/data/parse_subclass_handler.dart

@@ -12,30 +12,34 @@ class ParseSubClassHandler {
       {Map<String, ParseObjectConstructor>? registeredSubClassMap,
       ParseUserConstructor? parseUserConstructor,
       ParseFileConstructor? parseFileConstructor}) {
-    _subClassMap =
-        registeredSubClassMap ?? Map<String, ParseObjectConstructor>();
+    _subClassMap = registeredSubClassMap ?? <String, ParseObjectConstructor>{};
     _parseUserConstructor = parseUserConstructor;
-    if (parseFileConstructor != null)
+    if (parseFileConstructor != null) {
       _parseFileConstructor = parseFileConstructor;
+    }
   }
 
   late Map<String, ParseObjectConstructor> _subClassMap;
   ParseUserConstructor? _parseUserConstructor;
-  ParseFileConstructor _parseFileConstructor = ({String? name, String? url}) {
+  ParseFileConstructor _parseFileConstructor = defaultParseFileConstructor;
+
+  static ParseFileBase defaultParseFileConstructor(
+      {String? name, String? url}) {
     if (parseIsWeb) {
       return ParseWebFile(null, name: name!, url: url);
     } else {
       return ParseFile(null, name: name, url: url);
     }
-  };
+  }
 
   void registerSubClass(
       String className, ParseObjectConstructor objectConstructor) {
     if (className != keyClassUser &&
         className != keyClassInstallation &&
         className != keyClassSession &&
-        className != keyFileClassname)
+        className != keyFileClassname) {
       _subClassMap[className] = objectConstructor;
+    }
   }
 
   void registerUserSubClass(ParseUserConstructor parseUserConstructor) {

packages/dart/lib/src/network/dio_adapter_io.dart

@@ -7,8 +7,9 @@ HttpClientAdapter createHttpClientAdapter(SecurityContext? securityContext) {
   final DefaultHttpClientAdapter defaultHttpClientAdapter =
       DefaultHttpClientAdapter();
 
-  if (securityContext != null)
+  if (securityContext != null) {
     defaultHttpClientAdapter.onHttpClientCreate =
         (HttpClient client) => HttpClient(context: securityContext);
+  }
   return defaultHttpClientAdapter;
 }

packages/dart/lib/src/network/parse_client.dart

@@ -62,7 +62,7 @@ abstract class ParseClient {
   //   ParseNetworkOptions options,
   // });
 
-  @deprecated
+  @Deprecated("Use ParseCoreData() instead.")
   ParseCoreData get data => ParseCoreData();
 }
 

packages/dart/lib/src/network/parse_dio_client.dart

@@ -159,13 +159,16 @@ class _ParseDioClient with dio.DioMixin implements dio.Dio {
     options.headers![keyHeaderApplicationId] = parseCoreData.applicationId;
     if (_sendSessionId &&
         parseCoreData.sessionId != null &&
-        options.headers![keyHeaderSessionToken] == null)
+        options.headers![keyHeaderSessionToken] == null) {
       options.headers![keyHeaderSessionToken] = parseCoreData.sessionId;
+    }
 
-    if (parseCoreData.clientKey != null)
+    if (parseCoreData.clientKey != null) {
       options.headers![keyHeaderClientKey] = parseCoreData.clientKey;
-    if (parseCoreData.masterKey != null)
+    }
+    if (parseCoreData.masterKey != null) {
       options.headers![keyHeaderMasterKey] = parseCoreData.masterKey;
+    }
 
     /// If developer wants to add custom headers, extend this class and add headers needed.
     if (additionalHeaders != null && additionalHeaders!.isNotEmpty) {

packages/dart/lib/src/network/parse_http_client.dart

@@ -133,13 +133,16 @@ class _ParseHTTPClient extends http.BaseClient {
     request.headers[keyHeaderApplicationId] = parseCoreData.applicationId;
     if (_sendSessionId &&
         parseCoreData.sessionId != null &&
-        request.headers[keyHeaderSessionToken] == null)
+        request.headers[keyHeaderSessionToken] == null) {
       request.headers[keyHeaderSessionToken] = parseCoreData.sessionId!;
+    }
 
-    if (parseCoreData.clientKey != null)
+    if (parseCoreData.clientKey != null) {
       request.headers[keyHeaderClientKey] = parseCoreData.clientKey!;
-    if (parseCoreData.masterKey != null)
+    }
+    if (parseCoreData.masterKey != null) {
       request.headers[keyHeaderMasterKey] = parseCoreData.masterKey!;
+    }
 
     /// If developer wants to add custom headers, extend this class and add headers needed.
     if (additionalHeaders != null && additionalHeaders!.isNotEmpty) {

packages/dart/lib/src/network/parse_live_query.dart

@@ -115,8 +115,9 @@ class LiveQueryReconnectingController {
         _currentTimer = null;
         _reconnect();
       });
-      if (debug)
+      if (debug) {
         print('$DEBUG_TAG: Retrytimer set to ${retryInterval[_retryState]}ms');
+      }
       if (_retryState < retryInterval.length - 1) {
         _retryState++;
       }
@@ -212,9 +213,10 @@ class LiveQueryClient {
       subscription._enabled = false;
     });
     _connecting = false;
-    if (userInitialized)
+    if (userInitialized) {
       _clientEventStreamController.sink
           .add(LiveQueryClientEvent.USER_DISCONNECTED);
+    }
   }
 
   Future<Subscription<T>> subscribe<T extends ParseObject>(
@@ -353,7 +355,7 @@ class LiveQueryClient {
     final String _where = query.buildQuery().replaceAll('where=', '');
 
     //Convert where condition to Map
-    Map<String, dynamic> _whereMap = Map<String, dynamic>();
+    Map<String, dynamic> _whereMap = <String, dynamic>{};
     if (_where != '') {
       _whereMap = json.decode(_where);
     }

packages/dart/lib/src/network/parse_query.dart

@@ -37,7 +37,7 @@ class QueryBuilder<T extends ParseObject> {
 
   T object;
   List<MapEntry<String, dynamic>> queries = <MapEntry<String, dynamic>>[];
-  final Map<String, dynamic> limiters = Map<String, dynamic>();
+  final Map<String, dynamic> limiters = <String, dynamic>{};
 
   /// Adds a limit to amount of results return from Parse
   void setLimit(int limit) {
@@ -103,10 +103,10 @@ class QueryBuilder<T extends ParseObject> {
       {bool caseSensitive = false}) {
     if (caseSensitive) {
       queries.add(MapEntry<String, dynamic>(
-          _SINGLE_QUERY, '\"$column\":{\"\$regex\": \"^$query\"}'));
+          _SINGLE_QUERY, '"$column":{"\$regex": "^$query"}'));
     } else {
-      queries.add(MapEntry<String, dynamic>(_SINGLE_QUERY,
-          '\"$column\":{\"\$regex\": \"^$query\", \"\$options\": \"i\"}'));
+      queries.add(MapEntry<String, dynamic>(
+          _SINGLE_QUERY, '"$column":{"\$regex": "^$query", "\$options": "i"}'));
     }
   }
 
@@ -115,10 +115,10 @@ class QueryBuilder<T extends ParseObject> {
       {bool caseSensitive = false}) {
     if (caseSensitive) {
       queries.add(MapEntry<String, dynamic>(
-          _SINGLE_QUERY, '\"$column\":{\"\$regex\": \"$query\$\"}'));
+          _SINGLE_QUERY, '"$column":{"\$regex": "$query\$"}'));
     } else {
       queries.add(MapEntry<String, dynamic>(_SINGLE_QUERY,
-          '\"$column\":{\"\$regex\": \"$query\$\", \"\$options\": \"i\"}'));
+          '"$column":{"\$regex": "$query\$", "\$options": "i"}'));
     }
   }
 
@@ -183,7 +183,7 @@ class QueryBuilder<T extends ParseObject> {
   /// Retrieves related objets where [String] column is a relation field to the class [String] className
   void whereRelatedTo(String column, String className, String objectId) {
     queries.add(MapEntry<String, dynamic>(_SINGLE_QUERY,
-        '\"\$relatedTo\":{\"object\":{\"__type\":\"Pointer\",\"className\":\"$className\",\"objectId\":\"$objectId\"},\"key\":\"$column\"}'));
+        '"\$relatedTo":{"object":{"__type":"Pointer","className":"$className","objectId":"$objectId"},"key":"$column"}'));
   }
 
   /// Returns an object where the [String] column contains select
@@ -216,10 +216,10 @@ class QueryBuilder<T extends ParseObject> {
       {bool caseSensitive = false}) {
     if (caseSensitive) {
       queries.add(MapEntry<String, dynamic>(
-          _SINGLE_QUERY, '\"$column\":{\"\$regex\": \"$value\"}'));
+          _SINGLE_QUERY, '"$column":{"\$regex": "$value"}'));
     } else {
-      queries.add(MapEntry<String, dynamic>(_SINGLE_QUERY,
-          '\"$column\":{\"\$regex\": \"$value\", \"\$options\": \"i\"}'));
+      queries.add(MapEntry<String, dynamic>(
+          _SINGLE_QUERY, '"$column":{"\$regex": "$value", "\$options": "i"}'));
     }
   }
 
@@ -230,7 +230,7 @@ class QueryBuilder<T extends ParseObject> {
       bool orderByScore = true,
       bool diacriticSensitive = false}) {
     queries.add(MapEntry<String, dynamic>(_SINGLE_QUERY,
-        '\"$column\":{\"\$text\":{\"\$search\":{\"\$term\": \"$query\", \"\$caseSensitive\": $caseSensitive , \"\$diacriticSensitive\": $diacriticSensitive }}}'));
+        '"$column":{"\$text":{"\$search":{"\$term": "$query", "\$caseSensitive": $caseSensitive , "\$diacriticSensitive": $diacriticSensitive }}}'));
     if (orderByScore) {
       orderByAscending('\$score');
       keysToReturn(['\$score']);
@@ -242,7 +242,7 @@ class QueryBuilder<T extends ParseObject> {
     final double latitude = point.latitude;
     final double longitude = point.longitude;
     queries.add(MapEntry<String, dynamic>(_SINGLE_QUERY,
-        '\"$column\":{\"\$nearSphere\":{\"__type\":\"GeoPoint\",\"latitude\":$latitude,\"longitude\":$longitude}}'));
+        '"$column":{"\$nearSphere":{"__type":"GeoPoint","latitude":$latitude,"longitude":$longitude}}'));
   }
 
   /// Returns an object with key point values near the point given and within the maximum distance given.
@@ -252,7 +252,7 @@ class QueryBuilder<T extends ParseObject> {
     final double longitude = point.longitude;
 
     queries.add(MapEntry<String, dynamic>(_SINGLE_QUERY,
-        '\"$column\":{\"\$nearSphere\":{\"__type\":\"GeoPoint\",\"latitude\":$latitude,\"longitude\":$longitude},\"\$maxDistanceInMiles\":$maxDistance}'));
+        '"$column":{"\$nearSphere":{"__type":"GeoPoint","latitude":$latitude,"longitude":$longitude},"\$maxDistanceInMiles":$maxDistance}'));
   }
 
   /// Returns an object with key point values near the point given and within the maximum distance given.
@@ -262,7 +262,7 @@ class QueryBuilder<T extends ParseObject> {
     final double longitude = point.longitude;
 
     queries.add(MapEntry<String, dynamic>(_SINGLE_QUERY,
-        '\"$column\":{\"\$nearSphere\":{\"__type\":\"GeoPoint\",\"latitude\":$latitude,\"longitude\":$longitude},\"\$maxDistanceInKilometers\":$maxDistance}'));
+        '"$column":{"\$nearSphere":{"__type":"GeoPoint","latitude":$latitude,"longitude":$longitude},"\$maxDistanceInKilometers":$maxDistance}'));
   }
 
   /// Returns an object with key point values near the point given and within the maximum distance given.
@@ -272,7 +272,7 @@ class QueryBuilder<T extends ParseObject> {
     final double longitude = point.longitude;
 
     queries.add(MapEntry<String, dynamic>(_SINGLE_QUERY,
-        '\"$column\":{\"\$nearSphere\":{\"__type\":\"GeoPoint\",\"latitude\":$latitude,\"longitude\":$longitude},\"\$maxDistanceInRadians\":$maxDistance}'));
+        '"$column":{"\$nearSphere":{"__type":"GeoPoint","latitude":$latitude,"longitude":$longitude},"\$maxDistanceInRadians":$maxDistance}'));
   }
 
   /// Returns an object with key point values contained within a given rectangular geographic bounding box.
@@ -285,20 +285,21 @@ class QueryBuilder<T extends ParseObject> {
     final double longitudeN = northeast.longitude;
 
     queries.add(MapEntry<String, dynamic>(_SINGLE_QUERY,
-        '\"$column\":{\"\$within\":{\"\$box\": [{\"__type\": \"GeoPoint\",\"latitude\":$latitudeS,\"longitude\":$longitudeS},{\"__type\": \"GeoPoint\",\"latitude\":$latitudeN,\"longitude\":$longitudeN}]}}'));
+        '"$column":{"\$within":{"\$box": [{"__type": "GeoPoint","latitude":$latitudeS,"longitude":$longitudeS},{"__type": "GeoPoint","latitude":$latitudeN,"longitude":$longitudeN}]}}'));
   }
 
   /// Return an object with key coordinates be contained within and on the bounds of a given polygon.
   /// Supports closed and open (last point is connected to first) paths
   /// Polygon must have at least 3 points
   void whereWithinPolygon(String column, List<ParseGeoPoint> points) {
-    if (points.length < 3)
+    if (points.length < 3) {
       throw ArgumentError('Polygon must have at least 3 points');
+    }
     Map<String, dynamic> dictionary = <String, dynamic>{};
     dictionary['\$polygon'] = points.map((e) => e.toJson()).toList();
 
-    queries.add(MapEntry<String, dynamic>(_SINGLE_QUERY,
-        '\"$column\":{\"\$geoWithin\":${jsonEncode(dictionary)}}'));
+    queries.add(MapEntry<String, dynamic>(
+        _SINGLE_QUERY, '"$column":{"\$geoWithin":${jsonEncode(dictionary)}}'));
   }
 
   /// Add a constraint to the query that requires a particular key's value match another QueryBuilder
@@ -308,7 +309,7 @@ class QueryBuilder<T extends ParseObject> {
         query._buildQueryRelational(query.object.parseClassName);
 
     queries.add(MapEntry<String, dynamic>(
-        _SINGLE_QUERY, '\"$column\":{\"\$inQuery\":$inQuery}'));
+        _SINGLE_QUERY, '"$column":{"\$inQuery":$inQuery}'));
   }
 
   ///Add a constraint to the query that requires a particular key's value does not match another QueryBuilder
@@ -318,7 +319,7 @@ class QueryBuilder<T extends ParseObject> {
         query._buildQueryRelational(query.object.parseClassName);
 
     queries.add(MapEntry<String, dynamic>(
-        _SINGLE_QUERY, '\"$column\":{\"\$notInQuery\":$inQuery}'));
+        _SINGLE_QUERY, '"$column":{"\$notInQuery":$inQuery}'));
   }
 
   /// Add a constraint to the query that requires a particular key's value matches a value for a key in the results of another ParseQuery.
@@ -338,7 +339,7 @@ class QueryBuilder<T extends ParseObject> {
         query._buildQueryRelationalKey(query.object.parseClassName, keyInQuery);
 
     queries.add(MapEntry<String, dynamic>(
-        _SINGLE_QUERY, '\"$column\":{\"\$select\":$inQuery}'));
+        _SINGLE_QUERY, '"$column":{"\$select":$inQuery}'));
   }
 
   /// Add a constraint to the query that requires a particular key's value does not match any value for a key in the results of another ParseQuery
@@ -358,24 +359,24 @@ class QueryBuilder<T extends ParseObject> {
         query._buildQueryRelationalKey(query.object.parseClassName, keyInQuery);
 
     queries.add(MapEntry<String, dynamic>(
-        _SINGLE_QUERY, '\"$column\":{\"\$dontSelect\":$inQuery}'));
+        _SINGLE_QUERY, '"$column":{"\$dontSelect":$inQuery}'));
   }
 
   /// Finishes the query and calls the server
   ///
   /// Make sure to call this after defining your queries
-  Future<ParseResponse> query<T extends ParseObject>(
+  Future<ParseResponse> query<U extends ParseObject>(
       {ProgressCallback? progressCallback}) async {
-    return object.query<T>(
+    return object.query<U>(
       buildQuery(),
       progressCallback: progressCallback,
     );
   }
 
-  Future<ParseResponse> distinct<T extends ParseObject>(
+  Future<ParseResponse> distinct<U extends ParseObject>(
       String className) async {
     final String queryString = 'distinct=$className';
-    return object.distinct<T>(queryString);
+    return object.distinct<U>(queryString);
   }
 
   ///Counts the number of objects that match this query
@@ -392,13 +393,13 @@ class QueryBuilder<T extends ParseObject> {
   /// Builds the query relational for Parse
   String _buildQueryRelational(String className) {
     queries = _checkForMultipleColumnInstances(queries);
-    return '{\"where\":{${buildQueries(queries)}},\"className\":\"$className\"${getLimitersRelational(limiters)}}';
+    return '{"where":{${buildQueries(queries)}},"className":"$className"${getLimitersRelational(limiters)}}';
   }
 
   /// Builds the query relational with Key for Parse
   String _buildQueryRelationalKey(String className, String keyInQuery) {
     queries = _checkForMultipleColumnInstances(queries);
-    return '{\"query\":{\"className\":\"$className\",\"where\":{${buildQueries(queries)}}},\"key\":\"$keyInQuery\"}';
+    return '{"query":{"className":"$className","where":{${buildQueries(queries)}}},"key":"$keyInQuery"}';
   }
 
   /// Builds the query for Parse
@@ -446,15 +447,14 @@ class QueryBuilder<T extends ParseObject> {
 
     if (queryOperator == _NO_OPERATOR_NEEDED) {
       return MapEntry<String, dynamic>(
-          _NO_OPERATOR_NEEDED, '\"$key\": ${jsonEncode(value)}');
+          _NO_OPERATOR_NEEDED, '"$key": ${jsonEncode(value)}');
     } else {
-      String queryString = '\"$key\":';
-      final Map<String, dynamic> queryOperatorAndValueMap =
-          Map<String, dynamic>();
+      String queryString = '"$key":';
+      final Map<String, dynamic> queryOperatorAndValueMap = <String, dynamic>{};
       queryOperatorAndValueMap[queryOperator] = parseEncode(value);
       final String formattedQueryOperatorAndValue =
           jsonEncode(queryOperatorAndValueMap);
-      queryString += '$formattedQueryOperatorAndValue';
+      queryString += formattedQueryOperatorAndValue;
       return MapEntry<String, dynamic>(key, queryString);
     }
   }
@@ -488,7 +488,7 @@ class QueryBuilder<T extends ParseObject> {
             .toList();
 
         // Build first part of query
-        String queryStart = '\"${query.key}\":';
+        String queryStart = '"${query.key}":';
         String queryEnd = '';
 
         // Compact all the queries in the correct format
@@ -526,9 +526,9 @@ class QueryBuilder<T extends ParseObject> {
     String result = '';
     map.forEach((String key, dynamic value) {
       if (result.isNotEmpty) {
-        result = result + ',\"$key":$value';
+        result = result + ',"$key":$value';
       } else {
-        result = '\"$key\":$value';
+        result = '"$key":$value';
       }
     });
     return result;