Skip to content

Commit bc349c4

Browse files
Vikram KaltaVikram Kalta
Vikram Kalta
authored and
Vikram Kalta
committed
fix: reverted async implementation
1 parent 21ca6b2 commit bc349c4

17 files changed

+182
-1805
lines changed

‎Contentstack.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -253,31 +253,23 @@
253253
470657612B5E797300BBFF88 /* ContentstackTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4706575F2B5E797300BBFF88 /* ContentstackTest.swift */; };
254254
470657622B5E797300BBFF88 /* ContentstackTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4706575F2B5E797300BBFF88 /* ContentstackTest.swift */; };
255255
47161ACA2B5D747D00AD615B /* DVR in Frameworks */ = {isa = PBXBuildFile; productRef = 47161AC92B5D747D00AD615B /* DVR */; };
256-
475C7A782B44945800814330 /* AsyncEntryAPITest2.swift in Sources */ = {isa = PBXBuildFile; fileRef = 475C7A772B44945800814330 /* AsyncEntryAPITest2.swift */; };
257-
47658BB02C0E75DE00876052 /* AsyncTaxonomyTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47658BAF2C0E75DE00876052 /* AsyncTaxonomyTest.swift */; };
258-
478684742B22438C000FA417 /* AsyncAssetQueryAPITest2.swift in Sources */ = {isa = PBXBuildFile; fileRef = 478684732B22438C000FA417 /* AsyncAssetQueryAPITest2.swift */; };
259-
478684752B22438C000FA417 /* AsyncAssetQueryAPITest2.swift in Sources */ = {isa = PBXBuildFile; fileRef = 478684732B22438C000FA417 /* AsyncAssetQueryAPITest2.swift */; };
260-
478684762B22438C000FA417 /* AsyncAssetQueryAPITest2.swift in Sources */ = {isa = PBXBuildFile; fileRef = 478684732B22438C000FA417 /* AsyncAssetQueryAPITest2.swift */; };
261-
479A93D62B4418AA000C9612 /* AsyncContentTypeQueryAPITest2.swift in Sources */ = {isa = PBXBuildFile; fileRef = 479A93D52B4418AA000C9612 /* AsyncContentTypeQueryAPITest2.swift */; };
262-
47A8DB312B4DCBAD008F19E8 /* AsyncSyncAPITest2.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47A8DB302B4DCBAD008F19E8 /* AsyncSyncAPITest2.swift */; };
263256
47AAE0902B60420E0098655A /* SyncAPITest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47AAE08F2B60420E0098655A /* SyncAPITest.swift */; };
264257
47AAE0912B60420E0098655A /* SyncAPITest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47AAE08F2B60420E0098655A /* SyncAPITest.swift */; };
265258
47AAE0922B60420E0098655A /* SyncAPITest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47AAE08F2B60420E0098655A /* SyncAPITest.swift */; };
259+
47B4DC622C232A8200370CFC /* TaxonomyTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47B4DC612C232A8200370CFC /* TaxonomyTest.swift */; };
260+
47B4DC632C232A8200370CFC /* TaxonomyTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47B4DC612C232A8200370CFC /* TaxonomyTest.swift */; };
261+
47B4DC642C232A8200370CFC /* TaxonomyTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47B4DC612C232A8200370CFC /* TaxonomyTest.swift */; };
266262
47C6EFC22C0B5B9400F0D5CF /* Taxonomy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47C6EFC12C0B5B9400F0D5CF /* Taxonomy.swift */; };
267263
47C6EFC32C0B5B9400F0D5CF /* Taxonomy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47C6EFC12C0B5B9400F0D5CF /* Taxonomy.swift */; };
268264
47C6EFC42C0B5B9400F0D5CF /* Taxonomy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47C6EFC12C0B5B9400F0D5CF /* Taxonomy.swift */; };
269265
47C6EFC52C0B5B9400F0D5CF /* Taxonomy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47C6EFC12C0B5B9400F0D5CF /* Taxonomy.swift */; };
270-
47F96B752B4734270081B4C6 /* AsyncQueryOnAPITest2.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F96B742B4734270081B4C6 /* AsyncQueryOnAPITest2.swift */; };
271266
642AD4332B86110100E2AFDF /* ContentstackUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 642AD4322B86110100E2AFDF /* ContentstackUtils */; };
272267
642AD4352B86111700E2AFDF /* DVR in Frameworks */ = {isa = PBXBuildFile; productRef = 642AD4342B86111700E2AFDF /* DVR */; };
273268
642AD4372B86111A00E2AFDF /* ContentstackUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 642AD4362B86111A00E2AFDF /* ContentstackUtils */; };
274269
642AD4392B86112100E2AFDF /* ContentstackUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 642AD4382B86112100E2AFDF /* ContentstackUtils */; };
275270
642AD43B2B86112400E2AFDF /* DVR in Frameworks */ = {isa = PBXBuildFile; productRef = 642AD43A2B86112400E2AFDF /* DVR */; };
276271
642AD43D2B86112C00E2AFDF /* ContentstackUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 642AD43C2B86112C00E2AFDF /* ContentstackUtils */; };
277272
642AD43F2B86112F00E2AFDF /* DVR in Frameworks */ = {isa = PBXBuildFile; productRef = 642AD43E2B86112F00E2AFDF /* DVR */; };
278-
CE3C328A2AD50FE8006419E0 /* AsyncContentstackTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3C32852AD50579006419E0 /* AsyncContentstackTest.swift */; };
279-
CE3C328B2AD50FE9006419E0 /* AsyncContentstackTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3C32852AD50579006419E0 /* AsyncContentstackTest.swift */; };
280-
CE3C328C2AD50FEA006419E0 /* AsyncContentstackTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3C32852AD50579006419E0 /* AsyncContentstackTest.swift */; };
281273
/* End PBXBuildFile section */
282274

