From c742b9c3f8b09fa9955d4b05d8d33322cdfe26f9 Mon Sep 17 00:00:00 2001
From: Haotian Zhang <928016560@qq.com>
Date: Wed, 7 Sep 2022 17:41:28 +0800
Subject: [PATCH] refactor:optimize project and code.

---
 .../adapter/PolarisConfigFileLocator.java     | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/adapter/PolarisConfigFileLocator.java b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/adapter/PolarisConfigFileLocator.java
index bbf7746f8..7c79e3945 100644
--- a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/adapter/PolarisConfigFileLocator.java
+++ b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/adapter/PolarisConfigFileLocator.java
@@ -122,22 +122,24 @@ public class PolarisConfigFileLocator implements PropertySourceLocator {
 
 		// priority: application-${profile} > application > boostrap-${profile} > boostrap
 		String[] activeProfiles = environment.getActiveProfiles();
+		String[] defaultProfiles = environment.getDefaultProfiles();
+		List<String> profileList = new ArrayList<>();
+		if (ArrayUtils.isNotEmpty(activeProfiles)) {
+			profileList.addAll(Arrays.asList(activeProfiles));
+		}
+		else if (ArrayUtils.isNotEmpty(defaultProfiles)) {
+			profileList.addAll(Arrays.asList(defaultProfiles));
+		}
 		// build application config files
-		buildInternalApplicationConfigFiles(internalConfigFiles, namespace, serviceName, activeProfiles);
+		buildInternalApplicationConfigFiles(internalConfigFiles, namespace, serviceName, profileList);
 		// build bootstrap config files
-		buildInternalBootstrapConfigFiles(internalConfigFiles, namespace, serviceName, activeProfiles);
+		buildInternalBootstrapConfigFiles(internalConfigFiles, namespace, serviceName, profileList);
 
 		return internalConfigFiles;
 	}
 
-	private void buildInternalApplicationConfigFiles(List<ConfigFileMetadata> internalConfigFiles, String namespace, String serviceName, String[] profiles) {
-		List<String> profileList = new ArrayList<>();
-		if (ArrayUtils.isNotEmpty(profiles)) {
-			profileList.addAll(Arrays.asList(profiles));
-		}
-		else {
-			profileList.addAll(Arrays.asList(environment.getDefaultProfiles()));
-		}
+	private void buildInternalApplicationConfigFiles(
+			List<ConfigFileMetadata> internalConfigFiles, String namespace, String serviceName, List<String> profileList) {
 		for (String profile : profileList) {
 			if (!StringUtils.hasText(profile)) {
 				continue;
@@ -150,14 +152,8 @@ public class PolarisConfigFileLocator implements PropertySourceLocator {
 		internalConfigFiles.add(new DefaultConfigFileMetadata(namespace, serviceName, "application.yml"));
 	}
 
-	private void buildInternalBootstrapConfigFiles(List<ConfigFileMetadata> internalConfigFiles, String namespace, String serviceName, String[] profiles) {
-		List<String> profileList = new ArrayList<>();
-		if (ArrayUtils.isNotEmpty(profiles)) {
-			profileList.addAll(Arrays.asList(profiles));
-		}
-		else {
-			profileList.addAll(Arrays.asList(environment.getDefaultProfiles()));
-		}
+	private void buildInternalBootstrapConfigFiles(
+			List<ConfigFileMetadata> internalConfigFiles, String namespace, String serviceName, List<String> profileList) {
 		for (String profile : profileList) {
 			if (!StringUtils.hasText(profile)) {
 				continue;