8000 Fix up NG resource definitions · senthgit/twilio-java@fc86942 · GitHub
[go: up one dir, main page]
Skip to content

Commit fc86942

Browse files
skimbrelskimbrel
committed
Fix up NG resource definitions
1 parent 9fc3c06 commit fc86942

25 files changed

+81
-68
lines changed

‎src/main/java/com/twilio/sdk/resource/NextGenInstanceResource.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.util.Date;
88
import java.util.Map;
99

10-
public abstract class NextGenInstanceResource<C extends TwilioClient> extends InstanceResource {
10+
public abstract class NextGenInstanceResource<C extends TwilioClient> extends InstanceResource<C> {
1111

1212
protected static final SimpleDateFormat ISO_8601_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
1313

@@ -19,7 +19,7 @@ public NextGenInstanceResource(final C client, final Map<String, Object> propert
1919
super(client, properties);
2020
}
2121

22-
public NextGenInstanceResource(final C client, final Map<String, Object> properties, final Map<String, Object> filters) {
22+
public NextGenInstanceResource(final C client, final Map<String, Object> properties, final Map<String, String> filters) {
2323
super(client, properties, filters);
2424
}
2525

‎src/main/java/com/twilio/sdk/resource/NextGenListResource.java

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.twilio.sdk.TwilioRestResponse;
66

77
import java.util.ArrayList;
8+
import java.util.Collections;
89
import java.util.HashMap;
910
import java.util.Iterator;
1011
import java.util.List;
@@ -28,6 +29,42 @@ public NextGenListResource(final C client, final Map<String, String> filters) {
2829
this.filters = filters;
2930
}
3031

32+
public Iterator<T> iterator() {
33+
return new ListIterator(getPageData().iterator());
34+
}
35+
36+
public List<T> getPageData() {
37+
if (!this.isLoaded()) {
38+
try {
39+
this.load(this.filters);
40+
} catch (TwilioRestException e) {
41+
throw new RuntimeException(e);
42+
}
43+
}
44+
45+
return Collections.unmodifiableList(this.pageData);
46+
}
47+
48+
public String getNextPageUrl() {
49+
return nextPageUrl;
50+
}
51+
52+
public int getPage() {
53+
return page;
54+
}
55+
56+
public int getPageSize() {
57+
return pageSize;
58+
}
59+
60+
public String getPreviousPageUrl() {
61+
return previousPageUrl;
62+
}
63+
64+
public String getUrl() {
65+
return url;
66+
}
67+
3168
protected boolean hasNextPage() {
3269
return (nextPageUrl != null && nextPageUrl.length() > 0);
3370
}

‎src/main/java/com/twilio/sdk/resource/instance/taskrouter/Activity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package com.twilio.sdk.resource.instance.taskrouter;
22

33
import com.twilio.sdk.TwilioTaskRouterClient;
4-
import com.twilio.sdk.resource.NextGenNextGenInstanceResource;
4+
import com.twilio.sdk.resource.NextGenInstanceResource;
55

66
import java.util.Date;
77
import java.util.Map;
88

99
/**
1010
* Activity class use to get an activity resource.
1111
*/
12-
public class Activity extends NextGenNextGenInstanceResource<TwilioTaskRouterClient> {
12+
public class Activity extends NextGenInstanceResource<TwilioTaskRouterClient> {
1313

1414
private static final String WORKSPACE_SID_PROPERTY = "workspace_sid";
1515

‎src/main/java/com/twilio/sdk/resource/instance/taskrouter/Reservation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package com.twilio.sdk.resource.instance.taskrouter;
22

33
import com.twilio.sdk.TwilioTaskRouterClient;
4-
import com.twilio.sdk.resource.NextGenNextGenInstanceResource;
4+
import com.twilio.sdk.resource.NextGenInstanceResource;
55

66
import java.util.Date;
77
import java.util.Map;
88

99
/**
1010
* Reservation class use to get a reservation resource.
1111
*/
12-
public class Reservation extends NextGenNextGenInstanceResource<TwilioTaskRouterClient> {
12+
public class Reservation extends NextGenInstanceResource<TwilioTaskRouterClient> {
1313

1414
private static final String TASK_SID_PROPERTY = "task_sid";
1515

‎src/main/java/com/twilio/sdk/resource/list/taskrouter/ActivityList.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ public Activity create(final List<NameValuePair> params) throws TwilioRestExcept
5353
return makeNew(getClient(), response.toMap());
5454
}
5555

56-
@Override
57-
protected String getListKey() {
58-
return "activities";
59-
}
60-
6156
@Override
6257
protected Activity makeNew(final TwilioTaskRouterClient client, final Map<String, Object> params) {
6358
return new Activity(client, params);

‎src/main/java/com/twilio/sdk/resource/list/taskrouter/ReservationList.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ public ReservationList(final TwilioTaskRouterClient client, final String workspa
4242
this.taskSid = taskSid;
4343
}
4444

45-
@Override
46-
protected String getListKey() {
47-
return "reservations";
48-
}
49-
5045
@Override
5146
protected Reservation makeNew(final TwilioTaskRouterClient client, final Map<String, Object> params) {
5247
return new Reservation(client, params);

‎src/main/java/com/twilio/sdk/resource/list/taskrouter/TaskList.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ public Task create(final List<NameValuePair> params) throws TwilioRestException
5353
return makeNew(getClient(), response.toMap());
5454
}
5555

56-
@Override
57-
protected String getListKey() {
58-
return "tasks";
59-
}
60-
6156
@Override
6257
protected Task makeNew(final TwilioTaskRouterClient client, final Map<String, Object> params) {
6358
return new Task(client, params);

‎src/main/java/com/twilio/sdk/resource/list/taskrouter/TaskQueueList.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ public TaskQueue create(final List<NameValuePair> params) throws TwilioRestExcep
5353
return makeNew(getClient(), response.toMap());
5454
}
5555

56-
@Override
57-
protected String getListKey() {
58-
return "task_queues";
59-
}
60-
6156
@Override
6257
protected TaskQueue makeNew(final TwilioTaskRouterClient client, final Map<String, Object> params) {
6358
return new TaskQueue(client, params);

‎src/main/java/com/twilio/sdk/resource/list/taskrouter/TaskQueueListStatistics.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ protected TaskQueueStatistics makeNew(final TwilioTaskRouterClient client, final
4646
return new TaskQueueStatistics(client, workspaceSid, queueSid, null, params);
4747
}
4848

49-
@Override
50-
protected String getListKey() {
51-
return "task_queues_statistics";
52-
}
53-
5449
@Override
5550
protected String getResourceLocation() {
5651
return "/" + TwilioTaskRouterClient.DEFAULT_VERSION + "/Workspaces/" +

‎src/main/java/com/twilio/sdk/resource/list/taskrouter/WorkerList.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ public Worker create(final List<NameValuePair> params) throws TwilioRestExceptio
5353
return makeNew(getClient(), response.toMap());
5454
}
5555

56-
@Override
57-
protected String getListKey() {
58-
return "workers";
59-
}
60-
6156
@Override
6257
protected Worker makeNew(final TwilioTaskRouterClient client, final Map<String, Object> params) {
6358
return new Worker(client, params);

0 commit comments

Comments
 (0)
0