8000 Rename Queue to TaskQueue · senthgit/twilio-java@231dda1 · GitHub
[go: up one dir, main page]
Skip to content

Commit 231dda1

Browse files
AlexPaymentskimbrel
AlexPayment
authored and
skimbrel
committed
Rename Queue to TaskQueue
1 parent f60712b commit 231dda1

File tree

11 files changed

+124
-123
lines changed

11 files changed

+124
-123
lines changed

‎src/main/java/com/twilio/sdk/TwilioWdsClient.java

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

33
import com.twilio.sdk.resource.factory.wds.ActivityFactory;
4-
import com.twilio.sdk.resource.factory.wds.QueueFactory;
54
import com.twilio.sdk.resource.factory.wds.TaskFactory;
5+
import com.twilio.sdk.resource.factory.wds.TaskQueueFactory;
66
import com.twilio.sdk.resource.factory.wds.WorkerFactory;
77
import com.twilio.sdk.resource.factory.wds.WorkflowFactory;
88
import com.twilio.sdk.resource.factory.wds.WorkspaceFactory;
99
import com.twilio.sdk.resource.instance.wds.Activity;
10-
import com.twilio.sdk.resource.instance.wds.Queue;
1110
import com.twilio.sdk.resource.instance.wds.Reservation;
1211
import com.twilio.sdk.resource.instance.wds.Task;
12+
import com.twilio.sdk.resource.instance.wds.TaskQueue;
1313
import com.twilio.sdk.resource.instance.wds.Worker;
1414
import com.twilio.sdk.resource.instance.wds.Workflow;
1515
import com.twilio.sdk.resource.instance.wds.Workspace;
1616
import com.twilio.sdk.resource.list.wds.ActivityList;
17-
import com.twilio.sdk.resource.list.wds.QueueList;
1817
import com.twilio.sdk.resource.list.wds.ReservationList;
1918
import com.twilio.sdk.resource.list.wds.TaskList;
19+
import com.twilio.sdk.resource.list.wds.TaskQueueList;
2020
import com.twilio.sdk.resource.list.wds.WorkerList;
2121
import com.twilio.sdk.resource.list.wds.WorkflowList;
2222
import com.twilio.sdk.resource.list.wds.WorkspaceList;
@@ -47,16 +47,16 @@ public Activity createActivity(final String workspaceSid, final Map<String, Stri
4747
}
4848

4949
/**
50-
* Create an {@link com.twilio.sdk.resource.instance.wds.Queue}.
50+
* Create an {@link com.twilio.sdk.resource.instance.wds.TaskQueue}.
5151
*
5252
* @param properties queue properties
5353
* @return created queue
5454
* @throws TwilioRestException
5555
*/
56-
public Queue createQueue(final String workspaceSid, final Map<String, String> properties) throws
56+
public TaskQueue createTaskQueue(final String workspaceSid, final Map<String, String> properties) throws
5757
TwilioRestException {
58-
QueueFactory queueFactory = new QueueList(this, workspaceSid);
59-
return queueFactory.create(properties);
58+
TaskQueueFactory taskQueueFactory = new TaskQueueList(this, workspaceSid);
59+
return taskQueueFactory.create(properties);
6060
}
6161

