Skip to content

Commit 89cf240

Browse files
authored
1 parent fe7f5b9 commit 89cf240

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

sdk/spring/azure-spring-cloud-context/src/main/java/com/azure/spring/cloud/autoconfigure/context/AzureContextAutoConfiguration.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
import com.azure.spring.cloud.context.core.impl.DefaultCredentialsProvider;
1818
import com.microsoft.rest.RestClient;
1919
import java.io.IOException;
20+
import java.util.Optional;
21+
2022
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2123
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2224
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -56,12 +58,10 @@ public Azure azure(AzureTokenCredentials credentials, AzureProperties azurePrope
5658
.withInterceptor(new ResourceManagerThrottlingInterceptor()).withUserAgent(SPRING_CLOUD_USER_AGENT)
5759
.build();
5860

59-
if (azureProperties.getSubscriptionId() == null) {
60-
return Azure.authenticate(restClient, credentials.domain()).withDefaultSubscription();
61-
} else {
62-
return Azure.authenticate(restClient, credentials.domain())
63-
.withSubscription(azureProperties.getSubscriptionId());
64-
}
61+
String subscriptionId = Optional.of(azureProperties.getSubscriptionId())
62+
.orElseGet(credentials::defaultSubscriptionId);
63+
return Azure.authenticate(restClient, credentials.domain())
64+
.withSubscription(subscriptionId);
6565
}
6666

6767
@Bean

0 commit comments

Comments
 (0)