Azure · saragluna · Dec 30, 2021 · Dec 29, 2021
diff --git a/...ring/cloud/autoconfigure/appconfiguration/properties/AzureAppConfigurationProperties.java b/...ring/cloud/autoconfigure/appconfiguration/properties/AzureAppConfigurationProperties.java
@@ -4,13 +4,13 @@
 package com.azure.spring.cloud.autoconfigure.appconfiguration.properties;
 
 import com.azure.data.appconfiguration.ConfigurationServiceVersion;
-import com.azure.spring.cloud.autoconfigure.properties.core.AbstractAzureHttpCP;
+import com.azure.spring.cloud.autoconfigure.properties.core.AbstractAzureHttpConfigurationProperties;
 import com.azure.spring.service.appconfiguration.ConfigurationClientProperties;
 
 /**
  * Properties for Azure App Configuration.
  */
-public class AzureAppConfigurationProperties extends AbstractAzureHttpCP
+public class AzureAppConfigurationProperties extends AbstractAzureHttpConfigurationProperties
     implements ConfigurationClientProperties {
 
     public static final String PREFIX = "spring.cloud.azure.appconfiguration";

diff --git a/...zure/spring/cloud/autoconfigure/context/AzureDefaultTokenCredentialAutoConfiguration.java b/...zure/spring/cloud/autoconfigure/context/AzureDefaultTokenCredentialAutoConfiguration.java
@@ -7,7 +7,7 @@
 import com.azure.identity.DefaultAzureCredentialBuilder;
 import com.azure.spring.cloud.autoconfigure.AzureServiceConfigurationBase;
 import com.azure.spring.cloud.autoconfigure.properties.AzureGlobalProperties;
-import com.azure.spring.cloud.autoconfigure.properties.core.AbstractAzureHttpCP;
+import com.azure.spring.cloud.autoconfigure.properties.core.AbstractAzureHttpConfigurationProperties;
 import com.azure.spring.core.customizer.AzureServiceClientBuilderCustomizer;
 import com.azure.spring.core.factory.AbstractAzureServiceClientBuilderFactory;
 import com.azure.spring.core.factory.credential.AbstractAzureCredentialBuilderFactory;
@@ -88,7 +88,7 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
         }
     }
 
-    static class IdentityClientProperties extends AbstractAzureHttpCP {
+    static class IdentityClientProperties extends AbstractAzureHttpConfigurationProperties {
 
     }
 }
diff --git a/...in/java/com/azure/spring/cloud/autoconfigure/cosmos/properties/AzureCosmosProperties.java b/...in/java/com/azure/spring/cloud/autoconfigure/cosmos/properties/AzureCosmosProperties.java
@@ -9,9 +9,9 @@
 import com.azure.cosmos.GatewayConnectionConfig;
 import com.azure.cosmos.ThrottlingRetryOptions;
 import com.azure.cosmos.models.CosmosPermissionProperties;
-import com.azure.spring.cloud.autoconfigure.properties.core.AbstractAzureServiceCP;
-import com.azure.spring.cloud.autoconfigure.properties.core.client.ClientCP;
-import com.azure.spring.cloud.autoconfigure.properties.core.proxy.HttpProxyCP;
+import com.azure.spring.cloud.autoconfigure.properties.core.AbstractAzureServiceConfigurationProperties;
+import com.azure.spring.cloud.autoconfigure.properties.core.client.ClientConfigurationProperties;
+import com.azure.spring.cloud.autoconfigure.properties.core.proxy.HttpProxyConfigurationProperties;
 import com.azure.spring.service.cosmos.CosmosClientProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
@@ -21,15 +21,15 @@
 /**
  * Configuration properties for Cosmos database, consistency, telemetry, connection, query metrics and diagnostics.
  */
