@@ -11830,11 +11830,15 @@ class Foo extends amplify_core.Model {
11830
11830
11831
11831
Foo.fromJson(Map<String, dynamic> json)
11832
11832
: id = json['id'],
11833
- _bar1 = json['bar1']?['serializedData'] != null
11834
- ? Bar.fromJson(new Map<String, dynamic>.from(json['bar1']['serializedData']))
11833
+ _bar1 = json['bar1'] != null
11834
+ ? json['bar1']['serializedData'] != null
11835
+ ? Bar.fromJson(new Map<String, dynamic>.from(json['bar1']['serializedData']))
11836
+ : Bar.fromJson(new Map<String, dynamic>.from(json['bar1']))
11835
11837
: null,
11836
- _bar2 = json['bar2']?['serializedData'] != null
11837
- ? Bar.fromJson(new Map<String, dynamic>.from(json['bar2']['serializedData']))
11838
+ _bar2 = json['bar2'] != null
11839
+ ? json['bar2']['serializedData'] != null
11840
+ ? Bar.fromJson(new Map<String, dynamic>.from(json['bar2']['serializedData']))
11841
+ : Bar.fromJson(new Map<String, dynamic>.from(json['bar2']))
11838
11842
: null,
11839
11843
_createdAt = json['createdAt'] != null ? amplify_core.TemporalDateTime.fromString(json['createdAt']) : null,
11840
11844
_updatedAt = json['updatedAt'] != null ? amplify_core.TemporalDateTime.fromString(json['updatedAt']) : null;
@@ -12101,11 +12105,15 @@ class Bar extends amplify_core.Model {
12101
12105
: id = json['id'],
12102
12106
_bar1Id = json['bar1Id'],
12103
12107
_bar2Id = json['bar2Id'],
12104
- _foo1 = json['foo1']?['serializedData'] != null
12105
- ? Foo.fromJson(new Map<String, dynamic>.from(json['foo1']['serializedData']))
12108
+ _foo1 = json['foo1'] != null
12109
+ ? json['foo1']['serializedData'] != null
12110
+ ? Foo.fromJson(new Map<String, dynamic>.from(json['foo1']['serializedData']))
12111
+ : Foo.fromJson(new Map<String, dynamic>.from(json['foo1']))
12106
12112
: null,
12107
- _foo2 = json['foo2']?['serializedData'] != null
12108
- ? Foo.fromJson(new Map<String, dynamic>.from(json['foo2']['serializedData']))
12113
+ _foo2 = json['foo2'] != null
12114
+ ? json['foo2']['serializedData'] != null
12115
+ ? Foo.fromJson(new Map<String, dynamic>.from(json['foo2']['serializedData']))
12116
+ : Foo.fromJson(new Map<String, dynamic>.from(json['foo2']))
12109
12117
: null,
12110
12118
_createdAt = json['createdAt'] != null ? amplify_core.TemporalDateTime.fromString(json['createdAt']) : null,
12111
12119
_updatedAt = json['updatedAt'] != null ? amplify_core.TemporalDateTime.fromString(json['updatedAt']) : null;
@@ -12429,12 +12437,19 @@ class Primary extends amplify_core.Model {
12429
12437
_instanceId = json['instanceId'],
12430
12438
_recordId = json['recordId'],
12431
12439
_content = json['content'],
12432
- _related = json['related'] is List
12433
- ? (json['related'] as List)
12434
- .where((e) => e?['serializedData'] != null)
12435
- .map((e) => Related.fromJson(new Map<String, dynamic>.from(e['serializedData'])))
12436
- .toList()
12437
- : null,
12440
+ _related = json['related'] is Map
12441
+ ? (json['related']['items'] is List
12442
+ ? (json['related']['items'] as List)
12443
+ .where((e) => e != null)
12444
+ .map((e) => Related.fromJson(new Map<String, dynamic>.from(e)))
12445
+ .toList()
12446
+ : null)
12447
+ : (json['related'] is List
12448
+ ? (json['related'] as List)
12449
+ .where((e) => e?['serializedData'] != null)
12450
+ .map((e) => Related.fromJson(new Map<String, dynamic>.from(e?['serializedData'])))
12451
+ .toList()
12452
+ : null),
12438
12453
_createdAt = json['createdAt'] != null ? amplify_core.TemporalDateTime.fromString(json['createdAt']) : null,
12439
12454
_updatedAt = json['updatedAt'] != null ? amplify_core.TemporalDateTime.fromString(json['updatedAt']) : null;
12440
12455
@@ -12774,8 +12789,10 @@ class Related extends amplify_core.Model {
12774
12789
_primaryTenantId = json['primaryTenantId'],
12775
12790
_primaryInstanceId = json['primaryInstanceId'],
12776
12791
_primaryRecordId = json['primaryRecordId'],
12777
- _primary = json['primary']?['serializedData'] != null
12778
- ? Primary.fromJson(new Map<String, dynamic>.from(json['primary']['serializedData']))
12792
+ _primary = json['primary'] != null
12793
+ ? json['primary']['serializedData'] != null
12794
+ ? Primary.fromJson(new Map<String, dynamic>.from(json['primary']['serializedData']))
12795
+ : Primary.fromJson(new Map<String, dynamic>.from(json['primary']))
12779
12796
: null,
12780
12797
_createdAt = json['createdAt'] != null ? amplify_core.TemporalDateTime.fromString(json['createdAt']) : null,
12781
12798
_updatedAt = json['updatedAt'] != null ? amplify_core.TemporalDateTime.fromString(json['updatedAt']) : null;
@@ -13103,8 +13120,10 @@ class Primary extends amplify_core.Model {
13103
13120
_instanceId = json['instanceId'],
13104
13121
_recordId = json['recordId'],
13105
13122
_content = json['content'],
13106
- _related = json['related']?['serializedData'] != null
13107
- ? Related.fromJson(new Map<String, dynamic>.from(json['related']['serializedData']))
13123
+ _related = json['related'] != null
13124
+ ? json['related']['serializedData'] != null
13125
+ ? Related.fromJson(new Map<String, dynamic>.from(json['related']['serializedData']))
13126
+ : Related.fromJson(new Map<String, dynamic>.from(json['related']))
13108
13127
: null,
13109
13128
_createdAt = json['createdAt'] != null ? amplify_core.TemporalDateTime.fromString(json['createdAt']) : null,
13110
13129
_updatedAt = json['updatedAt'] != null ? amplify_core.TemporalDateTime.fromString(json['updatedAt']) : null;
@@ -13445,8 +13464,10 @@ class Related extends amplify_core.Model {
13445
13464
_primaryTenantId = json['primaryTenantId'],
13446
13465
_primaryInstanceId = json['primaryInstanceId'],
13447
13466
_primaryRecordId = json['primaryRecordId'],
13448
- _primary = json['primary']?['serializedData'] != null
13449
- ? Primary.fromJson(new Map<String, dynamic>.from(json['primary']['serializedData']))
13467
+ _primary = json['primary'] != null
13468
+ ? json['primary']['serializedData'] != null
13469
+ ? Primary.fromJson(new Map<String, dynamic>.from(json['primary']['serializedData']))
13470
+ : Primary.fromJson(new Map<String, dynamic>.from(json['primary']))
13450
13471
: null,
13451
13472
_createdAt = json['createdAt'] != null ? amplify_core.TemporalDateTime.fromString(json['createdAt']) : null,
13452
13473
_updatedAt = json['updatedAt'] != null ? amplify_core.TemporalDateTime.fromString(json['updatedAt']) : null;
@@ -13711,12 +13732,19 @@ class SqlPrimary extends amplify_core.Model {
13711
13732
SqlPrimary.fromJson(Map<String, dynamic> json)
13712
13733
: id = (json['id'] as num?)?.toInt(),
13713
13734
_content = json['content'],
13714
- _related = json['related'] is List
13715
- ? (json['related'] as List)
13716
- .where((e) => e?['serializedData'] != null)
13717
- .map((e) => SqlRelated.fromJson(new Map<String, dynamic>.from(e['serializedData'])))
13718
- .toList()
13719
- : null,
13735
+ _related = json['related'] is Map
13736
+ ? (json['related']['items'] is List
13737
+ ? (json['related']['items'] as List)
13738
+ .where((e) => e != null)
13739
+ .map((e) => SqlRelated.fromJson(new Map<String, dynamic>.from(e)))
13740
+ .toList()
13741
+ : null)
13742
+ : (json['related'] is List
13743
+ ? (json['related'] as List)
13744
+ .where((e) => e?['serializedData'] != null)
13745
+ .map((e) => SqlRelated.fromJson(new Map<String, dynamic>.from(e?['serializedData'])))
13746
+ .toList()
13747
+ : null),
13720
13748
_createdAt = json['createdAt'] != null ? amplify_core.TemporalDateTime.fromString(json['createdAt']) : null,
13721
13749
_updatedAt = json['updatedAt'] != null ? amplify_core.TemporalDateTime.fromString(json['updatedAt']) : null;
13722
13750
@@ -13981,8 +14009,10 @@ class SqlRelated extends amplify_core.Model {
13981
14009
: id = (json['id'] as num?)?.toInt(),
13982
14010
_content = json['content'],
13983
14011
_primaryId = (json['primaryId'] as num?)?.toInt(),
13984
- _primary = json['primary']?['serializedData'] != null
13985
- ? SqlPrimary.fromJson(new Map<String, dynamic>.from(json['primary']['serializedData']))
14012
+ _primary = json['primary'] != null
14013
+ ? json['primary']['serializedData'] != null
14014
+ ? SqlPrimary.fromJson(new Map<String, dynamic>.from(json['primary']['serializedData']))
14015
+ : SqlPrimary.fromJson(new Map<String, dynamic>.from(json['primary']))
13986
14016
: null,
13987
14017
_createdAt = json['createdAt'] != null ? amplify_core.TemporalDateTime.fromString(json['createdAt']) : null,
13988
14018
_updatedAt = json['updatedAt'] != null ? amplify_core.TemporalDateTime.fromString(json['updatedAt']) : null;
@@ -14234,14 +14264,23 @@ class Primary extends amplify_core.Model {
14234
14264
14235
14265
Primary.fromJson(Map<String, dynamic> json)
14236
14266
: id = json['id'],
14237
- _relatedMany = json['relatedMany'] is List
14238
- ? (json['relatedMany'] as List)
14239
- .where((e) => e?['serializedData'] != null)
14240
- .map((e) => RelatedMany.fromJson(new Map<String, dynamic>.from(e['serializedData'])))
14241
- .toList()
14242
- : null,
14243
- _relatedOne = json['relatedOne']?['serializedData'] != null
14244
- ? RelatedOne.fromJson(new Map<String, dynamic>.from(json['relatedOne']['serializedData']))
14267
+ _relatedMany = json['relatedMany'] is Map
14268
+ ? (json['relatedMany']['items'] is List
14269
+ ? (json['relatedMany']['items'] as List)
14270
+ .where((e) => e != null)
14271
+ .map((e) => RelatedMany.fromJson(new Map<String, dynamic>.from(e)))
14272
+ .toList()
14273
+ : null)
14274
+ : (json['relatedMany'] is List
14275
+ ? (json['relatedMany'] as List)
14276
+ .where((e) => e?['serializedData'] != null)
14277
+ .map((e) => RelatedMany.fromJson(new Map<String, dynamic>.from(e?['serializedData'])))
14278
+ .toList()
14279
+ : null),
14280
+ _relatedOne = json['relatedOne'] != null
14281
+ ? json['relatedOne']['serializedData'] != null
14282
+ ? RelatedOne.fromJson(new Map<String, dynamic>.from(json['relatedOne']['serializedData']))
14283
+ : RelatedOne.fromJson(new Map<String, dynamic>.from(json['relatedOne']))
14245
14284
: null,
14246
14285
_createdAt = json['createdAt'] != null ? amplify_core.TemporalDateTime.fromString(json['createdAt']) : null,
14247
14286
_updatedAt = json['updatedAt'] != null ? amplify_core.TemporalDateTime.fromString(json['updatedAt']) : null;
@@ -14498,8 +14537,10 @@ class RelatedOne extends amplify_core.Model {
14498
14537
RelatedOne.fromJson(Map<String, dynamic> json)
14499
14538
: id = json['id'],
14500
14539
_primaryId = json['primaryId'],
14501
- _primary = json['primary']?['serializedData'] != null
14502
- ? Primary.fromJson(new Map<String, dynamic>.from(json['primary']['serializedData']))
14540
+ _primary = json['primary'] != null
14541
+ ? json['primary']['serializedData'] != null
14542
+ ? Primary.fromJson(new Map<String, dynamic>.from(json['primary']['serializedData']))
14543
+ : Primary.fromJson(new Map<String, dynamic>.from(json['primary']))
14503
14544
: null,
14504
14545
_createdAt = json['createdAt'] != null ? amplify_core.TemporalDateTime.fromString(json['createdAt']) : null,
14505
14546
_updatedAt = json['updatedAt'] != null ? amplify_core.TemporalDateTime.fromString(json['updatedAt']) : null;
@@ -14753,8 +14794,10 @@ class RelatedMany extends amplify_core.Model {
14753
14794
RelatedMany.fromJson(Map<String, dynamic> json)
14754
14795
: id = json['id'],
14755
14796
_primaryId = json['primaryId'],
14756
- _primary = json['primary']?['serializedData'] != null
14757
- ? Primary.fromJson(new Map<String, dynamic>.from(json['primary']['serializedData']))
14797
+ _primary = json['primary'] != null
14798
+ ? json['primary']['serializedData'] != null
14799
+ ? Primary.fromJson(new Map<String, dynamic>.from(json['primary']['serializedData']))
14800
+ : Primary.fromJson(new Map<String, dynamic>.from(json['primary']))
14758
14801
: null,
14759
14802
_createdAt = json['createdAt'] != null ? amplify_core.TemporalDateTime.fromString(json['createdAt']) : null,
14760
14803
_updatedAt = json['updatedAt'] != null ? amplify_core.TemporalDateTime.fromString(json['updatedAt']) : null;
@@ -14998,8 +15041,10 @@ class SqlPrimary extends amplify_core.Model {
14998
15041
SqlPrimary.fromJson(Map<String, dynamic> json)
14999
15042
: id = (json['id'] as num?)?.toInt(),
15000
15043
_content = json['content'],
15001
- _related = json['related']?['serializedData'] != null
15002
- ? SqlRelated.fromJson(new Map<String, dynamic>.from(json['related']['serializedData']))
15044
+ _related = json['related'] != null
15045
+ ? json['related']['serializedData'] != null
15046
+ ? SqlRelated.fromJson(new Map<String, dynamic>.from(json['related']['serializedData']))
15047
+ : SqlRelated.fromJson(new Map<String, dynamic>.from(json['related']))
15003
15048
: null,
15004
15049
_createdAt = json['createdAt'] != null ? amplify_core.TemporalDateTime.fromString(json['createdAt']) : null,
15005
15050
_updatedAt = json['updatedAt'] != null ? amplify_core.TemporalDateTime.fromString(json['updatedAt']) : null;
@@ -15265,8 +15310,10 @@ class SqlRelated extends amplify_core.Model {
15265
15310
: id = (json['id'] as num?)?.toInt(),
15266
15311
_content = json['content'],
15267
15312
_primaryId = (json['primaryId'] as num?)?.toInt(),
15268
- _primary = json['primary']?['serializedData'] != null
15269
- ? SqlPrimary.fromJson(new Map<String, dynamic>.from(json['primary']['serializedData']))
15313
+ _primary = json['primary'] != null
15314
+ ? json['primary']['serializedData'] != null
15315
+ ? SqlPrimary.fromJson(new Map<String, dynamic>.from(json['primary']['serializedData']))
15316
+ : SqlPrimary.fromJson(new Map<String, dynamic>.from(json['primary']))
15270
15317
: null,
15271
15318
_createdAt = json['createdAt'] != null ? amplify_core.TemporalDateTime.fromString(json['createdAt']) : null,
15272
15319
_updatedAt = json['updatedAt'] != null ? amplify_core.TemporalDateTime.fromString(json['updatedAt']) : null;
0 commit comments