diff --git a/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberAsyncClient.java b/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberAsyncClient.java index 3c70dca7205e..5a66cc1b1221 100644 --- a/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberAsyncClient.java +++ b/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberAsyncClient.java @@ -220,7 +220,7 @@ Mono> updateCapabilitiesWithResponse( Map capabilitiesMap = new HashMap<>(); for (Map.Entry entry : phoneNumberCapabilitiesUpdate.entrySet()) { - capabilitiesMap.put(entry.getKey().getValue(), entry.getValue()); + capabilitiesMap.put(entry.getKey().getPhoneNumber(), entry.getValue()); } UpdateNumberCapabilitiesRequest updateNumberCapabilitiesRequest = new UpdateNumberCapabilitiesRequest(); updateNumberCapabilitiesRequest.setPhoneNumberCapabilitiesUpdate(capabilitiesMap); @@ -289,7 +289,7 @@ Mono> getNumberConfigurationWithResponse( try { Objects.requireNonNull(phoneNumber, "'phoneNumber' cannot be null."); NumberConfigurationPhoneNumber configurationPhoneNumber = new NumberConfigurationPhoneNumber(); - configurationPhoneNumber.setPhoneNumber(phoneNumber.getValue()); + configurationPhoneNumber.setPhoneNumber(phoneNumber.getPhoneNumber()); if (context == null) { return phoneNumberAdministrations.getNumberConfigurationWithResponseAsync( @@ -335,7 +335,7 @@ Mono> configureNumberWithResponse( Objects.requireNonNull(pstnConfiguration, "'pstnConfiguration' cannot be null."); NumberConfiguration numberConfiguration = new NumberConfiguration(); - numberConfiguration.setPhoneNumber(phoneNumber.getValue()).setPstnConfiguration(pstnConfiguration); + numberConfiguration.setPhoneNumber(phoneNumber.getPhoneNumber()).setPstnConfiguration(pstnConfiguration); if (context == null) { return phoneNumberAdministrations.configureNumberWithResponseAsync(numberConfiguration); @@ -373,7 +373,7 @@ Mono> unconfigureNumberWithResponse(PhoneNumberIdentifier phoneNu try { Objects.requireNonNull(phoneNumber, "'phoneNumber' cannot be null."); NumberConfigurationPhoneNumber configurationPhoneNumber = new NumberConfigurationPhoneNumber(); - configurationPhoneNumber.setPhoneNumber(phoneNumber.getValue()); + configurationPhoneNumber.setPhoneNumber(phoneNumber.getPhoneNumber()); if (context == null) { return phoneNumberAdministrations.unconfigureNumberWithResponseAsync(configurationPhoneNumber); @@ -559,7 +559,7 @@ private Mono> releasePhoneNumbersWithResponse( List phoneNumberStrings = phoneNumbers .stream() - .map(PhoneNumberIdentifier::getValue) + .map(PhoneNumberIdentifier::getPhoneNumber) .collect(Collectors.toList()); ReleaseRequest releaseRequest = new ReleaseRequest(); releaseRequest.setPhoneNumbers(phoneNumberStrings); diff --git a/sdk/communication/azure-communication-common/src/main/java/com/azure/communication/common/CommunicationIdentifierKind.java b/sdk/communication/azure-communication-common/src/main/java/com/azure/communication/common/CommunicationIdentifierKind.java new file mode 100644 index 000000000000..baa783c615cb --- /dev/null +++ b/sdk/communication/azure-communication-common/src/main/java/com/azure/communication/common/CommunicationIdentifierKind.java @@ -0,0 +1,43 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.communication.common; + +import com.azure.core.util.ExpandableStringEnum; +import com.fasterxml.jackson.annotation.JsonCreator; +import java.util.Collection; + +/** Defines values for CommunicationIdentifierKind. */ +public final class CommunicationIdentifierKind extends ExpandableStringEnum { + /** Static value unknown for CommunicationIdentifierKind. */ + public static final CommunicationIdentifierKind UNKNOWN = fromString("unknown"); + + /** Static value communicationUser for CommunicationIdentifierKind. */ + public static final CommunicationIdentifierKind COMMUNICATION_USER = fromString("communicationUser"); + + /** Static value phoneNumber for CommunicationIdentifierKind. */ + public static final CommunicationIdentifierKind PHONE_NUMBER = fromString("phoneNumber"); + + /** Static value callingApplication for CommunicationIdentifierKind. */ + public static final CommunicationIdentifierKind CALLING_APPLICATION = fromString("callingApplication"); + + /** Static value microsoftTeamsUser for CommunicationIdentifierKind. */ + public static final CommunicationIdentifierKind MICROSOFT_TEAMS_USER = fromString("microsoftTeamsUser"); + + /** + * Creates or finds a CommunicationIdentifierKind from its string representation. + * + * @param name a name to look for. + * @return the corresponding CommunicationIdentifierKind. + */ + @JsonCreator + public static CommunicationIdentifierKind fromString(String name) { + return fromString(name, CommunicationIdentifierKind.class); + } + + /** @return known CommunicationIdentifierKind values. */ + public static Collection values() { + return values(CommunicationIdentifierKind.class); + } +} diff --git a/sdk/communication/azure-communication-common/src/main/java/com/azure/communication/common/CommunicationIdentifierModel.java b/sdk/communication/azure-communication-common/src/main/java/com/azure/communication/common/CommunicationIdentifierModel.java new file mode 100644 index 000000000000..ff69546ba987 --- /dev/null +++ b/sdk/communication/azure-communication-common/src/main/java/com/azure/communication/common/CommunicationIdentifierModel.java @@ -0,0 +1,142 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.communication.common; + +import com.azure.core.annotation.Fluent; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** The CommunicationIdentifierModel model. */ +@Fluent +public final class CommunicationIdentifierModel { + /* + * Kind of the communication identifier. + */ + @JsonProperty(value = "kind", required = true) + private com.azure.communication.common.CommunicationIdentifierKind kind; + + /* + * Full Id of the identifier. + */ + @JsonProperty(value = "id") + private String id; + + /* + * The phone number in E.164 format. + */ + @JsonProperty(value = "phoneNumber") + private String phoneNumber; + + /* + * The AAD object Id of the Microsoft Teams user. + */ + @JsonProperty(value = "microsoftTeamsUserId") + private String microsoftTeamsUserId; + + /* + * True if the identifier is anonymous. + */ + @JsonProperty(value = "isAnonymous") + private Boolean isAnonymous; + + /** + * Get the kind property: Kind of the communication identifier. + * + * @return the kind value. + */ + public com.azure.communication.common.CommunicationIdentifierKind getKind() { + return this.kind; + } + + /** + * Set the kind property: Kind of the communication identifier. + * + * @param kind the kind value to set. + * @return the CommunicationIdentifierModel object itself. + */ + public CommunicationIdentifierModel setKind(com.azure.communication.common.CommunicationIdentifierKind kind) { + this.kind = kind; + return this; + } + + /** + * Get the id property: Full Id of the identifier. + * + * @return the id value. + */ + public String getId() { + return this.id; + } + + /** + * Set the id property: Full Id of the identifier. + * + * @param id the id value to set. + * @return the CommunicationIdentifierModel object itself. + */ + public CommunicationIdentifierModel setId(String id) { + this.id = id; + return this; + } + + /** + * Get the phoneNumber property: The phone number in E.164 format. + * + * @return the phoneNumber value. + */ + public String getPhoneNumber() { + return this.phoneNumber; + } + + /** + * Set the phoneNumber property: The phone number in E.164 format. + * + * @param phoneNumber the phoneNumber value to set. + * @return the CommunicationIdentifierModel object itself. + */ + public CommunicationIdentifierModel setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + return this; + } + + /** + * Get the microsoftTeamsUserId property: The AAD object Id of the Microsoft Teams user. + * + * @return the microsoftTeamsUserId value. + */ + public String getMicrosoftTeamsUserId() { + return this.microsoftTeamsUserId; + } + + /** + * Set the microsoftTeamsUserId property: The AAD object Id of the Microsoft Teams user. + * + * @param microsoftTeamsUserId the microsoftTeamsUserId value to set. + * @return the CommunicationIdentifierModel object itself. + */ + public CommunicationIdentifierModel setMicrosoftTeamsUserId(String microsoftTeamsUserId) { + this.microsoftTeamsUserId = microsoftTeamsUserId; + return this; + } + + /** + * Get the isAnonymous property: True if the identifier is anonymous. + * + * @return the isAnonymous value. + */ + public Boolean isAnonymous() { + return this.isAnonymous; + } + + /** + * Set the isAnonymous property: True if the identifier is anonymous. + * + * @param isAnonymous the isAnonymous value to set. + * @return the CommunicationIdentifierModel object itself. + */ + public CommunicationIdentifierModel setIsAnonymous(Boolean isAnonymous) { + this.isAnonymous = isAnonymous; + return this; + } +} diff --git a/sdk/communication/azure-communication-common/src/main/java/com/azure/communication/common/CommunicationIdentifierSerializer.java b/sdk/communication/azure-communication-common/src/main/java/com/azure/communication/common/CommunicationIdentifierSerializer.java new file mode 100644 index 000000000000..41e977d81f9f --- /dev/null +++ b/sdk/communication/azure-communication-common/src/main/java/com/azure/communication/common/CommunicationIdentifierSerializer.java @@ -0,0 +1,68 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.communication.common; + +import java.util.Objects; + +class CommunicationIdentifierSerializer { + public static CommunicationIdentifier deserialize(CommunicationIdentifierModel identifier) { + String id = identifier.getId(); + CommunicationIdentifierKind kind = identifier.getKind(); + + if (kind == CommunicationIdentifierKind.COMMUNICATION_USER) { + Objects.requireNonNull(id); + return new CommunicationUserIdentifier(id); + } + + if (kind == CommunicationIdentifierKind.CALLING_APPLICATION) { + Objects.requireNonNull(id); + return new CallingApplicationIdentifier(id); + } + + if (kind == CommunicationIdentifierKind.PHONE_NUMBER) { + Objects.requireNonNull(identifier.getPhoneNumber()); + return new PhoneNumberIdentifier(identifier.getPhoneNumber()); + } + + if (kind == CommunicationIdentifierKind.MICROSOFT_TEAMS_USER) { + Objects.requireNonNull(identifier.getMicrosoftTeamsUserId()); + return new MicrosoftTeamsUserIdentifier(identifier.getMicrosoftTeamsUserId(), identifier.isAnonymous()); + } + + Objects.requireNonNull(id); + return new UnknownIdentifier(id); + } + + public static CommunicationIdentifierModel serialize(CommunicationIdentifier identifier) { + if (identifier instanceof CommunicationUserIdentifier) { + return new CommunicationIdentifierModel() + .setKind(CommunicationIdentifierKind.COMMUNICATION_USER) + .setId(((CommunicationUserIdentifier) identifier).getId()); + } + + if (identifier instanceof CallingApplicationIdentifier) { + return new CommunicationIdentifierModel() + .setKind(CommunicationIdentifierKind.CALLING_APPLICATION) + .setId(((CallingApplicationIdentifier) identifier).getId()); + } + + if (identifier instanceof PhoneNumberIdentifier) { + return new CommunicationIdentifierModel() + .setKind(CommunicationIdentifierKind.PHONE_NUMBER) + .setPhoneNumber(((PhoneNumberIdentifier) identifier).getPhoneNumber()); + } + + if (identifier instanceof MicrosoftTeamsUserIdentifier) { + return new CommunicationIdentifierModel() + .setKind(CommunicationIdentifierKind.MICROSOFT_TEAMS_USER) + .setMicrosoftTeamsUserId(((MicrosoftTeamsUserIdentifier) identifier).getUserId()) + .setIsAnonymous(((MicrosoftTeamsUserIdentifier) identifier).isAnonymous()); + } + + return new CommunicationIdentifierModel() + .setKind(CommunicationIdentifierKind.UNKNOWN) + .setId(((UnknownIdentifier) identifier).getId()); + } +} diff --git a/sdk/communication/azure-communication-common/src/main/java/com/azure/communication/common/PhoneNumberIdentifier.java b/sdk/communication/azure-communication-common/src/main/java/com/azure/communication/common/PhoneNumberIdentifier.java index ab0430c195c6..252055d230b8 100644 --- a/sdk/communication/azure-communication-common/src/main/java/com/azure/communication/common/PhoneNumberIdentifier.java +++ b/sdk/communication/azure-communication-common/src/main/java/com/azure/communication/common/PhoneNumberIdentifier.java @@ -9,11 +9,11 @@ */ public class PhoneNumberIdentifier extends CommunicationIdentifier { - private final String value; + private final String phoneNumber; /** * Creates a PhoneNumberIdentifier object - * + * * @param phoneNumber the string identifier representing the PhoneNumber in E.164 format. * E.164 is a phone number formatted as +[CountryCode][AreaCode][LocalNumber] eg. "+18005555555" * @throws IllegalArgumentException thrown if phoneNumber parameter fail the validation. @@ -22,13 +22,13 @@ public PhoneNumberIdentifier(String phoneNumber) { if (CoreUtils.isNullOrEmpty(phoneNumber)) { throw new IllegalArgumentException("The initialization parameter [phoneNumber] cannot be null to empty."); } - this.value = phoneNumber; + this.phoneNumber = phoneNumber; } /** * @return the string identifier representing the object identity */ - public String getValue() { - return value; + public String getPhoneNumber() { + return phoneNumber; } } diff --git a/sdk/communication/azure-communication-common/src/test/java/com/azure/communication/common/CommunicationIdentifierSerializerTests.java b/sdk/communication/azure-communication-common/src/test/java/com/azure/communication/common/CommunicationIdentifierSerializerTests.java new file mode 100644 index 000000000000..711a3242dab0 --- /dev/null +++ b/sdk/communication/azure-communication-common/src/test/java/com/azure/communication/common/CommunicationIdentifierSerializerTests.java @@ -0,0 +1,154 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. +// Code generated by Microsoft (R) AutoRest Code Generator. + +package com.azure.communication.common; + + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; +import java.util.Arrays; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +public class CommunicationIdentifierSerializerTests { + + public static final String SOME_ID = "some id"; + + @Test + public void missingPropertyDeserializerThrows() { + CommunicationIdentifierModel[] modelsWithMissingMandatoryProperty = new CommunicationIdentifierModel[] + { + new CommunicationIdentifierModel().setKind(CommunicationIdentifierKind.UNKNOWN), // Missing Id + new CommunicationIdentifierModel().setKind(CommunicationIdentifierKind.COMMUNICATION_USER), // Missing Id + new CommunicationIdentifierModel().setKind(CommunicationIdentifierKind.CALLING_APPLICATION), // Missing Id + new CommunicationIdentifierModel().setKind(CommunicationIdentifierKind.PHONE_NUMBER).setId(SOME_ID), // Missing PhoneNumber + new CommunicationIdentifierModel().setKind(CommunicationIdentifierKind.MICROSOFT_TEAMS_USER).setId(SOME_ID), // Missing IsAnonymous + new CommunicationIdentifierModel().setKind(CommunicationIdentifierKind.MICROSOFT_TEAMS_USER) .setId(SOME_ID).setIsAnonymous(true) // Missing MicrosoftTeamsUserId + }; + + Arrays.stream(modelsWithMissingMandatoryProperty).forEach(identifierModel -> { + assertThrows(NullPointerException.class, + () -> { + CommunicationIdentifierSerializer.deserialize(identifierModel); + }); + }); + } + + @Test + public void serializeCommunicationUser() { + CommunicationIdentifierModel model = CommunicationIdentifierSerializer.serialize( + new CommunicationUserIdentifier(SOME_ID)); + + assertEquals(CommunicationIdentifierKind.COMMUNICATION_USER, model.getKind()); + assertEquals(SOME_ID, model.getId()); + } + + @Test + public void deserializeCommunicationUser() { + CommunicationIdentifier identifier = CommunicationIdentifierSerializer.deserialize( + new CommunicationIdentifierModel().setKind(CommunicationIdentifierKind.COMMUNICATION_USER) + .setId(SOME_ID)); + + CommunicationUserIdentifier expectedIdentifier = new CommunicationUserIdentifier(SOME_ID); + + assertEquals(identifier.getClass(), CommunicationUserIdentifier.class); + assertEquals(expectedIdentifier.getId(), ((CommunicationUserIdentifier) identifier).getId()); + } + + @Test + public void serializeUnknown() { + CommunicationIdentifierModel model = CommunicationIdentifierSerializer.serialize(new UnknownIdentifier(SOME_ID)); + + assertEquals(CommunicationIdentifierKind.UNKNOWN, model.getKind()); + assertEquals(SOME_ID, model.getId()); + } + + @Test + public void deserializeUnknown() { + CommunicationIdentifier unknownIdentifier = CommunicationIdentifierSerializer.deserialize( + new CommunicationIdentifierModel().setKind(CommunicationIdentifierKind.UNKNOWN) + .setId(SOME_ID)); + assertEquals(UnknownIdentifier.class, unknownIdentifier.getClass()); + assertEquals(SOME_ID, ((UnknownIdentifier) unknownIdentifier).getId()); + } + + @Test + public void desericalizeFutureType() { + final String futureType = "NewKind"; + CommunicationIdentifier unknownIdentifier = CommunicationIdentifierSerializer.deserialize( + new CommunicationIdentifierModel().setKind(CommunicationIdentifierKind.fromString(futureType)) + .setId(SOME_ID)); + assertEquals(UnknownIdentifier.class, unknownIdentifier.getClass()); + assertEquals(SOME_ID, ((UnknownIdentifier) unknownIdentifier).getId()); + } + + @Test + public void serializeCallingApplication() { + CommunicationIdentifierModel model = CommunicationIdentifierSerializer.serialize( + new CallingApplicationIdentifier(SOME_ID)); + + assertEquals(CommunicationIdentifierKind.CALLING_APPLICATION, model.getKind()); + assertEquals(SOME_ID, model.getId()); + } + + @Test + public void deserializeCallingApplication() { + CommunicationIdentifier identifier = CommunicationIdentifierSerializer.deserialize( + new CommunicationIdentifierModel() + .setKind(CommunicationIdentifierKind.CALLING_APPLICATION) + .setId(SOME_ID)); + + assertEquals(CallingApplicationIdentifier.class, identifier.getClass()); + assertEquals(SOME_ID, ((CallingApplicationIdentifier) identifier).getId()); + } + + @Test + public void serializePhoneNumber() { + final String phoneNumber = "+12223334444"; + CommunicationIdentifierModel model = CommunicationIdentifierSerializer.serialize( + new PhoneNumberIdentifier(phoneNumber)); + + assertEquals(CommunicationIdentifierKind.PHONE_NUMBER, model.getKind()); + assertEquals(phoneNumber, model.getPhoneNumber()); + } + + @Test + public void deserializePhoneNumber() { + final String phoneNumber = "+12223334444"; + CommunicationIdentifier identifier = CommunicationIdentifierSerializer.deserialize( + new CommunicationIdentifierModel().setKind(CommunicationIdentifierKind.PHONE_NUMBER) + .setPhoneNumber(phoneNumber)); + + assertEquals(PhoneNumberIdentifier.class, identifier.getClass()); + assertEquals(phoneNumber, ((PhoneNumberIdentifier) identifier).getPhoneNumber()); + } + + @ParameterizedTest + @ValueSource(booleans = {true, false}) + public void serializeMicrosoftTeamsUser(boolean isAnonymous) { + CommunicationIdentifierModel model = CommunicationIdentifierSerializer.serialize( + new MicrosoftTeamsUserIdentifier(SOME_ID, isAnonymous)); + + assertEquals(CommunicationIdentifierKind.MICROSOFT_TEAMS_USER, model.getKind()); + assertEquals(SOME_ID, model.getMicrosoftTeamsUserId()); + assertEquals(isAnonymous, model.isAnonymous()); + } + + @ParameterizedTest + @ValueSource(booleans = {true, false}) + public void deserializerMicrosoftTeamsUser(boolean isAnonymous) { + CommunicationIdentifier identifier = CommunicationIdentifierSerializer.deserialize( + new CommunicationIdentifierModel() + .setMicrosoftTeamsUserId(SOME_ID) + .setKind(CommunicationIdentifierKind.MICROSOFT_TEAMS_USER) + .setIsAnonymous(isAnonymous)); + + assertEquals(MicrosoftTeamsUserIdentifier.class, identifier.getClass()); + assertEquals(SOME_ID, ((MicrosoftTeamsUserIdentifier) identifier).getUserId()); + assertEquals(isAnonymous, ((MicrosoftTeamsUserIdentifier) identifier).isAnonymous()); + } + +} diff --git a/sdk/communication/azure-communication-sms/src/main/java/com/azure/communication/sms/SmsAsyncClient.java b/sdk/communication/azure-communication-sms/src/main/java/com/azure/communication/sms/SmsAsyncClient.java index 4b5d0317d2fa..93f07d4b20bb 100644 --- a/sdk/communication/azure-communication-sms/src/main/java/com/azure/communication/sms/SmsAsyncClient.java +++ b/sdk/communication/azure-communication-sms/src/main/java/com/azure/communication/sms/SmsAsyncClient.java @@ -47,8 +47,8 @@ public final class SmsAsyncClient { * @param context the context of the request. Can also be null or Context.NONE. * @return response for a successful send Sms request. */ - Mono> sendMessageWithResponse(PhoneNumberIdentifier from, - List to, String message, + Mono> sendMessageWithResponse(PhoneNumberIdentifier from, + List to, String message, SendSmsOptions smsOptions, Context context) { if (from == null) { return monoError(logger, new NullPointerException("Argument 'from' cannot be null.")); @@ -71,7 +71,7 @@ Mono> sendMessageWithResponse(PhoneNumberIdentifier fr * @return response for a successful send Sms request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono sendMessage(PhoneNumberIdentifier from, + public Mono sendMessage(PhoneNumberIdentifier from, List to, String message) { if (from == null) { return monoError(logger, new NullPointerException("Argument 'from' cannot be null.")); @@ -81,7 +81,7 @@ public Mono sendMessage(PhoneNumberIdentifier from, SendSmsOptions smsOptions = new SendSmsOptions(); smsOptions.setEnableDeliveryReport(false); - + return sendMessage(from, to, message, smsOptions); } @@ -122,8 +122,8 @@ public Mono sendMessage(PhoneNumberIdentifier from, PhoneNumber * @return response for a successful send Sms request. */ @ServiceMethod(returns = ReturnType.SINGLE) - public Mono sendMessage(PhoneNumberIdentifier from, - List to, String message, + public Mono sendMessage(PhoneNumberIdentifier from, + List to, String message, SendSmsOptions smsOptions) { if (from == null) { return monoError(logger, new NullPointerException("Argument 'from' cannot be null.")); @@ -136,19 +136,19 @@ public Mono sendMessage(PhoneNumberIdentifier from, return withContext(context -> this.smsServiceClient.getSms().sendAsync(sendMessageRequest, context)); } catch (RuntimeException ex) { return monoError(logger, ex); - } + } } - private SendMessageRequest createSmsMessageRequest(PhoneNumberIdentifier from, - List to, String message, + private SendMessageRequest createSmsMessageRequest(PhoneNumberIdentifier from, + List to, String message, SendSmsOptions smsOptions) { - Stream s = to.stream().map(n -> n.getValue()); + Stream s = to.stream().map(n -> n.getPhoneNumber()); SendMessageRequest sendMessageRequest = new SendMessageRequest(); - sendMessageRequest.setFrom(from.getValue()) + sendMessageRequest.setFrom(from.getPhoneNumber()) .setTo(s.collect(Collectors.toList())) .setMessage(message) .setSendSmsOptions(smsOptions); - + return sendMessageRequest; } } diff --git a/sdk/communication/azure-communication-sms/src/test/java/com/azure/communication/sms/SmsTestBase.java b/sdk/communication/azure-communication-sms/src/test/java/com/azure/communication/sms/SmsTestBase.java index 9d9e32e09239..05b08755d0e2 100644 --- a/sdk/communication/azure-communication-sms/src/test/java/com/azure/communication/sms/SmsTestBase.java +++ b/sdk/communication/azure-communication-sms/src/test/java/com/azure/communication/sms/SmsTestBase.java @@ -84,7 +84,7 @@ public Mono send(HttpRequest request) { assertNotNull(messageRequest, "No SmsMessageRequest"); assertEquals(body, messageRequest.getMessage(), "body incorrect"); - assertEquals(from.getValue(), messageRequest.getFrom(), "from incorrect"); + assertEquals(from.getPhoneNumber(), messageRequest.getFrom(), "from incorrect"); assertEquals(ENDPOINT, request.getUrl().getHost()); assertEquals(PATH, request.getUrl().getPath()); @@ -94,12 +94,12 @@ public Mono send(HttpRequest request) { // values without re-creating the HMAC Policy. We will // just make sure they are present and have values. assertTrue(headers.containsKey("Authorization")); - assertTrue(headers.containsKey("User-Agent")); + assertTrue(headers.containsKey("User-Agent")); assertTrue(headers.containsKey("x-ms-content-sha256")); assertNotNull(headers.get("Authorization")); assertNotNull(headers.get("x-ms-content-sha256")); - Stream numberStream = to.stream().map(n -> n.getValue()); + Stream numberStream = to.stream().map(n -> n.getPhoneNumber()); List numberStrings = numberStream.collect(Collectors.toList()); for (String t : messageRequest.getTo()) { if (!numberStrings.contains(t)) { @@ -146,11 +146,11 @@ public Mono getBodyAsString() { public Mono getBodyAsString(Charset charset) { return Mono.empty(); } - + }; return Mono.just(response); } }; - } + } }