-public class AzureCosmosProperties extends AbstractAzureServiceCP implements CosmosClientProperties {
+public class AzureCosmosProperties extends AbstractAzureServiceConfigurationProperties implements CosmosClientProperties {
 
     public static final String PREFIX = "spring.cloud.azure.cosmos";
 
     @NestedConfigurationProperty
-    private final HttpProxyCP proxy = new HttpProxyCP();
+    private final HttpProxyConfigurationProperties proxy = new HttpProxyConfigurationProperties();
 
     @NestedConfigurationProperty
-    private final ClientCP client = new ClientCP();
+    private final ClientConfigurationProperties client = new ClientConfigurationProperties();
 
     private String endpoint;
 
@@ -72,12 +72,12 @@ public class AzureCosmosProperties extends AbstractAzureServiceCP implements Cos
     private boolean populateQueryMetrics;
 
     @Override
-    public HttpProxyCP getProxy() {
+    public HttpProxyConfigurationProperties getProxy() {
         return proxy;
     }
 
     @Override
-    public ClientCP getClient() {
+    public ClientConfigurationProperties getClient() {
         return client;
     }
 

diff --git a/...azure/spring/cloud/autoconfigure/eventhubs/properties/AzureEventHubsCommonProperties.java b/...azure/spring/cloud/autoconfigure/eventhubs/properties/AzureEventHubsCommonProperties.java
@@ -3,13 +3,13 @@
 
 package com.azure.spring.cloud.autoconfigure.eventhubs.properties;
 
-import com.azure.spring.cloud.autoconfigure.properties.core.AbstractAzureAmqpCP;
+import com.azure.spring.cloud.autoconfigure.properties.core.AbstractAzureAmqpConfigurationProperties;
 import com.azure.spring.core.implementation.connectionstring.EventHubsConnectionString;
 
 /**
  * Azure Event Hubs related properties.
  */
-public abstract class AzureEventHubsCommonProperties extends AbstractAzureAmqpCP {
+public abstract class AzureEventHubsCommonProperties extends AbstractAzureAmqpConfigurationProperties {
 
     protected String domainName = "servicebus.windows.net";
     protected String namespace;

diff --git a/...in/java/com/azure/spring/cloud/autoconfigure/keyvault/common/AzureKeyVaultProperties.java b/...in/java/com/azure/spring/cloud/autoconfigure/keyvault/common/AzureKeyVaultProperties.java
@@ -3,14 +3,14 @@
 
 package com.azure.spring.cloud.autoconfigure.keyvault.common;
 
-import com.azure.spring.cloud.autoconfigure.properties.core.AbstractAzureHttpCP;
+import com.azure.spring.cloud.autoconfigure.properties.core.AbstractAzureHttpConfigurationProperties;
 
 /**
  * Azure Key Vault properties.
  *
  * @since 4.0.0
  */
-public class AzureKeyVaultProperties extends AbstractAzureHttpCP {
+public class AzureKeyVaultProperties extends AbstractAzureHttpConfigurationProperties {
 
     /**
      * Azure Key Vault endpoint.

diff --git a/...re/spring/cloud/autoconfigure/keyvault/secrets/AzureKeyVaultPropertySourceProperties.java b/...re/spring/cloud/autoconfigure/keyvault/secrets/AzureKeyVaultPropertySourceProperties.java
@@ -4,7 +4,7 @@
 package com.azure.spring.cloud.autoconfigure.keyvault.secrets;
 
 import com.azure.security.keyvault.secrets.SecretServiceVersion;
-import com.azure.spring.cloud.autoconfigure.properties.core.AbstractAzureHttpCP;
+import com.azure.spring.cloud.autoconfigure.properties.core.AbstractAzureHttpConfigurationProperties;
 
 import java.time.Duration;
 import java.util.List;
@@ -16,7 +16,7 @@
  *
  * @since 4.0.0
  */
-public class AzureKeyVaultPropertySourceProperties extends AbstractAzureHttpCP {
+public class AzureKeyVaultPropertySourceProperties extends AbstractAzureHttpConfigurationProperties {
 
     public static final Duration DEFAULT_REFRESH_INTERVAL = Duration.ofMinutes(30);
 

diff --git a/.../src/main/java/com/azure/spring/cloud/autoconfigure/properties/AzureGlobalProperties.java b/.../src/main/java/com/azure/spring/cloud/autoconfigure/properties/AzureGlobalProperties.java
@@ -4,12 +4,12 @@
 package com.azure.spring.cloud.autoconfigure.properties;
 
 import com.azure.core.amqp.AmqpTransportType;
-import com.azure.spring.cloud.autoconfigure.properties.core.authentication.TokenCredentialCP;
-import com.azure.spring.cloud.autoconfigure.properties.core.client.ClientCP;
-import com.azure.spring.cloud.autoconfigure.properties.core.client.HttpLoggingCP;
-import com.azure.spring.cloud.autoconfigure.properties.core.profile.AzureProfileCP;
-import com.azure.spring.cloud.autoconfigure.properties.core.proxy.ProxyCP;
-import com.azure.spring.cloud.autoconfigure.properties.core.retry.RetryCP;
+import com.azure.spring.cloud.autoconfigure.properties.core.authentication.TokenCredentialConfigurationProperties;
+import com.azure.spring.cloud.autoconfigure.properties.core.client.ClientConfigurationProperties;
+import com.azure.spring.cloud.autoconfigure.properties.core.client.HttpLoggingConfigurationProperties;
+import com.azure.spring.cloud.autoconfigure.properties.core.profile.AzureProfileConfigurationProperties;
+import com.azure.spring.cloud.autoconfigure.properties.core.proxy.ProxyConfigurationProperties;
+import com.azure.spring.cloud.autoconfigure.properties.core.retry.RetryConfigurationProperties;
 import com.azure.spring.core.properties.AzureProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
@@ -26,90 +26,90 @@ public class AzureGlobalProperties implements AzureProperties {
     public static final String PREFIX = "spring.cloud.azure";
 
     @NestedConfigurationProperty
-    private final GlobalClientCP client = new GlobalClientCP();
+    private final GlobalClientConfigurationProperties client = new GlobalClientConfigurationProperties();
 
     @NestedConfigurationProperty
-    private final GlobalProxyCP proxy = new GlobalProxyCP();
+    private final GlobalProxyConfigurationProperties proxy = new GlobalProxyConfigurationProperties();
 
     @NestedConfigurationProperty
-    private final GlobalRetryCP retry = new GlobalRetryCP();
+    private final GlobalRetryConfigurationProperties retry = new GlobalRetryConfigurationProperties();
 
     @NestedConfigurationProperty
-    private final TokenCredentialCP credential = new TokenCredentialCP();
+    private final TokenCredentialConfigurationProperties credential = new TokenCredentialConfigurationProperties();
 
     @NestedConfigurationProperty
-    private final AzureProfileCP profile = new AzureProfileCP();
+    private final AzureProfileConfigurationProperties profile = new AzureProfileConfigurationProperties();
 
     @Override
-    public GlobalClientCP getClient() {
+    public GlobalClientConfigurationProperties getClient() {
         return client;
     }
 
     @Override
-    public GlobalProxyCP getProxy() {
+    public GlobalProxyConfigurationProperties getProxy() {
         return proxy;
     }
 
     @Override
-    public GlobalRetryCP getRetry() {
+    public GlobalRetryConfigurationProperties getRetry() {
         return retry;
     }
 
     @Override
-    public TokenCredentialCP getCredential() {
+    public TokenCredentialConfigurationProperties getCredential() {
         return credential;
     }
 
     @Override
-    public AzureProfileCP getProfile() {
+    public AzureProfileConfigurationProperties getProfile() {
         return profile;
     }
 
     /**
      * Global configurations for the transport client underneath.
      */
-    public static final class GlobalClientCP extends ClientCP {
+    public static final class GlobalClientConfigurationProperties extends ClientConfigurationProperties {
 
-        private final HttpClientCP http = new HttpClientCP();
-        private final AmqpClientCP amqp = new AmqpClientCP();
+        private final GlobalHttpClientConfigurationProperties http = new GlobalHttpClientConfigurationProperties();
+        private final GlobalAmqpClientConfigurationProperties amqp = new GlobalAmqpClientConfigurationProperties();
 
-        public HttpClientCP getHttp() {
+        public GlobalHttpClientConfigurationProperties getHttp() {
             return http;
         }
 
-        public AmqpClientCP getAmqp() {
+        public GlobalAmqpClientConfigurationProperties getAmqp() {
             return amqp;
         }
     }
 
     /**
      * Global configurations for proxy.
      */
-    public static final class GlobalProxyCP extends ProxyCP {
+    public static final class GlobalProxyConfigurationProperties extends ProxyConfigurationProperties {
 
-        private final HttpProxyCP http = new HttpProxyCP();
+        private final GlobalHttpProxyConfigurationProperties http = new GlobalHttpProxyConfigurationProperties();
 
-        public HttpProxyCP getHttp() {
+        public GlobalHttpProxyConfigurationProperties getHttp() {
             return http;
         }
     }
 
     /**
      * Global configurations for proxy.
      */
-    public static final class GlobalRetryCP extends RetryCP {
+    public static final class GlobalRetryConfigurationProperties extends RetryConfigurationProperties {
 
-        private final HttpRetryCP http = new HttpRetryCP();
+        private final GlobalHttpRetryConfigurationProperties http = new GlobalHttpRetryConfigurationProperties();
 
-        public HttpRetryCP getHttp() {
+        public GlobalHttpRetryConfigurationProperties getHttp() {
             return http;
         }
     }
 
     /**
      * Retry properties only apply to http-based clients.
      */
-    public static final class HttpRetryCP {
+    public static final class GlobalHttpRetryConfigurationProperties {
 
         /**
          * HTTP header, such as Retry-After or x-ms-retry-after-ms, to lookup for the retry delay.
@@ -141,7 +141,7 @@ public void setRetryAfterTimeUnit(ChronoUnit retryAfterTimeUnit) {
     /**
      * Proxy properties only apply to http-based clients.
      */
-    public static final class HttpProxyCP {
+    public static final class GlobalHttpProxyConfigurationProperties {
 
         /**
          * A list of hosts or CIDR to not use proxy HTTP/HTTPS connections through.
@@ -160,7 +160,7 @@ public void setNonProxyHosts(String nonProxyHosts) {
     /**
      * Transport properties for http-based clients.
      */
-    public static final class HttpClientCP {
+    public static final class GlobalHttpClientConfigurationProperties {
         /**
          * Amount of time each request being sent over the wire.
          */
@@ -187,7 +187,7 @@ public static final class HttpClientCP {
         private Duration connectionIdleTimeout;
 
         @NestedConfigurationProperty
-        private final HttpLoggingCP logging = new HttpLoggingCP();
+        private final HttpLoggingConfigurationProperties logging = new HttpLoggingConfigurationProperties();
 
         public Duration getWriteTimeout() {
             return writeTimeout;
@@ -237,15 +237,15 @@ public void setConnectionIdleTimeout(Duration connectionIdleTimeout) {
             this.connectionIdleTimeout = connectionIdleTimeout;
         }
 
-        public HttpLoggingCP getLogging() {
+        public HttpLoggingConfigurationProperties getLogging() {
             return logging;
         }
     }
 
     /**
      * Transport properties for amqp-based clients.
      */
-    public static final class AmqpClientCP {
+    public static final class GlobalAmqpClientConfigurationProperties {
 
         /**
          * Transport type for AMQP-based client.

diff --git a/.../properties/core/AbstractAzureAmqpCP.java → ...ractAzureAmqpConfigurationProperties.java b/.../properties/core/AbstractAzureAmqpCP.java → ...ractAzureAmqpConfigurationProperties.java
@@ -3,37 +3,37 @@
 
 package com.azure.spring.cloud.autoconfigure.properties.core;
 
-import com.azure.spring.cloud.autoconfigure.properties.core.client.AmqpClientCP;
-import com.azure.spring.cloud.autoconfigure.properties.core.proxy.ProxyCP;
-import com.azure.spring.cloud.autoconfigure.properties.core.retry.RetryCP;
+import com.azure.spring.cloud.autoconfigure.properties.core.client.AmqpClientConfigurationProperties;
+import com.azure.spring.cloud.autoconfigure.properties.core.proxy.ProxyConfigurationProperties;
+import com.azure.spring.cloud.autoconfigure.properties.core.retry.RetryConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
 /**
  * Configuration properties base class for all AMQP-based Azure Service clients.
  */
-public abstract class AbstractAzureAmqpCP extends AbstractAzureServiceCP {
+public abstract class AbstractAzureAmqpConfigurationProperties extends AbstractAzureServiceConfigurationProperties {
 
     @NestedConfigurationProperty
-    protected final AmqpClientCP client = new AmqpClientCP();
+    protected final AmqpClientConfigurationProperties client = new AmqpClientConfigurationProperties();
 
     @NestedConfigurationProperty
-    protected final RetryCP retry = new RetryCP();
+    protected final RetryConfigurationProperties retry = new RetryConfigurationProperties();
 
     @NestedConfigurationProperty
-    protected final ProxyCP proxy = new ProxyCP();
+    protected final ProxyConfigurationProperties proxy = new ProxyConfigurationProperties();
 
     @Override
-    public AmqpClientCP getClient() {
+    public AmqpClientConfigurationProperties getClient() {
         return client;
     }
 
     @Override
-    public RetryCP getRetry() {
+    public RetryConfigurationProperties getRetry() {
         return retry;
     }
 
     @Override
-    public ProxyCP getProxy() {
+    public ProxyConfigurationProperties getProxy() {
         return proxy;
     }
 }