From 8614031a72eb3d8828ac9ae9c29d3d0d5e7da039 Mon Sep 17 00:00:00 2001 From: mailson Date: Mon, 2 Feb 2026 16:34:13 -0800 Subject: [PATCH 1/2] Fixing more tests for required fields changes --- .../com/intercom/api/integration/DataAttributesTest.java | 2 +- .../java/com/intercom/api/integration/IntegrationTest.java | 7 +++---- .../java/com/intercom/api/integration/MessagesTest.java | 2 +- .../java/com/intercom/api/integration/SegmentsTest.java | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/test/java/com/intercom/api/integration/DataAttributesTest.java b/src/test/java/com/intercom/api/integration/DataAttributesTest.java index eaaf67a..eb28f1c 100644 --- a/src/test/java/com/intercom/api/integration/DataAttributesTest.java +++ b/src/test/java/com/intercom/api/integration/DataAttributesTest.java @@ -44,7 +44,7 @@ public void before() { ObjectMappers.JSON_MAPPER.convertValue(createRequestData, CreateDataAttributeRequest.class); dataAttribute = client.dataAttributes().create(createRequest); - dataAttributeId = dataAttribute.getId().orElseThrow(() -> new RuntimeException("dataAttribute.id is required")); + dataAttributeId = Integer.parseInt(dataAttribute.getId()); } @Test diff --git a/src/test/java/com/intercom/api/integration/IntegrationTest.java b/src/test/java/com/intercom/api/integration/IntegrationTest.java index 9c6ddbe..c7dc348 100644 --- a/src/test/java/com/intercom/api/integration/IntegrationTest.java +++ b/src/test/java/com/intercom/api/integration/IntegrationTest.java @@ -61,13 +61,13 @@ public void before() { .create(CreateContactRequest.of(CreateContactRequest.WithExternalId.builder() .externalId(Utils.randomString()) .build())); - userId = user.getId().orElseThrow(() -> new RuntimeException("User ID is required")); + userId = user.getId(); lead = client.contacts() .create(CreateContactRequest.of(CreateContactRequest.WithRole.builder() .role("lead") .name("Marek Barek") .build())); - leadId = lead.getId().orElseThrow(() -> new RuntimeException("Lead ID is required")); + leadId = lead.getId(); tag = client.tags() .create(TagsCreateRequestBody.of(CreateOrUpdateTagRequest.builder() .name(Utils.randomString()) @@ -126,8 +126,7 @@ public void testTagConversation() { // act Tag response = client.tags() .tagConversation(TagConversationRequest.builder() - .conversationId(message.getConversationId() - .orElseThrow(() -> new RuntimeException("Conversation ID is required"))) + .conversationId(message.getConversationId()) .tagId(tag.getId()) .adminId(adminId) .build()); diff --git a/src/test/java/com/intercom/api/integration/MessagesTest.java b/src/test/java/com/intercom/api/integration/MessagesTest.java index a5ad577..5b9411a 100644 --- a/src/test/java/com/intercom/api/integration/MessagesTest.java +++ b/src/test/java/com/intercom/api/integration/MessagesTest.java @@ -42,7 +42,7 @@ public void before() { .externalId(Utils.randomString()) .name("Message Test User") .build())); - userId = user.getId().orElseThrow(() -> new RuntimeException("User ID is required")); + userId = user.getId(); } @AfterEach diff --git a/src/test/java/com/intercom/api/integration/SegmentsTest.java b/src/test/java/com/intercom/api/integration/SegmentsTest.java index 80701e8..2b4aca8 100644 --- a/src/test/java/com/intercom/api/integration/SegmentsTest.java +++ b/src/test/java/com/intercom/api/integration/SegmentsTest.java @@ -24,7 +24,7 @@ public void before() { .getSegments() .orElseThrow(() -> new RuntimeException("Segments list is required")) .get(0); - segmentId = segment.getId().orElseThrow(() -> new RuntimeException("Segment ID is required")); + segmentId = segment.getId(); } @Test From 9db2c73ba2cc6fa8628660832ee385b7954fd98f Mon Sep 17 00:00:00 2001 From: mailson Date: Mon, 2 Feb 2026 16:40:39 -0800 Subject: [PATCH 2/2] reverting changes --- .../com/intercom/api/integration/ContactsTest.java | 9 ++++----- .../intercom/api/integration/ConversationsTest.java | 12 +++++------- .../intercom/api/integration/DataAttributesTest.java | 2 +- .../intercom/api/integration/IntegrationTest.java | 7 ++++--- .../com/intercom/api/integration/MessagesTest.java | 2 +- .../java/com/intercom/api/integration/NotesTest.java | 4 ++-- .../com/intercom/api/integration/SegmentsTest.java | 2 +- .../java/com/intercom/api/integration/TagsTest.java | 11 ++++------- 8 files changed, 22 insertions(+), 27 deletions(-) diff --git a/src/test/java/com/intercom/api/integration/ContactsTest.java b/src/test/java/com/intercom/api/integration/ContactsTest.java index e112835..02fe924 100644 --- a/src/test/java/com/intercom/api/integration/ContactsTest.java +++ b/src/test/java/com/intercom/api/integration/ContactsTest.java @@ -64,7 +64,7 @@ public void before() { .externalId(Utils.randomString()) .phone("+353871234567") .build())); - contactId = contact.getId().orElseThrow(() -> new RuntimeException("Contact ID is required")); + contactId = contact.getId(); // act company = client.companies() @@ -151,8 +151,7 @@ public void testCreateLead() { try { client.contacts() .delete(DeleteContactRequest.builder() - .contactId( - response.getId().orElseThrow(() -> new RuntimeException("Contact ID is required"))) + .contactId(response.getId()) .build()); } catch (Exception e) { throw new RuntimeException("Failed to delete contact.", e); @@ -218,7 +217,7 @@ public void testDelete() { .role("lead") .name("Roman Bowling") .build())); - String createdId = created.getId().orElseThrow(() -> new RuntimeException("Contact ID is required")); + String createdId = created.getId(); ContactDeleted response = client.contacts() .delete(DeleteContactRequest.builder().contactId(createdId).build()); @@ -234,7 +233,7 @@ public void testMergeLeadInUser() { .role("lead") .name("Roman Bowling") .build())); - String leadId = lead.getId().orElseThrow(() -> new RuntimeException("Lead ID is required")); + String leadId = lead.getId(); ContactsMergeLeadInUserResponse response = client.contacts() .mergeLeadInUser(MergeContactsRequest.builder() .leadId(leadId) diff --git a/src/test/java/com/intercom/api/integration/ConversationsTest.java b/src/test/java/com/intercom/api/integration/ConversationsTest.java index 61b7496..a3e6f9f 100644 --- a/src/test/java/com/intercom/api/integration/ConversationsTest.java +++ b/src/test/java/com/intercom/api/integration/ConversationsTest.java @@ -86,19 +86,19 @@ public void before() { .externalId(Utils.randomString()) .name("Baba Booey") .build())); - userId = user.getId().orElseThrow(() -> new RuntimeException("User ID is required")); + userId = user.getId(); secondUser = client.contacts() .create(CreateContactRequest.of(CreateContactRequest.WithExternalId.builder() .externalId(Utils.randomString()) .name("Babusha Boy") .build())); - secondUserId = secondUser.getId().orElseThrow(() -> new RuntimeException("Second user ID is required")); + secondUserId = secondUser.getId(); lead = client.contacts() .create(CreateContactRequest.of(CreateContactRequest.WithExternalId.builder() .externalId(Utils.randomString()) .name("Babushka Lead") .build())); - leadId = lead.getId().orElseThrow(() -> new RuntimeException("Lead ID is required")); + leadId = lead.getId(); Message conversationMessage = client.conversations() .create(CreateConversationRequest.builder() @@ -120,14 +120,12 @@ public void before() { after(); } - String msgConversationId = conversationMessage - .getConversationId() - .orElseThrow(() -> new RuntimeException("Conversation ID is required")); + String msgConversationId = conversationMessage.getConversationId(); conversation = client.conversations() .find(FindConversationRequest.builder() .conversationId(msgConversationId) .build()); - conversationId = conversation.getId().orElseThrow(() -> new RuntimeException("Conversation ID is required")); + conversationId = conversation.getId(); } @AfterEach diff --git a/src/test/java/com/intercom/api/integration/DataAttributesTest.java b/src/test/java/com/intercom/api/integration/DataAttributesTest.java index eb28f1c..eaaf67a 100644 --- a/src/test/java/com/intercom/api/integration/DataAttributesTest.java +++ b/src/test/java/com/intercom/api/integration/DataAttributesTest.java @@ -44,7 +44,7 @@ public void before() { ObjectMappers.JSON_MAPPER.convertValue(createRequestData, CreateDataAttributeRequest.class); dataAttribute = client.dataAttributes().create(createRequest); - dataAttributeId = Integer.parseInt(dataAttribute.getId()); + dataAttributeId = dataAttribute.getId().orElseThrow(() -> new RuntimeException("dataAttribute.id is required")); } @Test diff --git a/src/test/java/com/intercom/api/integration/IntegrationTest.java b/src/test/java/com/intercom/api/integration/IntegrationTest.java index c7dc348..9c6ddbe 100644 --- a/src/test/java/com/intercom/api/integration/IntegrationTest.java +++ b/src/test/java/com/intercom/api/integration/IntegrationTest.java @@ -61,13 +61,13 @@ public void before() { .create(CreateContactRequest.of(CreateContactRequest.WithExternalId.builder() .externalId(Utils.randomString()) .build())); - userId = user.getId(); + userId = user.getId().orElseThrow(() -> new RuntimeException("User ID is required")); lead = client.contacts() .create(CreateContactRequest.of(CreateContactRequest.WithRole.builder() .role("lead") .name("Marek Barek") .build())); - leadId = lead.getId(); + leadId = lead.getId().orElseThrow(() -> new RuntimeException("Lead ID is required")); tag = client.tags() .create(TagsCreateRequestBody.of(CreateOrUpdateTagRequest.builder() .name(Utils.randomString()) @@ -126,7 +126,8 @@ public void testTagConversation() { // act Tag response = client.tags() .tagConversation(TagConversationRequest.builder() - .conversationId(message.getConversationId()) + .conversationId(message.getConversationId() + .orElseThrow(() -> new RuntimeException("Conversation ID is required"))) .tagId(tag.getId()) .adminId(adminId) .build()); diff --git a/src/test/java/com/intercom/api/integration/MessagesTest.java b/src/test/java/com/intercom/api/integration/MessagesTest.java index 5b9411a..a5ad577 100644 --- a/src/test/java/com/intercom/api/integration/MessagesTest.java +++ b/src/test/java/com/intercom/api/integration/MessagesTest.java @@ -42,7 +42,7 @@ public void before() { .externalId(Utils.randomString()) .name("Message Test User") .build())); - userId = user.getId(); + userId = user.getId().orElseThrow(() -> new RuntimeException("User ID is required")); } @AfterEach diff --git a/src/test/java/com/intercom/api/integration/NotesTest.java b/src/test/java/com/intercom/api/integration/NotesTest.java index 380ef5b..22121e5 100644 --- a/src/test/java/com/intercom/api/integration/NotesTest.java +++ b/src/test/java/com/intercom/api/integration/NotesTest.java @@ -43,7 +43,7 @@ public void before() { .create(CreateContactRequest.of(CreateContactRequest.WithExternalId.builder() .externalId(Utils.randomString()) .build())); - contactId = contact.getId().orElseThrow(() -> new RuntimeException("Contact ID is required")); + contactId = contact.getId(); note = client.notes() .create(CreateContactNoteRequest.builder() @@ -51,7 +51,7 @@ public void before() { .body(Utils.randomString()) .adminId(adminId) .build()); - noteId = Integer.parseInt(note.getId().orElseThrow(() -> new RuntimeException("Note ID is required"))); + noteId = Integer.parseInt(note.getId()); } @AfterEach diff --git a/src/test/java/com/intercom/api/integration/SegmentsTest.java b/src/test/java/com/intercom/api/integration/SegmentsTest.java index 2b4aca8..80701e8 100644 --- a/src/test/java/com/intercom/api/integration/SegmentsTest.java +++ b/src/test/java/com/intercom/api/integration/SegmentsTest.java @@ -24,7 +24,7 @@ public void before() { .getSegments() .orElseThrow(() -> new RuntimeException("Segments list is required")) .get(0); - segmentId = segment.getId(); + segmentId = segment.getId().orElseThrow(() -> new RuntimeException("Segment ID is required")); } @Test diff --git a/src/test/java/com/intercom/api/integration/TagsTest.java b/src/test/java/com/intercom/api/integration/TagsTest.java index 35df891..80bda65 100644 --- a/src/test/java/com/intercom/api/integration/TagsTest.java +++ b/src/test/java/com/intercom/api/integration/TagsTest.java @@ -121,7 +121,7 @@ public void testTagContact() { .create(CreateContactRequest.of(CreateContactRequest.WithExternalId.builder() .externalId(Utils.randomString()) .build())); - String contactId = contact.getId().orElseThrow(() -> new RuntimeException("Contact ID is required")); + String contactId = contact.getId(); // act Tag response = client.tags() @@ -204,7 +204,7 @@ public void testTagConversation() { .externalId(Utils.randomString()) .name("John Smith") .build())); - String contactId = contact.getId().orElseThrow(() -> new RuntimeException("Contact ID is required")); + String contactId = contact.getId(); Message conversationMessage = client.conversations() .create(CreateConversationRequest.builder() @@ -228,12 +228,9 @@ public void testTagConversation() { Conversation conversation = client.conversations() .find(FindConversationRequest.builder() - .conversationId(conversationMessage - .getConversationId() - .orElseThrow(() -> new RuntimeException("Conversation ID is required"))) + .conversationId(conversationMessage.getConversationId()) .build()); - String conversationId = - conversation.getId().orElseThrow(() -> new RuntimeException("Conversation ID is required")); + String conversationId = conversation.getId(); // act Tag response = client.tags()