283275
/* Begin PBXContainerItemProxy section */
@@ -400,15 +392,9 @@
400392
470657632B5E7F5400BBFF88 /* DVR.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = DVR.framework; sourceTree = BUILT_PRODUCTS_DIR; };
401393
47161AC42B5D744E00AD615B /* DVR.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = DVR.framework; sourceTree = BUILT_PRODUCTS_DIR; };
402394
47161ACB2B5D788E00AD615B /* DVR.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = DVR.framework; sourceTree = BUILT_PRODUCTS_DIR; };
403-
475C7A772B44945800814330 /* AsyncEntryAPITest2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncEntryAPITest2.swift; sourceTree = "<group>"; };
404-
47658BAF2C0E75DE00876052 /* AsyncTaxonomyTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncTaxonomyTest.swift; sourceTree = "<group>"; };
405-
478684732B22438C000FA417 /* AsyncAssetQueryAPITest2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncAssetQueryAPITest2.swift; sourceTree = "<group>"; };
406-
479A93D52B4418AA000C9612 /* AsyncContentTypeQueryAPITest2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncContentTypeQueryAPITest2.swift; sourceTree = "<group>"; };
407-
47A8DB302B4DCBAD008F19E8 /* AsyncSyncAPITest2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncSyncAPITest2.swift; sourceTree = "<group>"; };
408395
47AAE08F2B60420E0098655A /* SyncAPITest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncAPITest.swift; sourceTree = "<group>"; };
396+
47B4DC612C232A8200370CFC /* TaxonomyTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaxonomyTest.swift; sourceTree = "<group>"; };
409397
47C6EFC12C0B5B9400F0D5CF /* Taxonomy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Taxonomy.swift; sourceTree = "<group>"; };
410-
47F96B742B4734270081B4C6 /* AsyncQueryOnAPITest2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncQueryOnAPITest2.swift; sourceTree = "<group>"; };
411-
CE3C32852AD50579006419E0 /* AsyncContentstackTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AsyncContentstackTest.swift; sourceTree = "<group>"; };
412398
OBJ_17 /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
413399
OBJ_18 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
414400
OBJ_6 /* Package.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
@@ -659,6 +645,7 @@
659645
4706575B2B5E78B300BBFF88 /* AssetQueryAPITest.swift */,
660646
4706575F2B5E797300BBFF88 /* ContentstackTest.swift */,
661647
47AAE08F2B60420E0098655A /* SyncAPITest.swift */,
648+
47B4DC612C232A8200370CFC /* TaxonomyTest.swift */,
662649
);
663650
name = APITests;
664651
sourceTree = "<group>";
@@ -671,20 +658,6 @@
671658
name = Utilities;
672659
sourceTree = "<group>";
673660
};
674-
CE3C32822AD504F8006419E0 /* AsyncAPITests */ = {
675-
isa = PBXGroup;
676-
children = (
677-
CE3C32852AD50579006419E0 /* AsyncContentstackTest.swift */,
678-
478684732B22438C000FA417 /* AsyncAssetQueryAPITest2.swift */,
679-
479A93D52B4418AA000C9612 /* AsyncContentTypeQueryAPITest2.swift */,
680-
475C7A772B44945800814330 /* AsyncEntryAPITest2.swift */,
681-
47F96B742B4734270081B4C6 /* AsyncQueryOnAPITest2.swift */,
682-
47A8DB302B4DCBAD008F19E8 /* AsyncSyncAPITest2.swift */,
683-
47658BAF2C0E75DE00876052 /* AsyncTaxonomyTest.swift */,
684-
);
685-
name = AsyncAPITests;
686-
sourceTree = "<group>";
687-
};
688661
OBJ_10 /* Tests */ = {
689662
isa = PBXGroup;
690663
children = (
@@ -693,7 +666,6 @@
693666
0F38D7DE242C7C8300232D7F /* Models */,
694667
0FFA5DA6241F9403003B3AF5 /* Utilities */,
695668
0FFA5D9D241F8F9B003B3AF5 /* APITests */,
696-
CE3C32822AD504F8006419E0 /* AsyncAPITests */,
697669
0FFA5D9C241F8F81003B3AF5 /* UnitTests */,
698670
0F4A763B241BB36100E3A024 /* Supporting Files */,
699671
0FFA5DA2241F90BF003B3AF5 /* SutBuilder.swift */,
@@ -748,7 +720,6 @@
748720
0F4A762B241BB0D200E3A024 /* Contentstack.swift */,
749721
0FFA5D56241F5085003B3AF5 /* ContentstackConfig.swift */,
750722
47C6EFC12C0B5B9400F0D5CF /* Taxonomy.swift */,
751-
64F522052BF5C65300AE6E0F /* PrivacyInfo.xcprivacy */,
752723
);
753724
path = Sources;
754725
sourceTree = SOURCE_ROOT;
@@ -1009,7 +980,6 @@
1009980
isa = PBXResourcesBuildPhase;
1010981
buildActionMask = 2147483647;
1011982
files = (
1012-
64F522062BF5C65300AE6E0F /* PrivacyInfo.xcprivacy in Resources */,
1013983
);
1014984
runOnlyForDeploymentPostprocessing = 0;
1015985
};
@@ -1023,7 +993,6 @@
1023993
0F359991257BE29B00B3DB89 /* Asset.json in Resources */,
1024994
0F359992257BE2A700B3DB89 /* ContentType.json in Resources */,
1025995
0F4C0A87243C6990006604B7 /* config.json in Resources */,
1026-
64F522072BF5C65300AE6E0F /* PrivacyInfo.xcprivacy in Resources */,
1027996
0F5794C2266A37120082815C /* Paragraph.Json in Resources */,
1028997
);
1029998
runOnlyForDeploymentPostprocessing = 0;
@@ -1032,7 +1001,6 @@
10321001
isa = PBXResourcesBuildPhase;
10331002
buildActionMask = 2147483647;
10341003
files = (
1035-
64F522082BF5C65300AE6E0F /* PrivacyInfo.xcprivacy in Resources */,
10361004
);
10371005
runOnlyForDeploymentPostprocessing = 0;
10381006
};
@@ -1046,7 +1014,6 @@
10461014
0F50EA17244ED7F500E5D705 /* QueryOn.json in Resources */,
10471015
0F796C532449EA8700EA04D5 /* Entry.json in Resources */,
10481016
0F4C0A88243C6990006604B7 /* config.json in Resources */,
1049-
64F522092BF5C65300AE6E0F /* PrivacyInfo.xcprivacy in Resources */,
10501017
0F5794C3266A37120082815C /* Paragraph.Json in Resources */,
10511018
);
10521019
runOnlyForDeploymentPostprocessing = 0;
@@ -1055,7 +1022,6 @@
10551022
isa = PBXResourcesBuildPhase;
10561023
buildActionMask = 2147483647;
10571024
files = (
1058-
64F5220A2BF5C65300AE6E0F /* PrivacyInfo.xcprivacy in Resources */,
10591025
);
10601026
runOnlyForDeploymentPostprocessing = 0;
10611027
};
@@ -1069,7 +1035,6 @@
10691035
0F50EA18244ED7F500E5D705 /* QueryOn.json in Resources */,
10701036
0F796C542449EA8700EA04D5 /* Entry.json in Resources */,
10711037
0F4C0A89243C6990006604B7 /* config.json in Resources */,
1072-
64F5220B2BF5C65300AE6E0F /* PrivacyInfo.xcprivacy in Resources */,
10731038
0F5794C4266A37120082815C /* Paragraph.Json in Resources */,
10741039
);
10751040
runOnlyForDeploymentPostprocessing = 0;
@@ -1078,7 +1043,6 @@
10781043
isa = PBXResourcesBuildPhase;
10791044
buildActionMask = 2147483647;
10801045
files = (
1081-
64F5220C2BF5C65300AE6E0F /* PrivacyInfo.xcprivacy in Resources */,
10821046
);
10831047
runOnlyForDeploymentPostprocessing = 0;
10841048
};
@@ -1131,18 +1095,15 @@
11311095
isa = PBXSourcesBuildPhase;
11321096
buildActionMask = 2147483647;
11331097
files = (
1134-
47A8DB312B4DCBAD008F19E8 /* AsyncSyncAPITest2.swift in Sources */,
11351098
0F60CA332428D02600ED67E6 /* QueryEntryType.swift in Sources */,
11361099
4706575C2B5E78B300BBFF88 /* AssetQueryAPITest.swift in Sources */,
11371100
0F60CA2F2428949C00ED67E6 /* EntryTest.swift in Sources */,
1138-
478684742B22438C000FA417 /* AsyncAssetQueryAPITest2.swift in Sources */,
11391101
0F244FA724406A4A003C3F26 /* EntryQueriableTest.swift in Sources */,
1140-
47F96B752B4734270081B4C6 /* AsyncQueryOnAPITest2.swift in Sources */,
11411102
0F463113243B044F001CE1FA /* SyncTest.swift in Sources */,
1142-
CE3C328A2AD50FE8006419E0 /* AsyncContentstackTest.swift in Sources */,
11431103
0FFA5DBC241F9A6C003B3AF5 /* XCTestCase+Extension.swift in Sources */,
11441104
0F4FBCA02420B0E4007B8CAE /* DateTest.swift in Sources */,
11451105
0FFA5D4A241F4DED003B3AF5 /* ContentstackConfigTest.swift in Sources */,
1106+
47B4DC622C232A8200370CFC /* TaxonomyTest.swift in Sources */,
11461107
0F50EA1D244ED88C00E5D705 /* StackCacheAPITest.swift in Sources */,
11471108
470657582B5E788400BBFF88 /* EntryAPITest.swift in Sources */,
11481109
0F096B14243610470094F042 /* ImageTransformTestAdditional.swift in Sources */,
@@ -1153,14 +1114,11 @@
11531114
47AAE0902B60420E0098655A /* SyncAPITest.swift in Sources */,
11541115
470657542B5E785C00BBFF88 /* ContentTypeQueryAPITest.swift in Sources */,
11551116
470657602B5E797300BBFF88 /* ContentstackTest.swift in Sources */,
1156-
479A93D62B4418AA000C9612 /* AsyncContentTypeQueryAPITest2.swift in Sources */,
11571117
0F4FBCA92420B615007B8CAE /* UtilsTest.swift in Sources */,
11581118
0F7138CD2424A94000B314B0 /* QueryTest.swift in Sources */,
11591119
0F50EA0E244EC3DD00E5D705 /* Session.swift in Sources */,
1160-
475C7A782B44945800814330 /* AsyncEntryAPITest2.swift in Sources */,
11611120
0FFA5D9F241F8FFE003B3AF5 /* ContentTypeTest.swift in Sources */,
11621121
0F4A7646241BB3CB00E3A024 /* ContentstackTests.swift in Sources */,
1163-
47658BB02C0E75DE00876052 /* AsyncTaxonomyTest.swift in Sources */,
11641122
0F7138C52424A70C00B314B0 /* AssetQueryTest.swift in Sources */,
11651123
0FFA5D8F241F8123003B3AF5 /* StackTest.swift in Sources */,
11661124
0FFA5DA3241F90BF003B3AF5 /* SutBuilder.swift in Sources */,
@@ -1218,13 +1176,12 @@
12181176
0F60CA342428D02600ED67E6 /* QueryEntryType.swift in Sources */,
12191177
470657552B5E785C00BBFF88 /* ContentTypeQueryAPITest.swift in Sources */,
12201178
0F60CA302428949C00ED67E6 /* EntryTest.swift in Sources */,
1221-
478684752B22438C000FA417 /* AsyncAssetQueryAPITest2.swift in Sources */,
12221179
0F244FA824406A4A003C3F26 /* EntryQueriableTest.swift in Sources */,
12231180
0F463114243B044F001CE1FA /* SyncTest.swift in Sources */,
1224-
CE3C328B2AD50FE9006419E0 /* AsyncContentstackTest.swift in Sources */,
12251181
47AAE0912B60420E0098655A /* SyncAPITest.swift in Sources */,
12261182
0FFA5DBD241F9A6C003B3AF5 /* XCTestCase+Extension.swift in Sources */,
12271183
0F4FBCA12420B0E4007B8CAE /* DateTest.swift in Sources */,
1184+
47B4DC632C232A8200370CFC /* TaxonomyTest.swift in Sources */,
12281185
0FFA5D90241F8126003B3AF5 /* ContentstackConfigTest.swift in Sources */,
12291186
0F50EA1E244ED88C00E5D705 /* StackCacheAPITest.swift in Sources */,
12301187
0F096B15243610470094F042 /* ImageTransformTestAdditional.swift in Sources */,
@@ -1297,13 +1254,12 @@
12971254
0F60CA352428D02600ED67E6 /* QueryEntryType.swift in Sources */,
12981255
470657562B5E785C00BBFF88 /* ContentTypeQueryAPITest.swift in Sources */,
12991256
0F60CA312428949C00ED67E6 /* EntryTest.swift in Sources */,
1300-
478684762B22438C000FA417 /* AsyncAssetQueryAPITest2.swift in Sources */,
13011257
0F244FA924406A4A003C3F26 /* EntryQueriableTest.swift in Sources */,
13021258
0F463115243B044F001CE1FA /* SyncTest.swift in Sources */,
1303-
CE3C328C2AD50FEA006419E0 /* AsyncContentstackTest.swift in Sources */,
13041259
47AAE0922B60420E0098655A /* SyncAPITest.swift in Sources */,
13051260
0FFA5DBE241F9A6C003B3AF5 /* XCTestCase+Extension.swift in Sources */,
13061261
0F4FBCA22420B0E4007B8CAE /* DateTest.swift in Sources */,
1262+
47B4DC642C232A8200370CFC /* TaxonomyTest.swift in Sources */,
13071263
0FFA5D91241F8127003B3AF5 /* ContentstackConfigTest.swift in Sources */,
13081264
0F50EA1F244ED88C00E5D705 /* StackCacheAPITest.swift in Sources */,
13091265
0F096B16243610470094F042 /* ImageTransformTestAdditional.swift in Sources */,

‎Sources/Asset.swift‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -246,15 +246,4 @@ extension Asset: ResourceQueryable {
246246
}
247247
})
248248
}
249-
250-
public func fetch<ResourceType>() async throws -> ContentstackResponse<ResourceType> where ResourceType: EndpointAccessible, ResourceType: Decodable {
251-
guard let uid = self.uid else { fatalError("Please provide Asset uid") }
252-
253-
do {
254-
let (data): ContentstackResponse<ResourceType> = try await self.stack.asyncFetch(endpoint: ResourceType.endpoint, cachePolicy: self.cachePolicy, parameters: parameters + [QueryParameter.uid: uid], headers: headers)
255-
return data
256-
} catch {
257-
throw error
258-
}
259-
}
260249
}

