Spring cloud azure refactor global properties (#25239)

Azure · Nov 15, 2021 · 1a124b0 · 1a124b0
1 parent 64bcb2b
commit 1a124b0
Show file tree

Hide file tree

Showing 88 changed files with 1,477 additions and 666 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
@@ -477,6 +477,8 @@ the main ServiceBusClientBuilder. -->
 
   <!-- MissingJavadocMethod: Temporarily skip -->
   <suppress checks="MissingJavadocMethod" files=".*[/\\]com[/\\]azure[/\\]spring[/\\].*"/>
+  <!-- JavadocThrowsChecks: Temporarily skip -->
+  <suppress checks="JavadocThrowsChecks" files=".*[/\\]com[/\\]azure[/\\]spring[/\\].*"/>
   <!-- MissingJavadocMethod: internal packages -->
   <suppress checks="MissingJavadocType|JavadocThrowsChecks|EnforceFinalFields" files=".*[/\\]com[/\\]azure[/\\]spring[/\\]integration[/\\]test.*"/>
 

diff --git a/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml b/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
@@ -2311,7 +2311,7 @@
   </Match>
 
   <Match>
-    <Class name="com.azure.spring.cloud.autoconfigure.jms.AzureServiceBusJmsProperties"/>
+    <Class name="com.azure.spring.cloud.autoconfigure.jms.properties.AzureServiceBusJmsProperties"/>
     <Field name="pricingTier"/>
     <Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"/>
   </Match>

diff --git a/...gration-core/src/main/java/com/azure/spring/integration/core/api/BatchConsumerConfig.java b/...gration-core/src/main/java/com/azure/spring/integration/core/api/BatchConsumerConfig.java
diff --git a/...pring-integration-core/src/main/java/com/azure/spring/integration/core/api/Batchable.java b/...pring-integration-core/src/main/java/com/azure/spring/integration/core/api/Batchable.java
diff --git a/...va/com/azure/spring/integration/eventhub/converter/EventHubBatchMessageConverterTest.java b/...va/com/azure/spring/integration/eventhub/converter/EventHubBatchMessageConverterTest.java
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.AzureCosmosProperties;
+import com.azure.spring.cloud.autoconfigure.cosmos.properties.AzureCosmosProperties;
 import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
 import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;

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
@@ -4,8 +4,12 @@
 package com.azure.spring.cloud.autoconfigure;
 
 import com.azure.spring.cloud.autoconfigure.properties.AzureGlobalProperties;
+import com.azure.spring.core.aware.ClientAware;
+import com.azure.spring.core.aware.ProxyAware;
+import com.azure.spring.core.aware.RetryAware;
 import com.azure.spring.core.properties.AzureProperties;
 import com.azure.spring.core.properties.AzurePropertiesUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
@@ -24,6 +28,28 @@ public AzureServiceConfigurationBase(AzureGlobalProperties azureProperties) {
 
     protected <T extends AzureProperties> T loadProperties(AzureGlobalProperties source, T target) {
         AzurePropertiesUtils.copyAzureCommonProperties(source, target);
+
+        if (target.getClient() instanceof ClientAware.HttpClient) {
+            BeanUtils.copyProperties(source.getClient().getHttp(), target.getClient());
+
+            ClientAware.HttpClient targetClient = (ClientAware.HttpClient) target.getClient();
+            BeanUtils.copyProperties(source.getClient().getHttp().getLogging(), targetClient.getLogging());
+            targetClient.getLogging().getAllowedHeaderNames().addAll(source.getClient().getHttp().getLogging().getAllowedHeaderNames());
+            targetClient.getLogging().getAllowedQueryParamNames().addAll(source.getClient().getHttp().getLogging().getAllowedQueryParamNames());
+        }
+
+        if (target.getClient() instanceof ClientAware.AmqpClient) {
+            BeanUtils.copyProperties(source.getClient().getAmqp(), target.getClient());
+        }
+
+        if (target.getProxy() instanceof ProxyAware.HttpProxy) {
+            BeanUtils.copyProperties(source.getProxy().getHttp(), target.getProxy());
+        }
+
+        if (target.getRetry() instanceof RetryAware.HttpRetry) {
+            BeanUtils.copyProperties(source.getRetry().getHttp(), target.getRetry());
+        }
+
         return target;
     }
 }
diff --git a/...e/spring/cloud/autoconfigure/appconfiguration/AzureAppConfigurationAutoConfiguration.java b/...e/spring/cloud/autoconfigure/appconfiguration/AzureAppConfigurationAutoConfiguration.java
@@ -7,6 +7,7 @@
 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.condition.ConditionalOnAnyProperty;
 import com.azure.spring.cloud.autoconfigure.properties.AzureGlobalProperties;
 import com.azure.spring.core.AzureSpringIdentifier;