Azure · minnieliu · Feb 12, 2021 · Jan 7, 2021 · Jan 7, 2021 · Jan 14, 2021
diff --git a/eng/.docsettings.yml b/eng/.docsettings.yml
@@ -128,6 +128,7 @@ known_content_issues:
   - ['sdk/communication/azure-communication-sms/swagger/README.md', '#3113']
   - ['sdk/communication/azure-communication-administration/swagger/README.md', '#3113']
   - ['sdk/communication/azure-communication-identity/swagger/README.md', '#3113']
+  - ['sdk/communication/azure-communication-phonenumbers/swagger/README.md', '#3113']
   - ['sdk/cosmos/changelog/README.md', '#3113']
   - ['sdk/cosmos/faq/README.md', '#3113']
   - ['sdk/cosmos/azure-cosmos-benchmark/README.md', '#3113']

diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
@@ -75,6 +75,11 @@
       <groupId>com.azure</groupId>
       <artifactId>azure-communication-sms</artifactId>
       <version>1.0.0-beta.5</version> <!-- {x-version-update;com.azure:azure-communication-sms;current} -->
+    </dependency>
+      <dependency>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-communication-phonenumbers</artifactId>
+      <version>1.0.0-beta.5</version> <!-- {x-version-update;com.azure:azure-communication-phonenumbers;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>

diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
@@ -50,6 +50,7 @@ com.azure:azure-communication-common;1.0.0-beta.4;1.0.0-beta.5
 com.azure:azure-communication-administration;1.0.0-beta.4;1.0.0-beta.5
 com.azure:azure-communication-sms;1.0.0-beta.4;1.0.0-beta.5
 com.azure:azure-communication-identity;1.0.0-beta.4;1.0.0-beta.5
+com.azure:azure-communication-phonenumbers;1.0.0-beta.5;1.0.0-beta.5
 com.azure:azure-core;1.13.0;1.14.0-beta.1
 com.azure:azure-core-amqp;2.0.2;2.1.0-beta.1
 com.azure:azure-core-amqp-experimental;1.0.0-beta.1;1.0.0-beta.1

diff --git a/sdk/communication/azure-communication-administration/CHANGELOG.md b/sdk/communication/azure-communication-administration/CHANGELOG.md
@@ -1,13 +1,15 @@
 # Release History
 
 ## 1.0.0-beta.5 (Unreleased)
+### Breaking Changes 
+- PhoneNumbersClient and PhoneNumbersAsyncClient is moved to a new package, `azure.communication.phonenumbers`.
 
 ## 1.0.0-beta.4 (Skipped)
 ### Added
 - Added support for Azure Active Directory Authentication.
 
 ### Breaking Changes
-- CommunicationIdentityClient and CommunicationIdentityAsyncClient is moved to a new package, `azure-communication-identity`.
+- CommunicationIdentityClient and CommunicationIdentityAsyncClient is moved to a new package, `azure.communication.identity`.
 
 ## 1.0.0-beta.3 (2020-11-16)
 ### Added

diff --git a/sdk/communication/azure-communication-administration/README.md b/sdk/communication/azure-communication-administration/README.md
@@ -1,11 +1,10 @@
 # Azure Communication Administration client library for Java
 
-The administration package provides capabilities for Phone Number Administration.
+The administration package previously provided capabilities for User and Token Management and for Phone Number Administration.
 
-Acquired phone numbers can come with many capabilities, depending on the country, number type and phone plan. Examples of capabilities are SMS inbound and outbound usage, PSTN inbound and outbound usage. Phone numbers can also be assigned to a bot via a webhook URL.
+Now, User and Token Management capabilities have been moved to `azure.communication.identity`.
+Phone Number Administration has been moved to `azure.communication.phonenumbers`.
 
-[Source code][source] | [Package (Maven)][package] | [API reference documentation][api_documentation]
-| [Product documentation][product_docs]
 ## Getting started
 
 ### Prerequisites
@@ -28,217 +27,8 @@ Acquired phone numbers can come with many capabilities, depending on the country
 
 ## Key concepts
 
-
-### Initializing Phone Number Client
-The PhoneNumberClientBuilder is enabled to use Azure Active Directory Authentication
-<!-- embedme ./src/samples/java/com/azure/communication/administration/ReadmeSamples.java#L285-L294 -->
-```java
-String endpoint = "https://<RESOURCE_NAME>.communication.azure.com";
-
-// Create an HttpClient builder of your choice and customize it
-HttpClient httpClient = new NettyAsyncHttpClientBuilder().build();
-
-PhoneNumberClient phoneNumberClient = new PhoneNumberClientBuilder()
-    .endpoint(endpoint)
-    .credential(new DefaultAzureCredentialBuilder().build())
-    .httpClient(httpClient)
-    .buildClient();
-```
-
-Using the endpoint and access key from the communication resource to authenticate is also posible.
-<!-- embedme ./src/samples/java/com/azure/communication/administration/ReadmeSamples.java#L36-L47 -->
-```java
-// You can find your endpoint and access token from your resource in the Azure Portal
-String endpoint = "https://<RESOURCE_NAME>.communication.azure.com";
-String accessKey = "SECRET";
-
-// Create an HttpClient builder of your choice and customize it
-HttpClient httpClient = new NettyAsyncHttpClientBuilder().build();
-
-PhoneNumberClient phoneNumberClient = new PhoneNumberClientBuilder()
-    .endpoint(endpoint)
-    .accessKey(accessKey)
-    .httpClient(httpClient)
-    .buildClient();
-```
-Alternatively, you can provide the entire connection string using the connectionString() function of the PhoneNumberClientBuilder instead of providing the endpoint and access key. 
-
-### Phone plans overview
-
-Phone plans come in two types; Geographic and Toll-Free. Geographic phone plans are phone plans associated with a location, whose phone numbers' area codes are associated with the area code of a geographic location. Toll-Free phone plans are phone plans not associated location. For example, in the US, toll-free numbers can come with area codes such as 800 or 888.
-
-All geographic phone plans within the same country are grouped into a phone plan group with a Geographic phone number type. All Toll-Free phone plans within the same country are grouped into a phone plan group.
-
-### Searching and Acquiring numbers
-
-Phone numbers search can be search through the search creation API by providing a phone plan id, an area code and quantity of phone numbers. The provided quantity of phone numbers will be reserved for ten minutes. This search of phone numbers can either be cancelled or purchased. If the search is cancelled, then the phone numbers will become available to others. If the search is purchased, then the phone numbers are acquired for the Azure resources.
-
-### Configuring / Assigning numbers
-
-Phone numbers can be assigned to a callback URL via the configure number API. As part of the configuration, you will need an acquired phone number, callback URL and application id.
-
 ## Examples
 
-### Get Countries
-
-<!-- embedme ./src/samples/java/com/azure/communication/administration/ReadmeSamples.java#L59-L68 -->
-```java
-PhoneNumberClient phoneNumberClient = createPhoneNumberClient();
-
-PagedIterable<PhoneNumberCountry> phoneNumberCountries = phoneNumberClient
-    .listAllSupportedCountries(locale);
-
-for (PhoneNumberCountry phoneNumberCountry
-    : phoneNumberCountries) {
-    System.out.println("Phone Number Country Code: " + phoneNumberCountry.getCountryCode());
-    System.out.println("Phone Number Country Name: " + phoneNumberCountry.getLocalizedName());
-}
-```
-
-### Get Phone Plan Groups
-
-Phone plan groups come in two types, Geographic and Toll-Free.
-
-<!-- embedme ./src/samples/java/com/azure/communication/administration/ReadmeSamples.java#L103-L110 -->
-```java
-PagedIterable<PhonePlanGroup> phonePlanGroups = phoneNumberClient
-    .listPhonePlanGroups(countryCode, locale, true);
-
-for (PhonePlanGroup phonePlanGroup
-    : phonePlanGroups) {
-    System.out.println("Phone Plan GroupId: " + phonePlanGroup.getPhonePlanGroupId());
-    System.out.println("Phone Plan NumberType: " + phonePlanGroup.getPhoneNumberType());
-}
-```
-
-### Get Phone Plans
-
-Unlike Toll-Free phone plans, area codes for Geographic Phone Plans are empty. Area codes are found in the Area Codes API.
-
-<!-- embedme ./src/samples/java/com/azure/communication/administration/ReadmeSamples.java#L126-L135 -->
-```java
-PagedIterable<PhonePlan> phonePlans = phoneNumberClient
-    .listPhonePlans(countryCode, phonePlanGroupId, locale);
-
-for (PhonePlan phonePlan
-    : phonePlans) {
-    System.out.println("Phone Plan Id: " + phonePlan.getPhonePlanId());
-    System.out.println("Phone Plan Name: " + phonePlan.getLocalizedName());
-    System.out.println("Phone Plan Capabilities: " + phonePlan.getCapabilities());
-    System.out.println("Phone Plan Area Codes: " + phonePlan.getAreaCodes());
-}
-```
-
-### Get Location Options
-
-For Geographic phone plans, you can query the available geographic locations. The locations options are structured like the geographic hierarchy of a country. For example, the US has states and within each state are cities.
-
-<!-- embedme ./src/samples/java/com/azure/communication/administration/ReadmeSamples.java#L152-L168 -->
-```java
-LocationOptions locationOptions = phoneNumberClient
-    .getPhonePlanLocationOptions(countryCode, phonePlanGroupId, phonePlanId, locale)
-    .getLocationOptions();
-
-System.out.println("Getting LocationOptions for: " + locationOptions.getLabelId());
-for (LocationOptionsDetails locationOptionsDetails
-    : locationOptions.getOptions()) {
-    System.out.println(locationOptionsDetails.getValue());
-    for (LocationOptions locationOptions1
-        : locationOptionsDetails.getLocationOptions()) {
-        System.out.println("Getting LocationOptions for: " + locationOptions1.getLabelId());
-        for (LocationOptionsDetails locationOptionsDetails1
-            : locationOptions1.getOptions()) {
-            System.out.println(locationOptionsDetails1.getValue());
-        }
-    }
-}
-```
-
-### Get Area Codes
-
-Fetching area codes for geographic phone plans will require the the location options queries set. You must include the chain of geographic locations traversing down the location options object returned by the GetLocationOptions API.
-
-<!-- embedme ./src/samples/java/com/azure/communication/administration/ReadmeSamples.java#L194-L200 -->
-```java
-AreaCodes areaCodes = phoneNumberClient
-    .getAllAreaCodes("selection", countryCode, phonePlanId, locationOptions);
-
-for (String areaCode
-    : areaCodes.getPrimaryAreaCodes()) {
-    System.out.println(areaCode);
-}
-```
-
-### Configure Phone Number
-
-<!-- embedme ./src/samples/java/com/azure/communication/administration/ReadmeSamples.java#L214-L214 -->
-```java
-phoneNumberClient.configureNumber(phoneNumber, pstnConfiguration);
-```
-
-## Long Running Operations
-
-The Phone Number Client supports a variety of long running operations that allow indefinite polling time to the functions listed down below.
-
-### Create Search
-
-<!-- embedme ./src/samples/java/com/azure/communication/administration/ReadmeSamples.java#L221-L245 -->
-```java
-String phonePlanId = "PHONE_PLAN_ID";
-
-List<String> phonePlanIds = new ArrayList<>();
-phonePlanIds.add(phonePlanId);
-
-CreateReservationOptions createReservationOptions = new CreateReservationOptions();
-createReservationOptions
-    .setAreaCode("AREA_CODE_FOR_RESERVATION")
-    .setDescription("DESCRIPTION_FOR_RESERVATION")
-    .setDisplayName("NAME_FOR_RESERVATION")
-    .setPhonePlanIds(phonePlanIds)
-    .setQuantity(2);
-
-Duration duration = Duration.ofSeconds(1);
-PhoneNumberClient phoneNumberClient = createPhoneNumberClient();
-
-SyncPoller<PhoneNumberReservation, PhoneNumberReservation> res =
-    phoneNumberClient.beginCreateReservation(createReservationOptions, duration);
-res.waitForCompletion();
-PhoneNumberReservation result = res.getFinalResult();
-
-System.out.println("Reservation Id: " + result.getReservationId());
-for (String phoneNumber: result.getPhoneNumbers()) {
-    System.out.println("Phone Number: " + phoneNumber);
-}
-```
-
-### Purchase Search
-<!-- embedme ./src/samples/java/com/azure/communication/administration/ReadmeSamples.java#L252-L258 -->
-```java
-Duration duration = Duration.ofSeconds(1);
-String phoneNumberReservationId = "RESERVATION_ID_TO_PURCHASE";
-PhoneNumberClient phoneNumberClient = createPhoneNumberClient();
-
-SyncPoller<Void, Void> res =
-    phoneNumberClient.beginPurchaseReservation(phoneNumberReservationId, duration);
-res.waitForCompletion();
-```
-
-### Release Phone Numbers
-<!-- embedme ./src/samples/java/com/azure/communication/administration/ReadmeSamples.java#L265-L275 -->
-```java
-Duration duration = Duration.ofSeconds(1);
-PhoneNumberIdentifier phoneNumber = new PhoneNumberIdentifier("PHONE_NUMBER_TO_RELEASE");
-List<PhoneNumberIdentifier> phoneNumbers = new ArrayList<>();
-phoneNumbers.add(phoneNumber);
-PhoneNumberClient phoneNumberClient = createPhoneNumberClient();
-
-SyncPoller<PhoneNumberRelease, PhoneNumberRelease> res =
-    phoneNumberClient.beginReleasePhoneNumbers(phoneNumbers, duration);
-res.waitForCompletion();
-PhoneNumberRelease result = res.getFinalResult();
-System.out.println("Phone number release status: " + result.getStatus());
-```
-
 ## Contributing
 
 This project welcomes contributions and suggestions. Most contributions require you to agree to a [Contributor License Agreement (CLA)][cla] declaring that you have the right to, and actually do, grant us the rights to use your contribution.
@@ -264,8 +54,5 @@ Check out other client libraries for Azure communication service
 [product_docs]: https://docs.microsoft.com/azure/communication-services/
 [package]: https://search.maven.org/artifact/com.azure/azure-communication-administration
 [api_documentation]: https://aka.ms/java-docs
-[source]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/communication/azure-communication-administration/src
-
-
 
 ![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-java%2Fsdk%2Fcommunication%2Fazure-communication-administration%2FREADME.png)