‎Sources/ContentType.swift‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -178,15 +178,4 @@ extension ContentType: ResourceQueryable {
178178
}
179179
})
180180
}
181-
182-
public func fetch<ResourceType>() async throws -> ContentstackResponse<ResourceType> where ResourceType: EndpointAccessible, ResourceType: Decodable {
183-
guard let uid = self.uid else { fatalError("Please provide ContentType uid") }
184-
185-
do {
186-
let data: ContentstackResponse<ResourceType> = try await self.stack.asyncFetch(endpoint: ResourceType.endpoint, cachePolicy: self.cachePolicy, parameters: parameters + [QueryParameter.uid: uid], headers: headers)
187-
return data
188-
} catch {
189-
throw error
190-
}
191-
}
192181
}

‎Sources/Entry.swift‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,4 @@ extension Entry: ResourceQueryable {
165165
}
166166
})
167167
}
168-
169-
public func fetch<ResourceType>() async throws -> ContentstackResponse<ResourceType> where ResourceType: EndpointAccessible, ResourceType: Decodable {
170-
do {
171-
guard let uid = self.uid else { fatalError("Please provide Entry uid") }
172-
let data: ContentstackResponse<ResourceType> = try await self.stack.asyncFetch(endpoint: ResourceType.endpoint, cachePolicy: self.cachePolicy, parameters: parameters + [QueryParameter.uid: uid], headers: headers)
173-
return data
174-
} catch {
175-
throw error
176-
}
177-
}
178168
}

