Made a few corrections to secrets classes.

Author: vcolin7

sdk/keyvault/azure-security-keyvault-secrets-v2/src/main/java/com/azure/v2/security/keyvault/secrets/SecretClient.java

@@ -27,10 +27,8 @@
 import io.clientcore.core.traits.HttpTrait;
 import io.clientcore.core.utils.configuration.Configuration;
 
-import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -52,9 +50,8 @@
  * <!-- src_embed com.v2.azure.security.keyvault.SecretClient.instantiation -->
  * <!-- end com.azure.v2.security.keyvault.SecretClient.instantiation -->
  *
- * <p>The {@link HttpInstrumentationOptions.HttpLogLevel log level},
- * {@link HttpInstrumentationOptions instrumentation policy} and custom {@link HttpClient HTTP client} can be optionally
- * configured in the {@link SecretClientBuilder}.</p>
+ * <p>The {@link HttpInstrumentationOptions.HttpLogLevel log level}, multiple custom {@link HttpPipelinePolicy policies}
+ * and custom {@link HttpClient HTTP client} can be optionally configured in the {@link SecretClientBuilder}.</p>
  *
  * <!-- src_embed com.azure.v2.security.keyvault.secrets.SecretClient.instantiation.withHttpClient -->
  * <!-- end com.azure.v2.security.keyvault.secrets.SecretClient.instantiation.withHttpClient -->
