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 397bd8707e32..61ac69041c37 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 @@ -41,6 +41,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import static com.azure.core.util.FluxUtil.monoError; @@ -117,6 +118,10 @@ public Mono> getAllAreaCodesWithResponse( Mono> getAllAreaCodesWithResponse( String locationType, String countryCode, String phonePlanId, List locationOptions, Context context) { + Objects.requireNonNull(locationType, "'locationType' cannot be null."); + Objects.requireNonNull(countryCode, "'countryCode' cannot be null."); + Objects.requireNonNull(phonePlanId, "'phonePlanId' cannot be null."); + LocationOptionsQueries locationOptionsQueries = new LocationOptionsQueries(); locationOptionsQueries.setLocationOptions(locationOptions); @@ -160,6 +165,8 @@ public Mono> getCapabilitiesUpda Mono> getCapabilitiesUpdateWithResponse( String capabilitiesId, Context context) { + Objects.requireNonNull(capabilitiesId, "'capabilitiesId' cannot be null."); + try { if (context == null) { return phoneNumberAdministrations.getCapabilitiesUpdateWithResponseAsync(capabilitiesId); @@ -199,6 +206,8 @@ public Mono> updateCapabilitiesWithRe Mono> updateCapabilitiesWithResponse( Map phoneNumberCapabilitiesUpdate, Context context) { + Objects.requireNonNull(phoneNumberCapabilitiesUpdate, "'phoneNumberCapabilitiesUpdate' cannot be null."); + Map capabilitiesMap = new HashMap<>(); for (Map.Entry entry : phoneNumberCapabilitiesUpdate.entrySet()) { capabilitiesMap.put(entry.getKey().getValue(), entry.getValue()); @@ -268,6 +277,8 @@ public Mono> getNumberConfigurationWithRes Mono> getNumberConfigurationWithResponse( PhoneNumber phoneNumber, Context context) { + Objects.requireNonNull(phoneNumber, "'phoneNumber' cannot be null."); + NumberConfigurationPhoneNumber configurationPhoneNumber = new NumberConfigurationPhoneNumber(); configurationPhoneNumber.setPhoneNumber(phoneNumber.getValue()); @@ -311,6 +322,9 @@ public Mono> configureNumberWithResponse( Mono> configureNumberWithResponse( PhoneNumber phoneNumber, PstnConfiguration pstnConfiguration, Context context) { + Objects.requireNonNull(phoneNumber, "'phoneNumber' cannot be null."); + Objects.requireNonNull(pstnConfiguration, "'pstnConfiguration' cannot be null."); + NumberConfiguration numberConfiguration = new NumberConfiguration(); numberConfiguration.setPhoneNumber(phoneNumber.getValue()).setPstnConfiguration(pstnConfiguration); @@ -348,6 +362,7 @@ public Mono> unconfigureNumberWithResponse(PhoneNumber phoneNumbe } Mono> unconfigureNumberWithResponse(PhoneNumber phoneNumber, Context context) { + Objects.requireNonNull(phoneNumber, "'phoneNumber' cannot be null."); NumberConfigurationPhoneNumber configurationPhoneNumber = new NumberConfigurationPhoneNumber(); configurationPhoneNumber.setPhoneNumber(phoneNumber.getValue()); @@ -378,6 +393,8 @@ public PagedFlux listPhonePlanGroups( PagedFlux listPhonePlanGroups( String countryCode, String locale, Boolean includeRateInformation, Context context) { + Objects.requireNonNull(countryCode, "'countryCode' cannot be null."); + try { if (context == null) { return phoneNumberAdministrations.getPhonePlanGroupsAsync( @@ -405,6 +422,9 @@ public PagedFlux listPhonePlans(String countryCode, String phonePlanG } PagedFlux listPhonePlans(String countryCode, String phonePlanGroupId, String locale, Context context) { + Objects.requireNonNull(countryCode, "'countryCode' cannot be null."); + Objects.requireNonNull(phonePlanGroupId, "'phonePlanGroupId' cannot be null."); + try { if (context == null) { return phoneNumberAdministrations.getPhonePlansAsync( @@ -453,6 +473,10 @@ public Mono> getPhonePlanLocationOptionsWithRe Mono> getPhonePlanLocationOptionsWithResponse( String countryCode, String phonePlanGroupId, String phonePlanId, String locale, Context context) { + Objects.requireNonNull(countryCode, "'countryCode' cannot be null."); + Objects.requireNonNull(phonePlanGroupId, "'phonePlanGroupId' cannot be null."); + Objects.requireNonNull(phonePlanId, "'phonePlanId' cannot be null."); + try { if (context == null) { return phoneNumberAdministrations.getPhonePlanLocationOptionsWithResponseAsync( @@ -490,6 +514,8 @@ public Mono> getReleaseByIdWithResponse(String rele } Mono> getReleaseByIdWithResponse(String releaseId, Context context) { + Objects.requireNonNull(releaseId, "'releaseId' cannot be null."); + try { if (context == null) { return phoneNumberAdministrations.getReleaseByIdWithResponseAsync(releaseId); @@ -525,6 +551,8 @@ public Mono> releasePhoneNumbersWithResponse(List> releasePhoneNumbersWithResponse(List phoneNumbers, Context context) { + Objects.requireNonNull(phoneNumbers, "'phoneNumbers' cannot be null."); + List phoneNumberStrings = phoneNumbers.stream().map(PhoneNumber::getValue).collect(Collectors.toList()); ReleaseRequest releaseRequest = new ReleaseRequest(); releaseRequest.setPhoneNumbers(phoneNumberStrings); @@ -586,6 +614,8 @@ public Mono> getSearchByIdWithResponse(String search } Mono> getSearchByIdWithResponse(String searchId, Context context) { + Objects.requireNonNull(searchId, "'searchId' cannot be null."); + try { if (context == null) { return phoneNumberAdministrations.getSearchByIdWithResponseAsync(searchId); @@ -621,6 +651,8 @@ public Mono> createSearchWithResponse(CreateSearc } Mono> createSearchWithResponse(CreateSearchOptions searchOptions, Context context) { + Objects.requireNonNull(searchOptions, "'searchOptions' cannot be null."); + try { if (context == null) { return phoneNumberAdministrations.createSearchWithResponseAsync(searchOptions); @@ -677,6 +709,8 @@ public Mono> cancelSearchWithResponse(String searchId) { } Mono> cancelSearchWithResponse(String searchId, Context context) { + Objects.requireNonNull(searchId, "'searchId' cannot be null."); + try { if (context == null) { return phoneNumberAdministrations.cancelSearchWithResponseAsync(searchId); @@ -711,6 +745,8 @@ public Mono> purchaseSearchWithResponse(String searchId) { } Mono> purchaseSearchWithResponse(String searchId, Context context) { + Objects.requireNonNull(searchId, "'searchId' cannot be null."); + try { if (context == null) { return phoneNumberAdministrations.purchaseSearchWithResponseAsync(searchId); diff --git a/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberClientBuilder.java b/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberClientBuilder.java index 0587a79fa379..5fd3715dd27d 100644 --- a/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberClientBuilder.java +++ b/sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberClientBuilder.java @@ -69,7 +69,7 @@ public PhoneNumberClientBuilder endpoint(String endpoint) { * @return The updated {@link PhoneNumberClientBuilder} object. */ public PhoneNumberClientBuilder pipeline(HttpPipeline pipeline) { - this.pipeline = Objects.requireNonNull(pipeline, "'pipeline' cannot be null."); + this.pipeline = pipeline; return this; } diff --git a/sdk/communication/azure-communication-administration/src/test/java/com/azure/communication/administration/PhoneNumberClientBuilderTest.java b/sdk/communication/azure-communication-administration/src/test/java/com/azure/communication/administration/PhoneNumberClientBuilderTest.java index a888f041bcca..7c0d6ec82da1 100644 --- a/sdk/communication/azure-communication-administration/src/test/java/com/azure/communication/administration/PhoneNumberClientBuilderTest.java +++ b/sdk/communication/azure-communication-administration/src/test/java/com/azure/communication/administration/PhoneNumberClientBuilderTest.java @@ -285,13 +285,6 @@ public void setEndpointNull() { }); } - @Test() - public void setPipelineNull() { - assertThrows(NullPointerException.class, () -> { - this.clientBuilder.pipeline(null); - }); - } - @Test() public void setHttpClientNull() { assertThrows(NullPointerException.class, () -> {