Add storage common property configuration supports all Storage features

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/condition/ConditionalOnAnyProperty.java

@@ -34,6 +34,14 @@
      */
     String prefix() default "";
 
+    /**
+     * The prefixes that should be applied to each property. The prefixes automatically ends
+     * with a dot if not specified. A valid prefix is defined by one or more words
+     * separated with dots (e.g. {@code "spring.cloud.azure"}).
+     * @return the prefix array
+     */
+    String[] prefixes() default {};
+
     /**
      * The name of the properties to test. If a prefix has been defined, it is applied to
      * compute the full key of each property. For instance if the prefix is {@code "spring.cloud.azure"}

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/condition/OnAnyPropertyCondition.java

@@ -52,6 +52,8 @@ private static class Spec {
 
         private final String prefix;
 
+        private final String[] prefixes;
+
         private final String havingValue;
 
         private final String[] names;
@@ -61,6 +63,7 @@ private static class Spec {
         Spec(AnnotationAttributes annotationAttributes) {
             String prefixAttr = annotationAttributes.getString("prefix");
             prefix = AzureStringUtils.ensureEndsWithSuffix(prefixAttr.trim(), PROPERTY_SUFFIX);
+            this.prefixes = getPrefixes(annotationAttributes);
             this.havingValue = annotationAttributes.getString("havingValue");
             this.names = getNames(annotationAttributes);
             this.matchIfMissing = annotationAttributes.getBoolean("matchIfMissing");
@@ -76,6 +79,14 @@ private String[] getNames(Map<String, Object> annotationAttributes) {
             return (value.length > 0) ? value : name;
         }
 
+        private String[] getPrefixes(Map<String, Object> annotationAttributes) {
+            String[] prefixesAttr = (String[]) annotationAttributes.get("prefixes");
+            for (int i = 0; i < prefixesAttr.length; i++) {
+                prefixesAttr[i] = AzureStringUtils.ensureEndsWithSuffix(prefixesAttr[i].trim(), PROPERTY_SUFFIX);
+            }
+            return prefixesAttr;
+        }
+
         private void collectProperties(PropertyResolver resolver, List<String> missing, List<String> nonMatching,
                                        List<String> matching) {
             for (String name : this.names) {
@@ -94,6 +105,24 @@ private void collectProperties(PropertyResolver resolver, List<String> missing,
                     }
                 }
             }
+            for (String prefix : this.prefixes) {
+                for (String name : this.names) {
+                    String key = prefix + name;
+                    if (resolver.containsProperty(key)) {
+                        if (!isMatch(resolver.getProperty(key), this.havingValue)) {
+                            nonMatching.add(name);
+                        } else {
+                            matching.add(name);
+                        }
+                    } else {
+                        if (!this.matchIfMissing) {
+                            missing.add(name);
+                        } else {
+                            matching.add(name);
+                        }
+                    }
+                }
+            }
         }
 
         private boolean isMatch(String value, String requiredValue) {
@@ -107,7 +136,17 @@ private boolean isMatch(String value, String requiredValue) {
         public String toString() {
             StringBuilder result = new StringBuilder();
             result.append("(");
-            result.append(this.prefix);
+            if (this.prefix.length() > 1) {
+                result.append(this.prefix);
+            } else if (this.prefixes.length > 0) {
+                if (this.prefixes.length == 1) {
+                    result.append(this.prefixes[0]);
+                } else {
+                    result.append("[");
+                    result.append(StringUtils.arrayToCommaDelimitedString(this.prefixes));
+                    result.append("]");
+                }
+            }
             if (this.names.length == 1) {
                 result.append(this.names[0]);
             } else {

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/properties/utils/AzureServicePropertiesUtils.java

@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.spring.cloud.autoconfigure.implementation.properties.utils;
+
+import com.azure.spring.cloud.core.implementation.util.AzurePropertiesUtils;
+import com.azure.spring.cloud.core.properties.AzureProperties;
+
+/**
+ * Util class for processor Azure Service properties.
+ */
+public final class AzureServicePropertiesUtils {
+
+    public AzureServicePropertiesUtils() {
+    }
+
+    /**
+     * Load the default value to an Azure Service properties from the Azure properties.
+     *
+     * @param source The Azure properties.
+     * @param target The properties of an Azure Service, such as Storage Blob properties. Some common components of the
+     *               service's properties have default value as set to the Azure properties. For example, the proxy of
+     *               the Storage Blob properties takes the proxy set to the Azure properties as default.
+     * @param <T> The type of the properties of an Azure Service.
+     * @return The Azure Service's properties.
+     */
+    public static <T extends AzureProperties> T loadServiceProperties(AzureProperties source, T target) {
+        AzurePropertiesUtils.copyAzureCommonPropertiesIgnoreNull(source, target);
+        AzurePropertiesUtils.copyPropertiesIgnoreNull(source, target);
+        return target;
+    }
+
+}

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/storage/common/AzureStorageGlobalProperties.java