‎Sources/QueryProtocols.swift‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,6 @@ extension BaseQuery {
7474
}
7575
self.stack.fetch(endpoint: ResourceType.endpoint,
7676
cachePolicy: self.cachePolicy, parameters: parameters, headers: headers, then: completion)
77-
}
78-
79-
public func find<ResourceType>() async throws -> ContentstackResponse<ResourceType> where ResourceType: Decodable & EndpointAccessible {
80-
if self.queryParameter.count > 0, let query = self.queryParameter.jsonString {
81-
self.parameters[QueryParameter.query] = query
82-
}
83-
do {
84-
let data: ContentstackResponse<ResourceType> = try await self.stack.asyncFetch(endpoint: ResourceType.endpoint, cachePolicy: self.cachePolicy, parameters: parameters, headers: headers)
85-
return data
86-
} catch {
87-
throw error
88-
}
8977
}
9078
}
9179
/// A concrete implementation of BaseQuery which serves as the base class for `Query`,
@@ -567,8 +555,8 @@ public protocol ResourceQueryable {
567555
/// This call fetches the latest version of a specific `ContentType`, `Asset`, and `Entry` of a particular stack.
568556
/// - Parameters:
569557
/// - completion: A handler which will be called on completion of the operation.
570-
// func fetch<ResourceType>() async throws -> (Result<ResourceType, Error>, ResponseType) where ResourceType: Decodable & EndpointAccessible
571-
func fetch<ResourceType>() async throws -> ContentstackResponse<ResourceType> where ResourceType: Decodable & EndpointAccessible
558+
func fetch<ResourceType>(_ completion: @escaping ResultsHandler<ResourceType>)
559+
where ResourceType: Decodable & EndpointAccessible
572560
}
573561

574562
/// The base Queryable protocol to find collections for content types, assets, and entries.
@@ -577,5 +565,6 @@ public protocol Queryable {
577565
/// `Entry`, and `Asset` instances.
578566
/// - Parameters:
579567
/// - completion: A handler which will be called on completion of the operation.
580-
func find<ResourceType>() async throws -> ResultsHandler<ContentstackResponse<ResourceType>>
568+
func find<ResourceType>(_ completion: @escaping ResultsHandler<ContentstackResponse<ResourceType>>)
569+
where ResourceType: Decodable & EndpointAccessible
581570
}

0 commit comments

Comments
 (0)