@@ -102,7 +99,7 @@ public SecretClientBuilder() {
      * <p>If {@link SecretClientBuilder#httpPipeline(HttpPipeline) pipeline} is set, then the {@code pipeline} and
      * {@link SecretClientBuilder#endpoint(String) endpoint} are used to create the
      * {@link SecretClientBuilder client}. All other builder settings are ignored. If {@code pipeline} is not set, then
-     * the {@link SecretClientBuilder#credential(TokenCredential) credential}, and
+     * a {@link SecretClientBuilder#credential(TokenCredential) credential} and
      * {@link SecretClientBuilder#endpoint(String) endpoint} are required to build the {@link SecretClient client}.</p>
      *
      * @return A {@link SecretClient} based on the options set in this builder.
@@ -114,19 +111,20 @@ public SecretClientBuilder() {
      * {@link #httpRetryPolicy(HttpRetryPolicy)} have been set.
      */
     public SecretClient buildClient() {
-        return new SecretClient(getClientImpl(), endpoint);
+        return new SecretClient(buildImplClient(), endpoint);
     }
 
-    private SecretClientImpl getClientImpl() {
+    private SecretClientImpl buildImplClient() {
         Configuration configuration = this.configuration == null
             ? Configuration.getGlobalConfiguration()
             : this.configuration;
 
         String endpoint = getEndpoint(configuration);
 
         if (endpoint == null) {
-            throw LOGGER.logThrowableAsError(
-                new IllegalStateException("An Azure Key Vault of Managed HSM endpoint url is required."));
+            throw LOGGER.logThrowableAsError(new IllegalStateException(
+                "An Azure Key Vault endpoint is required. You can set one by using the KeyClientBuilder.endpoint()"
+                    + "method or by setting the environment variable 'AZURE_KEYVAULT_ENDPOINT'."));
         }
 
         SecretServiceVersion version = this.version == null ? SecretServiceVersion.getLatest() : this.version;
@@ -136,7 +134,8 @@ private SecretClientImpl getClientImpl() {
         }
 
         if (credential == null) {
-            throw LOGGER.logThrowableAsError(new IllegalStateException("Azure Key Vault credentials are required."));
+            throw LOGGER.logThrowableAsError(new IllegalStateException(
+                "A credential object is required. You can set one by using the KeyClientBuilder.credential() method."));
         }
 
         // Closest to API goes first, closest to wire goes last.
@@ -194,8 +193,8 @@ private SecretClientImpl getClientImpl() {
      * other information via {@link KeyVaultSecretIdentifier#getEndpoint()}.
      * @return The updated {@link SecretClientBuilder} object.
      *
-     * @throws IllegalArgumentException If {@code endpoint} isn't a valid URI.
-     * @throws NullPointerException If {@code endpoint} is null.
+     * @throws IllegalArgumentException If {@code endpoint} cannot be parsed into a valid URI.
+     * @throws NullPointerException If {@code endpoint} is {@code null}.
      */
     @Override
     public SecretClientBuilder endpoint(String endpoint) {
@@ -216,8 +215,8 @@ public SecretClientBuilder endpoint(String endpoint) {
 
     /**
      * Sets the {@link TokenCredential} used to authorize requests sent to the service. Refer to the Azure SDK for Java
-     * <a href="https://aka.ms/azsdk/java/docs/identity">identity and authentication</a>
-     * documentation for more details on proper usage of the {@link TokenCredential} type.
+     * <a href="https://aka.ms/azsdk/java/docs/identity">identity and authentication</a> documentation for more details
+     * on proper usage of the {@link TokenCredential} type.
      *
      * @param credential {@link TokenCredential} used to authorize requests sent to the service.
      * @return The updated {@link SecretClientBuilder} object.
@@ -248,7 +247,7 @@ public SecretClientBuilder credential(TokenCredential credential) {
      *     If OpenTelemetry is not found on the classpath, the same information is captured in logs.
      *     HTTP request spans contain basic information about the request, such as the HTTP method, URL, status code and
      *     duration.
-     *     See {@link io.clientcore.core.http.pipeline.HttpInstrumentationPolicy} for
+     *     See {@link HttpInstrumentationPolicy} for
      *     the details.</li>
      * </ul>
      *
@@ -288,7 +287,7 @@ public SecretClientBuilder httpInstrumentationOptions(HttpInstrumentationOptions
     @Override
     public SecretClientBuilder addHttpPipelinePolicy(HttpPipelinePolicy pipelinePolicy) {
         if (pipelinePolicy == null) {
-            throw LOGGER.logThrowableAsError(new NullPointerException("'policy' cannot be null."));
+            throw LOGGER.logThrowableAsError(new NullPointerException("'pipelinePolicy' cannot be null."));
         }
 
         policies.add(pipelinePolicy);
@@ -469,10 +468,10 @@ private String getEndpoint(Configuration configuration) {
         }
 
         try {
-            URL url = new URL(configEndpoint);
+            URI uri = new URI(configEndpoint);
 
-            return url.toString();
-        } catch (MalformedURLException ex) {
+            return uri.toString();
+        } catch (URISyntaxException ex) {
             return null;
         }
     }

sdk/keyvault/azure-security-keyvault-secrets-v2/src/main/java/com/azure/v2/security/keyvault/secrets/SecretClientBuilder.java

@@ -324,9 +324,9 @@ public static void clearCache() {
      * @return The host name and port of the Key Vault or Managed HSM endpoint.
      */
     private static String getRequestAuthority(HttpRequest request) {
-        URI url = request.getUri();
-        String authority = url.getAuthority();
-        int port = url.getPort();
+        URI uri = request.getUri();
+        String authority = uri.getAuthority();
+        int port = uri.getPort();
 
         // Append port for complete authority.
         if (!authority.contains(":") && port > 0) {

sdk/keyvault/azure-security-keyvault-secrets-v2/src/main/java/com/azure/v2/security/keyvault/secrets/implementation/KeyVaultCredentialPolicy.java

@@ -560,7 +560,7 @@ public Response<SecretBundle> updateSecretWithResponse(String secretName, String
      * </pre>
      *
      * @param secretName The name of the secret.
-     * @param secretVersion The version of the secret. This URI fragment is optional. If not specified, the latest
+     * @param secretVersion The version of the secret. This URL fragment is optional. If not specified, the latest
      * version of the secret is returned.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the service returns an error.

sdk/keyvault/azure-security-keyvault-secrets-v2/src/main/java/com/azure/v2/security/keyvault/secrets/implementation/SecretClientImpl.java

@@ -11,8 +11,8 @@
 import io.clientcore.core.serialization.json.JsonReader;
 
 import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
@@ -200,8 +200,8 @@ public static void unpackId(String id, Consumer<String> nameConsumer, Consumer<S
         }
 
         try {
-            URL url = new URL(id);
-            String[] tokens = url.getPath().split("/");
+            URI uri = new URI(id);
+            String[] tokens = uri.getPath().split("/");
 
             if (tokens.length >= 3) {
                 nameConsumer.accept(tokens[2]);
@@ -210,14 +210,15 @@ public static void unpackId(String id, Consumer<String> nameConsumer, Consumer<S
             if (tokens.length >= 4) {
                 versionConsumer.accept(tokens[3]);
             }
-        } catch (MalformedURLException e) {
+        } catch (URISyntaxException e) {
             // Should never come here.
-            LOGGER.atError().log("Received Malformed Secret Id URL from KV Service");
+            LOGGER.atError().log("Received malformed secret id URL from Key Vault Service.");
         }
     }
 
     public static OffsetDateTime epochToOffsetDateTime(JsonReader epochReader) throws IOException {
         Instant instant = Instant.ofEpochMilli(epochReader.getLong() * 1000L);
+
         return OffsetDateTime.ofInstant(instant, ZoneOffset.UTC);
     }
 

sdk/keyvault/azure-security-keyvault-secrets-v2/src/main/java/com/azure/v2/security/keyvault/secrets/implementation/models/SecretsModelsUtils.java

@@ -6,8 +6,8 @@
 import com.azure.v2.security.keyvault.secrets.SecretClient;
 import io.clientcore.core.instrumentation.logging.ClientLogger;
 
-import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
 
 /**
  * Information about a {@link KeyVaultSecret} parsed from the secret URL. You can use this information when calling
@@ -45,9 +45,9 @@ public KeyVaultSecretIdentifier(String sourceId) {
         }
 
         try {
-            final URL url = new URL(sourceId);
+            final URI uri = new URI(sourceId);
             // We expect an sourceId with either 3 or 4 path segments: key vault + collection + name + "pending"/version
-            final String[] pathSegments = url.getPath().split("/");
+            final String[] pathSegments = uri.getPath().split("/");
 
             // More or less segments in the URI than expected.
             if (pathSegments.length != 3 && pathSegments.length != 4) {
@@ -56,10 +56,10 @@ public KeyVaultSecretIdentifier(String sourceId) {
             }
 
             this.sourceId = sourceId;
-            this.endpoint = url.getProtocol() + "://" + url.getHost();
+            this.endpoint = uri.getScheme() + "://" + uri.getHost();
             this.name = pathSegments[2];
             this.version = pathSegments.length == 4 ? pathSegments[3] : null;
-        } catch (MalformedURLException e) {
+        } catch (URISyntaxException e) {
             throw LOGGER.logThrowableAsError(
                 new IllegalArgumentException("'sourceId' is not a valid Key Vault identifier.", e));
         }

sdk/keyvault/azure-security-keyvault-secrets-v2/src/main/java/com/azure/v2/security/keyvault/secrets/models/KeyVaultSecretIdentifier.java

@@ -1,8 +1,7 @@
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
 module com.azure.v2.security.keyvault.secrets {
-    requires transitive io.clientcore.core;
-    requires com.azure.v2.core;
+    requires transitive com.azure.v2.core;
 
     exports com.azure.v2.security.keyvault.secrets;
     exports com.azure.v2.security.keyvault.secrets.models;