Skip to content

Commit 42550cd

Browse files
authored
Merge pull request #634 from sircpl/sircpl/revert_triggers_cbp
Revert changes to getTriggersWithParameters due to CBP bug in API
2 parents 6faf15d + 4d54db0 commit 42550cd

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/main/java/org/zendesk/client/v2/Zendesk.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -954,12 +954,11 @@ public Iterable<Trigger> getTriggers() {
954954
public Iterable<Trigger> getTriggers(
955955
String categoryId, boolean active, String sortBy, SortOrder sortOrder) {
956956
return new PagedIterable<>(
957-
tmpl("/triggers.json{?category_id,active,sort_by,sort_order}&page[size]={pageSize}")
957+
tmpl("/triggers.json{?category_id,active,sort_by,sort_order}")
958958
.set("category_id", categoryId)
959959
.set("active", active)
960960
.set("sort_by", sortBy)
961-
.set("sort_order", sortOrder.getQueryParameter())
962-
.set("pageSize", cbpPageSize),
961+
.set("sort_order", sortOrder.getQueryParameter()),
963962
handleList(Trigger.class, "triggers"));
964963
}
965964

src/test/java/org/zendesk/client/v2/RealSmokeTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,9 +315,9 @@ public void getTriggersWithParameters() throws Exception {
315315
createClientWithTokenOrPassword(2);
316316
int count = 0;
317317
String title = null;
318-
for (Trigger t : instance.getTriggers(null, true, "title", SortOrder.ASCENDING)) {
318+
for (Trigger t : instance.getTriggers(null, true, "alphabetical", SortOrder.ASCENDING)) {
319319
if (title != null) {
320-
assertTrue(title.compareTo(t.getTitle()) < 0);
320+
assertTrue(title.compareToIgnoreCase(t.getTitle()) < 0);
321321
}
322322
title = t.getTitle();
323323
if (++count > 10) {

0 commit comments

Comments
 (0)