8000 Use Calendar for dates and remove unused account sid · senthgit/twilio-java@1064bf0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1064bf0

Browse files
AlexPaymentskimbrel
AlexPayment
authored and
skimbrel
committed
Use Calendar for dates and remove unused account sid
1 parent 916300d commit 1064bf0

File tree

15 files changed

+64
-92
lines changed

15 files changed

+64
-92
lines changed

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

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ public ActivityList getActivities(final String workspaceSid) {
231231
*/
232232
public ActivityList getActivities(final String workspaceSid, final Map<String, String> filters) {
233233
ActivityList list = new ActivityList(this, workspaceSid, filters);
234-
list.setRequestAccountSid(getAccountSid());
235234
return list;
236235
}
237236

@@ -243,7 +242,6 @@ public ActivityList getActivities(final String workspaceSid, final Map<String, S
243242
*/
244243
public Activity getActivity(final String workspaceSid, final String activitySid) {
245244
Activity activity = new Activity(this, workspaceSid, activitySid);
246-
activity.setRequestAccountSid(getAccountSid());
247245
return activity;
248246
}
249247

@@ -255,7 +253,6 @@ public Activity getActivity(final String workspaceSid, final String activitySid)
255253
*/
256254
public Event getEvent(final String workspaceSid, final String eventSid) {
257255
Event event = new Event(this, workspaceSid, eventSid);
258-
event.setRequestAccountSid(getAccountSid());
259256
return event;
260257
}
261258

@@ -277,7 +274,6 @@ public EventList getEvents(final String workspaceSid) {
277274
*/
278275
public EventList getEvents(final String workspaceSid, final Map<String, String> filters) {
279276
EventList list = new EventList(this, workspaceSid, filters);
280-
list.setRequestAccountSid(getAccountSid());
281277
return list;
282278
}
283279

@@ -290,7 +286,6 @@ public EventList getEvents(final String workspaceSid, final Map<String, String>
290286
*/
291287
public Reservation getReservation(final String workspaceSid, final String taskSid, final String reservationSid) {
292288
Reservation reservation = new Reservation(this, workspaceSid, taskSid, reservationSid);
293-
reservation.setRequestAccountSid(getAccountSid());
294289
return reservation;
295290
}
296291

@@ -313,7 +308,6 @@ public ReservationList getReservations(final String workspaceSid, final String t
313308
public ReservationList getReservations(final String workspaceSid, final String taskSid,
314309
final Map<String, String> filters) {
315310
ReservationList list = new ReservationList(this, workspaceSid, taskSid, filters);
316-
list.setRequestAccountSid(getAccountSid());
317311
return list;
318312
}
319313

@@ -325,7 +319,6 @@ public ReservationList getReservations(final String workspaceSid, final String t
325319
*/
326320
public TaskQueue getTaskQueue(final String workspaceSid, final String queueSid) {
327321
TaskQueue taskQueue = new TaskQueue(this, workspaceSid, queueSid);
328-
taskQueue.setRequestAccountSid(getAccountSid());
329322
return taskQueue;
330323
}
331324

@@ -347,7 +340,6 @@ public TaskQueueList getTaskQueues(final String workspaceSid) {
347340
*/
348341
public TaskQueueList getTaskQueues(final String workspaceSid, final Map<String, String> filters) {
349342
TaskQueueList list = new TaskQueueList(this, workspaceSid, filters);
350-
list.setRequestAccountSid(getAccountSid());
351343
return list;
352344
}
353345

@@ -370,7 +362,6 @@ public TaskQueueListStatistics getQueuesStatistics(final String workspaceSid) {
370362
*/
371363
public TaskQueueListStatistics getQueuesStatistics(final String workspaceSid, final Map<String, String> filters) {
372364
TaskQueueListStatistics list = new TaskQueueListStatistics(this, workspaceSid, filters);
373-
list.setRequestAccountSid(getAccountSid());
374365
return list;
375366
}
376367

@@ -396,7 +387,6 @@ public TaskQueueStatistics getQueueStatistics(final String workspaceSid, final S
396387
public TaskQueueStatistics getQueueStatistics(final String workspaceSid, final String queueSid,
397388
final Map<String, String> filters) {
398389
TaskQueueStatistics taskQueueStatistics = new TaskQueueStatistics(this, workspaceSid, queueSid, filters);
399-
taskQueueStatistics.setRequestAccountSid(getAccountSid());
400390
return taskQueueStatistics;
401391
}
402392

@@ -408,7 +398,6 @@ public TaskQueueStatistics getQueueStatistics(final String workspaceSid, final S
408398
*/
409399
public Task getTask(final String workspaceSid, final String taskSid) {
410400
Task task = new Task(this, workspaceSid, taskSid);
411-
task.setRequestAccountSid(getAccountSid());
412401
return task;
413402
}
414403

@@ -430,7 +419,6 @@ public TaskList getTasks(final String workspaceSid) {
430419
*/
431420
public TaskList getTasks(final String workspaceSid, final Map<String, String> filters) {
432421
TaskList list = new TaskList(this, workspaceSid, filters);
433-
list.setRequestAccountSid(getAccountSid());
434422
return list;
435423
}
436424

@@ -442,7 +430,6 @@ public TaskList getTasks(final String workspaceSid, final Map<String, String> fi
442430
*/
443431
public Worker getWorker(final String workspaceSid, final String workerSid) {
444432
Worker worker = new Worker(this, workspaceSid, workerSid);
445-
worker.setRequestAccountSid(getAccountSid());
446433
return worker;
447434
}
448435

@@ -464,7 +451,6 @@ public WorkerList getWorkers(final String workspaceSid) {
464451
*/
465452
public WorkerList getWorkers(final String workspaceSid, final Map<String, String> filters) {
466453
WorkerList list = new WorkerList(this, workspaceSid, filters);
467-
list.setRequestAccountSid(getAccountSid());
468454
return list;
469455
}
470456

@@ -487,7 +473,6 @@ public WorkersStatistics getWorkersStatistics(final String workspaceSid) {
487473
*/
488474
public WorkersStatistics getWorkersStatistics(final String workspaceSid, final Map<String, String> filters) {
489475
WorkersStatistics workersStatistics = new WorkersStatistics(this, workspaceSid, filters);
490-
workersStatistics.setRequestAccountSid(getAccountSid());
491476
return workersStatistics;
492477
}
493478

@@ -513,7 +498,6 @@ public WorkerStatistics getWorkerStatistics(final String workspaceSid, final Str
513498
public WorkerStatistics getWorkerStatistics(final String workspaceSid, final String workerSid,
514499
final Map<String, String> filters) {
515500
WorkerStatistics workerStatistics = new WorkerStatistics(this, workspaceSid, workerSid, filters);
516-
workerStatistics.setRequestAccountSid(getAccountSid());
517501
return workerStatistics;
518502
}
519503

@@ -525,7 +509,6 @@ public WorkerStatistics getWorkerStatistics(final String workspaceSid, final Str
525509
*/
526510
public Workflow getWorkflow(final String workspaceSid, final String workflowSid) {
527511
Workflow workflow = new Workflow(this, workspaceSid, workflowSid);
528-
workflow.setRequestAccountSid(getAccountSid());
529512
return workflow;
530513
}
531514

@@ -547,7 +530,6 @@ public WorkflowList getWorkflows(final String workspaceSid) {
547530
*/
548531
public WorkflowList getWorkflows(final String workspaceSid, final Map<String, String> filters) {
549532
WorkflowList list = new WorkflowList(this, workspaceSid, filters);
550-
list.setRequestAccountSid(getAccountSid());
551533
return list;
552534
}
553535

@@ -573,7 +555,6 @@ public WorkflowStatistics getWorkflowStatistics(final String workspaceSid, final
573555
public WorkflowStatistics getWorkflowStatistics(final String workspaceSid, final String workflowSid,
574556
final Map<String, String> filters) {
575557
WorkflowStatistics workflowStatistics = new WorkflowStatistics(this, workspaceSid, workflowSid, filters);
576-
workflowStatistics.setRequestAccountSid(getAccountSid());
577558
return workflowStatistics;
578559
}
579560

@@ -584,7 +565,6 @@ public WorkflowStatistics getWorkflowStatistics(final String workspaceSid, final
584565
*/
585566
public Workspace getWorkspace(final String sid) {
586567
Workspace workspace = new Workspace(this, sid);
587-
workspace.setRequestAccountSid(getAccountSid());
588568
return workspace;
589569
}
590570

@@ -605,7 +585,6 @@ public WorkspaceList getWorkspaces() {
605585
*/
606586
public WorkspaceList getWorkspaces(final Map<String, String> filters) {
607587
WorkspaceList list = new WorkspaceList(this, filters);
608-
list.setRequestAccountSid(getAccountSid());
609588
return list;
610589
}
611590

@@ -628,7 +607,6 @@ public WorkspaceStatistics getWorkspaceStatistics(final String workspaceSid) {
628607
*/
629608
public WorkspaceStatistics getWorkspaceStatistics(final String workspaceSid, final Map<String, String> filters) {
630609
WorkspaceStatistics workspaceStatistics = new WorkspaceStatistics(this, workspaceSid, filters);
631-
workspaceStatistics.setRequestAccountSid(getAccountSid());
632610
return workspaceStatistics;
633611
}
634612

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

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ public abstract class InstanceResource<C extends TwilioClient> extends Resource<
2323

2424
protected static final String DATE_UPDATED_PROPERTY = "date_updated";
2525

26-
protected static final SimpleDateFormat ISO_8601_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
27-
2826
protected static final SimpleDateFormat RFC_2822_FORMAT = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss Z");
2927

3028
/** The Constant SID_PROPERTY. */
@@ -187,27 +185,14 @@ protected void parseResponse(TwilioRestResponse response) {
187185
* @return the date value of the input string
188186
*/
189187
protected Date parseDate(final String inDate) {
190-
return parseDate(inDate, RFC_2822_FORMAT);
188+
if (inDate == null) {
189+
return null;
190+
}
191+
try {
192+
return RFC_2822_FORMAT.parse(inDate);
193+
} catch (ParseException e) {
194+
return null;
195+
}
191196
}
192197

193-
/**
194-
* return a date from the property string
195-
*
196-
* @return the date value of the input string
197-
*/
198-
protected Date parseIso8601Date(final String inDate) {
199-
return parseDate(inDate, ISO_8601_FORMAT);
200-
}
201-
202-
private Date parseDate(final String date, final SimpleDateFormat format) {
203-
if (date == null) {
204-
return null;
205-
}
206-
try {
207-
return format.parse(date);
208-
} catch (ParseException e) {
209-
return null;
210-
}
211-
}
212-
213198
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,6 @@ protected List<T> toList(TwilioRestResponse response) {
117117
private void extract_object(List<T> returnList, Object o) {
118118
if (o instanceof Map) {
119119
T instance = makeNew(getClient(), (Map<String, Object>) o);
120-
if(instance.getRequestAccountSid() == null){
121-
//Only set RequestAccountSid if the makeNew instance didn't already set it.
122-
instance.setRequestAccountSid(getRequestAccountSid());
123-
}
124120
returnList.add(instance);
125121
}
126122
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.twilio.sdk.TwilioTaskRouterClient;
44
import com.twilio.sdk.resource.NextGenInstanceResource;
55

6-
import java.util.Date;
6+
import java.util.Calendar;
77
import java.util.Map;
88

99
public class Event extends NextGenInstanceResource<TwilioTaskRouterClient> {
@@ -107,8 +107,8 @@ public Map<String, String> getEventData() {
107107
*
108108
* @return the event date
109109
*/
110-
public Date getEventDate() {
111-
return parseIso8601Date(getProperty("event_date"));
110+
public Calendar getEventDate() {
111+
return parseCalendar(getProperty("event_date"));
112112
}
113113

114114
/**

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import com.twilio.sdk.TwilioTaskRouterClient;
44
import com.twilio.sdk.resource.NextGenInstanceResource;
55

6+
import java.util.Calendar;
67
import java.util.Collections;
7-
import java.util.Date;
88
import java.util.HashSet;
99
import java.util.List;
1010
import java.util.Map;
@@ -127,8 +127,8 @@ public Double getAverageTaskAcceptanceTime() {
127127
*
128128
* @return the end time
129129
*/
130-
public Date getEndTime() {
131-
return parseIso8601Date((String) getCumulative().get("start_time"));
130+
public Calendar getEndTime() {
131+
return parseCalendar((String) getCumulative().get("start_time"));
132132
}
133133

134134
/**
@@ -210,8 +210,8 @@ public Integer getReservedTasks() {
210210
*
211211
* @return the start time
212212
*/
213-
public Date getStartTime() {
214-
return parseIso8601Date((String) getCumulative().get("start_time"));
213+
public Calendar getStartTime() {
214+
return parseCalendar((String) getCumulative().get("start_time"));
215215
}
216216

217217
/**

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import com.twilio.sdk.TwilioTaskRouterClient;
44
import com.twilio.sdk.resource.NextGenInstanceResource;
55

6+
import java.util.Calendar;
67
import java.util.Collections;
7-
import java.util.Date;
88
import java.util.HashSet;
99
import java.util.List;
1010
import java.util.Map;
@@ -81,8 +81,8 @@ public Set<ActivityDuration> getActivityDurations() {
8181
*
8282
* @return the end time
8383
*/
84-
public Date getEndTime() {
85-
return parseIso8601Date((String) getCumulative().get("start_time"));
84+
public Calendar getEndTime() {
85+
return parseCalendar((String) getCumulative().get("start_time"));
8686
}
8787

8888
/**
@@ -117,8 +117,8 @@ public Integer getReservationsTimedOut() {
117117
*
118118
* @return the start time
119119
*/
120-
public Date getStartTime() {
121-
return parseIso8601Date((String) getCumulative().get("start_time"));
120+
public Calendar getStartTime() {
121+
return parseCalendar((String) getCumulative().get("start_time"));
122122
}
123123

124124
/**

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import com.twilio.sdk.TwilioTaskRouterClient;
44
import com.twilio.sdk.resource.NextGenInstanceResource;
55

6+
import java.util.Calendar;
67
import java.util.Collections;
7-
import java.util.Date;
88
import java.util.HashSet;
99
import java.util.List;
1010
import java.util.Map;
@@ -97,8 +97,8 @@ public Set<ActivityStatistic> getActivityStatistics() {
9797
*
9898
* @return the end time
9999
*/
100-
public Date getEndTime() {
101-
return parseIso8601Date((String) getCumulative().get("start_time"));
100+
public Calendar getEndTime() {
101+
return parseCalendar((String) getCumulative().get("start_time"));
102102
}
103103

104104
/**
@@ -133,8 +133,8 @@ public Integer getReservationsTimedOut() {
133133
*
134134
* @return the start time
135135
*/
136-
public Date getStartTime() {
137-
return parseIso8601Date((String) getCumulative().get("start_time"));
136+
public Calendar getStartTime() {
137+
return parseCalendar((String) getCumulative().get("start_time"));
138138
}
139139

140140
/**
@@ -166,8 +166,7 @@ public String getWorkspaceSid() {
166166

167167
@Override
168168
protected String getResourceLocation() {
169-
return "/" + TwilioTaskRouterClient.DEFAULT_VERSION + "/Workspaces/" +
170-
getWorkspaceSid() + "/Workers/Statistics";
169+
return "/" + TwilioTaskRouterClient.DEFAULT_VERSION + "/Workspaces/" + getWorkspaceSid() + "/Workers/Statistics";
171170
}
172171

173172
private Map<String, Object> getCumulative() {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.twilio.sdk.TwilioTaskRouterClient;
44
import com.twilio.sdk.resource.NextGenInstanceResource;
55

6-
import java.util.Date;
6+
import java.util.Calendar;
77
import java.util.Map;
88

99
/**
@@ -88,8 +88,8 @@ public Double getAverageTaskAcceptanceTime() {
8888
*
8989
* @return the end time
9090
*/
91-
public Date getEndTime() {
92-
return parseIso8601Date((String) getCumulative().get("start_time"));
91+
public Calendar getEndTime() {
92+
return parseCalendar((String) getCumulative().get("start_time"));
9393
}
9494

9595
/**
@@ -162,8 +162,8 @@ public Integer getReservedTasks() {
162162
*
163163
* @return the start time
164164
*/
165-
public Date getStartTime() {
166-
return parseIso8601Date((String) getCumulative().get("start_time"));
165+
public Calendar getStartTime() {
166+
return parseCalendar((String) getCumulative().get("start_time"));
167167
}
168168

169169
/**

0 commit comments

Comments
 (0)
0