Skip to content

Commit 81d8d64

Browse files
mmartinicmmartinic
committed
fix formatting
1 parent 4c47488 commit 81d8d64

File tree

2 files changed

+90
-95
lines changed

2 files changed

+90
-95
lines changed

‎intercom-java/src/main/java/io/intercom/api/CompanyUpdateBuilder.java‎

Lines changed: 50 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,66 @@
11
package io.intercom.api;
22

3+
import com.google.common.collect.Lists;
4+
35
import java.util.Iterator;
46
import java.util.List;
57

6-
import com.google.common.collect.Lists;
7-
88
class CompanyUpdateBuilder {
99

10-
/**
11-
* Provide restrictions on the company data that can be sent via a user
12-
* update
13-
*/
14-
static List<CompanyWithStringPlan> buildUserUpdateCompanies(CompanyCollection add, CompanyCollection remove) {
10+
/**
11+
* Provide restrictions on the company data that can be sent via a user update
12+
*/
13+
static List<CompanyWithStringPlan> buildUserUpdateCompanies(CompanyCollection add, CompanyCollection remove) {
1514

16-
final List<CompanyWithStringPlan> updatableCompanies = Lists.newArrayList();
17-
if (add != null) {
18-
final List<Company> companies = add.getPage();
19-
for (Company company : companies) {
20-
updatableCompanies.add(prepareUpdatableCompany(company));
21-
}
22-
}
15+
final List<CompanyWithStringPlan> updatableCompanies = Lists.newArrayList();
16+
if (add != null) {
17+
final List<Company> companies = add.getPage();
18+
for (Company company : companies) {
19+
updatableCompanies.add(prepareUpdatableCompany(company));
20+
}
21+
}
2322

24-
if (remove != null) {
25-
final List<Company> companies = remove.getPage();
23+
if (remove != null) {
24+
final List<Company> companies = remove.getPage();
2625

27-
for (Company company : companies) {
28-
removeCompanyFromAddedList(updatableCompanies, company);
29-
updatableCompanies.add(prepareUpdatableCompany(company).setRemove(Boolean.TRUE));
30-
}
31-
}
26+
for (Company company : companies) {
27+
removeCompanyFromAddedList(updatableCompanies, company);
28+
updatableCompanies.add(prepareUpdatableCompany(company).setRemove(Boolean.TRUE));
29+
}
30+
}
3231

33-
return updatableCompanies;
34-
}
32+
return updatableCompanies;
33+
}
3534

36-
private static void removeCompanyFromAddedList(List<CompanyWithStringPlan> companies, Company company) {
37-
Iterator<CompanyWithStringPlan> companyIterator = companies.iterator();
35+
private static void removeCompanyFromAddedList(List<CompanyWithStringPlan> companies, Company company) {
36+
Iterator<CompanyWithStringPlan> companyIterator = companies.iterator();
3837

39-
while (companyIterator.hasNext()) {
40-
CompanyWithStringPlan companyWithStringPlan = companyIterator.next();
41-
// TODO add equals and toHash methods to CompanyWithStringPlan and
42-
// use it here
43-
if (companyWithStringPlan.getId() != null && company.getId() != null && companyWithStringPlan.getId().equals(company.getId())) {
44-
companyIterator.remove();
45-
break;
46-
}
38+
while (companyIterator.hasNext()) {
39+
CompanyWithStringPlan companyWithStringPlan = companyIterator.next();
40+
// TODO add equals and toHash methods to CompanyWithStringPlan and use it here
41+
if (companyWithStringPlan.getId() != null && company.getId() != null && companyWithStringPlan.getId().equals(company.getId())) {
42+
companyIterator.remove();
43+
break;
44+
}
4745

48-
if (companyWithStringPlan.getCompanyID() != null && company.getCompanyID() != null && companyWithStringPlan.getCompanyID().equals(company.getCompanyID())) {
49-
companyIterator.remove();
50-
break;
51-
}
52-
}
53-
}
46+
if (companyWithStringPlan.getCompanyID() != null && company.getCompanyID() != null && companyWithStringPlan.getCompanyID().equals(company.getCompanyID())) {
47+
companyIterator.remove();
48+
break;
49+
}
50+
}
51+
}
5452

55-
private static CompanyWithStringPlan prepareUpdatableCompany(Company company) {
56-
final CompanyWithStringPlan updatableCompany = new CompanyWithStringPlan();
57-
updatableCompany.setId(company.getId());
58-
updatableCompany.setCompanyID(company.getCompanyID());
59-
updatableCompany.setName(company.getName());
60-
updatableCompany.setSessionCount(company.getSessionCount());
61-
updatableCompany.setMonthlySpend(company.getMonthlySpend());
62-
updatableCompany.setRemoteCreatedAt(company.getRemoteCreatedAt());
63-
if (company.getPlan() != null) {
64-
updatableCompany.setPlan(company.getPlan().getName());
65-
}
66-
return updatableCompany;
67-
}
53+
private static CompanyWithStringPlan prepareUpdatableCompany(Company company) {
54+
final CompanyWithStringPlan updatableCompany = new CompanyWithStringPlan();
55+
updatableCompany.setId(company.getId());
56+
updatableCompany.setCompanyID(company.getCompanyID());
57+
updatableCompany.setName(company.getName());
58+
updatableCompany.setSessionCount(company.getSessionCount());
59+
updatableCompany.setMonthlySpend(company.getMonthlySpend());
60+
updatableCompany.setRemoteCreatedAt(company.getRemoteCreatedAt());
61+
if (company.getPlan() != null) {
62+
updatableCompany.setPlan(company.getPlan().getName());
63+
}
64+
return updatableCompany;
65+
}
6866
}

