Skip to content

Commit c00b3ae

Browse files
🪴 #67 error handling infinite loop issue
1 parent 767720a commit c00b3ae

File tree

2 files changed

+14
-20
lines changed

2 files changed

+14
-20
lines changed

src/main/java/com/contentstack/sdk/Query.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1216,8 +1216,8 @@ private void includeLivePreview() {
12161216
Config ci = contentTypeInstance.stackInstance.config;
12171217
if (ci.enableLivePreview
12181218
&& ci.livePreviewContentType.equalsIgnoreCase(contentTypeUid)
1219-
&& ci.livePreviewHash == null
1220-
|| ci.livePreviewHash.isEmpty()) {
1219+
&& (ci.livePreviewHash == null
1220+
|| ci.livePreviewHash.isEmpty())) {
12211221
ci.livePreviewHash = "init";
12221222
}
12231223
}

src/test/java/com/contentstack/sdk/TestStack.java

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,6 @@ void testGetDeliveryToken() {
115115
assertTrue(stack.getDeliveryToken().startsWith("blt"));
116116
}
117117

118-
@Test
119-
@Deprecated
120-
@Order(14)
121-
void testGetAccessToken() {
122-
assertTrue(stack.getAccessToken().startsWith("blt"));
123-
}
124118

125119
@Test
126120
@Order(15)
@@ -236,7 +230,7 @@ void testSyncLocaleWithoutCallback() {
236230
@Order(28)
237231
void testSyncPublishTypeEntryPublished() {
238232
// deepcode ignore NullPassTo/test: <please specify a reason of ignoring this>
239-
stack.syncPublishType(Stack.PublishType.entry_published, null);
233+
stack.syncPublishType(Stack.PublishType.ENTRY_PUBLISHED, null);
240234
assertEquals(3, stack.syncParams.length());
241235
assertEquals("entry_published", stack.syncParams.get("type"));
242236
assertTrue(stack.syncParams.has("init"));
@@ -246,7 +240,7 @@ void testSyncPublishTypeEntryPublished() {
246240
@Test
247241
@Order(29)
248242
void testSyncPublishTypeAssetDeleted() {
249-
stack.syncPublishType(Stack.PublishType.asset_deleted, null);
243+
stack.syncPublishType(Stack.PublishType.ASSET_DELETED, null);
250244
assertEquals(3, stack.syncParams.length());
251245
assertEquals("asset_deleted", stack.syncParams.get("type"));
252246
assertTrue(stack.syncParams.has("init"));
@@ -256,7 +250,7 @@ void testSyncPublishTypeAssetDeleted() {
256250
@Test
257251
@Order(30)
258252
void testSyncPublishTypeAssetPublished() {
259-
stack.syncPublishType(Stack.PublishType.asset_published, null);
253+
stack.syncPublishType(Stack.PublishType.ASSET_PUBLISHED, null);
260254
assertEquals(3, stack.syncParams.length());
261255
assertEquals("asset_published", stack.syncParams.get("type"));
262256
assertTrue(stack.syncParams.has("init"));
@@ -266,7 +260,7 @@ void testSyncPublishTypeAssetPublished() {
266260
@Test
267261
@Order(31)
268262
void testSyncPublishTypeAssetUnPublished() {
269-
stack.syncPublishType(Stack.PublishType.asset_unpublished, null);
263+
stack.syncPublishType(Stack.PublishType.ASSET_UNPUBLISHED, null);
270264
assertEquals(3, stack.syncParams.length());
271265
assertEquals("asset_unpublished", stack.syncParams.get("type"));
272266
assertTrue(stack.syncParams.has("init"));
@@ -276,7 +270,7 @@ void testSyncPublishTypeAssetUnPublished() {
276270
@Test
277271
@Order(32)
278272
void testSyncPublishTypeContentTypeDeleted() {
279-
stack.syncPublishType(Stack.PublishType.content_type_deleted, null);
273+
stack.syncPublishType(Stack.PublishType.CONTENT_TYPE_DELETED, null);
280274
assertEquals(3, stack.syncParams.length());
281275
assertEquals("content_type_deleted", stack.syncParams.get("type"));
282276
assertTrue(stack.syncParams.has("init"));
@@ -286,7 +280,7 @@ void testSyncPublishTypeContentTypeDeleted() {
286280
@Test
287281
@Order(33)
288282
void testSyncPublishTypeEntryDeleted() {
289-
stack.syncPublishType(Stack.PublishType.entry_deleted, null);
283+
stack.syncPublishType(Stack.PublishType.ENTRY_DELETED, null);
290284
assertEquals(3, stack.syncParams.length());
291285
assertEquals("entry_deleted", stack.syncParams.get("type"));
292286
assertTrue(stack.syncParams.has("init"));
@@ -297,7 +291,7 @@ void testSyncPublishTypeEntryDeleted() {
297291
@Order(34)
298292
void testSyncPublishTypeEntryUnpublished() {
299293
// deepcode ignore NullPassTo/test: <please specify a reason of ignoring this>
300-
stack.syncPublishType(Stack.PublishType.entry_unpublished, null);
294+
stack.syncPublishType(Stack.PublishType.ENTRY_UNPUBLISHED, null);
301295
assertEquals(3, stack.syncParams.length());
302296
assertEquals("entry_unpublished", stack.syncParams.get("type"));
303297
assertTrue(stack.syncParams.has("init"));
@@ -309,11 +303,11 @@ void testSyncPublishTypeEntryUnpublished() {
309303
void testSyncIncludingMultipleParams() {
310304
Date newDate = new Date();
311305
String startFrom = stack.convertUTCToISO(newDate);
312-
stack.sync("product", newDate, "en-us", Stack.PublishType.entry_published, null);
306+
stack.sync("product", newDate, "en-us", Stack.PublishType.ENTRY_PUBLISHED, null);
313307
assertEquals(6, stack.syncParams.length());
314-
assertEquals("entry_published", stack.syncParams.get("type"));
308+
assertEquals("entry_published", stack.syncParams.get("type").toString().toLowerCase());
315309
assertEquals("en-us", stack.syncParams.get("locale"));
316-
assertEquals("product", stack.syncParams.get("content_type_uid"));
310+
assertEquals("product", stack.syncParams.get("content_type_uid").toString().toLowerCase());
317311
assertEquals(startFrom, stack.syncParams.get("start_from"));
318312
assertTrue(stack.syncParams.has("init"));
319313
assertTrue(stack.syncParams.has("environment"));
@@ -371,7 +365,7 @@ void testConfigGetHost() {
371365
}
372366

373367
@Test
374-
@Disabled
368+
@Disabled("No relevant code")
375369
@Order(41)
376370
void testSynchronizationAPIRequest() throws IllegalAccessException {
377371
Dotenv dotenv = Dotenv.load();
@@ -396,7 +390,7 @@ public void onCompletion(SyncStack response, Error error) {
396390
}
397391

398392
@Test
399-
@Disabled
393+
@Disabled("No relevant code")
400394
@Order(42)
401395
void testSyncPaginationToken() throws IllegalAccessException {
402396
Dotenv dotenv = Dotenv.load();

0 commit comments

Comments
 (0)