Skip to content

Commit 020ea34

Browse files
steve-henrysteve-henry
authored
Update formatting to pass Spotless check (#352)
Fixing the formatting that prevented previous publish attempt
1 parent a60ad66 commit 020ea34

14 files changed

+93
-99
lines changed

‎src/test/java/com/intercom/api/integration/AdminsTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ public class AdminsTest {
2424
public void before() {
2525
// arrange
2626
client = TestClientFactory.create();
27-
adminId = client.admins().list().getAdmins()
27+
adminId = client.admins()
28+
.list()
29+
.getAdmins()
2830
.orElseThrow(() -> new RuntimeException("Admins list is required"))
2931
.get(0)
3032
.orElseThrow(() -> new RuntimeException("Admin is required"))

‎src/test/java/com/intercom/api/integration/ArticlesTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.intercom.api.Intercom;
44
import com.intercom.api.core.pagination.SyncPagingIterable;
5-
import com.intercom.api.types.CreateArticleRequest;
65
import com.intercom.api.resources.articles.requests.DeleteArticleRequest;
76
import com.intercom.api.resources.articles.requests.FindArticleRequest;
87
import com.intercom.api.resources.articles.requests.ListArticlesRequest;
@@ -14,6 +13,7 @@
1413
import com.intercom.api.types.AdminList;
1514
import com.intercom.api.types.ArticleContent;
1615
import com.intercom.api.types.ArticleTranslatedContent;
16+
import com.intercom.api.types.CreateArticleRequest;
1717
import com.intercom.api.types.DeletedArticleObject;
1818
import com.intercom.api.utils.TestClientFactory;
1919
import com.intercom.api.utils.Utils;
@@ -39,7 +39,8 @@ public void before() {
3939
AdminList randomAdmins = client.admins().list();
4040

4141
Integer parentId = Integer.parseInt(randomCollections.getItems().get(0).getId());
42-
int adminId = Integer.parseInt(randomAdmins.getAdmins()
42+
int adminId = Integer.parseInt(randomAdmins
43+
.getAdmins()
4344
.orElseThrow(() -> new RuntimeException("Admins list is required"))
4445
.get(0)
4546
.orElseThrow(() -> new RuntimeException("Admin is required"))

‎src/test/java/com/intercom/api/integration/CompaniesTest.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.intercom.api.core.pagination.SyncPage;
55
import com.intercom.api.core.pagination.SyncPagingIterable;
66
import com.intercom.api.resources.companies.requests.AttachContactToCompanyRequest;
7-
import com.intercom.api.types.CreateOrUpdateCompanyRequest;
87
import com.intercom.api.resources.companies.requests.DeleteCompanyRequest;
98
import com.intercom.api.resources.companies.requests.DetachContactFromCompanyRequest;
109
import com.intercom.api.resources.companies.requests.FindCompanyRequest;
@@ -16,6 +15,7 @@
1615
import com.intercom.api.resources.contacts.types.Contact;
1716
import com.intercom.api.types.CompanyAttachedContacts;
1817
import com.intercom.api.types.CompanyAttachedSegments;
18+
import com.intercom.api.types.CreateOrUpdateCompanyRequest;
1919
import com.intercom.api.types.DeletedCompanyObject;
2020
import com.intercom.api.utils.TestClientFactory;
2121
import com.intercom.api.utils.Utils;
@@ -42,7 +42,11 @@ public void before() {
4242
client.contacts().list(ListContactsRequest.builder().perPage(1).build());
4343

4444
// act
45-
contactId = randomContacts.getItems().get(0).getId().orElseThrow(() -> new RuntimeException("Contact ID is required"));
45+
contactId = randomContacts
46+
.getItems()
47+
.get(0)
48+
.getId()
49+
.orElseThrow(() -> new RuntimeException("Contact ID is required"));
4650
company = client.companies()
4751
.createOrUpdate(java.util.Optional.of(CreateOrUpdateCompanyRequest.builder()
4852
.name(Utils.randomString())

‎src/test/java/com/intercom/api/integration/ContactsTest.java‎

Lines changed: 20 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44
import com.intercom.api.core.pagination.SyncPage;
55
import com.intercom.api.core.pagination.SyncPagingIterable;
66
import com.intercom.api.resources.companies.requests.AttachContactToCompanyRequest;
7-
import com.intercom.api.resources.contacts.types.ContactsCreateResponse;
8-
import com.intercom.api.resources.contacts.types.ContactsFindResponse;
9-
import com.intercom.api.resources.contacts.types.ContactsUpdateResponse;
10-
import com.intercom.api.resources.contacts.types.ContactsMergeLeadInUserResponse;
11-
import com.intercom.api.types.CreateOrUpdateCompanyRequest;
127
import com.intercom.api.resources.companies.requests.DeleteCompanyRequest;
138
import com.intercom.api.resources.companies.types.Company;
149
import com.intercom.api.resources.contacts.requests.ArchiveContactRequest;
@@ -25,6 +20,10 @@
2520
import com.intercom.api.resources.contacts.requests.UnarchiveContactRequest;
2621
import com.intercom.api.resources.contacts.requests.UpdateContactRequest;
2722
import com.intercom.api.resources.contacts.types.Contact;
23+
import com.intercom.api.resources.contacts.types.ContactsCreateResponse;
24+
import com.intercom.api.resources.contacts.types.ContactsFindResponse;
25+
import com.intercom.api.resources.contacts.types.ContactsMergeLeadInUserResponse;
26+
import com.intercom.api.resources.contacts.types.ContactsUpdateResponse;
2827
import com.intercom.api.resources.tags.requests.TagContactRequest;
2928
import com.intercom.api.resources.tags.requests.UntagContactRequest;
3029
import com.intercom.api.resources.tags.types.Tag;
@@ -34,6 +33,7 @@
3433
import com.intercom.api.types.ContactSegments;
3534
import com.intercom.api.types.ContactUnarchived;
3635
import com.intercom.api.types.CreateContactRequest;
36+
import com.intercom.api.types.CreateOrUpdateCompanyRequest;
3737
import com.intercom.api.types.CreateOrUpdateTagRequest;
3838
import com.intercom.api.types.SubscriptionTypeList;
3939
import com.intercom.api.types.TagList;
@@ -86,9 +86,11 @@ public void before() {
8686
.build());
8787

8888
SubscriptionTypeList subscriptionTypes = client.subscriptionTypes().list();
89-
subscriptionId = subscriptionTypes.getData()
89+
subscriptionId = subscriptionTypes
90+
.getData()
9091
.orElseThrow(() -> new RuntimeException("No subscription types found"))
91-
.get(0).getId()
92+
.get(0)
93+
.getId()
9294
.orElseThrow(() -> new RuntimeException("Subscription type ID is required"));
9395
client.contacts()
9496
.attachSubscription(AttachSubscriptionToContactRequest.builder()
@@ -149,7 +151,8 @@ public void testCreateLead() {
149151
try {
150152
client.contacts()
151153
.delete(DeleteContactRequest.builder()
152-
.contactId(response.getId().orElseThrow(() -> new RuntimeException("Contact ID is required")))
154+
.contactId(
155+
response.getId().orElseThrow(() -> new RuntimeException("Contact ID is required")))
153156
.build());
154157
} catch (Exception e) {
155158
throw new RuntimeException("Failed to delete contact.", e);
@@ -183,31 +186,25 @@ public void testUpdate() {
183186
public void testArchive() {
184187
// act
185188
ContactArchived response = client.contacts()
186-
.archive(ArchiveContactRequest.builder()
187-
.contactId(contactId)
188-
.build());
189+
.archive(ArchiveContactRequest.builder().contactId(contactId).build());
189190

190191
// assert
191192
Assertions.assertNotNull(response);
192193

193194
// cleanup
194195
client.contacts()
195-
.unarchive(UnarchiveContactRequest.builder()
196-
.contactId(contactId)
197-
.build());
196+
.unarchive(
197+
UnarchiveContactRequest.builder().contactId(contactId).build());
198198
}
199199

200200
@Test
201201
public void testUnarchive() {
202202
// act
203203
client.contacts()
204-
.archive(ArchiveContactRequest.builder()
205-
.contactId(contactId)
206-
.build());
204+
.archive(ArchiveContactRequest.builder().contactId(contactId).build());
207205
ContactUnarchived response = client.contacts()
208-
.unarchive(UnarchiveContactRequest.builder()
209-
.contactId(contactId)
210-
.build());
206+
.unarchive(
207+
UnarchiveContactRequest.builder().contactId(contactId).build());
211208

212209
// assert
213210
Assertions.assertNotNull(response);
@@ -223,9 +220,7 @@ public void testDelete() {
223220
.build()));
224221
String createdId = created.getId().orElseThrow(() -> new RuntimeException("Contact ID is required"));
225222
ContactDeleted response = client.contacts()
226-
.delete(DeleteContactRequest.builder()
227-
.contactId(createdId)
228-
.build());
223+
.delete(DeleteContactRequest.builder().contactId(createdId).build());
229224

230225
// assert
231226
Assertions.assertNotNull(response);
@@ -252,9 +247,7 @@ public void testMergeLeadInUser() {
252247
// cleanup
253248
try {
254249
client.contacts()
255-
.delete(DeleteContactRequest.builder()
256-
.contactId(leadId)
257-
.build());
250+
.delete(DeleteContactRequest.builder().contactId(leadId).build());
258251
} catch (Exception e) {
259252
throw new RuntimeException("Failed to delete contact.", e);
260253
}
@@ -401,9 +394,7 @@ private void tryDeleteCompany() {
401394
private void tryDeleteContact() {
402395
try {
403396
client.contacts()
404-
.delete(DeleteContactRequest.builder()
405-
.contactId(contactId)
406-
.build());
397+
.delete(DeleteContactRequest.builder().contactId(contactId).build());
407398
} catch (Exception e) {
408399
throw new RuntimeException("Failed to delete contact.", e);
409400
}

‎src/test/java/com/intercom/api/integration/ConversationsTest.java‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,17 @@ public void before() {
6767
// arrange
6868
client = TestClientFactory.create();
6969

70-
List<Admin> admins = client.admins().list().getAdmins()
71-
.orElseThrow(() -> new RuntimeException("Admins list is required"))
72-
.stream()
73-
.filter(opt -> opt.isPresent())
74-
.map(opt -> opt.get())
75-
.filter(Admin::getHasInboxSeat)
76-
.collect(Collectors.toList());
70+
List<Admin> admins =
71+
client
72+
.admins()
73+
.list()
74+
.getAdmins()
75+
.orElseThrow(() -> new RuntimeException("Admins list is required"))
76+
.stream()
77+
.filter(opt -> opt.isPresent())
78+
.map(opt -> opt.get())
79+
.filter(Admin::getHasInboxSeat)
80+
.collect(Collectors.toList());
7781
adminId = admins.get(0).getId();
7882
secondAdminId = admins.get(1).getId();
7983

@@ -116,7 +120,8 @@ public void before() {
116120
after();
117121
}
118122

119-
String msgConversationId = conversationMessage.getConversationId()
123+
String msgConversationId = conversationMessage
124+
.getConversationId()
120125
.orElseThrow(() -> new RuntimeException("Conversation ID is required"));
121126
conversation = client.conversations()
122127
.find(FindConversationRequest.builder()
@@ -223,7 +228,8 @@ public void testAssign() {
223228
public void testRunAssignmentRules() {
224229
Intercom legacyServiceClient = TestClientFactory.create(ApiVersion._2_11);
225230
// act - runAssignmentRules returns void
226-
legacyServiceClient.conversations()
231+
legacyServiceClient
232+
.conversations()
227233
.runAssignmentRules(AutoAssignConversationRequest.builder()
228234
.conversationId(conversationId)
229235
.build());
@@ -422,17 +428,13 @@ public void testPaginationPager() {
422428
private void tryDeleteContacts() {
423429
try {
424430
client.contacts()
425-
.delete(DeleteContactRequest.builder()
426-
.contactId(userId)
427-
.build());
431+
.delete(DeleteContactRequest.builder().contactId(userId).build());
428432
client.contacts()
429433
.delete(DeleteContactRequest.builder()
430434
.contactId(secondUserId)
431435
.build());
432436
client.contacts()
433-
.delete(DeleteContactRequest.builder()
434-
.contactId(leadId)
435-
.build());
437+
.delete(DeleteContactRequest.builder().contactId(leadId).build());
436438
} catch (Exception e) {
437439
throw new RuntimeException("Failed to delete contacts.", e);
438440
}

‎src/test/java/com/intercom/api/integration/DataAttributesTest.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import com.intercom.api.utils.Utils;
1414
import java.util.Arrays;
1515
import java.util.HashMap;
16-
import java.util.List;
1716
import java.util.Map;
1817
import org.junit.jupiter.api.Assertions;
1918
import org.junit.jupiter.api.BeforeEach;
@@ -45,9 +44,7 @@ public void before() {
4544
ObjectMappers.JSON_MAPPER.convertValue(createRequestData, CreateDataAttributeRequest.class);
4645

4746
dataAttribute = client.dataAttributes().create(createRequest);
48-
dataAttributeId = dataAttribute
49-
.getId()
50-
.orElseThrow(() -> new RuntimeException("dataAttribute.id is required"));
47+
dataAttributeId = dataAttribute.getId().orElseThrow(() -> new RuntimeException("dataAttribute.id is required"));
5148
}
5249

5350
@Test

‎src/test/java/com/intercom/api/integration/DataExportTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ public void before() {
2626
.createdAtAfter(1670000000)
2727
.createdAtBefore(1670940528)
2828
.build());
29-
jobIdentifier = export.getJobIdentifier()
30-
.orElseThrow(() -> new RuntimeException("Job identifier is required"));
29+
jobIdentifier = export.getJobIdentifier().orElseThrow(() -> new RuntimeException("Job identifier is required"));
3130
}
3231

3332
@Test

‎src/test/java/com/intercom/api/integration/IntegrationTest.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
import com.intercom.api.Intercom;
44
import com.intercom.api.resources.companies.requests.AttachContactToCompanyRequest;
5-
import com.intercom.api.resources.contacts.types.ContactsCreateResponse;
6-
import com.intercom.api.types.CreateOrUpdateCompanyRequest;
75
import com.intercom.api.resources.companies.requests.DeleteCompanyRequest;
86
import com.intercom.api.resources.companies.types.Company;
97
import com.intercom.api.resources.contacts.requests.DeleteContactRequest;
8+
import com.intercom.api.resources.contacts.types.ContactsCreateResponse;
109
import com.intercom.api.resources.conversations.requests.CreateConversationRequest;
1110
import com.intercom.api.resources.messages.types.Message;
1211
import com.intercom.api.resources.tags.requests.DeleteTagRequest;
1312
import com.intercom.api.resources.tags.requests.TagConversationRequest;
1413
import com.intercom.api.resources.tags.types.Tag;
1514
import com.intercom.api.resources.tags.types.TagsCreateRequestBody;
1615
import com.intercom.api.types.CreateContactRequest;
16+
import com.intercom.api.types.CreateOrUpdateCompanyRequest;
1717
import com.intercom.api.types.CreateOrUpdateTagRequest;
1818
import com.intercom.api.utils.TestClientFactory;
1919
import com.intercom.api.utils.Utils;
@@ -38,7 +38,9 @@ public class IntegrationTest {
3838
public void before() {
3939
// arrange
4040
client = TestClientFactory.create();
41-
adminId = client.admins().list().getAdmins()
41+
adminId = client.admins()
42+
.list()
43+
.getAdmins()
4244
.orElseThrow(() -> new RuntimeException("Admins list is required"))
4345
.get(0)
4446
.orElseThrow(() -> new RuntimeException("Admin is required"))
@@ -137,13 +139,9 @@ public void testTagConversation() {
137139
private void tryDeleteContacts() {
138140
try {
139141
client.contacts()
140-
.delete(DeleteContactRequest.builder()
141-
.contactId(userId)
142-
.build());
142+
.delete(DeleteContactRequest.builder().contactId(userId).build());
143143
client.contacts()
144-
.delete(DeleteContactRequest.builder()
145-
.contactId(leadId)
146-
.build());
144+
.delete(DeleteContactRequest.builder().contactId(leadId).build());
147145
} catch (Exception e) {
148146
throw new RuntimeException("Failed to delete contacts.", e);
149147
}

‎src/test/java/com/intercom/api/integration/MessagesTest.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ public void before() {
3030
// arrange
3131
client = TestClientFactory.create();
3232

33-
adminId = client.admins().list().getAdmins()
33+
adminId = client.admins()
34+
.list()
35+
.getAdmins()
3436
.orElseThrow(() -> new RuntimeException("Admins list is required"))
3537
.get(0)
3638
.orElseThrow(() -> new RuntimeException("Admin is required"))
@@ -40,8 +42,7 @@ public void before() {
4042
.externalId(Utils.randomString())
4143
.name("Message Test User")
4244
.build()));
43-
userId = user.getId()
44-
.orElseThrow(() -> new RuntimeException("User ID is required"));
45+
userId = user.getId().orElseThrow(() -> new RuntimeException("User ID is required"));
4546
}
4647

4748
@AfterEach
@@ -111,9 +112,7 @@ public void testCreateMessageNoConversation() {
111112
private void tryDeleteContact() {
112113
try {
113114
client.contacts()
114-
.delete(DeleteContactRequest.builder()
115-
.contactId(userId)
116-
.build());
115+
.delete(DeleteContactRequest.builder().contactId(userId).build());
117116
} catch (Exception e) {
118117
throw new RuntimeException("Failed to delete contact.", e);
119118
}

0 commit comments

Comments
 (0)