WIP

sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberAsyncClient.java → sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumbersAsyncClient.java

@@ -28,12 +28,12 @@
 /**
  * Asynchronous client for Communication service phone number operations
  */
-@ServiceClient(builder = PhoneNumberClientBuilder.class, isAsync = true)
-public final class PhoneNumberAsyncClient {
-    private final ClientLogger logger = new ClientLogger(PhoneNumberAsyncClient.class);
+@ServiceClient(builder = PhoneNumbersClientBuilder.class, isAsync = true)
+public final class PhoneNumbersAsyncClient {
+    private final ClientLogger logger = new ClientLogger(PhoneNumbersAsyncClient.class);
     private final PhoneNumbersImpl phoneNumbersImpl;
 
-    PhoneNumberAsyncClient(PhoneNumberAdminClientImpl phoneNumberAdminClient) {
+    PhoneNumbersAsyncClient(PhoneNumberAdminClientImpl phoneNumberAdminClient) {
         this.phoneNumbersImpl = phoneNumberAdminClient.getPhoneNumbers();
     }
 

sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberClient.java → sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumbersClient.java

@@ -21,13 +21,13 @@
 /**
  * Synchronous client for Communication service phone number operations
  */
-@ServiceClient(builder = PhoneNumberClientBuilder.class, isAsync = false)
-public final class PhoneNumberClient {
+@ServiceClient(builder = PhoneNumbersClientBuilder.class, isAsync = false)
+public final class PhoneNumbersClient {
 
-    private final ClientLogger logger = new ClientLogger(PhoneNumberAsyncClient.class);
+    private final ClientLogger logger = new ClientLogger(PhoneNumbersAsyncClient.class);
     private final PhoneNumbersImpl phoneNumbersImpl;
 
-    PhoneNumberClient(PhoneNumberAdminClientImpl phoneNumberAdminClient) {
+    PhoneNumbersClient(PhoneNumberAdminClientImpl phoneNumberAdminClient) {
         this.phoneNumbersImpl = phoneNumberAdminClient.getPhoneNumbers();
     }
 

sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberClientBuilder.java → sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumbersClientBuilder.java

@@ -32,16 +32,16 @@
 /**
  * Builder for creating clients of Communication Service phone number configuration
  */
-@ServiceClientBuilder(serviceClients = {PhoneNumberClient.class, PhoneNumberAsyncClient.class})
-public final class PhoneNumberClientBuilder {
+@ServiceClientBuilder(serviceClients = {PhoneNumbersClient.class, PhoneNumbersAsyncClient.class})
+public final class PhoneNumbersClientBuilder {
     private static final Map<String, String> PROPERTIES =
         CoreUtils.getProperties("azure-communication-administration.properties");
     private static final String SDK_NAME = "name";
     private static final String SDK_VERSION = "version";
 
-    private final ClientLogger logger = new ClientLogger(PhoneNumberClientBuilder.class);
+    private final ClientLogger logger = new ClientLogger(PhoneNumbersClientBuilder.class);
 
-    private PhoneNumberServiceVersion version;
+    private PhoneNumbersServiceVersion version;
     private String endpoint;
     private HttpPipeline pipeline;
     private HttpClient httpClient;
@@ -55,10 +55,10 @@ public final class PhoneNumberClientBuilder {
      * Set endpoint of the service
      *
      * @param endpoint url of the service
-     * @return The updated {@link PhoneNumberClientBuilder} object.
+     * @return The updated {@link PhoneNumbersClientBuilder} object.
      * @throws NullPointerException If {@code endpoint} is {@code null}.
      */
-    public PhoneNumberClientBuilder endpoint(String endpoint) {
+    public PhoneNumbersClientBuilder endpoint(String endpoint) {
         this.endpoint = Objects.requireNonNull(endpoint, "'endpoint' cannot be null.");
         return this;
     }
@@ -67,12 +67,12 @@ public PhoneNumberClientBuilder endpoint(String endpoint) {
      * Sets the HTTP pipeline to use for the service client
      * <p>
      * If {@code pipeline} is set, all other settings aside from
-     * {@link PhoneNumberClientBuilder#endpoint(String) endpoint} are ignored.
+     * {@link PhoneNumbersClientBuilder#endpoint(String) endpoint} are ignored.
      *
      * @param pipeline HttpPipeline to use
-     * @return The updated {@link PhoneNumberClientBuilder} object.
+     * @return The updated {@link PhoneNumbersClientBuilder} object.
      */
-    public PhoneNumberClientBuilder pipeline(HttpPipeline pipeline) {
+    public PhoneNumbersClientBuilder pipeline(HttpPipeline pipeline) {
         this.pipeline = pipeline;
         return this;
     }
@@ -81,10 +81,10 @@ public PhoneNumberClientBuilder pipeline(HttpPipeline pipeline) {
      * Set HttpClient to use
      *
      * @param httpClient HttpClient to use
-     * @return The updated {@link PhoneNumberClientBuilder} object.
+     * @return The updated {@link PhoneNumbersClientBuilder} object.
      * @throws NullPointerException If {@code httpClient} is {@code null}.
      */
-    public PhoneNumberClientBuilder httpClient(HttpClient httpClient) {
+    public PhoneNumbersClientBuilder httpClient(HttpClient httpClient) {
         this.httpClient = httpClient;
         return this;
     }
@@ -95,9 +95,9 @@ public PhoneNumberClientBuilder httpClient(HttpClient httpClient) {
      * <p> If logLevel is not provided, default value of {@link HttpLogDetailLevel#NONE} is set.</p>
      *
      * @param httpLogOptions The logging configuration to use when sending and receiving HTTP requests/responses.
-     * @return the updated {@link PhoneNumberClientBuilder} object.
+     * @return the updated {@link PhoneNumbersClientBuilder} object.
      */
-    public PhoneNumberClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) {
+    public PhoneNumbersClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) {
         this.httpLogOptions = httpLogOptions;
         return this;
     }
@@ -106,10 +106,10 @@ public PhoneNumberClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) {
      * Set AzureKeyCredential for authorization
      *
      * @param accessKey access key for initalizing AzureKeyCredential
-     * @return The updated {@link PhoneNumberClientBuilder} object.
+     * @return The updated {@link PhoneNumbersClientBuilder} object.
      * @throws NullPointerException If {@code accessKey} is {@code null}.
      */
-    public PhoneNumberClientBuilder accessKey(String accessKey) {
+    public PhoneNumbersClientBuilder accessKey(String accessKey) {
         Objects.requireNonNull(accessKey, "'accessKey' cannot be null.");
         this.azureKeyCredential = new AzureKeyCredential(accessKey);
         return this;
@@ -119,10 +119,10 @@ public PhoneNumberClientBuilder accessKey(String accessKey) {
      * Sets the {@link TokenCredential} used to authenticate HTTP requests.
      *
      * @param tokenCredential {@link TokenCredential} used to authenticate HTTP requests.
-     * @return The updated {@link PhoneNumberClientBuilder} object.
+     * @return The updated {@link PhoneNumbersClientBuilder} object.
      * @throws NullPointerException If {@code tokenCredential} is null.
      */
-    public PhoneNumberClientBuilder credential(TokenCredential tokenCredential) {
+    public PhoneNumbersClientBuilder credential(TokenCredential tokenCredential) {
         this.tokenCredential = Objects.requireNonNull(tokenCredential, "'tokenCredential' cannot be null.");
         return this;
     }
@@ -132,10 +132,10 @@ public PhoneNumberClientBuilder credential(TokenCredential tokenCredential) {
      * Set the endpoint and AzureKeyCredential for authorization
      *
      * @param connectionString connection string for setting endpoint and initalizing AzureKeyCredential
-     * @return The updated {@link PhoneNumberClientBuilder} object.
+     * @return The updated {@link PhoneNumbersClientBuilder} object.
      * @throws NullPointerException If {@code connectionString} is {@code null}.
      */
-    public PhoneNumberClientBuilder connectionString(String connectionString) {
+    public PhoneNumbersClientBuilder connectionString(String connectionString) {
         Objects.requireNonNull(connectionString, "'connectionString' cannot be null.");
         CommunicationConnectionString connectionStringObject = new CommunicationConnectionString(connectionString);
         String endpoint = connectionStringObject.getEndpoint();
@@ -150,9 +150,9 @@ public PhoneNumberClientBuilder connectionString(String connectionString) {
      * Sets the configuration object used to retrieve environment configuration values during building of the client.
      *
      * @param configuration Configuration store used to retrieve environment configurations.
-     * @return The updated {@link PhoneNumberClientBuilder} object.
+     * @return The updated {@link PhoneNumbersClientBuilder} object.
      */
-    public PhoneNumberClientBuilder configuration(Configuration configuration) {
+    public PhoneNumbersClientBuilder configuration(Configuration configuration) {
         this.configuration = configuration;
         return this;
     }
@@ -161,25 +161,25 @@ public PhoneNumberClientBuilder configuration(Configuration configuration) {
      * Adds a policy to the set of existing policies that are executed after required policies.
      *
      * @param policy The retry policy for service requests.
-     * @return The updated {@link PhoneNumberClientBuilder} object.
+     * @return The updated {@link PhoneNumbersClientBuilder} object.
      * @throws NullPointerException If {@code policy} is {@code null}.
      */
-    public PhoneNumberClientBuilder addPolicy(HttpPipelinePolicy policy) {
+    public PhoneNumbersClientBuilder addPolicy(HttpPipelinePolicy policy) {
         this.additionalPolicies.add(Objects.requireNonNull(policy, "'policy' cannot be null."));
         return this;
     }
 
     /**
-     * Sets the {@link PhoneNumberServiceVersion} that is used when making API requests.
+     * Sets the {@link PhoneNumbersServiceVersion} that is used when making API requests.
      * <p>
      * If a service version is not provided, the service version that will be used will be the latest known service
      * version based on the version of the client library being used. If no service version is specified, updating to a
      * newer version the client library will have the result of potentially moving to a newer service version.
      *
-     * @param version {@link PhoneNumberServiceVersion} of the service to be used when making requests.
-     * @return The updated {@link PhoneNumberClientBuilder} object.
+     * @param version {@link PhoneNumbersServiceVersion} of the service to be used when making requests.
+     * @return The updated {@link PhoneNumbersClientBuilder} object.
      */
-    public PhoneNumberClientBuilder serviceVersion(PhoneNumberServiceVersion version) {
+    public PhoneNumbersClientBuilder serviceVersion(PhoneNumbersServiceVersion version) {
         this.version = version;
         return this;
     }
@@ -189,26 +189,26 @@ public PhoneNumberClientBuilder serviceVersion(PhoneNumberServiceVersion version
      * UserAgentPolicy, RetryPolicy, and CookiePolicy.
      * Additional HttpPolicies specified by additionalPolicies will be applied after them
      *
-     * @return {@link PhoneNumberClient} instance
+     * @return {@link PhoneNumbersClient} instance
      */
-    public PhoneNumberClient buildClient() {
+    public PhoneNumbersClient buildClient() {
         this.validateRequiredFields();
 
         if (this.version != null) {
             logger.info("Build client for service version" + this.version.getVersion());
         }
 
-        return new PhoneNumberClient(this.createPhoneNumberAdminClient());
+        return new PhoneNumbersClient(this.createPhoneNumberAdminClient());
     }
 
     /**
      * Create asynchronous client applying CommunicationClientCredentialPolicy,
      * UserAgentPolicy, RetryPolicy, and CookiePolicy.
      * Additional HttpPolicies specified by additionalPolicies will be applied after them
      *
-     * @return {@link PhoneNumberAsyncClient} instance
+     * @return {@link PhoneNumbersAsyncClient} instance
      */
-    public PhoneNumberAsyncClient buildAsyncClient() {
+    public PhoneNumbersAsyncClient buildAsyncClient() {
         this.validateRequiredFields();
 
         if (this.version != null) {
@@ -218,8 +218,8 @@ public PhoneNumberAsyncClient buildAsyncClient() {
         return this.createPhoneNumberAsyncClient(this.createPhoneNumberAdminClient());
     }
 
-    PhoneNumberAsyncClient createPhoneNumberAsyncClient(PhoneNumberAdminClientImpl phoneNumberAdminClient) {
-        return new PhoneNumberAsyncClient(phoneNumberAdminClient);
+    PhoneNumbersAsyncClient createPhoneNumberAsyncClient(PhoneNumberAdminClientImpl phoneNumberAdminClient) {
+        return new PhoneNumbersAsyncClient(phoneNumberAdminClient);
     }
 
     HttpPipelinePolicy createAuthenticationPolicy() {

sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumberServiceVersion.java → sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/PhoneNumbersServiceVersion.java

@@ -8,12 +8,12 @@
 /**
  * The versions of Phone Number Admin Service supported by this client library.
  */
-public enum PhoneNumberServiceVersion implements ServiceVersion {
+public enum PhoneNumbersServiceVersion implements ServiceVersion {
     V2020_07_20_PREVIEW_1("2020-07-20-preview1");
 
     private final String version;
 
-    PhoneNumberServiceVersion(String version) {
+    PhoneNumbersServiceVersion(String version) {
 
         this.version = version;
     }
@@ -30,9 +30,9 @@ public String getVersion() {
     /**
      * Gets the latest service version supported by this client library
      *
-     * @return the latest {@link PhoneNumberServiceVersion}
+     * @return the latest {@link PhoneNumbersServiceVersion}
      */
-    public static PhoneNumberServiceVersion getLatest() {
+    public static PhoneNumbersServiceVersion getLatest() {
 
         return V2020_07_20_PREVIEW_1;
     }

sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/implementation/PhoneNumbersImpl.java

@@ -4,18 +4,18 @@
 
 package com.azure.communication.administration.implementation;
 
+import com.azure.communication.administration.implementation.models.AcquiredPhoneNumbers;
+import com.azure.communication.administration.implementation.models.CommunicationErrorResponseException;
+import com.azure.communication.administration.implementation.models.PhoneNumberAssignmentType;
+import com.azure.communication.administration.implementation.models.PhoneNumberCapabilityValue;
+import com.azure.communication.administration.implementation.models.PhoneNumberPurchaseRequest;
+import com.azure.communication.administration.implementation.models.PhoneNumberType;
 import com.azure.communication.administration.models.AcquiredPhoneNumber;
 import com.azure.communication.administration.models.AcquiredPhoneNumberUpdate;
-import com.azure.communication.administration.models.AcquiredPhoneNumbers;
-import com.azure.communication.administration.models.CommunicationErrorResponseException;
-import com.azure.communication.administration.models.PhoneNumberAssignmentType;
 import com.azure.communication.administration.models.PhoneNumberCapabilitiesRequest;
-import com.azure.communication.administration.models.PhoneNumberCapabilityValue;
 import com.azure.communication.administration.models.PhoneNumberOperation;
-import com.azure.communication.administration.models.PhoneNumberPurchaseRequest;
 import com.azure.communication.administration.models.PhoneNumberSearchRequest;
 import com.azure.communication.administration.models.PhoneNumberSearchResult;
-import com.azure.communication.administration.models.PhoneNumberType;
 import com.azure.communication.administration.models.PhoneNumbersPurchasePhoneNumbersResponse;
 import com.azure.communication.administration.models.PhoneNumbersReleasePhoneNumberResponse;
 import com.azure.communication.administration.models.PhoneNumbersSearchAvailablePhoneNumbersResponse;

sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/models/AcquiredPhoneNumbers.java → sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/implementation/models/AcquiredPhoneNumbers.java

@@ -2,8 +2,9 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.communication.administration.models;
+package com.azure.communication.administration.implementation.models;
 
+import com.azure.communication.administration.models.AcquiredPhoneNumber;
 import com.azure.core.annotation.Fluent;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;

sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/models/CommunicationError.java → sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/implementation/models/CommunicationError.java

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.communication.administration.models;
+package com.azure.communication.administration.implementation.models;
 
 import com.azure.core.annotation.Fluent;
 import com.fasterxml.jackson.annotation.JsonProperty;

sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/models/CommunicationErrorResponse.java → sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/implementation/models/CommunicationErrorResponse.java

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.communication.administration.models;
+package com.azure.communication.administration.implementation.models;
 
 import com.azure.core.annotation.Fluent;
 import com.fasterxml.jackson.annotation.JsonProperty;

sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/models/CommunicationErrorResponseException.java → sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/implementation/models/CommunicationErrorResponseException.java

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.communication.administration.models;
+package com.azure.communication.administration.implementation.models;
 
 import com.azure.core.exception.HttpResponseException;
 import com.azure.core.http.HttpResponse;

sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/models/OperationKind.java → sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/implementation/models/OperationKind.java

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.communication.administration.models;
+package com.azure.communication.administration.implementation.models;
 
 import com.azure.core.util.ExpandableStringEnum;
 import com.fasterxml.jackson.annotation.JsonCreator;

sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/models/PhoneNumberAssignmentType.java → sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/implementation/models/PhoneNumberAssignmentType.java

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.communication.administration.models;
+package com.azure.communication.administration.implementation.models;
 
 import com.azure.core.util.ExpandableStringEnum;
 import com.fasterxml.jackson.annotation.JsonCreator;

sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/models/PhoneNumberCapabilityValue.java → sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/implementation/models/PhoneNumberCapabilityValue.java

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.communication.administration.models;
+package com.azure.communication.administration.implementation.models;
 
 import com.azure.core.util.ExpandableStringEnum;
 import com.fasterxml.jackson.annotation.JsonCreator;

sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/models/PhoneNumberOperationStatusCodes.java → sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/implementation/models/PhoneNumberOperationStatusCodes.java

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.communication.administration.models;
+package com.azure.communication.administration.implementation.models;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;

sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/models/PhoneNumberPurchaseRequest.java → sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/implementation/models/PhoneNumberPurchaseRequest.java

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.communication.administration.models;
+package com.azure.communication.administration.implementation.models;
 
 import com.azure.core.annotation.Fluent;
 import com.fasterxml.jackson.annotation.JsonProperty;

sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/models/PhoneNumberType.java → sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/implementation/models/PhoneNumberType.java

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.communication.administration.models;
+package com.azure.communication.administration.implementation.models;
 
 import com.azure.core.util.ExpandableStringEnum;
 import com.fasterxml.jackson.annotation.JsonCreator;

sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/implementation/models/package-info.java

@@ -0,0 +1,9 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+/**
+ * Package containing the data models for PhoneNumberAdminClient. The phone numbers client uses the Communication
+ * Services to acquire and manage phone numbers.
+ */
+package com.azure.communication.administration.implementation.models;

sdk/communication/azure-communication-administration/src/main/java/com/azure/communication/administration/implementation/package-info.java

@@ -2,5 +2,8 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-/** Package containing the implementations for PhoneNumberAdminClient. Azure Communication Phone Number Service. */
+/**
+ * Package containing the implementations and inner classes for PhoneNumberAdminClient. The phone numbers client uses
+ * the Communication Services to acquire and manage phone numbers.
+ */
 package com.azure.communication.administration.implementation;