From 7b433943f6e51addcb177f08723195c35a3ae09a Mon Sep 17 00:00:00 2001 From: Timothy Lim Date: Thu, 2 Aug 2018 21:59:05 +0800 Subject: [PATCH 1/5] Revert "Remove company deletion endpoint as it doesn't exist in the API" This reverts commit de1c903dc7bf49ebf83c3d98846b1b422a28395a. --- intercom-java/src/main/java/io/intercom/api/Company.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/intercom-java/src/main/java/io/intercom/api/Company.java b/intercom-java/src/main/java/io/intercom/api/Company.java index 197872b1..3824b825 100644 --- a/intercom-java/src/main/java/io/intercom/api/Company.java +++ b/intercom-java/src/main/java/io/intercom/api/Company.java @@ -49,6 +49,10 @@ public static Company update(Company company) throws InvalidException, Authoriza return DataResource.update(entity, "companies", Company.class); } + public static Company delete(String id) throws InvalidException, AuthorizationException { + return DataResource.delete(id, "companies", Company.class); + } + public static CompanyCollection list(Map params) throws InvalidException, AuthorizationException { return DataResource.list(params, "companies", CompanyCollection.class); } From 25b036b7de51d62e83f7754ed81cad74958c65fb Mon Sep 17 00:00:00 2001 From: Timothy Lim Date: Thu, 2 Aug 2018 22:00:17 +0800 Subject: [PATCH 2/5] Revert "Update readme to use latest code" This reverts commit 9f4c7d32a4930d983febe6cdfedd3677f44c861b. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 84db5314..79bb42d9 100644 --- a/README.md +++ b/README.md @@ -431,13 +431,13 @@ Conversation.create(adminMessage); // send a message from a user UserMessage userMessage = new UserMessage() .setBody("Hey! Is there, is there a reward?") - .setFrom(user); + .setUser(user); Conversation.create(userMessage); // send a message from a contact ContactMessage contactMessage = new ContactMessage() .setBody("Hey! Is there, is there a reward?") - .setFrom(contact); + .setUser(contact); Conversation.create(contactMessage); //list all conversations From 61056cb69ca147c44fc55b39edd74b535d2e9890 Mon Sep 17 00:00:00 2001 From: Timothy Lim Date: Thu, 2 Aug 2018 22:02:33 +0800 Subject: [PATCH 3/5] Revert "use double quotes for dependencies" This reverts commit 117fefa5b8d1e3f4c4758856e6cbb5a96f746b74. --- build.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index f06bb10d..69f9bbc4 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,6 @@ subprojects { ext { jacksonVersion = '2.9.6' - powermockVersion = '1.6.6' } apply plugin: 'maven' @@ -51,15 +50,16 @@ subprojects { compile "com.fasterxml.jackson.core:jackson-core:$jacksonVersion" compile "com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion" compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" - compile "com.google.guava:guava:17.0" - compile "org.slf4j:slf4j-api:1.7.25" - compile "commons-codec:commons-codec:1.9" - testCompile "junit:junit:4.12" - testCompile "org.powermock:powermock-module-junit4:$powermockVersion" - testCompile "org.powermock:powermock-api-mockito:$powermockVersion" + compile 'com.google.guava:guava:17.0' + compile 'org.slf4j:slf4j-api:1.7.25' + compile 'commons-codec:commons-codec:1.9' + testCompile 'junit:junit:4.11' + testCompile 'org.powermock:powermock-module-junit4:1.6.6' + testCompile 'org.powermock:powermock-api-mockito:1.6.6' } } + task wrapper(type: Wrapper) { gradleVersion = '2.0' } From ea16d9ab5d63da182b8cca0129944850ac627744 Mon Sep 17 00:00:00 2001 From: Timothy Lim Date: Thu, 2 Aug 2018 22:03:18 +0800 Subject: [PATCH 4/5] Revert "update to jackson 2.9.6 due to CVEs" This reverts commit 331e3519ccedfdf2213368a4139c24554686f9ae. --- build.gradle | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 69f9bbc4..47dd0d21 100644 --- a/build.gradle +++ b/build.gradle @@ -33,10 +33,6 @@ subprojects { mavenCentral() } - ext { - jacksonVersion = '2.9.6' - } - apply plugin: 'maven' apply plugin: 'maven-publish' apply plugin: 'java' @@ -47,11 +43,11 @@ subprojects { //noinspection GroovyAssignabilityCheck dependencies { - compile "com.fasterxml.jackson.core:jackson-core:$jacksonVersion" - compile "com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion" - compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" + compile 'com.fasterxml.jackson.core:jackson-core:2.4.2' + compile 'com.fasterxml.jackson.core:jackson-annotations:2.4.2' + compile 'com.fasterxml.jackson.core:jackson-databind:2.4.2' compile 'com.google.guava:guava:17.0' - compile 'org.slf4j:slf4j-api:1.7.25' + compile 'org.slf4j:slf4j-api:1.7.7' compile 'commons-codec:commons-codec:1.9' testCompile 'junit:junit:4.11' testCompile 'org.powermock:powermock-module-junit4:1.6.6' From 9e584499a7b0bb1452b89b59bcec47547e1223f6 Mon Sep 17 00:00:00 2001 From: Timothy Lim Date: Thu, 2 Aug 2018 22:04:36 +0800 Subject: [PATCH 5/5] Revert "Prioritise user_id over email in user tagging" This reverts commit 3d8540c044e9180c9746b038bd0006388a7a3d2c. --- intercom-java/src/main/java/io/intercom/api/Tag.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/intercom-java/src/main/java/io/intercom/api/Tag.java b/intercom-java/src/main/java/io/intercom/api/Tag.java index 8a4085a5..2482e2ba 100644 --- a/intercom-java/src/main/java/io/intercom/api/Tag.java +++ b/intercom-java/src/main/java/io/intercom/api/Tag.java @@ -83,12 +83,12 @@ static TaggableCollection createTagTypedCollection(Tag tag, UserCollection users if (!Strings.isNullOrEmpty(id)) { userMap.put("id", id); usersLite.add(userMap); - } else if (!Strings.isNullOrEmpty(userId)) { - userMap.put("user_id", userId); - usersLite.add(userMap); } else if (!Strings.isNullOrEmpty(email)) { userMap.put("email", email); usersLite.add(userMap); + } else if (!Strings.isNullOrEmpty(userId)) { + userMap.put("user_id", userId); + usersLite.add(userMap); } else { logger.warn("no identifiers found for user tag target, skipping [" + tag + "] [" + user.toString() + "]"); }