fix analyzer warnings

hpoul · hpoul · commit 6149817f4858 · 2021-03-21T09:41:47.000Z
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -143,7 +143,7 @@ linter:
     - slash_for_doc_comments
     # - sort_child_properties_last # not yet tested
     - sort_constructors_first
-    - sort_pub_dependencies
+    #- sort_pub_dependencies
     - sort_unnamed_constructors_first
     - test_types_in_equals
     - throw_in_finally
diff --git a/lib/src/config.dart b/lib/src/config.dart
@@ -2,7 +2,6 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:json_annotation/json_annotation.dart';
-import 'package:meta/meta.dart';
 
 part 'config.g.dart';
 
@@ -14,10 +13,7 @@ class DatabaseConfig {
     required this.databaseName,
     required this.username,
     this.password,
-  })  : assert(host != null),
-        assert(port != null),
-        assert(databaseName != null),
-        assert(username != null);
+  });
 
   factory DatabaseConfig.fromJson(Map<String, dynamic> json) =>
       _$DatabaseConfigFromJson(json);
diff --git a/lib/src/database_access.dart b/lib/src/database_access.dart
@@ -53,8 +53,6 @@ class DatabaseTransactionBase<TABLES extends TablesBase> {
     required Map<String, Object> where,
     bool setContainsOptional = false,
   }) async {
-    assert(set != null);
-    assert(where != null);
     _assertColumnNames(set);
     _assertColumnNames(where);
     assert(!where.keys.any((key) => set.containsKey(key)));
@@ -149,9 +147,7 @@ abstract class DatabaseAccessBase<TX extends DatabaseTransactionBase<TABLES>,
     required this.config,
     required this.tables,
     required this.migrations,
-  })  : assert(config != null),
-        assert(tables != null),
-        assert(migrations != null);
+  });
 
   final TABLES tables;
   final DatabaseConfig config;
@@ -229,7 +225,7 @@ abstract class DatabaseAccessBase<TX extends DatabaseTransactionBase<TABLES>,
 
     final migrationRun = clock.now().toUtc();
     await run((conn) async {
-      final List<Migrations<TX, TABLES>> migrations = this.migrations.migrations;
+      final migrations = this.migrations.migrations;
       for (final migration in migrations) {
         if (migration.id > lastMigration) {
           _logger.fine('Running migration ${migration.id} '
@@ -318,8 +314,7 @@ class Migrations<TX extends DatabaseTransactionBase<TABLES>,
     required this.id,
     this.versionCode = 'a',
     required this.up,
-  })  : assert(id != null),
-        assert(up != null);
+  });
 
   final int id;
   final String versionCode;
@@ -336,7 +331,7 @@ class SimpleWhere {
     checkState(conditions.isNotEmpty);
   }
 
-  final Map<String, Object> conditions;
+  final Map<String, Object?> conditions;
 
   String sql() =>
       conditions.entries.map((e) => '${e.key} = @${e.key}').join(' AND ');
diff --git a/lib/src/tables/migration_tables.dart b/lib/src/tables/migration_tables.dart
@@ -1,5 +1,4 @@
 import 'package:logging/logging.dart';
-import 'package:meta/meta.dart';
 import 'package:postgres_utils/src/database_access.dart';
 import 'package:postgres_utils/src/tables/base_tables.dart';
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import 'package:logging/logging.dart';`
`2`		`-import 'package:meta/meta.dart';`
`3`	`2`	`import 'package:postgres_utils/src/database_access.dart';`
`4`	`3`	`import 'package:postgres_utils/src/tables/base_tables.dart';`
`5`	`4`