Skip to content

Commit 0a60e43

Browse files
committed
resolve conflicting getter definitions error for jackson
1 parent 21bd6e5 commit 0a60e43

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

intercom-java/src/main/java/io/intercom/api/User.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -227,20 +227,10 @@ public Boolean getUnsubscribedFromEmails() {
227227
return unsubscribedFromEmails;
228228
}
229229

230-
public Boolean getUpdateLastRequestAt() {
231-
return updateLastRequestAt;
232-
}
233-
234-
public Boolean getNewSession() {
235-
return newSession;
236-
}
237-
238-
@Deprecated
239230
public Boolean isUpdateLastRequestAt() {
240231
return updateLastRequestAt;
241232
}
242233

243-
@Deprecated
244234
public Boolean isNewSession() {
245235
return newSession;
246236
}

intercom-java/src/test/java/io/intercom/api/UserTest.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,9 @@
66

77
import java.util.List;
88
import java.util.Map;
9-
import java.util.regex.Matcher;
10-
import java.util.regex.Pattern;
119

1210
import static io.intercom.api.TestSupport.load;
13-
import static org.junit.Assert.assertEquals;
14-
import static org.junit.Assert.assertFalse;
15-
import static org.junit.Assert.assertTrue;
11+
import static org.junit.Assert.*;
1612

1713
public class UserTest {
1814

@@ -61,8 +57,6 @@ public void testUserUpdateDefaultSerdes() throws Exception {
6157
check we didn't set unsubscribed_from_emails, update_last_request_at, or
6258
new_session by default
6359
*/
64-
assertEquals(null, userUpdate.getNewSession());
65-
assertEquals(null, userUpdate.getUnsubscribedFromEmails());
6660
assertEquals(null, userUpdate.getUnsubscribedFromEmails());
6761
assertEquals(null, userUpdate.isNewSession());
6862
assertEquals(null, userUpdate.isUpdateLastRequestAt());
@@ -97,8 +91,6 @@ public void testUserUpdateDefaultModifiedSerdes() throws Exception {
9791

9892
final User.UserUpdate userUpdate = User.UserUpdate.buildFrom(user);
9993

100-
assertEquals(true, userUpdate.getNewSession());
101-
assertEquals(true, userUpdate.getUnsubscribedFromEmails());
10294
assertEquals(true, userUpdate.getUnsubscribedFromEmails());
10395
assertEquals(true, userUpdate.isNewSession());
10496
assertEquals(true, userUpdate.isUpdateLastRequestAt());

0 commit comments

Comments
 (0)