Skip to content

Commit cc51514

Browse files
juntuchen-msftjuntuchen-msft
authored
updated naming of per-action callback URI override (Azure#36116)
1 parent 696df6d commit cc51514

File tree

8 files changed

+59
-62
lines changed

8 files changed

+59
-62
lines changed

‎sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/CallConnectionAsync.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,14 +272,14 @@ Mono<Response<TransferCallResult>> transferCallToParticipantWithResponseInternal
272272
TransferToParticipantRequestInternal request = new TransferToParticipantRequestInternal()
273273
.setTargetParticipant(CommunicationIdentifierConverter.convert(transferCallToParticipantOptions.getTargetParticipant()))
274274
.setOperationContext(transferCallToParticipantOptions.getOperationContext())
275-
.setCallbackUriOverride(transferCallToParticipantOptions.getCallbackUrlOverride());
275+
.setCallbackUri(transferCallToParticipantOptions.getCallbackUrl());
276276

277277
if (transferCallToParticipantOptions.getCustomContext().getSipHeaders() != null || transferCallToParticipantOptions.getCustomContext().getVoipHeaders() != null) {
278278
request.setCustomContext(new CustomContext()
279279
.setSipHeaders(transferCallToParticipantOptions.getCustomContext().getSipHeaders())
280280
.setVoipHeaders(transferCallToParticipantOptions.getCustomContext().getVoipHeaders()));
281281
}
282-
282+
283283
if (transferCallToParticipantOptions.getTransferee() != null) {
284284
request.setTransferee(CommunicationIdentifierConverter.convert(transferCallToParticipantOptions.getTransferee()));
285285
}
@@ -329,7 +329,7 @@ Mono<Response<AddParticipantResult>> addParticipantWithResponseInternal(AddParti
329329
.setSourceDisplayName(addParticipantOptions.getTargetParticipant().getSourceDisplayName())
330330
.setSourceCallerIdNumber(PhoneNumberIdentifierConverter.convert(addParticipantOptions.getTargetParticipant().getSourceCallerIdNumber()))
331331
.setOperationContext(addParticipantOptions.getOperationContext())
332-
.setCallbackUriOverride(addParticipantOptions.getCallbackUrlOverride());
332+
.setCallbackUri(addParticipantOptions.getCallbackUrl());
333333

334334
// Need to do a null check since it is optional; it might be a null and breaks the get function as well as type casting.
335335
if (addParticipantOptions.getInvitationTimeout() != null) {
@@ -389,7 +389,7 @@ Mono<Response<RemoveParticipantResult>> removeParticipantWithResponseInternal(Re
389389
RemoveParticipantRequestInternal request = new RemoveParticipantRequestInternal()
390390
.setParticipantToRemove(CommunicationIdentifierConverter.convert(removeParticipantOptions.getParticipant()))
391391
.setOperationContext(removeParticipantOptions.getOperationContext())
392-
.setCallbackUriOverride(removeParticipantOptions.getCallbackUrlOverride());
392+
.setCallbackUri(removeParticipantOptions.getCallbackUrl());
393393

394394
return callConnectionInternal.removeParticipantWithResponseAsync(
395395
callConnectionId,

‎sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/implementation/models/AddParticipantRequestInternal.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ public final class AddParticipantRequestInternal {
5454
private CustomContext customContext;
5555

5656
/*
57-
* The callback URI override.
57+
* The callback URI to override the main callback URI.
5858
*/
59-
@JsonProperty(value = "callbackUriOverride")
60-
private String callbackUriOverride;
59+
@JsonProperty(value = "callbackUri")
60+
private String callbackUri;
6161

6262
/**
6363
* Get the sourceCallerIdNumber property: The source caller Id, a phone number, that's shown to the PSTN participant
@@ -188,22 +188,22 @@ public AddParticipantRequestInternal setCustomContext(CustomContext customContex
188188
}
189189

190190
/**
191-
* Get the callbackUriOverride property: The callback URI override.
191+
* Get the callbackUri property: The callback URI to override the main callback URI.
192192
*
193-
* @return the callbackUriOverride value.
193+
* @return the callbackUri value.
194194
*/
195-
public String getCallbackUriOverride() {
196-
return this.callbackUriOverride;
195+
public String getCallbackUri() {
196+
return this.callbackUri;
197197
}
198198

199199
/**
200-
* Set the callbackUriOverride property: The callback URI override.
200+
* Set the callbackUri property: The callback URI to override the main callback URI.
201201
*
202-
* @param callbackUriOverride the callbackUriOverride value to set.
202+
* @param callbackUri the callbackUri value to set.
203203
* @return the AddParticipantRequestInternal object itself.
204204
*/
205-
public AddParticipantRequestInternal setCallbackUriOverride(String callbackUriOverride) {
206-
this.callbackUriOverride = callbackUriOverride;
205+
public AddParticipantRequestInternal setCallbackUri(String callbackUri) {
206+
this.callbackUri = callbackUri;
207207
return this;
208208
}
209209
}

‎sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/implementation/models/RemoveParticipantRequestInternal.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ public final class RemoveParticipantRequestInternal {
2424
private String operationContext;
2525

2626
/*
27-
* The callback URI override.
27+
* The callback URI to override the main callback URI.
2828
*/
29-
@JsonProperty(value = "callbackUriOverride")
30-
private String callbackUriOverride;
29+
@JsonProperty(value = "callbackUri")
30+
private String callbackUri;
3131

3232
/**
3333
* Get the participantToRemove property: The participants to be removed from the call.
@@ -72,22 +72,22 @@ public RemoveParticipantRequestInternal setOperationContext(String operationCont
7272
}
7373

7474
/**
75-
* Get the callbackUriOverride property: The callback URI override.
75+
* Get the callbackUri property: The callback URI to override the main callback URI.
7676
*
77-
* @return the callbackUriOverride value.
77+
* @return the callbackUri value.
7878
*/
79-
public String getCallbackUriOverride() {
80-
return this.callbackUriOverride;
79+
public String getCallbackUri() {
80+
return this.callbackUri;
8181
}
8282

8383
/**
84-
* Set the callbackUriOverride property: The callback URI override.
84+
* Set the callbackUri property: The callback URI to override the main callback URI.
8585
*
86-
* @param callbackUriOverride the callbackUriOverride value to set.
86+
* @param callbackUri the callbackUri value to set.
8787
* @return the RemoveParticipantRequestInternal object itself.
8888
*/
89-
public RemoveParticipantRequestInternal setCallbackUriOverride(String callbackUriOverride) {
90-
this.callbackUriOverride = callbackUriOverride;
89+
public RemoveParticipantRequestInternal setCallbackUri(String callbackUri) {
90+
this.callbackUri = callbackUri;
9191
return this;
9292
}
9393
}

‎sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/implementation/models/TransferToParticipantRequestInternal.java‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ public final class TransferToParticipantRequestInternal {
3636
private CommunicationIdentifierModel transferee;
3737

3838
/*
39-
* The callback URI override.
39+
* The callback URI to override the main callback URI.
4040
*/
41-
@JsonProperty(value = "callbackUriOverride")
42-
private String callbackUriOverride;
41+
@JsonProperty(value = "callbackUri")
42+
private String callbackUri;
4343

4444
/**
4545
* Get the targetParticipant property: The identity of the target where call should be transferred to.
@@ -104,8 +104,6 @@ public TransferToParticipantRequestInternal setOperationContext(String operation
104104
}
105105

106106
/**
107-
<<<<<<< HEAD
108-
=======
109107
* Get the transferee property: Transferee is the participant who is transferring the call.
110108
*
111109
* @return the transferee value.
@@ -126,23 +124,22 @@ public TransferToParticipantRequestInternal setTransferee(CommunicationIdentifie
126124
}
127125

128126
/**
129-
>>>>>>> 1800d18d847 (add transfer in group call support)
130-
* Get the callbackUriOverride property: The callback URI override.
127+
* Get the callbackUri property: The callback URI to override the main callback URI.
131128
*
132-
* @return the callbackUriOverride value.
129+
* @return the callbackUri value.
133130
*/
134-
public String getCallbackUriOverride() {
135-
return this.callbackUriOverride;
131+
public String getCallbackUri() {
132+
return this.callbackUri;
136133
}
137134

138135
/**
139-
* Set the callbackUriOverride property: The callback URI override.
136+
* Set the callbackUri property: The callback URI to override the main callback URI.
140137
*
141-
* @param callbackUriOverride the callbackUriOverride value to set.
138+
* @param callbackUri the callbackUri value to set.
142139
* @return the TransferToParticipantRequestInternal object itself.
143140
*/
144-
public TransferToParticipantRequestInternal setCallbackUriOverride(String callbackUriOverride) {
145-
this.callbackUriOverride = callbackUriOverride;
141+
public TransferToParticipantRequestInternal setCallbackUri(String callbackUri) {
142+
this.callbackUri = callbackUri;
146143
return this;
147144
}
148145
}

‎sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/models/AddParticipantOptions.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public final class AddParticipantOptions {
3434
/**
3535
* The call back URI override.
3636
*/
37-
private String callbackUrlOverride;
37+
private String callbackUrl;
3838

3939
/**
4040
* Constructor
@@ -67,8 +67,8 @@ public String getOperationContext() {
6767
*
6868
* @return the callbackUriOverride
6969
*/
70-
public String getCallbackUrlOverride() {
71-
return callbackUrlOverride;
70+
public String getCallbackUrl() {
71+
return callbackUrl;
7272
}
7373

7474
/**
@@ -94,11 +94,11 @@ public AddParticipantOptions setOperationContext(String operationContext) {
9494
/**
9595
* Set the call back URI override.
9696
*
97-
* @param callbackUrlOverride The call back URI override to set
97+
* @param callbackUrl The call back URI override to set
9898
* @return the AddParticipantOptions object itself.
9999
*/
100-
public AddParticipantOptions setCallbackUrlOverride(String callbackUrlOverride) {
101-
this.callbackUrlOverride = callbackUrlOverride;
100+
public AddParticipantOptions setCallbackUrl(String callbackUrl) {
101+
this.callbackUrl = callbackUrl;
102102
return this;
103103
}
104104

‎sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/models/RemoveParticipantOptions.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public final class RemoveParticipantOptions {
2525
/**
2626
* Callback URI override
2727
*/
28-
private String callbackUrlOverride;
28+
private String callbackUrl;
2929

3030
/**
3131
* Constructor
@@ -59,8 +59,8 @@ public String getOperationContext() {
5959
*
6060
* @return the callbackUriOverride
6161
*/
62-
public String getCallbackUrlOverride() {
63-
return callbackUrlOverride;
62+
public String getCallbackUrl() {
63+
return callbackUrl;
6464
}
6565

6666
/**
@@ -77,11 +77,11 @@ public RemoveParticipantOptions setOperationContext(String operationContext) {
7777
/**
7878
* Set the callbackUriOverride.
7979
*
80-
* @param callbackUrlOverride the callbackUriOverride to set
80+
* @param callbackUrl the callbackUriOverride to set
8181
* @return the RemoveParticipantOptions object itself.
8282
*/
83-
public RemoveParticipantOptions setCallbackUrlOverride(String callbackUrlOverride) {
84-
this.callbackUrlOverride = callbackUrlOverride;
83+
public RemoveParticipantOptions setCallbackUrl(String callbackUrl) {
84+
this.callbackUrl = callbackUrl;
8585
return this;
8686
}
8787
}

‎sdk/communication/azure-communication-callautomation/src/main/java/com/azure/communication/callautomation/models/TransferCallToParticipantOptions.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
public final class TransferCallToParticipantOptions {
1919
private final CommunicationIdentifier targetParticipant;
2020
private final CustomContext customContext;
21-
private String callbackUrlOverride;
22-
21+
private String callbackUrl;
22+
2323
/**
2424
* Participant being transferred away
2525
*/
@@ -91,7 +91,7 @@ public TransferCallToParticipantOptions setOperationContext(String operationCont
9191
this.operationContext = operationContext;
9292
return this;
9393
}
94-
94+
9595
/**
9696
* Get transferee.
9797
*
@@ -100,7 +100,7 @@ public TransferCallToParticipantOptions setOperationContext(String operationCont
100100
public CommunicationIdentifier getTransferee() {
101101
return transferee;
102102
}
103-
103+
104104
/**
105105
* Set the transferee.
106106
*
@@ -133,18 +133,18 @@ public CustomContext getCustomContext() {
133133
*
134134
* @return the callbackUrlOverride
135135
*/
136-
public String getCallbackUrlOverride() {
137-
return callbackUrlOverride;
136+
public String getCallbackUrl() {
137+
return callbackUrl;
138138
}
139139

140140
/**
141141
* Set the operationContext.
142142
*
143-
* @param callbackUrlOverride the callbackUrlOverride to set
143+
* @param callbackUrl the callbackUrlOverride to set
144144
* @return the TransferCallToParticipantOptions object itself.
145145
*/
146-
public TransferCallToParticipantOptions setCallbackUrlOverride(String callbackUrlOverride) {
147-
this.callbackUrlOverride = callbackUrlOverride;
146+
public TransferCallToParticipantOptions setCallbackUrl(String callbackUrl) {
147+
this.callbackUrl = callbackUrl;
148148
return this;
149149
}
150150
}

‎sdk/communication/azure-communication-callautomation/swagger/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ autorest README.md --java --v4 --use=@autorest/java@4.0.20 --use=@autorest/model
2828
``` yaml
2929
tag: package-2023-01-15-preview
3030
require:
31-
- https://github.com/williamzhao87/azure-rest-api-specs/blob/0a316f5346cf6dc37200403d6b20e2400157721c/specification/communication/data-plane/CallAutomation/readme.md
31+
- https://github.com/williamzhao87/azure-rest-api-specs/blob/b496fbaf1cef0d9a8d31cfb11c3fc301d4c328ef/specification/communication/data-plane/CallAutomation/readme.md
3232
java: true
3333
output-folder: ../
3434
license-header: MICROSOFT_MIT_SMALL

0 commit comments

Comments
 (0)