Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: allow conference participant to be any endpoint #559

Merged
merged 18 commits into from
Apr 23, 2021
Merged

feat: allow conference participant to be any endpoint #559

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ce82ee6
Update Participant.java
Jul 11, 2020
7eb4915
Update ParticipantCreator.java
Jul 11, 2020
a8f2a5e
Merge branch 'main' into master
Jul 30, 2020
f9bc5b6
Merge branch 'main' into master
Sep 23, 2020
35f261d
Merge branch 'main' into master
Oct 9, 2020
d10b338
Merge branch 'main' into master
Nov 4, 2020
9a44b29
Merge branch 'main' into master
thinkingserious Nov 17, 2020
a1e0ac6
Merge branch 'main' into master
JenniferMah Jan 8, 2021
dd2befd
Merge branch 'main' into master
JenniferMah Jan 22, 2021
53b6c4e
Merge branch 'main' into master
shwetha-manvinkurke Feb 10, 2021
adf0b3b
Merge branch 'main' into master
thinkingserious Feb 22, 2021
890eba7
Merge branch 'main' into master
JenniferMah Mar 3, 2021
baf759f
Merge branch 'main' into master
shwetha-manvinkurke Mar 10, 2021
6f0e43c
Merge branch 'main' into master
shwetha-manvinkurke Mar 16, 2021
24683d5
Merge branch 'main' into master
Apr 9, 2021
d06372f
Update src/main/java/com/twilio/rest/api/v2010/account/conference/Par…
Apr 9, 2021
b80d302
Merge branch 'main' into master
thinkingserious Apr 15, 2021
9bcb969
Merge branch 'main' into master
eshanholtz Apr 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/main/java/com/twilio/rest/api/v2010/account/conference/Participant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ public static ParticipantUpdater updater(final String pathConferenceSid,
*/
public static ParticipantCreator creator(final String pathAccountSid,
final String pathConferenceSid,
final com.twilio.type.PhoneNumber from,
final com.twilio.type.PhoneNumber to) {
final com.twilio.type.Endpoint from,
eshanholtz marked this conversation as resolved.
Show resolved Hide resolved
final com.twilio.type.Endpoint to) {
return new ParticipantCreator(pathAccountSid, pathConferenceSid, from, to);
}

Expand All @@ -156,8 +156,8 @@ public static ParticipantCreator creator(final String pathAccountSid,
* @return ParticipantCreator capable of executing the create
*/
public static ParticipantCreator creator(final String pathConferenceSid,
final com.twilio.type.PhoneNumber from,
final com.twilio.type.PhoneNumber to) {
final com.twilio.type.Endpoint from,
final com.twilio.type.Endpoint to) {
return new ParticipantCreator(pathConferenceSid, from, to);
}

Expand Down Expand Up @@ -508,4 +508,4 @@ public String toString() {
.add("uri", uri)
.toString();
}
}
}
14 changes: 7 additions & 7 deletions src/main/java/com/twilio/rest/api/v2010/account/conference/ParticipantCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
public class ParticipantCreator extends Creator<Participant> {
private String pathAccountSid;
private final String pathConferenceSid;
private final com.twilio.type.PhoneNumber from;
private final com.twilio.type.PhoneNumber to;
private final com.twilio.type.Endpoint from;
private final com.twilio.type.Endpoint to;
private URI statusCallback;
private HttpMethod statusCallbackMethod;
private List<String> statusCallbackEvent;
Expand Down Expand Up @@ -71,8 +71,8 @@ public class ParticipantCreator extends Creator<Participant> {
* this call.
*/
public ParticipantCreator(final String pathConferenceSid,
final com.twilio.type.PhoneNumber from,
final com.twilio.type.PhoneNumber to) {
final com.twilio.type.Endpoint from,
final com.twilio.type.Endpoint to) {
this.pathConferenceSid = pathConferenceSid;
this.from = from;
this.to = to;
Expand All @@ -90,8 +90,8 @@ public ParticipantCreator(final String pathConferenceSid,
*/
public ParticipantCreator(final String pathAccountSid,
final String pathConferenceSid,
final com.twilio.type.PhoneNumber from,
final com.twilio.type.PhoneNumber to) {
final com.twilio.type.Endpoint from,
final com.twilio.type.Endpoint to) {
this.pathAccountSid = pathAccountSid;
this.pathConferenceSid = pathConferenceSid;
this.from = from;
Expand Down Expand Up @@ -877,4 +877,4 @@ private void addPostParams(final Request request) {
request.addPostParam("CallerId", callerId);
}
}
}
}