@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.spring.cloud.autoconfigure.implementation.storage.common;
+
+/**
+ * Global Properties for Azure Storage services.
+ */
+public class AzureStorageGlobalProperties extends AzureStorageProperties {
+
+    public static final String PREFIX = "spring.cloud.azure.storage";
+
+}

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/storage/AzureStorageConfiguration.java

@@ -0,0 +1,31 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.spring.cloud.autoconfigure.storage;
+
+import com.azure.spring.cloud.autoconfigure.AzureServiceConfigurationBase;
+import com.azure.spring.cloud.autoconfigure.context.AzureGlobalProperties;
+import com.azure.spring.cloud.autoconfigure.implementation.storage.common.AzureStorageGlobalProperties;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Configuration for Azure Storage support.
+ *
+ * @since 4.0.0
+ */
+@Configuration
+public class AzureStorageConfiguration extends AzureServiceConfigurationBase {
+
+    AzureStorageConfiguration(AzureGlobalProperties azureGlobalProperties) {
+        super(azureGlobalProperties);
+    }
+
+    @Bean
+    @ConfigurationProperties(AzureStorageGlobalProperties.PREFIX)
+    AzureStorageGlobalProperties storageProperties() {
+        return loadProperties(getAzureGlobalProperties(), new AzureStorageGlobalProperties());
+    }
+
+}

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/storage/blob/AzureStorageBlobAutoConfiguration.java

@@ -3,10 +3,11 @@
 
 package com.azure.spring.cloud.autoconfigure.storage.blob;
 
-import com.azure.spring.cloud.autoconfigure.AzureServiceConfigurationBase;
 import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnAnyProperty;
-import com.azure.spring.cloud.autoconfigure.context.AzureGlobalProperties;
+import com.azure.spring.cloud.autoconfigure.implementation.properties.utils.AzureServicePropertiesUtils;
 import com.azure.spring.cloud.autoconfigure.implementation.storage.blob.properties.AzureStorageBlobProperties;
+import com.azure.spring.cloud.autoconfigure.storage.AzureStorageConfiguration;
+import com.azure.spring.cloud.autoconfigure.implementation.storage.common.AzureStorageGlobalProperties;
 import com.azure.spring.cloud.core.implementation.util.AzureSpringIdentifier;
 import com.azure.spring.cloud.core.provider.connectionstring.ServiceConnectionStringProvider;
 import com.azure.spring.cloud.core.provider.connectionstring.StaticConnectionStringProvider;
@@ -27,7 +28,10 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 
 import static com.azure.spring.cloud.autoconfigure.context.AzureContextUtils.STORAGE_BLOB_CLIENT_BUILDER_BEAN_NAME;
 import static com.azure.spring.cloud.autoconfigure.context.AzureContextUtils.STORAGE_BLOB_CLIENT_BUILDER_FACTORY_BEAN_NAME;
@@ -37,19 +41,18 @@
  *
  * @since 4.0.0
  */
+@Configuration(proxyBeanMethods = false)
+@EnableConfigurationProperties
 @ConditionalOnClass(BlobServiceClientBuilder.class)
 @ConditionalOnProperty(value = "spring.cloud.azure.storage.blob.enabled", havingValue = "true", matchIfMissing = true)
