Update kv secrets sync stack

sdk/keyvault/azure-security-keyvault-secrets/pom.xml

@@ -49,6 +49,7 @@
       --add-exports com.azure.core/com.azure.core.implementation.http=ALL-UNNAMED
 
       --add-opens com.azure.security.keyvault.secrets/com.azure.security.keyvault.secrets=ALL-UNNAMED
+      --add-opens com.azure.security.keyvault.secrets/com.azure.security.keyvault.secrets.implementation=ALL-UNNAMED
       --add-opens com.azure.security.keyvault.secrets/com.azure.security.keyvault.secrets.models=ALL-UNNAMED
     </javaModulesSurefireArgLine>
   </properties>
@@ -108,7 +109,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-test</artifactId>
-      <version>1.10.0</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
+      <version>1.11.0-beta.1</version> <!-- {x-version-update;unreleased_com.azure:azure-core-test;dependency} -->
       <scope>test</scope>
     </dependency>
 

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

@@ -30,6 +30,8 @@
 import com.azure.core.util.builder.ClientBuilderUtil;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.security.keyvault.secrets.implementation.KeyVaultCredentialPolicy;
+import com.azure.security.keyvault.secrets.implementation.KeyVaultErrorCodeStrings;
+import com.azure.security.keyvault.secrets.implementation.SecretClientImpl;
 import com.azure.security.keyvault.secrets.models.KeyVaultSecretIdentifier;
 
 import java.net.MalformedURLException;
@@ -117,7 +119,7 @@ public final class SecretClientBuilder implements
     private final Map<String, String> properties;
     private TokenCredential credential;
     private HttpPipeline pipeline;
-    private URL vaultUrl;
+    private String vaultUrl;
     private HttpClient httpClient;
     private HttpLogOptions httpLogOptions;
     private RetryPolicy retryPolicy;
@@ -155,7 +157,7 @@ public SecretClientBuilder() {
      * and {@link #retryPolicy(RetryPolicy)} have been set.
      */
     public SecretClient buildClient() {
-        return new SecretClient(buildAsyncClient());
+        return new SecretClient(buildInnerClient());
     }
 
     /**
@@ -177,9 +179,14 @@ public SecretClient buildClient() {
      * and {@link #retryPolicy(RetryPolicy)} have been set.
      */
     public SecretAsyncClient buildAsyncClient() {
+        return new SecretAsyncClient(buildInnerClient());
+    }
+
+
+    private SecretClientImpl buildInnerClient() {
         Configuration buildConfiguration =
             (configuration == null) ? Configuration.getGlobalConfiguration().clone() : configuration;
-        URL buildEndpoint = getBuildEndpoint(buildConfiguration);
+        String buildEndpoint = getBuildEndpoint(buildConfiguration);
 
         if (buildEndpoint == null) {
             throw logger.logExceptionAsError(
@@ -190,7 +197,7 @@ public SecretAsyncClient buildAsyncClient() {
         SecretServiceVersion serviceVersion = version != null ? version : SecretServiceVersion.getLatest();
 
         if (pipeline != null) {
-            return new SecretAsyncClient(vaultUrl, pipeline, serviceVersion);
+            return new SecretClientImpl(vaultUrl, pipeline, serviceVersion);
         }
 
         if (credential == null) {
@@ -237,7 +244,7 @@ public SecretAsyncClient buildAsyncClient() {
             .httpClient(httpClient)
             .build();
 
-        return new SecretAsyncClient(vaultUrl, pipeline, serviceVersion);
+        return new SecretClientImpl(vaultUrl, pipeline, serviceVersion);
     }
 
     /**
@@ -258,7 +265,8 @@ public SecretClientBuilder vaultUrl(String vaultUrl) {
         }
 
         try {
-            this.vaultUrl = new URL(vaultUrl);
+            URL url = new URL(vaultUrl);
+            this.vaultUrl = url.toString();
         } catch (MalformedURLException e) {
             throw logger.logExceptionAsError(new IllegalArgumentException(
                 "The Azure Key Vault url is malformed.", e));
@@ -480,7 +488,7 @@ public SecretClientBuilder clientOptions(ClientOptions clientOptions) {
         return this;
     }
 
-    private URL getBuildEndpoint(Configuration configuration) {
+    private String getBuildEndpoint(Configuration configuration) {
         if (vaultUrl != null) {
             return vaultUrl;
         }
@@ -491,7 +499,8 @@ private URL getBuildEndpoint(Configuration configuration) {
         }
 
         try {
-            return new URL(configEndpoint);
+            URL url =  new URL(configEndpoint);
+            return url.toString();
         } catch (MalformedURLException ex) {
             return null;
         }

sdk/keyvault/azure-security-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/KeyVaultErrorCodeStrings.java → sdk/keyvault/azure-security-keyvault-secrets/src/main/java/com/azure/security/keyvault/secrets/implementation/KeyVaultErrorCodeStrings.java

@@ -1,33 +1,33 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.security.keyvault.secrets;
+package com.azure.security.keyvault.secrets.implementation;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
-class KeyVaultErrorCodeStrings {
+public class KeyVaultErrorCodeStrings {
     static final String ERROR_STRINGS_FILE_NAME = "kvErrorStrings.properties";
     private static Properties errorStrings;
 
     /**
      * The property name of Azure Key Vault Credentials required error string.
      */
-    static final String CREDENTIAL_REQUIRED = "credential_required";
+    public static final String CREDENTIAL_REQUIRED = "credential_required";
 
     /**
      * The property name of Azure Key Vault Endpoint required error string.
      */
-    static final String VAULT_END_POINT_REQUIRED = "vault_endpoint_required";
+    public static final String VAULT_END_POINT_REQUIRED = "vault_endpoint_required";
 
     /**
      *  Gets the error String for the specified property.
      *
      * @param propertyName the property name for which error string is required.
      * @return The {@link String value} containing the error message.
      */
-    static String getErrorString(String propertyName) {
+    public static String getErrorString(String propertyName) {
         loadProperties();
         return errorStrings.getProperty(propertyName);
     }