‎intercom-java/src/test/java/io/intercom/api/CompanyUpdateBuilderTest.java‎

Lines changed: 40 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,62 @@
11
package io.intercom.api;
22

3-
import static org.junit.Assert.assertFalse;
4-
import static org.junit.Assert.assertNull;
5-
import static org.junit.Assert.assertTrue;
6-
7-
import java.util.List;
8-
3+
import com.fasterxml.jackson.databind.ObjectMapper;
4+
import com.google.common.collect.Lists;
95
import org.junit.BeforeClass;
106
import org.junit.Test;
117

12-
import com.fasterxml.jackson.databind.ObjectMapper;
13-
import com.google.common.collect.Lists;
8+
import java.util.List;
9+
10+
import static org.junit.Assert.*;
1411

1512
public class CompanyUpdateBuilderTest {
1613

17-
private static ObjectMapper mapper;
14+
private static ObjectMapper mapper;
1815

19-
@BeforeClass
20-
public static void beforeClass() {
21-
mapper = MapperSupport.objectMapper();
22-
}
16+
@BeforeClass
17+
public static void beforeClass() {
18+
mapper = MapperSupport.objectMapper();
19+
}
2320

24-
@Test
25-
public void testRemove() throws Exception {
21+
@Test
22+
public void testRemove() throws Exception {
2623

27-
final Company bacon = new Company().setCompanyID("bacon");
28-
final Company pancake = new Company().setCompanyID("pancake");
24+
final Company bacon = new Company().setCompanyID("bacon");
25+
final Company pancake = new Company().setCompanyID("pancake");
2926

30-
final List<CompanyWithStringPlan> cos = CompanyUpdateBuilder.buildUserUpdateCompanies(//
31-
new CompanyCollection(Lists.newArrayList(bacon, pancake)),//
32-
new CompanyCollection(Lists.newArrayList(bacon)));
27+
final List<CompanyWithStringPlan> cos = CompanyUpdateBuilder.buildUserUpdateCompanies(
28+
new CompanyCollection(Lists.newArrayList(bacon, pancake)),
29+
new CompanyCollection(Lists.newArrayList(bacon)));
3330

34-
Boolean baconIsRemoved = null;
35-
Boolean pancakeIsRemoved = null;
31+
Boolean baconIsRemoved = null;
32+
Boolean pancakeIsRemoved = null;
3633

37-
CompanyWithStringPlan baconCo = null;
38-
CompanyWithStringPlan pancakeCo = null;
34+
CompanyWithStringPlan baconCo = null;
35+
CompanyWithStringPlan pancakeCo = null;
3936

40-
for (CompanyWithStringPlan co : cos) {
41-
if (co.getCompanyID().equals("pancake")) {
42-
pancakeIsRemoved = co.getRemove();
43-
pancakeCo = co;
44-
}
37+
for (CompanyWithStringPlan co : cos) {
38+
if (co.getCompanyID().equals("pancake")) {
39+
pancakeIsRemoved = co.getRemove();
40+
pancakeCo = co;
41+
}
4542

46-
if (co.getCompanyID().equals("bacon")) {
47-
baconIsRemoved = co.getRemove();
48-
baconCo = co;
49-
}
43+
if (co.getCompanyID().equals("bacon")) {
44+
baconIsRemoved = co.getRemove();
45+
baconCo = co;
46+
}
5047

51-
}
52-
assertNull(pancakeIsRemoved);
53-
assertTrue(baconIsRemoved);
48+
}
49+
assertNull(pancakeIsRemoved);
50+
assertTrue(baconIsRemoved);
5451

55-
final String pancakeJson = mapper.writeValueAsString(pancakeCo);
56-
assertFalse(pancakeJson.contains("remove"));
57-
assertFalse(pancakeJson.contains("true"));
52+
final String pancakeJson = mapper.writeValueAsString(pancakeCo);
53+
assertFalse(pancakeJson.contains("remove"));
54+
assertFalse(pancakeJson.contains("true"));
5855

59-
final String baconJson = mapper.writeValueAsString(baconCo);
60-
assertTrue(baconJson.contains("remove"));
61-
assertTrue(baconJson.contains("true"));
56+
final String baconJson = mapper.writeValueAsString(baconCo);
57+
assertTrue(baconJson.contains("remove"));
58+
assertTrue(baconJson.contains("true"));
6259

63-
}
60+
}
6461

6562
}

0 commit comments

Comments
 (0)