6262
/**
@@ -133,7 +133,7 @@ public boolean deleteActivity(final String workspaceSid, final String activitySi
133133
* @return true, if successful
134134
* @throws TwilioRestException the twilio rest exception
135135
*/
136-
public boolean deleteQueue(final String workspaceSid, final String queueSid) throws TwilioRestException {
136+
public boolean deleteTaskQueue(final String workspaceSid, final String queueSid) throws TwilioRestException {
137137
TwilioRestResponse response = safeRequest(
138138
"/" + TwilioWdsClient.DEFAULT_VERSION + "/Accounts/" + getAccountSid() + "/Workspaces/" + workspaceSid +
139139
"/TaskQueues/" + queueSid, "DELETE", (Map) null);
@@ -279,19 +279,19 @@ public ReservationList getReservations(final String workspaceSid, final String t
279279
* @param workspaceSid The 34 character sid starting with WS
280280
* @param queueSid The 34 character sid starting with WQ
281281
*/
282-
public Queue getQueue(final String workspaceSid, final String queueSid) {
283-
Queue queue = new Queue(this, workspaceSid, queueSid);
284-
queue.setRequestAccountSid(getAccountSid());
285-
return queue;
282+
public TaskQueue getTaskQueue(final String workspaceSid, final String queueSid) {
283+
TaskQueue taskQueue = new TaskQueue(this, workspaceSid, queueSid);
284+
taskQueue.setRequestAccountSid(getAccountSid());
285+
return taskQueue;
286286
}
287287

288288
/**
289289
* Get the queues.
290290
*
291291
* @return the queues
292292
*/
293-
public QueueList getQueues(final String workspaceSid) {
294-
return getQueues(workspaceSid, new HashMap<String, String>(0));
293+
public TaskQueueList getTaskQueues(final String workspaceSid) {
294+
return getTaskQueues(workspaceSid, new HashMap<String, String>(0));
295295
}
296296

297297
/**
@@ -301,8 +301,8 @@ public QueueList getQueues(final String workspaceSid) {
301301
* @param filters the filters
302302
* @return queues matching the filters
303303
*/
304-
public QueueList getQueues(final String workspaceSid, final Map<String, String> filters) {
305-
QueueList list = new QueueList(this, workspaceSid, filters);
304+
public TaskQueueList getTaskQueues(final String workspaceSid, final Map<String, String> filters) {
305+
TaskQueueList list = new TaskQueueList(this, workspaceSid, filters);
306306
list.setRequestAccountSid(getAccountSid());
307307
return list;
308308
}

‎src/main/java/com/twilio/sdk/resource/factory/wds/QueueFactory.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎src/main/java/com/twilio/sdk/resource/factory/wds/TaskQueueFactory.java

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package com.twilio.sdk.resource.factory.wds;
2+
3+
import com.twilio.sdk.TwilioRestException;
4+
import com.twilio.sdk.resource.instance.wds.TaskQueue;
5+
import org.apache.http.NameValuePair;
6+
7+
import java.util.List;
8+
import java.util.Map;
9+
10+
/**
11+
* A factory for creating Queues.
12+
*/
13+
public interface TaskQueueFactory {
14+
15+
/**
16+
* Creates a {@link com.twilio.sdk.resource.instance.wds.TaskQueue}.
17+
*
18+
* @param params the params list
19+
* @return a TaskQueue
20+
* @throws com.twilio.sdk.TwilioRestException
21+
*/
22+
public TaskQueue create(Map<String, String> params) throws TwilioRestException;
23+
24+
/**
25+
* Creates a {@link com.twilio.sdk.resource.instance.wds.TaskQueue}.
26+
*
27+
* @param params the params list
28+
* @return a TaskQueue
29+
* @throws TwilioRestException
30+
*/
31+
public TaskQueue create(List<NameValuePair> params) throws TwilioRestException;
32+
}

‎src/main/java/com/twilio/sdk/resource/instance/wds/Task.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ public int getPriority() {
125125
}
126126

127127
/**
128-
* Gets the {@link com.twilio.sdk.resource.instance.wds.Queue} sid.
128+
* Gets the {@link TaskQueue} sid.
129129
*
130-
* @return the {@link com.twilio.sdk.resource.instance.wds.Queue} sid
130+
* @return the {@link TaskQueue} sid
131131
*/
132132
public String getQueueSid() {
133133
return getProperty("task_queue_sid");

‎src/main/java/com/twilio/sdk/resource/instance/wds/Queue.java renamed to ‎src/main/java/com/twilio/sdk/resource/instance/wds/TaskQueue.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/**
1010
* Queues distribute tasks to workers, and collect statistics about task distribution.
1111
*/
12-
public class Queue extends InstanceResource<TwilioWdsClient> {
12+
public class TaskQueue extends InstanceResource<TwilioWdsClient> {
1313

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

@@ -18,7 +18,7 @@ public class Queue extends InstanceResource<TwilioWdsClient> {
1818
*
1919
* @param client the client
2020
*/
21-
public Queue(final TwilioWdsClient client) {
21+
public TaskQueue(final TwilioWdsClient client) {
2222
super(client);
2323
}
2424

@@ -28,7 +28,7 @@ public Queue(final TwilioWdsClient client) {
2828
* @param client the client
2929
* @param properties the properties
3030
*/
31-
public Queue(final TwilioWdsClient client, final Map<String, Object> properties) {
31+
public TaskQueue(final TwilioWdsClient client, final Map<String, Object> properties) {
3232
super(client, properties);
3333
}
3434

@@ -39,13 +39,13 @@ public Queue(final TwilioWdsClient client, final Map<String, Object> properties)
3939
* @param workspaceSid the workspace sid
4040
* @param queueSid the queue sid
4141
*/
42-
public Queue(final TwilioWdsClient client, final String workspaceSid, final String queueSid) {
42+
public TaskQueue(final TwilioWdsClient client, final String workspaceSid, final String queueSid) {
4343
super(client);
4444
if (workspaceSid == null || "".equals(workspaceSid)) {
45-
throw new IllegalArgumentException("The workspaceSid for a Queue cannot be null");
45+
throw new IllegalArgumentException("The workspaceSid for a TaskQueue cannot be null");
4646
}
4747
if (queueSid == null || "".equals(queueSid)) {
48-
throw new IllegalArgumentException("The queueSid for a Queue cannot be null");
48+
throw new IllegalArgumentException("The queueSid for a TaskQueue cannot be null");
4949
}
5050
setProperty(WORKSPACE_SID_PROPERTY, workspaceSid);
5151
setProperty(SID_PROPERTY, queueSid);

‎src/main/java/com/twilio/sdk/resource/list/wds/QueueList.java renamed to ‎src/main/java/com/twilio/sdk/resource/list/wds/TaskQueueList.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
import com.twilio.sdk.TwilioRestResponse;
55
import com.twilio.sdk.TwilioWdsClient;
66
import com.twilio.sdk.resource.ListResource;
7-
import com.twilio.sdk.resource.factory.wds.QueueFactory;
8-
import com.twilio.sdk.resource.instance.wds.Queue;
7+
import com.twilio.sdk.resource.factory.wds.TaskQueueFactory;
8+
import com.twilio.sdk.resource.instance.wds.TaskQueue;
99
import org.apache.http.NameValuePair;
1010

1111
import java.util.List;
1212
import java.util.Map;
1313

1414
/**
15-
* QueueList to work with {@link com.twilio.sdk.resource.instance.wds.Queue}.
15+
* TaskQueueList to work with {@link com.twilio.sdk.resource.instance.wds.TaskQueue}.
1616
*/
17-
public class QueueList extends ListResource<Queue, TwilioWdsClient> implements QueueFactory {
17+
public class TaskQueueList extends ListResource<TaskQueue, TwilioWdsClient> implements TaskQueueFactory {
1818

1919
private String workspaceSid;
2020

@@ -24,7 +24,7 @@ public class QueueList extends ListResource<Queue, TwilioWdsClient> implements Q
2424
* @param client the client
2525
* @param workspaceSid the workspace sid
2626
*/
27-
public QueueList(final TwilioWdsClient client, final String workspaceSid) {
27+
public TaskQueueList(final TwilioWdsClient client, final String workspaceSid) {
2828
super(client);
2929
this.workspaceSid = workspaceSid;
3030
}
@@ -36,19 +36,19 @@ public QueueList(final TwilioWdsClient client, final String workspaceSid) {
3636
* @param filters the filters
3737
* @param workspaceSid the workspace sid
3838
*/
39-
public QueueList(final TwilioWdsClient client, final String workspaceSid, final Map<String, String> filters) {
39+
public TaskQueueList(final TwilioWdsClient client, final String workspaceSid, final Map<String, String> filters) {
4040
super(client, filters);
4141
this.workspaceSid = workspaceSid;
4242
}
4343

4444
@Override
45-
public Queue create(final Map<String, String> params) throws TwilioRestException {
45+
public TaskQueue create(final Map<String, String> params) throws TwilioRestException {
4646
TwilioRestResponse response = getClient().safeRequest(getResourceLocation(), "POST", params);
4747
return makeNew(getClient(), response.toMap());
4848
}
4949

5050
@Override
51-
public Queue create(final List<NameValuePair> params) throws TwilioRestException {
51+
public TaskQueue create(final List<NameValuePair> params) throws TwilioRestException {
5252
TwilioRestResponse response = getClient().safeRequest(getResourceLocation(), "POST", params);
5353
return makeNew(getClient(), response.toMap());
5454
}
@@ -59,8 +59,8 @@ protected String getListKey() {
5959
}
6060

6161
@Override
62-
protected Queue makeNew(final TwilioWdsClient client, final Map<String, Object> params) {
63-
return new Queue(client, params);
62+
protected TaskQueue makeNew(final TwilioWdsClient client, final Map<String, Object> params) {
63+
return new TaskQueue(client, params);
6464
}
6565

6666
@Override

‎src/test/java/com/twilio/sdk/resource/instance/wds/QueueTest.java

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎src/test/java/com/twilio/sdk/resource/instance/wds/TaskQueueTest.java

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
package com.twilio.sdk.resource.instance.wds;
2+
3+
import com.twilio.sdk.resource.instance.BasicRequestTester;
4+
import org.junit.Before;
5+
import org.junit.Test;
6+
7+
import java.util.HashMap;
8+
import java.util.Map;
9+
10+
import static org.junit.Assert.assertEquals;
11+
import static org.junit.Assert.assertNotNull;
12+
import static org.junit.Assert.assertTrue;
13+
14+
public class TaskQueueTest extends BasicRequestTester {
15+
16+
@Before
17+
public void setup() throws Exception {
18+
setExpectedServerContentType("application/json");
19+
setExpectedServerAnswer("/" + getClass().getPackage().getName().replace(".", "/") + "/taskqueue.json");
20+
}
21+
22+
@Test
23+
public void testCreateTaskQueue() throws Exception {
24+
setExpectedServerReturnCode(201);
25+
Map<String, String> properties = new HashMap<String, String>();
26+
properties.put("FriendlyName", "Test TaskQueue");
27+
properties.put("AssignmentActivitySid", "WAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
28+
properties.put("ReservationActivitySid", "WRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
29+
TaskQueue taskQueue = wdsClient.createTaskQueue("WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", properties);
30+
assertNotNull(taskQueue);
31+
assertEquals("Test Queue", taskQueue.getFriendlyName());
32+
}
33+
34+
@Test
35+
public void testDeleteTaskQueue() throws Exception {
36+
setExpectedServerAnswer(null);
37+
setExpectedServerReturnCode(204);
38+
assertTrue(wdsClient.deleteTaskQueue("WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "WQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"));
39+
}
40+
41+
@Test
42+
public void testGetTaskQueue() throws Exception {
43+
setExpectedServerReturnCode(200);
44+
TaskQueue taskQueue = wdsClient.getTaskQueue("WSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
45+
"WQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
46+
assertNotNull(taskQueue);
47+
assertEquals("WQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", taskQueue.getSid());
48+
assertEquals("Test Queue", taskQueue.getFriendlyName());
49+
}
50+
51+
}

0 commit comments

Comments
 (0)
0