Merge pull request #2123 from atsign-foundation/fix-2122

fix: clean up lint warnings as per #2122
atsign-foundation · Oct 14, 2024 · 3cf4372 · 3cf4372
2 parents dc628d0 + f63edaa
commit 3cf4372
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 21 deletions.
diff --git a/packages/at_secondary_server/analysis_options.yaml b/packages/at_secondary_server/analysis_options.yaml
@@ -7,10 +7,17 @@ include: package:lints/recommended.yaml
 # Uncomment to specify additional rules.
 linter:
   rules:
-    - camel_case_types
-    - await_only_futures
-    - unawaited_futures
-    - unnecessary_brace_in_string_interps
+    annotate_overrides: true
+    prefer_final_fields: true
+    implicit_call_tearoffs: true
+    camel_case_types : true
+    unnecessary_string_interpolations : true
+    unnecessary_brace_in_string_interps: true
+    await_only_futures : true
+    unawaited_futures: true
+    depend_on_referenced_packages : false
+    avoid_function_literals_in_foreach_calls: true
+    prefer_interpolation_to_compose_strings: true
 
 analyzer:
 #   exclude:

diff --git a/packages/at_secondary_server/lib/src/verb/handler/info_verb_handler.dart b/packages/at_secondary_server/lib/src/verb/handler/info_verb_handler.dart
@@ -58,11 +58,10 @@ class InfoVerbHandler extends AbstractVerbHandler {
     int uHours = uptime.inHours.remainder(24);
     int uMins = uptime.inMinutes.remainder(60);
     int uSeconds = uptime.inSeconds.remainder(60);
-    // ignore: prefer_interpolation_to_compose_strings
-    String uptimeAsWords = (uDays > 0 ? "$uDays days " : "") +
-        ((uDays > 0 || uHours > 0) ? "$uHours hours " : "") +
-        ((uDays > 0 || uHours > 0 || uMins > 0) ? "$uMins minutes " : "") +
-        "$uSeconds seconds";
+    String uptimeAsWords = '${uDays > 0 ? '$uDays days ' : ''}'
+        '${(uDays > 0 || uHours > 0) ? '$uHours hours ' : ''}'
+        '${(uDays > 0 || uHours > 0 || uMins > 0) ? '$uMins minutes ' : ''}'
+        '$uSeconds seconds';
     return uptimeAsWords;
   }
 }
diff --git a/packages/at_secondary_server/lib/src/verb/handler/pkam_verb_handler.dart b/packages/at_secondary_server/lib/src/verb/handler/pkam_verb_handler.dart
@@ -131,12 +131,6 @@ class PkamVerbHandler extends AbstractVerbHandler {
         response.errorMessage =
             'enrollment_id: $enrollId is expired or invalid';
         break;
-      default:
-        response.isError = true;
-        response.errorCode = 'AT0026';
-        response.errorMessage =
-            'Could not fetch enrollment status for enrollment_id: $enrollId';
-        break;
     }
     return response;
   }

diff --git a/packages/at_secondary_server/pubspec.yaml b/packages/at_secondary_server/pubspec.yaml
@@ -38,5 +38,5 @@ dev_dependencies:
   build_runner: ^2.3.3
   test: ^1.24.4
   coverage: ^1.6.1
-  lints: ^4.0.0
+  lints: ^5.0.0
   mocktail: ^1.0.3
diff --git a/packages/at_server_spec/analysis_options.yaml b/packages/at_server_spec/analysis_options.yaml
@@ -7,10 +7,17 @@ include: package:lints/recommended.yaml
 # Uncomment to specify additional rules.
 linter:
   rules:
-    - camel_case_types
-    - await_only_futures
-    - unawaited_futures
-    - unnecessary_brace_in_string_interps
+    annotate_overrides: true
+    prefer_final_fields: true
+    implicit_call_tearoffs: true
+    camel_case_types : true
+    unnecessary_string_interpolations : true
+    unnecessary_brace_in_string_interps: true
+    await_only_futures : true
+    unawaited_futures: true
+    depend_on_referenced_packages : false
+    avoid_function_literals_in_foreach_calls: true
+    prefer_interpolation_to_compose_strings: true
 
 analyzer:
 #   exclude:

diff --git a/packages/at_server_spec/pubspec.yaml b/packages/at_server_spec/pubspec.yaml
@@ -13,4 +13,4 @@ dependencies:
   at_commons: ^5.0.0
 
 dev_dependencies:
-  lints: ^3.0.0
+  lints: ^5.0.0