try to move *ConfigurationProperties to implementation package (#27200)

Azure · Feb 22, 2022 · c8a7610 · c8a7610
1 parent 1378063
commit c8a7610
Show file tree

Hide file tree

Showing 144 changed files with 285 additions and 311 deletions.
diff --git a/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
@@ -414,17 +414,7 @@ the main ServiceBusClientBuilder. -->
   <suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.spring.servicebus.core.properties.ProducerProperties"/>
   <suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.spring.storage.queue.core.properties.StorageQueueProperties"/>
   <suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.spring.cloud.autoconfigure.aadb2c.AADB2CJwtBearerTokenAuthenticationConverter"/>
-  <suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.spring.cloud.autoconfigure.appconfiguration.properties.AzureAppConfigurationProperties"/>
-  <suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.spring.cloud.autoconfigure.cosmos.properties.AzureCosmosProperties"/>
-  <suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.spring.cloud.autoconfigure.eventhubs.properties.AzureEventHubsProperties"/>
-  <suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.spring.cloud.autoconfigure.keyvault.certificates.properties.AzureKeyVaultCertificateProperties"/>
-  <suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.spring.cloud.autoconfigure.keyvault.secrets.properties.AzureKeyVaultSecretProperties"/>
-  <suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.spring.cloud.autoconfigure.servicebus.properties.AzureServiceBusProperties"/>
-  <suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.spring.cloud.autoconfigure.storage.blob.properties.AzureStorageBlobProperties"/>
-  <suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.spring.cloud.autoconfigure.storage.common.AzureStorageProperties"/>
-  <suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.spring.cloud.autoconfigure.storage.common.StorageRetryConfigurationProperties"/>
-  <suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.spring.cloud.autoconfigure.storage.fileshare.properties.AzureStorageFileShareProperties"/>
-  <suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.spring.cloud.autoconfigure.storage.queue.properties.AzureStorageQueueProperties"/>
+  <suppress checks="com.azure.tools.checkstyle.checks.NoImplInPublicAPI" files="com.azure.spring.cloud.autoconfigure.AzureServiceConfigurationBase"/>
 
   <!-- TODO: (https://github.com/Azure/azure-sdk-for-java/issues/18291)  -->
   <!-- GoodLoggingCheck: Spring as a framework, will not directly use ClientLogger-->
@@ -437,41 +427,25 @@ the main ServiceBusClientBuilder. -->
   <suppress files="com.azure.spring[\\/].*AutoConfiguration\.java" checks="MissingJavadocMethod|JavadocThrowsChecks" />
   <suppress files="com.azure.spring[\\/].*Configuration\.java" checks="MissingJavadocMethod" />
   <suppress files="com.azure.spring[\\/].*Metadata\.java" checks="MissingJavadocMethod" />
+  <!-- The package name length limit -->
+  <suppress checks="PackageName" files="com.azure.spring.cloud.autoconfigure.implementation.keyvault.certificates.properties.AzureKeyVaultCertificateProperties"/>
+  <suppress checks="PackageName" files="com.azure.spring.cloud.autoconfigure.implementation.keyvault.certificates.properties.package-info.java"/>
+  <suppress checks="PackageName" files="com.azure.spring.cloud.autoconfigure.implementation.properties.core.authentication.TokenCredentialConfigurationProperties"/>
+  <suppress checks="PackageName" files="com.azure.spring.cloud.autoconfigure.implementation.properties.core.authentication.package-info.java"/>
 
   <!--BlacklistedWordsCheck: URL is the name -->
-  <suppress checks="com.azure.tools.checkstyle.checks.BlacklistedWordsCheck" files="com.azure.spring.autoconfigure.storage.resource.(BlobStorageResource|FileStorageResource).java"/>
-
-  <!--BlacklistedWordsCheck: B2C is the product name -->
-  <suppress checks="com.azure.tools.checkstyle.checks.BlacklistedWordsCheck" files="com.azure.spring.autoconfigure.b2c.AADB2CURL"/>
   <suppress checks="com.azure.tools.checkstyle.checks.BlacklistedWordsCheck" files="com.azure.spring.core.resource.StorageBlobResource.java"/>
   <suppress checks="com.azure.tools.checkstyle.checks.BlacklistedWordsCheck" files="com.azure.spring.core.resource.StorageFileResource.java"/>
 
   <!-- EnforceFinalFieldsCheck: The property will be filled by Spring framework -->
-  <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.spring.autoconfigure.aad.(ServiceEndpointsProperties|UserGroups)"/>
-  <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.spring.autoconfigure.jms.ConnectionStringResolver"/>
   <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.spring.data.cosmos.config.AbstractCosmosConfiguration.java"/>
-  <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.spring.data.cosmos.core.query.CosmosPageRequest.java"/>
-  <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.spring.cloud.autoconfigure.context.AzureEnvironmentAutoConfiguration.java"/>
-  <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.spring.cloud.autoconfigure.storage.(AzureStorageQueueAutoConfiguration|AzureStorageAutoConfiguration).java"/>
-  <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.spring.cloud.autoconfigure.servicebus.(AzureServiceBusTopicAutoConfiguration|AzureServiceBusQueueAutoConfiguration).java"/>
-  <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.spring.cloud.autoconfigure.eventhub.AzureEventHubAutoConfiguration.java"/>
   <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.spring.messaging.container.AbstractListenerContainer.java"/>
-  <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.spring.servicebus.stream.binder.config.(ServiceBusTopicBinderConfiguration|ServiceBusQueueBinderConfiguration).java"/>
-  <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.spring.eventhub.stream.binder.config.EventHubBinderConfiguration.java"/>
-
-  <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.spring.data.gremlin.conversion.source.AbstractGremlinSource.java"/>
-  <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.spring.keyvault.KeyVaultOperation.java"/>
-
   <suppress checks="com.azure.tools.checkstyle.checks.EnforceFinalFieldsCheck" files="com.azure.spring.cloud.autoconfigure.keyvault.env.KeyVaultOperation.java"/>
-  <suppress checks="MethodName" files="com.azure.spring.data.gremlin.common.GremlinConfig.java"/>
 
-  <suppress checks="MethodName" files="com.azure.spring.integration.core.api.(CheckpointConfig|BatchConsumerConfig).java"/>
-  <suppress checks="MethodName" files="com.azure.spring.integration.servicebus.ServiceBusClientConfig.java"/>
 
   <!-- Checkstyle suppressions for azure.spring.data.cosmos package -->
   <suppress checks="MethodName|MemberName|ParameterName" files="src[/\\]test[/\\]java[/\\]com[/\\]azure[/\\]spring[/\\]data[/\\]cosmos[/\\]domain|repository.*.java"/>
   <suppress checks="MethodName" files="com.azure.spring.data.cosmos.config.CosmosConfig.java"/>
-  <suppress checks="PackageName" files="com.azure.spring.data.cosmos.multidatasource.*\.java"/>
   <suppress checks="MemberName" files="com.azure.spring.data.cosmos.MyItem.java"/>
   <!-- ### end: Spring related suppression -->
 

diff --git a/...n/java/com/azure/spring/cloud/actuate/autoconfigure/cosmos/CosmosHealthConfiguration.java b/...n/java/com/azure/spring/cloud/actuate/autoconfigure/cosmos/CosmosHealthConfiguration.java
@@ -6,7 +6,7 @@
 import com.azure.cosmos.CosmosAsyncClient;
 import com.azure.spring.cloud.actuate.cosmos.CosmosHealthIndicator;
 import com.azure.spring.cloud.autoconfigure.cosmos.AzureCosmosAutoConfiguration;
-import com.azure.spring.cloud.autoconfigure.cosmos.properties.AzureCosmosProperties;
+import com.azure.spring.cloud.autoconfigure.implementation.cosmos.properties.AzureCosmosProperties;
 import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
 import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
@@ -26,8 +26,8 @@
 public class CosmosHealthConfiguration {
 
     @Bean
-    public HealthIndicator cosmosHealthContributor(AzureCosmosProperties azureCosmosProperties,
-                                                   CosmosAsyncClient cosmosAsyncClient) {
+    HealthIndicator cosmosHealthContributor(AzureCosmosProperties azureCosmosProperties,
+                                            CosmosAsyncClient cosmosAsyncClient) {
         return new CosmosHealthIndicator(cosmosAsyncClient,
                                          azureCosmosProperties.getDatabase(),
                                          azureCosmosProperties.getEndpoint());

diff --git a/...loud/actuate/autoconfigure/appconfiguration/AppConfigurationHealthConfigurationTests.java b/...loud/actuate/autoconfigure/appconfiguration/AppConfigurationHealthConfigurationTests.java
@@ -5,7 +5,7 @@
 
 import com.azure.spring.cloud.actuate.appconfiguration.AppConfigurationHealthIndicator;
 import com.azure.spring.cloud.autoconfigure.appconfiguration.AzureAppConfigurationAutoConfiguration;
-import com.azure.spring.cloud.autoconfigure.properties.AzureGlobalProperties;
+import com.azure.spring.cloud.autoconfigure.implementation.properties.AzureGlobalProperties;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;

diff --git a/...a/com/azure/spring/cloud/actuate/autoconfigure/cosmos/CosmosHealthConfigurationTests.java b/...a/com/azure/spring/cloud/actuate/autoconfigure/cosmos/CosmosHealthConfigurationTests.java
@@ -7,7 +7,7 @@
 import com.azure.cosmos.CosmosClientBuilder;
 import com.azure.spring.cloud.actuate.cosmos.CosmosHealthIndicator;
 import com.azure.spring.cloud.autoconfigure.cosmos.AzureCosmosAutoConfiguration;
-import com.azure.spring.cloud.autoconfigure.properties.AzureGlobalProperties;
+import com.azure.spring.cloud.autoconfigure.implementation.properties.AzureGlobalProperties;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;

diff --git a/...azure/spring/cloud/actuate/autoconfigure/eventhubs/EventHubsHealthConfigurationTests.java b/...azure/spring/cloud/actuate/autoconfigure/eventhubs/EventHubsHealthConfigurationTests.java
@@ -6,7 +6,7 @@
 import com.azure.messaging.eventhubs.EventHubClientBuilder;
 import com.azure.spring.cloud.actuate.eventhubs.EventHubsHealthIndicator;
 import com.azure.spring.cloud.autoconfigure.eventhubs.AzureEventHubsAutoConfiguration;
-import com.azure.spring.cloud.autoconfigure.properties.AzureGlobalProperties;
+import com.azure.spring.cloud.autoconfigure.implementation.properties.AzureGlobalProperties;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;

diff --git a/...m/azure/spring/cloud/actuate/autoconfigure/keyvault/KeyVaultHealthConfigurationTests.java b/...m/azure/spring/cloud/actuate/autoconfigure/keyvault/KeyVaultHealthConfigurationTests.java
@@ -5,7 +5,7 @@
 
 import com.azure.spring.cloud.actuate.keyvault.KeyVaultSecretHealthIndicator;
 import com.azure.spring.cloud.autoconfigure.keyvault.secrets.AzureKeyVaultSecretAutoConfiguration;
-import com.azure.spring.cloud.autoconfigure.properties.AzureGlobalProperties;
+import com.azure.spring.cloud.autoconfigure.implementation.properties.AzureGlobalProperties;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;

diff --git a/...azure/spring/cloud/actuate/autoconfigure/storage/StorageBlobHealthConfigurationTests.java b/...azure/spring/cloud/actuate/autoconfigure/storage/StorageBlobHealthConfigurationTests.java
@@ -4,7 +4,7 @@
 package com.azure.spring.cloud.actuate.autoconfigure.storage;
 
 import com.azure.spring.cloud.actuate.storage.StorageBlobHealthIndicator;
-import com.azure.spring.cloud.autoconfigure.properties.AzureGlobalProperties;
+import com.azure.spring.cloud.autoconfigure.implementation.properties.AzureGlobalProperties;
 import com.azure.spring.cloud.autoconfigure.storage.blob.AzureStorageBlobAutoConfiguration;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;

diff --git a/...zure/spring/cloud/actuate/autoconfigure/storage/StorageQueueHealthConfigurationTests.java b/...zure/spring/cloud/actuate/autoconfigure/storage/StorageQueueHealthConfigurationTests.java
@@ -4,7 +4,7 @@
 package com.azure.spring.cloud.actuate.autoconfigure.storage;
 
 import com.azure.spring.cloud.actuate.storage.StorageQueueHealthIndicator;
-import com.azure.spring.cloud.autoconfigure.properties.AzureGlobalProperties;
+import com.azure.spring.cloud.autoconfigure.implementation.properties.AzureGlobalProperties;
 import com.azure.spring.cloud.autoconfigure.storage.queue.AzureStorageQueueAutoConfiguration;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;

diff --git a/...ure/src/main/java/com/azure/spring/cloud/autoconfigure/AzureServiceConfigurationBase.java b/...ure/src/main/java/com/azure/spring/cloud/autoconfigure/AzureServiceConfigurationBase.java
@@ -3,8 +3,8 @@
 
 package com.azure.spring.cloud.autoconfigure;
 
-import com.azure.spring.cloud.autoconfigure.properties.AzureGlobalProperties;
-import com.azure.spring.cloud.autoconfigure.properties.utils.AzureGlobalPropertiesUtils;
+import com.azure.spring.cloud.autoconfigure.implementation.properties.AzureGlobalProperties;
+import com.azure.spring.cloud.autoconfigure.implementation.properties.utils.AzureGlobalPropertiesUtils;
 import com.azure.spring.core.properties.AzureProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;

diff --git a/...va/com/azure/spring/cloud/autoconfigure/aad/configuration/AADPropertiesConfiguration.java b/...va/com/azure/spring/cloud/autoconfigure/aad/configuration/AADPropertiesConfiguration.java
@@ -5,7 +5,7 @@
 
 import com.azure.spring.cloud.autoconfigure.aad.properties.AADAuthenticationProperties;
 import com.azure.spring.cloud.autoconfigure.aad.properties.AADResourceServerProperties;
-import com.azure.spring.cloud.autoconfigure.properties.AzureGlobalProperties;
+import com.azure.spring.cloud.autoconfigure.implementation.properties.AzureGlobalProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;

diff --git a/.../azure/spring/cloud/autoconfigure/aadb2c/configuration/AADB2CPropertiesConfiguration.java b/.../azure/spring/cloud/autoconfigure/aadb2c/configuration/AADB2CPropertiesConfiguration.java
@@ -4,7 +4,7 @@
 package com.azure.spring.cloud.autoconfigure.aadb2c.configuration;
 
 import com.azure.spring.cloud.autoconfigure.aadb2c.properties.AADB2CProperties;
-import com.azure.spring.cloud.autoconfigure.properties.AzureGlobalProperties;
+import com.azure.spring.cloud.autoconfigure.implementation.properties.AzureGlobalProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;

diff --git a/...e/spring/cloud/autoconfigure/appconfiguration/AzureAppConfigurationAutoConfiguration.java b/...e/spring/cloud/autoconfigure/appconfiguration/AzureAppConfigurationAutoConfiguration.java
@@ -7,9 +7,9 @@
 import com.azure.data.appconfiguration.ConfigurationClient;
 import com.azure.data.appconfiguration.ConfigurationClientBuilder;
 import com.azure.spring.cloud.autoconfigure.AzureServiceConfigurationBase;
-import com.azure.spring.cloud.autoconfigure.appconfiguration.properties.AzureAppConfigurationProperties;
+import com.azure.spring.cloud.autoconfigure.implementation.appconfiguration.AzureAppConfigurationProperties;
 import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnAnyProperty;
-import com.azure.spring.cloud.autoconfigure.properties.AzureGlobalProperties;
+import com.azure.spring.cloud.autoconfigure.implementation.properties.AzureGlobalProperties;
 import com.azure.spring.core.AzureSpringIdentifier;
 import com.azure.spring.core.connectionstring.ConnectionStringProvider;
 import com.azure.spring.core.connectionstring.StaticConnectionStringProvider;
@@ -37,7 +37,7 @@ public AzureAppConfigurationAutoConfiguration(AzureGlobalProperties azureGlobalP
 
     @ConfigurationProperties(prefix = AzureAppConfigurationProperties.PREFIX)
     @Bean
-    public AzureAppConfigurationProperties azureAppConfigurationProperties() {
+    AzureAppConfigurationProperties azureAppConfigurationProperties() {
         return loadProperties(this.azureGlobalProperties, new AzureAppConfigurationProperties());
     }
 
@@ -75,7 +75,7 @@ ConfigurationClientBuilderFactory configurationClientBuilderFactory(
 
     @Bean
     @ConditionalOnProperty("spring.cloud.azure.appconfiguration.connection-string")
-    public StaticConnectionStringProvider<AzureServiceType.AppConfiguration> staticAppConfigurationConnectionStringProvider(
+    StaticConnectionStringProvider<AzureServiceType.AppConfiguration> staticAppConfigurationConnectionStringProvider(
         AzureAppConfigurationProperties properties) {
 
         return new StaticConnectionStringProvider<>(AzureServiceType.APP_CONFIGURATION, properties.getConnectionString());

diff --git a/...n/java/com/azure/spring/cloud/autoconfigure/appconfiguration/properties/package-info.java b/...n/java/com/azure/spring/cloud/autoconfigure/appconfiguration/properties/package-info.java
diff --git a/.../com/azure/spring/cloud/autoconfigure/context/AzureGlobalPropertiesAutoConfiguration.java b/.../com/azure/spring/cloud/autoconfigure/context/AzureGlobalPropertiesAutoConfiguration.java
@@ -3,7 +3,7 @@
 
 package com.azure.spring.cloud.autoconfigure.context;
 
-import com.azure.spring.cloud.autoconfigure.properties.AzureGlobalProperties;
+import com.azure.spring.cloud.autoconfigure.implementation.properties.AzureGlobalProperties;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.boot.context.properties.bind.Binder;
 import org.springframework.context.EnvironmentAware;

diff --git a/...a/com/azure/spring/cloud/autoconfigure/context/AzureTokenCredentialAutoConfiguration.java b/...a/com/azure/spring/cloud/autoconfigure/context/AzureTokenCredentialAutoConfiguration.java
@@ -10,8 +10,8 @@
 import com.azure.identity.ManagedIdentityCredentialBuilder;
 import com.azure.identity.UsernamePasswordCredentialBuilder;
 import com.azure.spring.cloud.autoconfigure.AzureServiceConfigurationBase;
-import com.azure.spring.cloud.autoconfigure.properties.AzureGlobalProperties;
-import com.azure.spring.cloud.autoconfigure.properties.core.AbstractAzureHttpConfigurationProperties;
+import com.azure.spring.cloud.autoconfigure.implementation.properties.AzureGlobalProperties;
+import com.azure.spring.cloud.autoconfigure.implementation.properties.core.AbstractAzureHttpConfigurationProperties;
 import com.azure.spring.core.aware.authentication.TokenCredentialAware;
 import com.azure.spring.core.customizer.AzureServiceClientBuilderCustomizer;
 import com.azure.spring.core.factory.AbstractAzureServiceClientBuilderFactory;

diff --git a/...c/main/java/com/azure/spring/cloud/autoconfigure/cosmos/AzureCosmosAutoConfiguration.java b/...c/main/java/com/azure/spring/cloud/autoconfigure/cosmos/AzureCosmosAutoConfiguration.java
@@ -8,8 +8,8 @@
 import com.azure.cosmos.CosmosClientBuilder;
 import com.azure.spring.cloud.autoconfigure.AzureServiceConfigurationBase;
 import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnAnyProperty;
-import com.azure.spring.cloud.autoconfigure.cosmos.properties.AzureCosmosProperties;
-import com.azure.spring.cloud.autoconfigure.properties.AzureGlobalProperties;
+import com.azure.spring.cloud.autoconfigure.implementation.cosmos.properties.AzureCosmosProperties;
+import com.azure.spring.cloud.autoconfigure.implementation.properties.AzureGlobalProperties;
 import com.azure.spring.core.AzureSpringIdentifier;
 import com.azure.spring.core.customizer.AzureServiceClientBuilderCustomizer;
 import com.azure.spring.service.implementation.cosmos.CosmosClientBuilderFactory;
@@ -34,7 +34,7 @@ public AzureCosmosAutoConfiguration(AzureGlobalProperties azureGlobalProperties)
 
     @Bean
     @ConfigurationProperties(AzureCosmosProperties.PREFIX)
-    public AzureCosmosProperties azureCosmosProperties() {
+    AzureCosmosProperties azureCosmosProperties() {
         return loadProperties(this.azureGlobalProperties, new AzureCosmosProperties());
     }
 

diff --git a/...in/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosDataAutoConfiguration.java b/...in/java/com/azure/spring/cloud/autoconfigure/data/cosmos/CosmosDataAutoConfiguration.java
@@ -3,7 +3,7 @@
 
 package com.azure.spring.cloud.autoconfigure.data.cosmos;
 
-import com.azure.spring.cloud.autoconfigure.cosmos.properties.AzureCosmosProperties;
+import com.azure.spring.cloud.autoconfigure.implementation.cosmos.properties.AzureCosmosProperties;
 import com.azure.spring.data.cosmos.config.AbstractCosmosConfiguration;
 import com.azure.spring.data.cosmos.config.CosmosConfig;
 import com.azure.spring.data.cosmos.core.CosmosTemplate;