-@ConditionalOnAnyProperty(prefix = "spring.cloud.azure.storage.blob", name = { "account-name", "endpoint", "connection-string" })
-public class AzureStorageBlobAutoConfiguration extends AzureServiceConfigurationBase {
-
-    AzureStorageBlobAutoConfiguration(AzureGlobalProperties azureGlobalProperties) {
-        super(azureGlobalProperties);
-    }
+@ConditionalOnAnyProperty(prefixes = { "spring.cloud.azure.storage.blob", "spring.cloud.azure.storage" }, name = { "account-name", "endpoint", "connection-string" })
+@Import(AzureStorageConfiguration.class)
+public class AzureStorageBlobAutoConfiguration {
 
     @Bean
     @ConfigurationProperties(AzureStorageBlobProperties.PREFIX)
-    AzureStorageBlobProperties azureStorageBlobProperties() {
-        return loadProperties(getAzureGlobalProperties(), new AzureStorageBlobProperties());
+    AzureStorageBlobProperties azureStorageBlobProperties(AzureStorageGlobalProperties storageGlobalProperties) {
+        return AzureServicePropertiesUtils.loadServiceProperties(storageGlobalProperties, new AzureStorageBlobProperties());
     }
 
     @Bean
@@ -130,7 +133,7 @@ BlobServiceClientBuilder blobServiceClientBuilder(@Qualifier(STORAGE_BLOB_CLIENT
     }
 
     @Bean
-    @ConditionalOnProperty("spring.cloud.azure.storage.blob.connection-string")
+    @ConditionalOnAnyProperty(prefixes = { AzureStorageBlobProperties.PREFIX, AzureStorageGlobalProperties.PREFIX }, name = { "connection-string" })
     StaticConnectionStringProvider<AzureServiceType.StorageBlob> staticStorageBlobConnectionStringProvider(
         AzureStorageBlobProperties properties) {
         return new StaticConnectionStringProvider<>(AzureServiceType.STORAGE_BLOB, properties.getConnectionString());

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/storage/blob/AzureStorageBlobResourceAutoConfiguration.java

@@ -18,7 +18,7 @@
  */
 @ConditionalOnClass({ AzureStorageBlobProtocolResolver.class })
 @ConditionalOnProperty(value = "spring.cloud.azure.storage.blob.enabled", havingValue = "true", matchIfMissing = true)
-@ConditionalOnAnyProperty(prefix = "spring.cloud.azure.storage.blob", name = { "account-name", "endpoint", "connection-string" })
+@ConditionalOnAnyProperty(prefixes = { "spring.cloud.azure.storage.blob", "spring.cloud.azure.storage" }, name = { "account-name", "endpoint", "connection-string" })
 public class AzureStorageBlobResourceAutoConfiguration {
 
     /**

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/storage/fileshare/AzureStorageFileShareAutoConfiguration.java

@@ -3,10 +3,11 @@
 
 package com.azure.spring.cloud.autoconfigure.storage.fileshare;
 
-import com.azure.spring.cloud.autoconfigure.AzureServiceConfigurationBase;
 import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnAnyProperty;
-import com.azure.spring.cloud.autoconfigure.context.AzureGlobalProperties;
+import com.azure.spring.cloud.autoconfigure.implementation.properties.utils.AzureServicePropertiesUtils;
+import com.azure.spring.cloud.autoconfigure.implementation.storage.common.AzureStorageGlobalProperties;
 import com.azure.spring.cloud.autoconfigure.implementation.storage.fileshare.properties.AzureStorageFileShareProperties;
+import com.azure.spring.cloud.autoconfigure.storage.AzureStorageConfiguration;
 import com.azure.spring.cloud.core.customizer.AzureServiceClientBuilderCustomizer;
 import com.azure.spring.cloud.core.implementation.util.AzureSpringIdentifier;
 import com.azure.spring.cloud.core.provider.connectionstring.ServiceConnectionStringProvider;
@@ -28,26 +29,28 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for Azure Storage File Share support.
  *
  * @since 4.0.0
  */
+@Configuration(proxyBeanMethods = false)
+@EnableConfigurationProperties
 @ConditionalOnClass(ShareServiceClientBuilder.class)
 @ConditionalOnProperty(value = "spring.cloud.azure.storage.fileshare.enabled", havingValue = "true", matchIfMissing = true)
-@ConditionalOnAnyProperty(prefix = "spring.cloud.azure.storage.fileshare", name = { "account-name", "endpoint", "connection-string" })
-public class AzureStorageFileShareAutoConfiguration extends AzureServiceConfigurationBase {
-
-    AzureStorageFileShareAutoConfiguration(AzureGlobalProperties azureGlobalProperties) {
-        super(azureGlobalProperties);
-    }
+@ConditionalOnAnyProperty(prefixes = { "spring.cloud.azure.storage.fileshare", "spring.cloud.azure.storage" }, name = { "account-name", "endpoint", "connection-string" })
+@Import(AzureStorageConfiguration.class)
+public class AzureStorageFileShareAutoConfiguration {
 
     @Bean
     @ConfigurationProperties(AzureStorageFileShareProperties.PREFIX)
-    AzureStorageFileShareProperties azureStorageFileShareProperties() {
-        return loadProperties(getAzureGlobalProperties(), new AzureStorageFileShareProperties());
+    AzureStorageFileShareProperties azureStorageFileShareProperties(AzureStorageGlobalProperties storageGlobalProperties) {
+        return AzureServicePropertiesUtils.loadServiceProperties(storageGlobalProperties, new AzureStorageFileShareProperties());
     }
 
     /**
@@ -140,7 +143,7 @@ ShareDirectoryClient shareDirectoryClient(AzureStorageFileShareProperties proper
     }
 
     @Bean
-    @ConditionalOnProperty("spring.cloud.azure.storage.fileshare.connection-string")
+    @ConditionalOnAnyProperty(prefixes = { AzureStorageFileShareProperties.PREFIX, AzureStorageGlobalProperties.PREFIX }, name = { "connection-string" })
     StaticConnectionStringProvider<AzureServiceType.StorageFileShare> staticStorageFileShareConnectionStringProvider(
         AzureStorageFileShareProperties properties) {
         return new StaticConnectionStringProvider<>(AzureServiceType.STORAGE_FILE_SHARE, properties.getConnectionString());

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/storage/fileshare/AzureStorageFileShareResourceAutoConfiguration.java

@@ -18,7 +18,7 @@
  */
 @ConditionalOnClass({ AzureStorageFileProtocolResolver.class })
 @ConditionalOnProperty(value = "spring.cloud.azure.storage.fileshare.enabled", havingValue = "true", matchIfMissing = true)
-@ConditionalOnAnyProperty(prefix = "spring.cloud.azure.storage.fileshare", name = { "account-name", "endpoint", "connection-string" })
+@ConditionalOnAnyProperty(prefixes = { "spring.cloud.azure.storage.fileshare", "spring.cloud.azure.storage" }, name = { "account-name", "endpoint", "connection-string" })
 public class AzureStorageFileShareResourceAutoConfiguration  {
 
     /**

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/storage/queue/AzureStorageQueueAutoConfiguration.java

@@ -3,10 +3,11 @@
 
 package com.azure.spring.cloud.autoconfigure.storage.queue;
 
-import com.azure.spring.cloud.autoconfigure.AzureServiceConfigurationBase;
 import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnAnyProperty;
-import com.azure.spring.cloud.autoconfigure.context.AzureGlobalProperties;
+import com.azure.spring.cloud.autoconfigure.implementation.properties.utils.AzureServicePropertiesUtils;
+import com.azure.spring.cloud.autoconfigure.implementation.storage.common.AzureStorageGlobalProperties;
 import com.azure.spring.cloud.autoconfigure.implementation.storage.queue.properties.AzureStorageQueueProperties;
+import com.azure.spring.cloud.autoconfigure.storage.AzureStorageConfiguration;
 import com.azure.spring.cloud.core.customizer.AzureServiceClientBuilderCustomizer;
 import com.azure.spring.cloud.core.implementation.util.AzureSpringIdentifier;
 import com.azure.spring.cloud.core.provider.connectionstring.ServiceConnectionStringProvider;
@@ -24,26 +25,28 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for Azure Storage Queue support.
  *
  * @since 4.0.0
  */
+@Configuration(proxyBeanMethods = false)
+@EnableConfigurationProperties
 @ConditionalOnClass(QueueServiceClientBuilder.class)
 @ConditionalOnProperty(value = "spring.cloud.azure.storage.queue.enabled", havingValue = "true", matchIfMissing = true)
-@ConditionalOnAnyProperty(prefix = "spring.cloud.azure.storage.queue", name = { "account-name", "endpoint", "connection-string" })
-public class AzureStorageQueueAutoConfiguration extends AzureServiceConfigurationBase {
-
-    AzureStorageQueueAutoConfiguration(AzureGlobalProperties azureGlobalProperties) {
-        super(azureGlobalProperties);
-    }
+@ConditionalOnAnyProperty(prefixes = { "spring.cloud.azure.storage.queue", "spring.cloud.azure.storage" }, name = { "account-name", "endpoint", "connection-string" })
+@Import(AzureStorageConfiguration.class)
+public class AzureStorageQueueAutoConfiguration {
 
     @Bean
     @ConfigurationProperties(AzureStorageQueueProperties.PREFIX)
-    AzureStorageQueueProperties azureStorageQueueProperties() {
-        return loadProperties(getAzureGlobalProperties(), new AzureStorageQueueProperties());
+    AzureStorageQueueProperties azureStorageQueueProperties(AzureStorageGlobalProperties storageGlobalProperties) {
+        return AzureServicePropertiesUtils.loadServiceProperties(storageGlobalProperties, new AzureStorageQueueProperties());
     }
 
     /**
@@ -105,7 +108,7 @@ QueueServiceClientBuilder queueServiceClientBuilder(QueueServiceClientBuilderFac
     }
 
     @Bean
-    @ConditionalOnProperty("spring.cloud.azure.storage.queue.connection-string")
+    @ConditionalOnAnyProperty(prefixes = { AzureStorageQueueProperties.PREFIX, AzureStorageGlobalProperties.PREFIX }, name = { "connection-string" })
     StaticConnectionStringProvider<AzureServiceType.StorageQueue> staticStorageQueueConnectionStringProvider(
         AzureStorageQueueProperties storageQueueProperties) {