Merge pull request dart-archive/gcloud#129 from dart-lang/lints

Switch to pkg:lints for lints

Author: jonasfj

pkgs/gcloud/analysis_options.yaml

@@ -1,4 +1,4 @@
-include: package:pedantic/analysis_options.yaml
+include: package:lints/recommended.yaml
 
 analyzer:
   strong-mode:
@@ -17,6 +17,7 @@ linter:
     - package_api_docs
     - package_names
     - package_prefixed_library_names
+    - prefer_relative_imports
     - test_types_in_equals
     - throw_in_finally
     - unnecessary_brace_in_string_interps

pkgs/gcloud/lib/common.dart

@@ -29,7 +29,7 @@ typedef FirstPageProvider<T> = Future<Page<T>> Function(int pageSize);
 
 /// Helper class to turn a series of pages into a stream.
 class StreamFromPages<T> {
-  static const int _PAGE_SIZE = 50;
+  static const int _pageSize = 50;
   final FirstPageProvider<T> _firstPageProvider;
   bool _pendingRequest = false;
   bool _paused = false;
@@ -66,7 +66,7 @@ class StreamFromPages<T> {
   }
 
   void _onListen() {
-    var pageSize = _PAGE_SIZE;
+    var pageSize = _pageSize;
     _pendingRequest = true;
     _firstPageProvider(pageSize).then(_handlePage, onError: _handleError);
   }

pkgs/gcloud/lib/datastore.dart

@@ -12,6 +12,7 @@ library gcloud.datastore;
 import 'dart:async';
 
 import 'package:http/http.dart' as http;
+
 import 'common.dart' show Page;
 import 'service_scope.dart' as ss;
 import 'src/datastore_impl.dart' show DatastoreImpl;
@@ -54,7 +55,7 @@ class DatastoreError implements Exception {
       : message = (message ?? 'DatastoreError: An unknown error occured');
 
   @override
-  String toString() => '$message';
+  String toString() => message;
 }
 
 class UnknownDatastoreError extends DatastoreError {
@@ -187,6 +188,7 @@ class Key {
 ///
 // TODO(Issue #6): Add dataset-id here.
 class Partition {
+  // ignore: constant_identifier_names
   static const Partition DEFAULT = Partition._default();
 
   /// The namespace of this partition.
@@ -243,10 +245,15 @@ class KeyElement {
 
 /// A relation used in query filters.
 class FilterRelation {
+  // ignore: constant_identifier_names
   static const FilterRelation LessThan = FilterRelation._('<');
+  // ignore: constant_identifier_names
   static const FilterRelation LessThanOrEqual = FilterRelation._('<=');
+  // ignore: constant_identifier_names
   static const FilterRelation GreatherThan = FilterRelation._('>');
+  // ignore: constant_identifier_names
   static const FilterRelation GreatherThanOrEqual = FilterRelation._('>=');
+  // ignore: constant_identifier_names
   static const FilterRelation Equal = FilterRelation._('==');
 
   final String name;
@@ -277,7 +284,9 @@ class Filter {
 /// 'Order' class.
 /// [i.e. so one can write Order.Ascending, Order.Descending].
 class OrderDirection {
+  // ignore: constant_identifier_names
   static const OrderDirection Ascending = OrderDirection._('Ascending');
+  // ignore: constant_identifier_names
   static const OrderDirection Decending = OrderDirection._('Decending');
 
   final String name;
@@ -365,7 +374,8 @@ abstract class Transaction {}
 /// and allocate IDs from the auto ID allocation policy.
 abstract class Datastore {
   /// List of required OAuth2 scopes for Datastore operation.
-  static const Scopes = DatastoreImpl.SCOPES;
+  // ignore: constant_identifier_names
+  static const Scopes = DatastoreImpl.scopes;
 
   /// Access Datastore using an authenticated client.
   ///

pkgs/gcloud/lib/db/metamodel.dart

@@ -8,6 +8,7 @@ import '../db.dart' as db;
 
 @db.Kind(name: '__namespace__')
 class Namespace extends db.ExpandoModel {
+  // ignore: constant_identifier_names
   static const int EmptyNamespaceId = 1;
 
   String? get name {

pkgs/gcloud/lib/pubsub.dart

@@ -9,12 +9,12 @@ import 'dart:collection';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:gcloud/src/common_utils.dart';
 import 'package:googleapis/pubsub/v1.dart' as pubsub;
 import 'package:http/http.dart' as http;
 
 import 'common.dart';
 import 'service_scope.dart' as ss;
+import 'src/common_utils.dart';
 
 export 'common.dart';
 
@@ -113,6 +113,7 @@ void registerPubSubService(PubSub pubsub) {
 ///
 abstract class PubSub {
   /// List of required OAuth2 scopes for Pub/Sub operation.
+  // ignore: constant_identifier_names
   static const SCOPES = [pubsub.PubsubApi.pubsubScope];
 
   /// Access Pub/Sub using an authenticated client.

pkgs/gcloud/lib/service_scope.dart

@@ -77,7 +77,7 @@ library gcloud.service_scope;
 import 'dart:async';
 
 /// The Symbol used as index in the zone map for the service scope object.
-const Symbol _ServiceScopeKey = #gcloud.service_scope;
+const Symbol _serviceScopeKey = #gcloud.service_scope;
 
 /// An empty service scope.
 ///
@@ -87,7 +87,7 @@ final _ServiceScope _emptyServiceScope = _ServiceScope();
 
 /// Returns the current [_ServiceScope] object.
 _ServiceScope? get _serviceScope =>
-    Zone.current[_ServiceScopeKey] as _ServiceScope?;
+    Zone.current[_serviceScopeKey] as _ServiceScope?;
 
 /// Start a new zone with a new service scope and run [func] inside it.
 ///
@@ -160,7 +160,7 @@ class _ServiceScope {
   Object? lookup(Object serviceScope) {
     _ensureNotInDestroyingState();
     var entry = _key2Values[serviceScope];
-    return entry != null ? entry.value : null;
+    return entry?.value;
   }
 
   /// Inserts a new item to the service scope using [serviceScopeKey].
@@ -200,7 +200,7 @@ class _ServiceScope {
     _ensureNotInDestroyingState();
 
     var serviceScope = _copy();
-    var map = {_ServiceScopeKey: serviceScope};
+    var map = {_serviceScopeKey: serviceScope};
     return runZoned(() {
       var f = func();
       return f.whenComplete(serviceScope._runScopeExitHandlers);

pkgs/gcloud/lib/src/datastore_impl.dart

@@ -6,12 +6,12 @@ library gcloud.datastore_impl;
 
 import 'dart:async';
 
-import 'package:gcloud/src/common_utils.dart';
 import 'package:googleapis/datastore/v1.dart' as api;
 import 'package:http/http.dart' as http;
 
 import '../common.dart' show Page;
 import '../datastore.dart' as datastore;
+import 'common_utils.dart';
 
 class TransactionImpl implements datastore.Transaction {
   final String data;
@@ -20,7 +20,7 @@ class TransactionImpl implements datastore.Transaction {
 }
 
 class DatastoreImpl implements datastore.Datastore {
-  static const List<String> SCOPES = <String>[
+  static const List<String> scopes = <String>[
     api.DatastoreApi.datastoreScope,
     api.DatastoreApi.cloudPlatformScope,
   ];
@@ -489,7 +489,7 @@ class DatastoreImpl implements datastore.Datastore {
 }
 
 class QueryPageImpl implements Page<datastore.Entity> {
-  static const int MAX_ENTITIES_PER_RESPONSE = 2000;
+  static const int _maxEntitiesPerResponse = 2000;
 
   final api.DatastoreApi _api;
   final String _project;
@@ -505,7 +505,7 @@ class QueryPageImpl implements Page<datastore.Entity> {
 
   static Future<QueryPageImpl> runQuery(api.DatastoreApi api, String project,
       api.RunQueryRequest request, int? limit,
-      {int batchSize = MAX_ENTITIES_PER_RESPONSE}) {
+      {int batchSize = _maxEntitiesPerResponse}) {
     if (limit != null && limit < batchSize) {
       batchSize = limit;
     }

pkgs/gcloud/lib/src/db/annotations.dart

@@ -49,9 +49,11 @@ class Kind {
 /// The type used for id's of an entity.
 class IdType {
   /// Use integer ids for identifying entities.
+  // ignore: constant_identifier_names
   static const IdType Integer = IdType('Integer');
 
   /// Use string ids for identifying entities.
+  // ignore: constant_identifier_names
   static const IdType String = IdType('String');
 
   final core.String _type;

pkgs/gcloud/lib/src/db/db.dart

@@ -16,18 +16,18 @@ typedef TransactionHandler<T> = Future<T> Function(Transaction transaction);
 /// (inserts/updates/deletes). Finally the transaction can be either committed
 /// or rolled back.
 class Transaction {
-  static const int _TRANSACTION_STARTED = 0;
-  static const int _TRANSACTION_ROLLED_BACK = 1;
-  static const int _TRANSACTION_COMMITTED = 2;
-  static const int _TRANSACTION_COMMIT_FAILED = 3;
+  static const int _transactionStarted = 0;
+  static const int _transactionRolledBack = 1;
+  static const int _transactionCommitted = 2;
+  static const int _transactionCommitFailed = 3;
 
   final DatastoreDB db;
   final ds.Transaction _datastoreTransaction;
 
   final List<Model> _inserts = [];
   final List<Key> _deletes = [];
 
-  int _state = _TRANSACTION_STARTED;
+  int _state = _transactionStarted;
 
   Transaction(this.db, this._datastoreTransaction);
 
@@ -107,30 +107,30 @@ class Transaction {
 
   /// Rolls this transaction back.
   Future rollback() {
-    _checkSealed(changeState: _TRANSACTION_ROLLED_BACK, allowFailed: true);
+    _checkSealed(changeState: _transactionRolledBack, allowFailed: true);
     return db.datastore.rollback(_datastoreTransaction);
   }
 
   /// Commits this transaction including all of the queued mutations.
   Future commit() {
-    _checkSealed(changeState: _TRANSACTION_COMMITTED);
+    _checkSealed(changeState: _transactionCommitted);
     try {
       return _commitHelper(db,
           inserts: _inserts,
           deletes: _deletes,
           datastoreTransaction: _datastoreTransaction);
     } catch (error) {
-      _state = _TRANSACTION_COMMIT_FAILED;
+      _state = _transactionCommitFailed;
       rethrow;
     }
   }
 
   void _checkSealed({int? changeState, bool allowFailed = false}) {
-    if (_state == _TRANSACTION_COMMITTED) {
+    if (_state == _transactionCommitted) {
       throw StateError('The transaction has already been committed.');
-    } else if (_state == _TRANSACTION_ROLLED_BACK) {
+    } else if (_state == _transactionRolledBack) {
       throw StateError('The transaction has already been rolled back.');
-    } else if (_state == _TRANSACTION_COMMIT_FAILED && !allowFailed) {
+    } else if (_state == _transactionCommitFailed && !allowFailed) {
       throw StateError('The transaction has attempted commit and failed.');
     }
     if (changeState != null) {
@@ -413,7 +413,7 @@ Future _commitHelper(DatastoreDB db,
     ds.Transaction? datastoreTransaction}) {
   List<ds.Entity>? entityInserts, entityAutoIdInserts;
   List<ds.Key>? entityDeletes;
-  late var autoIdModelInserts;
+  late List<Model> autoIdModelInserts;
   if (inserts != null) {
     entityInserts = <ds.Entity>[];
     entityAutoIdInserts = <ds.Entity>[];

pkgs/gcloud/lib/src/db/model_db_impl.dart

@@ -198,14 +198,14 @@ class ModelDBImpl implements ModelDB {
   }
 
   void _initialize(Iterable<mirrors.LibraryMirror> libraries) {
-    libraries.forEach((mirrors.LibraryMirror lm) {
+    for (var lm in libraries) {
       lm.declarations.values
           .whereType<mirrors.ClassMirror>()
           .where((d) => d.hasReflectedType)
           .forEach((declaration) {
         _tryLoadNewModelClass(declaration);
       });
-    });
+    }
 
     // Ask every [ModelDescription] to compute whatever global state it wants
     // to have.