Skip to content

Commit 3ff3517

Browse files
reeshika-hreeshika-h
committed
dart analyze reports fixed
1 parent 36ab6fe commit 3ff3517

18 files changed

+121
-122
lines changed

‎analysis_options.yaml

+7-10
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
include: analysis_options.yaml
2-
31
analyzer:
4-
exclude: [ build/**, lib/**.freezed.dart, lib/**.g.dart ]
2+
exclude:
3+
- build/**
4+
- lib/**.freezed.dart
5+
- lib/**.g.dart
6+
57
strong-mode:
68
implicit-casts: false
9+
710
errors:
811
missing_required_param: error
912
parameter_assignments: error
@@ -23,8 +26,6 @@ linter:
2326
avoid_relative_lib_imports: true
2427
avoid_renaming_method_parameters: true
2528
avoid_return_types_on_setters: true
26-
avoid_returning_null: true
27-
avoid_returning_null_for_future: true
2829
avoid_returning_null_for_void: true
2930
avoid_returning_this: true
3031
avoid_shadowing_type_parameters: true
@@ -44,12 +45,9 @@ linter:
4445
file_names: true
4546
hash_and_equals: true
4647
implementation_imports: true
47-
invariant_booleans: true
48-
iterable_contains_unrelated_type: true
4948
join_return_with_assignment: true
5049
library_names: true
5150
library_prefixes: true
52-
list_remove_unrelated_type: true
5351
literal_only_boolean_expressions: true
5452
no_adjacent_strings_in_list: true
5553
no_duplicate_case_values: true
@@ -65,7 +63,6 @@ linter:
6563
prefer_conditional_assignment: true
6664
# prefer_const_constructors: true
6765
prefer_contains: true
68-
prefer_equal_for_default_values: true
6966
prefer_final_fields: true
7067
prefer_final_locals: true
7168
prefer_generic_function_type_aliases: true
@@ -96,4 +93,4 @@ linter:
9693
use_function_type_syntax_for_parameters: true
9794
use_rethrow_when_possible: true
9895
valid_regexps: true
99-
void_checks: true
96+
void_checks: true

‎lib/client.dart

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ignore_for_file: lines_longer_than_80_chars
2+
13
import 'dart:async';
24
import 'dart:convert';
35

@@ -57,7 +59,7 @@ class HttpClient extends http.BaseClient {
5759
return fromJson<T, K>(bodyJson);
5860
} else {
5961
if (bodyJson!.containsKey('entries')) {
60-
var previewResponse = stack!.livePreview?.entries;
62+
final previewResponse = stack!.livePreview?.entries;
6163
if (previewResponse != null) {
6264
return fromJson<T, K>(mergeLivePreview(bodyJson, Map.fromEntries(previewResponse)));
6365
}
@@ -69,6 +71,7 @@ class HttpClient extends http.BaseClient {
6971
}
7072
}
7173

74+
// ignore: always_declare_return_types
7275
mergeLivePreview(Map? bodyJson, Map previewResponse) {}
7376

7477
/// Generic objects as well as List of generic objects

‎lib/src/base_query.dart

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class BaseQuery {
2121
/// ```
2222
///
2323
void addParams(Map parameters) {
24-
if (parameters != null && parameters.isNotEmpty) {
24+
if (parameters.isNotEmpty) {
2525
parameters.forEach((key, value) {
2626
queryParameter[key] = value;
2727
});
@@ -40,7 +40,7 @@ class BaseQuery {
4040
/// ```
4141
///
4242
void addQuery(Map parameters) {
43-
if (parameters != null && parameters.isNotEmpty) {
43+
if (parameters.isNotEmpty) {
4444
parameters.forEach((key, value) {
4545
parameter[key] = value;
4646
});
@@ -113,7 +113,7 @@ class BaseQuery {
113113
/// ```
114114
///
115115
void param(String key, String value) {
116-
if (key != null && value != null && key.isNotEmpty && value.isNotEmpty) {
116+
if (key.isNotEmpty && value.isNotEmpty) {
117117
queryParameter[key] = value.toString();
118118
}
119119
}
@@ -131,7 +131,7 @@ class BaseQuery {
131131
/// ```
132132
///
133133
void query(String key, String value) {
134-
if (key != null && value != null && key.isNotEmpty && value.isNotEmpty) {
134+
if (key.isNotEmpty && value.isNotEmpty) {
135135
parameter[key] = value.toString();
136136
}
137137
}
@@ -156,7 +156,7 @@ class BaseQuery {
156156
}
157157

158158
void where(String fieldUid, QueryOperation queryOperation) {
159-
if (fieldUid != null && fieldUid.isNotEmpty) {
159+
if (fieldUid.isNotEmpty) {
160160
switch(queryOperation.operationType) {
161161
case QueryOperationType.Equals:
162162
parameter[fieldUid] = queryOperation.value;

‎lib/src/entry_queryable.dart

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ignore_for_file: lines_longer_than_80_chars
2+
13
import 'package:contentstack/constant.dart';
24
import 'package:contentstack/src/enums/include.dart';
35
import 'package:contentstack/src/enums/include_type.dart';
@@ -20,7 +22,7 @@ class EntryQueryable {
2022
/// entry.addParam(key, value);
2123
/// ```
2224
void addParam(String key, String value) {
23-
if (key != null && value != null && key.isNotEmpty && value.isNotEmpty) {
25+
if (key.isNotEmpty && value.isNotEmpty) {
2426
parameter[key] = value.toString();
2527
}
2628
}
@@ -40,7 +42,7 @@ class EntryQueryable {
4042
/// ```
4143
///
4244
void except(List<String> fieldUid) {
43-
if (fieldUid != null && fieldUid.isNotEmpty) {
45+
if (fieldUid.isNotEmpty) {
4446
final List referenceArray = [];
4547
for (final item in fieldUid) {
4648
referenceArray.add(item);
@@ -175,8 +177,7 @@ class EntryQueryable {
175177
referenceArray.add(referenceFieldUid);
176178
}
177179

178-
if (includeReferenceField.fieldUidList != null &&
179-
includeReferenceField.fieldUidList.isNotEmpty) {
180+
if (includeReferenceField.fieldUidList.isNotEmpty) {
180181
for (final item in includeReferenceField.fieldUidList) {
181182
referenceArray.add(item);
182183
}
@@ -185,8 +186,7 @@ class EntryQueryable {
185186
break;
186187
case IncludeType.Only:
187188
final Map<String, dynamic> referenceOnlyParam = <String, dynamic>{};
188-
if (includeReferenceField.fieldUidList != null &&
189-
includeReferenceField.fieldUidList.isNotEmpty) {
189+
if (includeReferenceField.fieldUidList.isNotEmpty) {
190190
for (final item in includeReferenceField.fieldUidList) {
191191
referenceArray.add(item);
192192
}
@@ -197,8 +197,7 @@ class EntryQueryable {
197197
break;
198198
case IncludeType.Except:
199199
final Map<String, dynamic> referenceOnlyParam = <String, dynamic>{};
200-
if (includeReferenceField.fieldUidList != null &&
201-
includeReferenceField.fieldUidList.isNotEmpty) {
200+
if (includeReferenceField.fieldUidList.isNotEmpty) {
202201
for (final item in includeReferenceField.fieldUidList) {
203202
referenceArray.add(item);
204203
}
@@ -262,7 +261,7 @@ class EntryQueryable {
262261
/// ```
263262
///
264263
void only(List<String> fieldUid) {
265-
if (fieldUid != null && fieldUid.isNotEmpty) {
264+
if (fieldUid.isNotEmpty) {
266265
final List referenceArray = [];
267266
for (final item in fieldUid) {
268267
referenceArray.add(item);

‎lib/src/enums/include.dart

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import 'package:contentstack/src/enums/include_type.dart';
22

3+
// ignore: lines_longer_than_80_chars
34
// set the name to IncludeClass, as the name Include was conflicting with reference.dart enum in entry_queryable.dart
45
// it also has an element named Include
56
class IncludeClass {

‎lib/src/enums/operator.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:contentstack/src/query.dart';
21
import 'package:contentstack/src/enums/operator_type.dart';
2+
import 'package:contentstack/src/query.dart';
33

44
class QueryOperator {
55
final QueryOperatorType operatorType;

‎lib/src/image_transform.dart

+40-49
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2+
// ignore_for_file: lines_longer_than_80_chars, cascade_invocations
3+
14
import 'dart:async';
25
import 'dart:convert';
36

@@ -282,13 +285,9 @@ class ImageTransformation {
282285
/// cropRatio as prams else it takes crop params and comas
283286
/// separated width & height
284287
final cropLRBL = [];
285-
if (width != null) {
286-
cropLRBL.add(width);
287-
}
288-
if (height != null) {
288+
cropLRBL.add(width);
289289
cropLRBL.add(height);
290-
}
291-
if (region != null) {
290+
if (region != null) {
292291
cropLRBL.add(region);
293292
}
294293
if (offset != null) {
@@ -359,25 +358,19 @@ class ImageTransformation {
359358
///
360359
361360
void fit(double width, double height, Fit fit) {
362-
if (width != null) {
363-
query.append('width', width.toString());
364-
}
365-
if (height != null) {
361+
query.append('width', width.toString());
366362
query.append('height', height.toString());
367-
}
368-
if (fit != null) {
369363
//enum Fit { bounds, crop }
370364

371-
switch(fit) {
372-
case Fit.Bounds:
373-
query.append('fit', 'bounds');
374-
break;
375-
case Fit.Crop:
376-
query.append('fit', 'crop');
377-
break;
378-
}
365+
switch(fit) {
366+
case Fit.Bounds:
367+
query.append('fit', 'bounds');
368+
break;
369+
case Fit.Crop:
370+
query.append('fit', 'crop');
371+
break;
372+
}
379373
}
380-
}
381374

382375
/// The frame parameter fetches the first frame from an animated GIF
383376
/// (Graphics Interchange Format) file that comprises
@@ -429,35 +422,33 @@ class ImageTransformation {
429422
// degrees90TowardsRight = '6';
430423
// horizontallyAndRotate90DegreesRight = '7';
431424
// rotate90DegreesLeft = '8';
432-
if (orient != null) {
433-
switch(orient) {
434-
case Orientation.ToDefault:
435-
query.append('orient', 1);
436-
break;
437-
case Orientation.Horizontally:
438-
query.append('orient', 2);
439-
break;
440-
case Orientation.HorizontallyAndVertically:
441-
query.append('orient', 3);
442-
break;
443-
case Orientation.Vertically:
444-
query.append('orient', 4);
445-
break;
446-
case Orientation.HorizontallyAndRotate90DegreeLeft:
447-
query.append('orient', 5);
448-
break;
449-
case Orientation.Degrees90TowardsRight:
450-
query.append('orient', 6);
451-
break;
452-
case Orientation.HorizontallyAndRotate90DegreesRight:
453-
query.append('orient', 7);
454-
break;
455-
case Orientation.Rotate90DegreesLeft:
456-
query.append('orient', 8);
457-
break;
458-
}
425+
switch(orient) {
426+
case Orientation.ToDefault:
427+
query.append('orient', 1);
428+
break;
429+
case Orientation.Horizontally:
430+
query.append('orient', 2);
431+
break;
432+
case Orientation.HorizontallyAndVertically:
433+
query.append('orient', 3);
434+
break;
435+
case Orientation.Vertically:
436+
query.append('orient', 4);
437+
break;
438+
case Orientation.HorizontallyAndRotate90DegreeLeft:
439+
query.append('orient', 5);
440+
break;
441+
case Orientation.Degrees90TowardsRight:
442+
query.append('orient', 6);
443+
break;
444+
case Orientation.HorizontallyAndRotate90DegreesRight:
445+
query.append('orient', 7);
446+
break;
447+
case Orientation.Rotate90DegreesLeft:
448+
query.append('orient', 8);
449+
break;
450+
}
459451
}
460-
}
461452

462453
/// The overlay parameter allows you to put one image on top of another.
463454
/// You need to specify the relative URL of the image as

‎lib/src/query_params.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class URLQueryParams {
2727

2828
String toUrl(String urls) {
2929
String updatedUrl;
30-
if (urls != null && urls.isNotEmpty && urls.endsWith('/')) {
30+
if (urls.isNotEmpty && urls.endsWith('/')) {
3131
updatedUrl = urls.substring(0, urls.length - 1);
3232
} else {
3333
updatedUrl = urls;

‎lib/src/stack.dart

+16-15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// ignore_for_file: non_constant_identifier_names
2+
13
import 'dart:async';
24
import 'dart:convert';
35

@@ -84,13 +86,13 @@ class Stack {
8486
_host = 'gcp-na-cdn.contentstack.com';
8587
}
8688

87-
if (_apiKey.replaceAll(RegExp('\\W'), '').isEmpty ?? true) {
89+
if (_apiKey.replaceAll(RegExp('\\W'), '').isEmpty) {
8890
throw ArgumentError.notNull('apiKey');
8991
}
90-
if (_deliveryToken.replaceAll(RegExp('\\W'), '').isEmpty ?? true) {
92+
if (_deliveryToken.replaceAll(RegExp('\\W'), '').isEmpty) {
9193
throw ArgumentError.notNull('deliveryToken');
9294
}
93-
if (_environment.replaceAll(RegExp('\\W'), '').isEmpty ?? true) {
95+
if (_environment.replaceAll(RegExp('\\W'), '').isEmpty) {
9496
throw ArgumentError.notNull('environment');
9597
}
9698

@@ -310,10 +312,8 @@ class Stack {
310312
/// stack = stack..removeHeader('headerKey');
311313
/// ```
312314
void removeHeader(String headerKey) {
313-
if (headerKey != null) {
314-
if (headers!.containsKey(headerKey)) {
315-
headers!.remove(headerKey);
316-
}
315+
if (headers!.containsKey(headerKey)) {
316+
headers!.remove(headerKey);
317317
}
318318
}
319319

@@ -447,27 +447,28 @@ class Stack {
447447
if (enable) {
448448
if (livePreviewQuery.containsKey('content_type_uid') &&
449449
livePreviewQuery['content_type_uid'] != null) {
450-
var content_type_uid = livePreviewQuery['content_type_uid'];
451-
var _entry_uid = livePreviewQuery['entry_uid'];
452-
var _host = livePreviewQuery['host'];
450+
final content_type_uid = livePreviewQuery['content_type_uid'];
451+
final _entry_uid = livePreviewQuery['entry_uid'];
452+
final _host = livePreviewQuery['host'];
453453
_executeAPI(content_type_uid, _entry_uid, _host);
454454
}
455455
}
456456
}
457457
}
458458

459459
Future _executeAPI(content_type_uid, entry_uid, host) async {
460-
var _url =
461-
"https://$host}/${this.apiVersion}/content_types/$content_type_uid/entries/$entry_uid";
462-
var _headers = {
460+
final _url =
461+
'https://$host}/$apiVersion/content_types/$content_type_uid/entries/$entry_uid';
462+
final _headers = {
463463
'authorization': headers!['authorization']!,
464464
'api_key': headers!['api_key']!,
465465
};
466466

467+
print('Request URL: $_url');
467468
await http.get(Uri.parse(_url), headers: _headers).then((response) {
468-
Map bodyJson = json.decode(utf8.decode(response.bodyBytes));
469+
final Map bodyJson = json.decode(utf8.decode(response.bodyBytes));
469470
print(bodyJson);
470-
livePreview!["entry"] = bodyJson['entry'];
471+
livePreview!['entry'] = bodyJson['entry'];
471472
});
472473
}
473474

0 commit comments

Comments
 (0)